WIP

Author: rijnb

CMakeLists.txt

@@ -21,24 +21,27 @@ project(mapcode_cpp)
 # export ASAN_OPTIONS=debug=true:strict_string_checks=1:detect_stack_use_after_return=true:detect_invalid_pointer_pairs=99999:
 #   detect_container_overflow=true:detect_odr_violation=2:check_initialization_order=true
 
-set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -Werror -fsanitize=address -fno-common -fno-optimize-sibling-calls -fno-omit-frame-pointer")
-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++11")
+set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DNO_POSIX_THREADS -DDEBUG -Wall -fsanitize=address -fno-common -fno-optimize-sibling-calls -fno-omit-frame-pointer")
+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG -std=c++11")
 set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -fsanitize=address")
 
 set(SOURCE_FILES
-    mapcodelib/basics.h
-    mapcodelib/mapcode_alphabets.h
-    mapcodelib/mapcode_countrynames.h
-    mapcodelib/mapcode_countrynames_short.h
-    mapcodelib/mapcode_fast_encode.h
-    mapcodelib/mapcode_fastalpha.h
-    mapcodelib/mapcode_territory_alphabets.h
-    mapcodelib/mapcoder.c
-    mapcodelib/mapcoder.h
-    unittest/decode_test.h
-    unittest/test_territories.c
-    unittest/unittest.c
-    utility/mapcode.cpp)
+        mapcodelib/basics.h
+        mapcodelib/mapcode_alphabets.h
+        mapcodelib/mapcode_countrynames.h
+        mapcodelib/mapcode_countrynames_local.h
+        mapcodelib/mapcode_countrynames_short.h
+        mapcodelib/mapcode_fast_encode.h
+        mapcodelib/mapcode_fastalpha.h
+        mapcodelib/mapcode_legacy.h
+        mapcodelib/mapcode_territory_alphabets.h
+        mapcodelib/mapcode_territories.h
+        mapcodelib/mapcoder.c
+        mapcodelib/mapcoder.h
+        unittest/decode_test.h
+        unittest/test_territories.c
+        unittest/unittest.c
+        utility/mapcode.cpp)
 
 set(SOURCE_FILES_UNITTEST
         unittest/unittest.c)

README.md

@@ -131,6 +131,14 @@ settings:
 
 # Release Notes
 
+### 2.4.1
+
+* Turned territories, alphabets and error codes into enums; Cleaned up source.
+
+* Split off legacy stuff into mapcode_legacy.h 
+
+* Added mapcode_territories.h
+
 ### 2.4.0
 
 * Added scripts for Korean (Choson'gul / Hangul), Burmese, Khmer, Sinhalese, Thaana (Maldivan), 

docs/mapcode_library_c.docx

@@ -24,41 +24,43 @@ extern "C" {
 /**
  * Alphabets:
  */
-#define MAPCODE_ALPHABETS_TOTAL        28
-
-#define MAPCODE_ALPHABET_ROMAN         0
-#define MAPCODE_ALPHABET_GREEK         1
-#define MAPCODE_ALPHABET_CYRILLIC      2
-#define MAPCODE_ALPHABET_HEBREW        3
-#define MAPCODE_ALPHABET_DEVANAGARI    4
-#define MAPCODE_ALPHABET_MALAYALAM     5
-#define MAPCODE_ALPHABET_GEORGIAN      6
-#define MAPCODE_ALPHABET_KATAKANA      7
-#define MAPCODE_ALPHABET_THAI          8
-#define MAPCODE_ALPHABET_LAO           9
-#define MAPCODE_ALPHABET_ARMENIAN      10
-#define MAPCODE_ALPHABET_BENGALI       11
-#define MAPCODE_ALPHABET_GURMUKHI      12
-#define MAPCODE_ALPHABET_TIBETAN       13
-#define MAPCODE_ALPHABET_ARABIC        14
-#define MAPCODE_ALPHABET_KOREAN        15
-#define MAPCODE_ALPHABET_BURMESE       16
-#define MAPCODE_ALPHABET_KHMER         17
-#define MAPCODE_ALPHABET_SINHALESE     18
-#define MAPCODE_ALPHABET_THAANA        19
-#define MAPCODE_ALPHABET_CHINESE       20
-#define MAPCODE_ALPHABET_TIFINAGH      21
-#define MAPCODE_ALPHABET_TAMIL         22
-#define MAPCODE_ALPHABET_AMHARIC       23
-#define MAPCODE_ALPHABET_TELUGU        24
-#define MAPCODE_ALPHABET_ODIA          25
-#define MAPCODE_ALPHABET_KANNADA       26
-#define MAPCODE_ALPHABET_GUJARATI      27
+enum Alphabet {
+    _ALPHABET_MIN = -1,
+    ALPHABET_ROMAN,
+    ALPHABET_GREEK,
+    ALPHABET_CYRILLIC,
+    ALPHABET_HEBREW,
+    ALPHABET_DEVANAGARI,
+    ALPHABET_MALAYALAM,
+    ALPHABET_GEORGIAN,
+    ALPHABET_KATAKANA,
+    ALPHABET_THAI,
+    ALPHABET_LAO,
+    ALPHABET_ARMENIAN,
+    ALPHABET_BENGALI,
+    ALPHABET_GURMUKHI,
+    ALPHABET_TIBETAN,
+    ALPHABET_ARABIC,
+    ALPHABET_KOREAN,
+    ALPHABET_BURMESE,
+    ALPHABET_KHMER,
+    ALPHABET_SINHALESE,
+    ALPHABET_THAANA,
+    ALPHABET_CHINESE,
+    ALPHABET_TIFINAGH,
+    ALPHABET_TAMIL,
+    ALPHABET_AMHARIC,
+    ALPHABET_TELUGU,
+    ALPHABET_ODIA,
+    ALPHABET_KANNADA,
+    ALPHABET_GUJARATI,
+    _ALPHABET_MAX,
+};
 
 #define MAX_ALPHABETS_PER_TERRITORY    3
 typedef struct {
     int count;
-    int alphabet[MAX_ALPHABETS_PER_TERRITORY];
+    enum Alphabet alphabet[MAX_ALPHABETS_PER_TERRITORY];
 } TerritoryAlphabets;
 
 #ifdef __cplusplus