Renames

Author: rijnb

.gitignore

@@ -1,3 +1,6 @@
+gmon.out
+report_*.txt
+
 # -----------------------------------------------------------------------------
 # Compiled sources
 # -----------------------------------------------------------------------------
@@ -35,7 +38,6 @@ utility/mapcode
 *.swp
 *.hprof
 *.hprof.index
-gmon.out
 *~
 
 # -----------------------------------------------------------------------------

mapcodelib/internal_alphabet_recognizer.h

@@ -24,9 +24,9 @@ extern "C" {
 // *** GENERATED FILE (dividemaps.cpp), DO NOT CHANGE OR PRETTIFY ***
 
 // Returns alphabet of character, or negative (_ALPHABET_MIN) in not recognized
-#define ALPHABET_OF_CHAR(w) ((enum Alphabet) alphabetOf[(w) >> 6])
+#define ALPHABET_OF_CHAR(w) ((enum Alphabet) ALPHABET_OF[(w) >> 6])
 
-static signed char alphabetOf[] = {
+static const signed char ALPHABET_OF[] = {
     /* 0000 */ ALPHABET_ROMAN       , ALPHABET_ROMAN       , ALPHABET_ROMAN       , ALPHABET_ROMAN,
     /* 0100 */ ALPHABET_ROMAN       , ALPHABET_ROMAN       , ALPHABET_ROMAN       , ALPHABET_ROMAN,
     /* 0200 */ ALPHABET_ROMAN       , ALPHABET_ROMAN       , ALPHABET_ROMAN       , ALPHABET_ROMAN,
@@ -285,8 +285,8 @@ static signed char alphabetOf[] = {
     /* ff00 */ ALPHABET_ARABIC      , ALPHABET_ARABIC      , ALPHABET_ARABIC      , ALPHABET_ARABIC
 }; // 1024 records
 
-#define ROMANVERSION_MAXCHAR 0x3129
-static const char *romanVersionOf[] = {
+#define ROMAN_VERSION_MAX_CHAR 0x3129
+static const char *ROMAN_VERSION_OF[] = {
     /* 0000 */ "\0                                !?#$%&'()*+,-./0123456789:;<=>?",
     /* 0040 */ "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[?]^_`abcdefghijklmnopqrstuvwxyz{|}~?",
     /* 0080 */ NULL,

mapcodelib/internal_data.h

@@ -22,9 +22,9 @@ extern "C" {
 
 // *** GENERATED FILE (coords.cpp), DO NOT CHANGE OR PRETTIFY ***
 
-#define mapcode_dataversion "2.3.0" // coords 2.0.2
+#define MAPCODE_DATA_VERSION "2.3.0" // coords 2.0.2
 
-static const char *iso3166alpha[_TERRITORY_MAX - _TERRITORY_MIN - 1] = {
+static const char *ISO3166_ALPHA[_TERRITORY_MAX - _TERRITORY_MIN - 1] = {
         "VAT", "MCO", "GIB", "TKL", "CCK", "BLM", "NRU", "TUV", "MAC", "SXM",
         "MAF", "NFK", "PCN", "BVT", "BMU", "IOT", "SMR", "GGY", "AIA", "MSR",
         "JEY", "CXR", "WLF", "VGB", "LIE", "ABW", "MHL", "ASM", "COK", "SPM",
@@ -113,7 +113,7 @@ static const char *iso3166alpha[_TERRITORY_MAX - _TERRITORY_MIN - 1] = {
 
 
 // index of first rectangle record for x-th territory
-static const int data_start[_TERRITORY_MAX - _TERRITORY_MIN] = {
+static const int DATA_START[_TERRITORY_MAX - _TERRITORY_MIN] = {
         0, 3, 6, 10, 14, 17, 19, 20, 31, 32,
         34, 36, 38, 43, 45, 48, 52, 59, 63, 65,
         67, 71, 73, 81, 87, 95, 97, 132, 139, 149,
@@ -181,7 +181,7 @@ typedef struct {
 } TerritoryBoundary;
 
 #ifndef MAKE_SOURCE_DIGITAL
-static const TerritoryBoundary territoryBoundaries[MAPCODE_BOUNDARY_MAX + 1] = {
+static const TerritoryBoundary TERRITORY_BOUNDARIES[MAPCODE_BOUNDARY_MAX + 1] = {
         {12433114,   41851944,  12548434,   41938434,  0x001000b}, // VAT
         {5850000,    35450000,  18560000,   55080000,  0x50a0216},
         {12444000,   41899000,  12460000,   41908000,  0x003021c},
@@ -16540,7 +16540,7 @@ static const TerritoryBoundary territoryBoundaries[MAPCODE_BOUNDARY_MAX + 1] = {
         {-180000000, -90000000, 180000000,  90000001,  0x000001d},
 };
 
-#define territoryBoundary(m) (&territoryBoundaries[m])
+#define TERRITORY_BOUNDARY(m) (&TERRITORY_BOUNDARIES[m])
 
 #endif // MAKE_SOURCE_DIGITAL
 

mapcodelib/internal_iso3166_data.h

@@ -70,8 +70,9 @@ static const char PARENT_NUMBER[_TERRITORY_MAX - _TERRITORY_MIN] = {
 typedef struct {
     const char *alphaCode;
     enum Territory territory;
-} alphaRec;
-static const alphaRec ALPHA_SEARCH[NR_TERRITORY_RECS] = {
+} AlphaRec;
+
+static const AlphaRec ALPHA_SEARCH[NR_TERRITORY_RECS] = {
         {"AAA",    TERRITORY_AAA},
         {"AB",     TERRITORY_CA_AB},
         {"ABW",    TERRITORY_ABW},

mapcodelib/internal_territory_alphabets.h

@@ -24,7 +24,7 @@ extern "C" {
 
 #include "mapcoder.h"
 
-static const TerritoryAlphabets alphabetsForTerritory[_TERRITORY_MAX - _TERRITORY_MIN - 1] = {
+static const TerritoryAlphabets ALPHABETS_FOR_TERRITORY[_TERRITORY_MAX - _TERRITORY_MIN - 1] = {
         {1, {ALPHABET_ROMAN}}, // VAT Vatican
         {1, {ALPHABET_ROMAN}}, // MCO Monaco
         {1, {ALPHABET_ROMAN}}, // GIB Gibraltar

mapcodelib/internal_territory_names_english.h

@@ -21,7 +21,7 @@ extern "C" {
 #endif
 
 // *** GENERATED FILE (coords.cpp), DO NOT CHANGE OR PRETTIFY ***
-static const char *isofullname[] = {
+static const char *TERRITORY_FULL_NAME[] = {
         "Vatican|Holy See",
         "Monaco",
         "Gibraltar",

mapcodelib/internal_territory_names_local.h

@@ -21,7 +21,7 @@ extern "C" {
 #endif
 
 // *** GENERATED FILE (coords.cpp), DO NOT CHANGE OR PRETTIFY ***
-static const char *localname_utf8[] = {
+static const char *TERRITORY_LOCAL_NAME_UTF8[] = {
         "Sancta Sedes|Holy See",
         "Monaco",
         "Gibraltar",

mapcodelib/internal_territory_search.h

@@ -28,7 +28,7 @@ extern "C" {
 #error "NO_FAST_ENCODE cannot be specified in this file"
 #endif
 
-static int redivar[] = {
+static const int REDIVAR[] = {
         27984500, 1383,
         2537718, 676,
         12842450, 332,

mapcodelib/mapcoder.c

@@ -62,13 +62,13 @@ void _TestAssert(int iCondition, const char *cstrFile, int iLine) {
 
 #endif
 
-#define IS_NAMELESS(m)        (territoryBoundaries[m].flags & 64)
-#define IS_RESTRICTED(m)      (territoryBoundaries[m].flags & 512)
-#define IS_SPECIAL_SHAPE(m)   (territoryBoundaries[m].flags & 1024)
-#define REC_TYPE(m)           ((territoryBoundaries[m].flags >> 7) & 3)
-#define SMART_DIV(m)          (territoryBoundaries[m].flags >> 16)
-#define HEADER_LETTER(m)      (ENCODE_CHARS[(territoryBoundaries[m].flags >> 11) & 31])
-#define BOUNDARY_PTR(m)       (&territoryBoundaries[m])
+#define IS_NAMELESS(m)        (TERRITORY_BOUNDARIES[m].flags & 64)
+#define IS_RESTRICTED(m)      (TERRITORY_BOUNDARIES[m].flags & 512)
+#define IS_SPECIAL_SHAPE(m)   (TERRITORY_BOUNDARIES[m].flags & 1024)
+#define REC_TYPE(m)           ((TERRITORY_BOUNDARIES[m].flags >> 7) & 3)
+#define SMART_DIV(m)          (TERRITORY_BOUNDARIES[m].flags >> 16)
+#define HEADER_LETTER(m)      (ENCODE_CHARS[(TERRITORY_BOUNDARIES[m].flags >> 11) & 31])
+#define BOUNDARY_PTR(m)       (&TERRITORY_BOUNDARIES[m])
 
 #define TOKENSEP   0
 #define TOKENDOT   1
@@ -454,13 +454,13 @@ static char *safeCopy(char *targetString, const char *sourceString, const int ta
 
 static int firstRec(const enum Territory ccode) {
     ASSERT((_TERRITORY_MIN < ccode) && (ccode < _TERRITORY_MAX));
-    return data_start[INDEX_OF_TERRITORY(ccode)];
+    return DATA_START[INDEX_OF_TERRITORY(ccode)];
 }
 
 
 static int lastRec(const enum Territory ccode) {
     ASSERT((_TERRITORY_MIN < ccode) && (ccode < _TERRITORY_MAX));
-    return data_start[INDEX_OF_TERRITORY(ccode) + 1] - 1;
+    return DATA_START[INDEX_OF_TERRITORY(ccode) + 1] - 1;
 }
 
 
@@ -475,7 +475,7 @@ static enum Territory parentTerritoryOf(const enum Territory ccode) {
 
 
 static int coDex(const int m) {
-    int c = territoryBoundaries[m].flags & 31;
+    int c = TERRITORY_BOUNDARIES[m].flags & 31;
     ASSERT((0 <= m) && (m <= MAPCODE_BOUNDARY_MAX));
     return 10 * (c / 5) + ((c % 5) + 1);
 }
@@ -1228,13 +1228,13 @@ static int encodeLatLonToMapcodes_internal(Mapcodes *mapcodes,
         {
             const int sum = enc.coord32.lonMicroDeg + enc.coord32.latMicroDeg;
             int coord = enc.coord32.lonMicroDeg;
-            int i = 0; // pointer into redivar
+            int i = 0; // pointer into REDIVAR
             for (;;) {
-                const int r = redivar[i++];
+                const int r = REDIVAR[i++];
                 if (r >= 0 && r < 1024) { // leaf?
                     int j;
                     for (j = 0; j <= r; j++) {
-                        const enum Territory ccode = (j == r ? TERRITORY_AAA : (enum Territory) redivar[i + j]);
+                        const enum Territory ccode = (j == r ? TERRITORY_AAA : (enum Territory) REDIVAR[i + j]);
                         encoderEngine(ccode, &enc, stop_with_one_result, extraDigits, requiredEncoder, TERRITORY_NONE);
                         if ((stop_with_one_result || (requiredEncoder >= 0)) && (enc.mapcodes->count > 0)) {
                             break;
@@ -1244,7 +1244,7 @@ static int encodeLatLonToMapcodes_internal(Mapcodes *mapcodes,
                 } else {
                     coord = sum - coord;
                     if (coord > r) {
-                        i = redivar[i];
+                        i = REDIVAR[i];
                     } else {
                         i++;
                     }
@@ -1750,10 +1750,10 @@ static enum MapcodeError decodeAutoHeader(DecodeRec *dec, int m) {
 
 // Returns romanised version of character, or question mark in not recognized
 static unsigned char getRomanVersionOf(UWORD w) {
-    if (w > ROMANVERSION_MAXCHAR || romanVersionOf[w >> 6] == NULL) {
+    if (w > ROMAN_VERSION_MAX_CHAR || ROMAN_VERSION_OF[w >> 6] == NULL) {
         return '?';
     }
-    return (unsigned char) romanVersionOf[w >> 6][w & 63];
+    return (unsigned char) ROMAN_VERSION_OF[w >> 6][w & 63];
 }
 
 
@@ -2745,7 +2745,7 @@ char *getTerritoryIsoName(char *territoryISO, enum Territory territory, int useS
     if (territory == TERRITORY_NONE) {
         *territoryISO = 0;
     } else {
-        const char *alphaCode = iso3166alpha[INDEX_OF_TERRITORY(territory)];
+        const char *alphaCode = ISO3166_ALPHA[INDEX_OF_TERRITORY(territory)];
         const char *hyphen = strchr(alphaCode, '-');
         if (useShortName && hyphen != NULL) {
             strcpy(territoryISO, hyphen + 1);
@@ -2809,8 +2809,8 @@ int multipleBordersNearby(double latDeg, double lonDeg, enum Territory territory
 
 
 static int compareAlphaCode(const void *e1, const void *e2) {
-    const alphaRec *a1 = (const alphaRec *) e1;
-    const alphaRec *a2 = (const alphaRec *) e2;
+    const AlphaRec *a1 = (const AlphaRec *) e1;
+    const AlphaRec *a2 = (const AlphaRec *) e2;
     ASSERT(e1);
     ASSERT(e2);
     return strcmp(a1->alphaCode, a2->alphaCode);
@@ -2841,11 +2841,11 @@ static enum Territory findMatch(const int parentNumber, const char *territoryISO
     codeISO[len] = 0;
     makeUppercase(codeISO);
     { // binary-search the result
-        const alphaRec *p;
-        alphaRec t;
+        const AlphaRec *p;
+        AlphaRec t;
         t.alphaCode = codeISO;
 
-        p = (const alphaRec *) bsearch(&t, ALPHA_SEARCH, NR_TERRITORY_RECS, sizeof(alphaRec), compareAlphaCode);
+        p = (const AlphaRec *) bsearch(&t, ALPHA_SEARCH, NR_TERRITORY_RECS, sizeof(AlphaRec), compareAlphaCode);
         if (p) {
             if (strcmp(t.alphaCode, p->alphaCode) == 0) { // only interested in PERFECT match
                 return p->territory;
@@ -3004,7 +3004,7 @@ encodeLatLonToMapcodes(Mapcodes *mapcodes, double latDeg, double lonDeg, enum Te
 // PUBLIC - returns most common alphabets for territory, NULL if error
 const TerritoryAlphabets *getAlphabetsForTerritory(enum Territory territory) {
     if (territory > _TERRITORY_MIN && territory < _TERRITORY_MAX) {
-        return &alphabetsForTerritory[INDEX_OF_TERRITORY(territory)];
+        return &ALPHABETS_FOR_TERRITORY[INDEX_OF_TERRITORY(territory)];
     }
     return NULL;
 }
@@ -3079,7 +3079,7 @@ static int getFullTerritoryName_internal(
 
 
 int getFullTerritoryNameEnglish(char *territoryName, enum Territory territory, int alternative) {
-    return getFullTerritoryName_internal(territoryName, territory, alternative, -1, isofullname);
+    return getFullTerritoryName_internal(territoryName, territory, alternative, -1, TERRITORY_FULL_NAME);
 }
 
 
@@ -3093,12 +3093,12 @@ int getFullTerritoryNameLocalInAlphabet(char *territoryName, enum Territory terr
         *territoryName = 0;
         return 0;
     }
-    return getFullTerritoryName_internal(territoryName, territory, alternative, (int) alphabet, localname_utf8);
+    return getFullTerritoryName_internal(territoryName, territory, alternative, (int) alphabet, TERRITORY_LOCAL_NAME_UTF8);
 }
 
 
 int getFullTerritoryNameLocal(char *territoryName, enum Territory territory, int alternative) {
-    return getFullTerritoryName_internal(territoryName, territory, alternative, -1, localname_utf8);
+    return getFullTerritoryName_internal(territoryName, territory, alternative, -1, TERRITORY_LOCAL_NAME_UTF8);
 }
 
 

utility/mapcode.cpp

@@ -557,8 +557,8 @@ int main(const int argc, const char **argv) {
             }
             printf(",");
 
-            // Use internal knowledge of isofullname to show aliases of full territory name.
-            char *names = strdup(isofullname[INDEX_OF_TERRITORY(ccode)]);
+            // Use internal knowledge of TERRITORY_FULL_NAME to show aliases of full territory name.
+            char *names = strdup(TERRITORY_FULL_NAME[INDEX_OF_TERRITORY(ccode)]);
             char *s = names;
             while (s) {
                 if (s != names) {
@@ -714,7 +714,7 @@ int main(const int argc, const char **argv) {
             double lat;
             double lon;
 
-            const TerritoryBoundary *mm = territoryBoundary(i);
+            const TerritoryBoundary *mm = TERRITORY_BOUNDARY(i);
             minLon = ((double) mm->minx) / 1.0E6;
             maxLon = ((double) mm->maxx) / 1.0E6;
             minLat = ((double) mm->miny) / 1.0E6;