deprecate된 함수를 사용하지 않음

git-svn-id: http://kldp.net/svn/hangul/libhangul/trunk@202 8f00fcd2-89fc-0310-932e-b01be5b65e01

diff --git a/hangul/hangul.h b/hangul/hangul.h
index 250620c..4e0bb5c 100644 (file)
--- a/hangul/hangul.h
+++ b/hangul/hangul.h
@@ -22,6 +22,12 @@
 #include <stdbool.h>
 #include <inttypes.h>
 
+#ifdef __GNUC__
+#define LIBHANGUL_DEPRECATED __attribute__((deprecated));
+#else
+#define LIBHANGUL_DEPRECATED
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -150,21 +156,23 @@ const char*  hanja_get_comment(const Hanja* hanja);
 
 
 /* deprecated */
-bool hangul_is_jaso(ucschar c);
-ucschar hangul_jaso_to_jamo(ucschar ch);
+bool hangul_is_jaso(ucschar c) LIBHANGUL_DEPRECATED;
+ucschar hangul_jaso_to_jamo(ucschar ch) LIBHANGUL_DEPRECATED;
 ucschar hangul_jaso_to_syllable(ucschar choseong,
                                ucschar jungseong,
-                               ucschar jongseong);
+                               ucschar jongseong) LIBHANGUL_DEPRECATED;
 void    hangul_syllable_to_jaso(ucschar syllable,
                                ucschar* choseong,
                                ucschar* jungseong,
-                               ucschar* jongseong);
+                               ucschar* jongseong) LIBHANGUL_DEPRECATED;
 typedef bool (*HangulICFilter) (ucschar*, ucschar, ucschar, ucschar, void*);
 void hangul_ic_set_filter(HangulInputContext *hic,
-                         HangulICFilter func, void *user_data);
+                         HangulICFilter func, void *user_data) LIBHANGUL_DEPRECATED;
 
 #ifdef __cplusplus
 }
 #endif
 
+#undef LIBHANGUL_DEPRECATED
+
 #endif /* libhangul_hangul_h */

diff --git a/hangul/hangulinputcontext.c b/hangul/hangulinputcontext.c
index 96d2302..ac5da5b 100644 (file)
--- a/hangul/hangulinputcontext.c
+++ b/hangul/hangulinputcontext.c
@@ -420,18 +420,18 @@ hangul_jaso_to_string(ucschar cho, ucschar jung, ucschar jong,
     if (cho) {
        if (jung) {
            /* have cho, jung, jong or no jong */
-           ch = hangul_jaso_to_syllable(cho, jung, jong);
+           ch = hangul_jamo_to_syllable(cho, jung, jong);
            buf[n++] = ch;
        } else {
            if (jong) {
                /* have cho, jong */
-               ch = hangul_jaso_to_jamo(cho);
+               ch = hangul_jamo_to_cjamo(cho);
                buf[n++] = ch;
-               ch = hangul_jaso_to_jamo(jong);
+               ch = hangul_jamo_to_cjamo(jong);
                buf[n++] = ch;
            } else {
                /* have cho */
-               ch = hangul_jaso_to_jamo(cho);
+               ch = hangul_jamo_to_cjamo(cho);
                buf[n++] = ch;
            }
        }
@@ -439,19 +439,19 @@ hangul_jaso_to_string(ucschar cho, ucschar jung, ucschar jong,
        if (jung) {
            if (jong) {
                /* have jung, jong */
-               ch = hangul_jaso_to_jamo(jung);
+               ch = hangul_jamo_to_cjamo(jung);
                buf[n++] = ch;
-               ch = hangul_jaso_to_jamo(jong);
+               ch = hangul_jamo_to_cjamo(jong);
                buf[n++] = ch;
            } else {
                /* have jung */
-               ch = hangul_jaso_to_jamo(jung);
+               ch = hangul_jamo_to_cjamo(jung);
                buf[n++] = ch;
            }
        } else {
            if (jong) { 
                /* have jong */
-               ch = hangul_jaso_to_jamo(jong);
+               ch = hangul_jamo_to_cjamo(jong);
                buf[n++] = ch;
            } else {
                /* have nothing */
@@ -534,7 +534,7 @@ hangul_ic_push(HangulInputContext *hic, ucschar c)
            return false;
        }
     } else {
-       if (!hangul_is_jaso(c)) {
+       if (!hangul_is_jamo(c)) {
            hangul_ic_flush_internal(hic);
            return false;
        }
@@ -614,7 +614,7 @@ hangul_ic_process_jamo(HangulInputContext *hic, ucschar ch)
     ucschar jong;
     ucschar combined;
 
-    if (!hangul_is_jaso(ch) && ch > 0) {
+    if (!hangul_is_jamo(ch) && ch > 0) {
        hangul_ic_save_commit_string(hic);
        hangul_ic_append_commit_string(hic, ch);
        return true;
@@ -835,7 +835,7 @@ hangul_ic_process_romaja(HangulInputContext *hic, int ascii, ucschar ch)
     ucschar jong;
     ucschar combined;
 
-    if (!hangul_is_jaso(ch) && ch > 0) {
+    if (!hangul_is_jamo(ch) && ch > 0) {
        hangul_ic_save_commit_string(hic);
        hangul_ic_append_commit_string(hic, ch);
        return true;

diff --git a/test/hangul.c b/test/hangul.c
index d9a0f30..4023759 100644 (file)
--- a/test/hangul.c
+++ b/test/hangul.c
@@ -15,13 +15,6 @@
 #define UCS4 "UCS-4LE"
 #endif
 
-bool filter(ucschar *str, ucschar cho, ucschar jung, ucschar jong, void *data)
-{
-    //printf("Filter: %x %x %x\n", cho, jung, jong);
-    //return jong == 0;
-    return true;
-}
-
 void ucs4_to_utf8(char *buf, const ucschar *ucs4, size_t bufsize)
 {
     size_t n;
@@ -75,7 +68,6 @@ main(int argc, char *argv[])
        printf("hic is null\n");
        return -1;
     }
-    hangul_ic_set_filter(hic, filter, NULL);
 
     for (ascii = getchar(); ascii != EOF; ascii = getchar()) {
        int ret = hangul_ic_process(hic, ascii);