ICU-66108.tar.gz

[apple/icu.git] / icuSources / tools / makeconv / makeconv.h

diff --git a/icuSources/tools/makeconv/makeconv.h b/icuSources/tools/makeconv/makeconv.h
index cb4825b32449e1b8eaae35972d70e0e9b4adf9a2..addc2cb3e7a6a8770761c9550222cf4bac1103d7 100644 (file)
--- a/icuSources/tools/makeconv/makeconv.h
+++ b/icuSources/tools/makeconv/makeconv.h
@@ -1,12 +1,14 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /*
 *******************************************************************************
 *
-*   Copyright (C) 2000-2001, International Business Machines
+*   Copyright (C) 2000-2010, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
 *   file name:  makeconv.h
-*   encoding:   US-ASCII
+*   encoding:   UTF-8
 *   tab size:   8 (not used)
 *   indentation:4
 *
@@ -20,44 +22,41 @@
 #include "unicode/utypes.h"
 #include "ucnv_bld.h"
 #include "unewdata.h"
+#include "ucm.h"
 
 /* exports from makeconv.c */
 U_CFUNC UBool VERBOSE;
+U_CFUNC UBool SMALL;
+U_CFUNC UBool IGNORE_SISO_CHECK;
+
+/* converter table type for writing */
+enum {
+    TABLE_NONE,
+    TABLE_BASE,
+    TABLE_EXT,
+    TABLE_BASE_AND_EXT
+};
 
 /* abstract converter generator struct, C++ - style */
 struct NewConverter;
 typedef struct NewConverter NewConverter;
 
+U_CDECL_BEGIN
 struct NewConverter {
     void
-    (*close)(NewConverter *cnvData);
-
-    UBool
-    (*startMappings)(NewConverter *cnvData);
+    (* U_CALLCONV_FPTR close)(NewConverter *cnvData);
 
     /** is this byte sequence valid? */
     UBool
-    (*isValid)(NewConverter *cnvData,
-               const uint8_t *bytes, int32_t length,
-               uint32_t b);
-
-    UBool
-    (*addToUnicode)(NewConverter *cnvData,
-                    const uint8_t *bytes, int32_t length,
-                    UChar32 c, uint32_t b,
-                    int8_t isFallback);
+    (*U_CALLCONV_FPTR isValid)(NewConverter *cnvData,
+               const uint8_t *bytes, int32_t length);
 
     UBool
-    (*addFromUnicode)(NewConverter *cnvData,
-                      const uint8_t *bytes, int32_t length,
-                      UChar32 c, uint32_t b,
-                      int8_t isFallback);
-
-    void
-    (*finishMappings)(NewConverter *cnvData, const UConverterStaticData *staticData);
+    (*U_CALLCONV_FPTR addTable)(NewConverter *cnvData, UCMTable *table, UConverterStaticData *staticData);
 
     uint32_t
-    (*write)(NewConverter *cnvData, const UConverterStaticData *staticData, UNewDataMemory *pData);
+    (*U_CALLCONV_FPTR write)(NewConverter *cnvData, const UConverterStaticData *staticData,
+             UNewDataMemory *pData, int32_t tableType);
 };
-
-#endif
+U_CDECL_END
+#endif /* __MAKECONV_H__ */