remove ONIG_TYPE_INT

diff --git a/sample/callout.c b/sample/callout.c
index 54080d2202d851464a0e3840a71dc40efc6e7520..e08891557c36a7d1dc1426b9ddeed607c144b56c 100644 (file)
--- a/sample/callout.c
+++ b/sample/callout.c
@@ -110,9 +110,6 @@ bar(OnigCalloutArgs* args, void* user_data)
 
     fprintf(stdout, "arg[%d]: ", i);
     switch (type) {
-    case ONIG_TYPE_INT:
-      fprintf(stdout, "%d\n", val.i);
-      break;
     case ONIG_TYPE_LONG:
       fprintf(stdout, "%ld\n", val.l);
       break;
@@ -212,7 +209,7 @@ extern int main(int argc, char* argv[])
   }
 
   name = (UChar* )"bar";
-  arg_types[0] = ONIG_TYPE_INT;
+  arg_types[0] = ONIG_TYPE_LONG;
   arg_types[1] = ONIG_TYPE_STRING;
   arg_types[2] = ONIG_TYPE_CHAR;
   opt_defaults[0].s.start = (UChar* )"I am a option argument's default value.";

diff --git a/src/ascii.c b/src/ascii.c
index 3da88ed6a32f7a09d9df5c22e099263747af5eff..ddd1ba4c41a58905b14c3a1469ca633b32a89773 100644 (file)
--- a/src/ascii.c
+++ b/src/ascii.c
@@ -37,19 +37,17 @@ init(void)
     int id;
     OnigEncoding enc;
     char* name;
-    OnigType t_int;
     OnigType t_long;
     OnigType  args[4];
     OnigValue opts[4];
 
     enc = ONIG_ENCODING_ASCII;
-    t_int  = ONIG_TYPE_INT;
     t_long = ONIG_TYPE_LONG;
 
     name = "FAIL";        BC0_P(name, fail);
     name = "SUCCESS";     BC0_P(name, success);
     name = "ABORT";       BC0_P(name, abort);
-    name = "ERROR";       BC1_P(name, error, &t_int);
+    name = "ERROR";       BC1_P(name, error, &t_long);
     name = "MAX";         BC1_B(name, max, &t_long);
     name = "COUNT";
     args[0] = ONIG_TYPE_CHAR; opts[0].c = 'p';

diff --git a/src/oniguruma.h b/src/oniguruma.h
index 44eb8e8e84d17c914baa555b9ae6ee0729fded22..38e9caad474bf32996183e4a8e25fe3d7fe5ed18 100644 (file)
--- a/src/oniguruma.h
+++ b/src/oniguruma.h
@@ -765,16 +765,14 @@ typedef enum {
 
 typedef enum {
   ONIG_TYPE_VOID     = 0,
-  ONIG_TYPE_INT      = 1,
-  ONIG_TYPE_LONG     = 2,
-  ONIG_TYPE_CHAR     = 3,
-  ONIG_TYPE_STRING   = 4,
-  ONIG_TYPE_POINTER  = 5,
-  ONIG_TYPE_TAG      = 7,
+  ONIG_TYPE_LONG     = 1,
+  ONIG_TYPE_CHAR     = 2,
+  ONIG_TYPE_STRING   = 3,
+  ONIG_TYPE_POINTER  = 4,
+  ONIG_TYPE_TAG      = 5,
 } OnigType;
 
 typedef union {
-  int  i;
   long l;
   OnigCodePoint c;
   struct {

diff --git a/src/regexec.c b/src/regexec.c
index 0af30dc67165be4da2123db0b4dac1d02585e70d..2dbdee74bded92d78a255e0986c75e31ccc18a6c 100644 (file)
--- a/src/regexec.c
+++ b/src/regexec.c
@@ -5274,7 +5274,7 @@ onig_builtin_error(OnigCalloutArgs* args, void* user_data ARG_UNUSED)
   r = onig_get_arg_by_callout_args(args, 0, 0, &val);
   if (r != ONIG_NORMAL) return r;
 
-  n = val.i;
+  n = (int )val.l;
   if (n >= 0) {
     n = ONIGERR_INVALID_CALLOUT_BODY;
   }

diff --git a/src/regparse.c b/src/regparse.c
index d836e2960ed920eed43c42af6a5398ec141ed5a0..14978fd6c8809fe81d5aa62271cc661bc2699a8a 100644 (file)
--- a/src/regparse.c
+++ b/src/regparse.c
@@ -6698,13 +6698,6 @@ parse_callout_args(int skip_mode, int cterm, UChar** src, UChar* end,
         long rl;
 
         switch (types[n]) {
-        case ONIG_TYPE_INT:
-          if (cn == 0 || eesc != 0) return ONIGERR_INVALID_CALLOUT_ARG;
-          r = parse_long(enc, buf, bufend, 1, INT_MAX, &rl);
-          if (r != ONIG_NORMAL) return r;
-          vals[n].i = (int )rl;
-          break;
-
         case ONIG_TYPE_LONG:
           if (cn == 0) return ONIGERR_INVALID_CALLOUT_ARG;
           r = parse_long(enc, buf, bufend, 1, LONG_MAX, &rl);

diff --git a/src/utf16_be.c b/src/utf16_be.c
index 170fac66f606cbb9050932088b75559d9eef25b0..3340d92705a724bb8716c2810a63f39eec785b30 100644 (file)
--- a/src/utf16_be.c
+++ b/src/utf16_be.c
@@ -38,20 +38,18 @@ init(void)
     int id;
     OnigEncoding enc;
     char* name;
-    OnigType t_int;
     OnigType t_long;
     OnigType args[4];
     OnigValue opts[4];
 
     enc = ONIG_ENCODING_UTF16_BE;
-    t_int  = ONIG_TYPE_INT;
     t_long = ONIG_TYPE_LONG;
 
     name = "\000F\000A\000I\000L\000\000";                BC0_P(name, fail);
     name = "\000S\000U\000C\000C\000E\000S\000S\000\000"; BC0_P(name, success);
     name = "\000A\000B\000O\000R\000T\000\000";           BC0_P(name, abort);
-    name = "\000E\000R\000R\000O\000R\000\000";           BC1_P(name, error, &t_int);
-    name = "\000M\000A\000X\000\000";                     BC1_B(name, max, &t_long);
+    name = "\000E\000R\000R\000O\000R\000\000";          BC1_P(name, error, &t_long);
+    name = "\000M\000A\000X\000\000";                    BC1_B(name, max, &t_long);
 
     name = "\000C\000O\000U\000N\000T\000\000";
     args[0] = ONIG_TYPE_CHAR; opts[0].c = 'p';

diff --git a/src/utf16_le.c b/src/utf16_le.c
index 573c55d2f2dec1918c21d9b64c6ec0e6d09ce9df..d0a733d6ad210eec71dc0f7ea199a30173618553 100644 (file)
--- a/src/utf16_le.c
+++ b/src/utf16_le.c
@@ -36,20 +36,18 @@ init(void)
     int id;
     OnigEncoding enc;
     char* name;
-    OnigType t_int;
     OnigType t_long;
     OnigType  args[4];
     OnigValue opts[4];
 
     enc = ONIG_ENCODING_UTF16_LE;
-    t_int  = ONIG_TYPE_INT;
     t_long = ONIG_TYPE_LONG;
 
     name = "F\000A\000I\000L\000\000\000";                BC0_P(name, fail);
     name = "S\000U\000C\000C\000E\000S\000S\000\000\000"; BC0_P(name, success);
     name = "A\000B\000O\000R\000T\000\000\000";           BC0_P(name, abort);
-    name = "E\000R\000R\000O\000R\000\000\000";           BC1_P(name, error, &t_int);
-    name = "M\000A\000X\000\000\000";                     BC1_B(name, max, &t_long);
+    name = "E\000R\000R\000O\000R\000\000\000";          BC1_P(name, error, &t_long);
+    name = "M\000A\000X\000\000\000";                    BC1_B(name, max, &t_long);
 
     name = "C\000O\000U\000N\000T\000\000\000";
     args[0] = ONIG_TYPE_CHAR; opts[0].c = 'p';