* include/ruby/oniguruma.h: upgrade to Oniguruma 5.9.0. fixes

  some memory violation.  [ruby-dev:31070]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12841 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 120 insertions, 85 deletions

diff --git a/regparse.h b/regparse.h
index de99032574..7a6314098a 100644
--- a/regparse.h
+++ b/regparse.h
@@ -32,38 +32,61 @@
 #include "regint.h"
 
 /* node type */
-#define N_STRING       (1<< 0)
-#define N_CCLASS       (1<< 1)
-#define N_CTYPE        (1<< 2)
-#define N_ANYCHAR      (1<< 3)
-#define N_BACKREF      (1<< 4)
-#define N_QUANTIFIER   (1<< 5)
-#define N_EFFECT       (1<< 6)
-#define N_ANCHOR       (1<< 7)
-#define N_LIST         (1<< 8)
-#define N_ALT          (1<< 9)
-#define N_CALL         (1<<10)
+#define NT_STR         0
+#define NT_CCLASS      1
+#define NT_CTYPE       2
+#define NT_CANY        3
+#define NT_BREF        4
+#define NT_QTFR        5
+#define NT_ENCLOSE     6
+#define NT_ANCHOR      7
+#define NT_LIST        8
+#define NT_ALT         9
+#define NT_CALL       10
+
+/* node type bit */
+#define NTYPE2BIT(type)      (1<<(type))
+
+#define BIT_NT_STR        NTYPE2BIT(NT_STR)
+#define BIT_NT_CCLASS     NTYPE2BIT(NT_CCLASS)
+#define BIT_NT_CTYPE      NTYPE2BIT(NT_CTYPE)
+#define BIT_NT_CANY       NTYPE2BIT(NT_CANY)
+#define BIT_NT_BREF       NTYPE2BIT(NT_BREF)
+#define BIT_NT_QTFR       NTYPE2BIT(NT_QTFR)
+#define BIT_NT_ENCLOSE    NTYPE2BIT(NT_ENCLOSE)
+#define BIT_NT_ANCHOR     NTYPE2BIT(NT_ANCHOR)
+#define BIT_NT_LIST       NTYPE2BIT(NT_LIST)
+#define BIT_NT_ALT        NTYPE2BIT(NT_ALT)
+#define BIT_NT_CALL       NTYPE2BIT(NT_CALL)
 
 #define IS_NODE_TYPE_SIMPLE(type) \
-  (((type) & (N_STRING | N_CCLASS | N_CTYPE | N_ANYCHAR | N_BACKREF)) != 0)
-
-#define NTYPE(node)        ((node)->type)
-#define NCONS(node)        ((node)->u.cons)
-#define NSTRING(node)      ((node)->u.str)
-#define NCCLASS(node)      ((node)->u.cclass)
-#define NCTYPE(node)       ((node)->u.ctype)
-#define NQUANTIFIER(node)  ((node)->u.quant)
-#define NANCHOR(node)      ((node)->u.anchor)
-#define NBACKREF(node)     ((node)->u.backref)
-#define NEFFECT(node)      ((node)->u.effect)
-#define NCALL(node)        ((node)->u.call)
+  ((NTYPE2BIT(type) & (BIT_NT_STR | BIT_NT_CCLASS | BIT_NT_CTYPE |\
+                       BIT_NT_CANY | BIT_NT_BREF)) != 0)
+
+#define NTYPE(node)             ((node)->u.base.type)
+#define SET_NTYPE(node, ntype)   (node)->u.base.type = (ntype)
+
+#define NSTR(node)         (&((node)->u.str))
+#define NCCLASS(node)      (&((node)->u.cclass))
+#define NCTYPE(node)       (&((node)->u.ctype))
+#define NBREF(node)        (&((node)->u.bref))
+#define NQTFR(node)        (&((node)->u.qtfr))
+#define NENCLOSE(node)     (&((node)->u.enclose))
+#define NANCHOR(node)      (&((node)->u.anchor))
+#define NCONS(node)        (&((node)->u.cons))
+#define NCALL(node)        (&((node)->u.call))
+
+#define NCAR(node)         (NCONS(node)->car)
+#define NCDR(node)         (NCONS(node)->cdr)
+
+
 
 #define ANCHOR_ANYCHAR_STAR_MASK (ANCHOR_ANYCHAR_STAR | ANCHOR_ANYCHAR_STAR_ML)
 #define ANCHOR_END_BUF_MASK      (ANCHOR_END_BUF | ANCHOR_SEMI_END_BUF)
 
-#define EFFECT_MEMORY           (1<<0)
-#define EFFECT_OPTION           (1<<1)
-#define EFFECT_STOP_BACKTRACK   (1<<2)
+#define ENCLOSE_MEMORY           (1<<0)
+#define ENCLOSE_OPTION           (1<<1)
+#define ENCLOSE_STOP_BACKTRACK   (1<<2)
 
 #define NODE_STR_MARGIN         16
 #define NODE_STR_BUF_SIZE       24  /* sizeof(CClassNode) - sizeof(int)*4 */
@@ -92,30 +115,6 @@
 #define NQ_TARGET_IS_EMPTY_MEM    2
 #define NQ_TARGET_IS_EMPTY_REC    3
 
-
-typedef struct {
-  UChar* s;
-  UChar* end;
-  unsigned int flag;
-  int    capa;    /* (allocated size - 1) or 0: use buf[] */
-  UChar  buf[NODE_STR_BUF_SIZE];
-} StrNode;
-
-typedef struct {
-  int state;
-  struct _Node* target;
-  int lower;
-  int upper;
-  int greedy;
-  int target_empty_info;
-  struct _Node* head_exact;
-  struct _Node* next_head_exact;
-  int is_refered;     /* include called node. don't eliminate even if {0} */
-#ifdef USE_COMBINATION_EXPLOSION_CHECK
-  int comb_exp_check_num;  /* 1,2,3...: check,  0: no check  */
-#endif
-} QuantifierNode;
-
 /* status bits */
 #define NST_MIN_FIXED             (1<<0)
 #define NST_MAX_FIXED             (1<<1)
@@ -133,20 +132,20 @@ typedef struct {
 #define NST_NEST_LEVEL            (1<<13)
 #define NST_BY_NUMBER             (1<<14) /* {n,m} */
 
-#define SET_EFFECT_STATUS(node,f)      (node)->u.effect.state |=  (f)
-#define CLEAR_EFFECT_STATUS(node,f)    (node)->u.effect.state &= ~(f)
-
-#define IS_EFFECT_CALLED(en)           (((en)->state & NST_CALLED)        != 0)
-#define IS_EFFECT_ADDR_FIXED(en)       (((en)->state & NST_ADDR_FIXED)    != 0)
-#define IS_EFFECT_RECURSION(en)        (((en)->state & NST_RECURSION)     != 0)
-#define IS_EFFECT_MARK1(en)            (((en)->state & NST_MARK1)         != 0)
-#define IS_EFFECT_MARK2(en)            (((en)->state & NST_MARK2)         != 0)
-#define IS_EFFECT_MIN_FIXED(en)        (((en)->state & NST_MIN_FIXED)     != 0)
-#define IS_EFFECT_MAX_FIXED(en)        (((en)->state & NST_MAX_FIXED)     != 0)
-#define IS_EFFECT_CLEN_FIXED(en)       (((en)->state & NST_CLEN_FIXED)    != 0)
-#define IS_EFFECT_STOP_BT_SIMPLE_REPEAT(en) \
+#define SET_ENCLOSE_STATUS(node,f)      (node)->u.enclose.state |=  (f)
+#define CLEAR_ENCLOSE_STATUS(node,f)    (node)->u.enclose.state &= ~(f)
+
+#define IS_ENCLOSE_CALLED(en)          (((en)->state & NST_CALLED)        != 0)
+#define IS_ENCLOSE_ADDR_FIXED(en)      (((en)->state & NST_ADDR_FIXED)    != 0)
+#define IS_ENCLOSE_RECURSION(en)       (((en)->state & NST_RECURSION)     != 0)
+#define IS_ENCLOSE_MARK1(en)           (((en)->state & NST_MARK1)         != 0)
+#define IS_ENCLOSE_MARK2(en)           (((en)->state & NST_MARK2)         != 0)
+#define IS_ENCLOSE_MIN_FIXED(en)       (((en)->state & NST_MIN_FIXED)     != 0)
+#define IS_ENCLOSE_MAX_FIXED(en)       (((en)->state & NST_MAX_FIXED)     != 0)
+#define IS_ENCLOSE_CLEN_FIXED(en)      (((en)->state & NST_CLEN_FIXED)    != 0)
+#define IS_ENCLOSE_STOP_BT_SIMPLE_REPEAT(en) \
     (((en)->state & NST_STOP_BT_SIMPLE_REPEAT) != 0)
-#define IS_EFFECT_NAMED_GROUP(en)      (((en)->state & NST_NAMED_GROUP)   != 0)
+#define IS_ENCLOSE_NAMED_GROUP(en)     (((en)->state & NST_NAMED_GROUP)   != 0)
 
 #define SET_CALL_RECURSION(node)       (node)->u.call.state |= NST_RECURSION
 #define IS_CALL_RECURSION(cn)          (((cn)->state & NST_RECURSION)  != 0)
@@ -156,7 +155,35 @@ typedef struct {
 #define IS_QUANTIFIER_IN_REPEAT(qn)    (((qn)->state & NST_IN_REPEAT)  != 0)
 #define IS_QUANTIFIER_BY_NUMBER(qn)    (((qn)->state & NST_BY_NUMBER)  != 0)
 
+#define CALLNODE_REFNUM_UNDEF  -1
+
 typedef struct {
+  NodeBase base;
+  UChar* s;
+  UChar* end;
+  unsigned int flag;
+  int    capa;    /* (allocated size - 1) or 0: use buf[] */
+  UChar  buf[NODE_STR_BUF_SIZE];
+} StrNode;
+
+typedef struct {
+  NodeBase base;
+  int state;
+  struct _Node* target;
+  int lower;
+  int upper;
+  int greedy;
+  int target_empty_info;
+  struct _Node* head_exact;
+  struct _Node* next_head_exact;
+  int is_refered;     /* include called node. don't eliminate even if {0} */
+#ifdef USE_COMBINATION_EXPLOSION_CHECK
+  int comb_exp_check_num;  /* 1,2,3...: check,  0: no check  */
+#endif
+} QtfrNode;
+
+typedef struct {
+  NodeBase base;
   int state;
   int type;
   int regnum;
@@ -168,9 +195,7 @@ typedef struct {
   OnigDistance max_len; /* max length (byte) */ 
   int char_len;         /* character length  */
   int opt_count;        /* referenced count in optimize_node_left() */
-} EffectNode;
-
-#define CALLNODE_REFNUM_UNDEF  -1
+} EncloseNode;
 
 #ifdef USE_SUBEXP_CALL
 
@@ -186,53 +211,63 @@ typedef struct {
 } UnsetAddrList;
 
 typedef struct {
+  NodeBase base;
   int     state;
   int     ref_num;
   UChar*  name;
   UChar*  name_end;
-  struct _Node*  target;  /* EffectNode : EFFECT_MEMORY */
+  struct _Node*  target;  /* EncloseNode : ENCLOSE_MEMORY */
   UnsetAddrList* unset_addr_list;
 } CallNode;
 
 #endif
 
 typedef struct {
+  NodeBase base;
   int  state;
   int  back_num;
   int  back_static[NODE_BACKREFS_SIZE];
   int* back_dynamic;
   int  nest_level;
-} BackrefNode;
+} BRefNode;
 
 typedef struct {
+  NodeBase base;
   int type;
   struct _Node* target;
   int char_len;
 } AnchorNode;
 
+typedef struct {
+  NodeBase base;
+  struct _Node* car;
+  struct _Node* cdr;
+} ConsAltNode;
+
+typedef struct {
+  NodeBase base;
+  int ctype;
+  int not;
+} CtypeNode;
+
 typedef struct _Node {
-  int type;
   union {
-    StrNode        str;
-    CClassNode     cclass;
-    QuantifierNode quant;
-    EffectNode     effect;
+    NodeBase     base;
+    StrNode      str;
+    CClassNode   cclass;
+    QtfrNode     qtfr;
+    EncloseNode  enclose;
+    BRefNode     bref;
+    AnchorNode   anchor;
+    ConsAltNode  cons;
+    CtypeNode    ctype;
 #ifdef USE_SUBEXP_CALL
-    CallNode       call;
+    CallNode     call;
 #endif
-    BackrefNode    backref;
-    AnchorNode     anchor;
-    struct {
-      struct _Node* left;
-      struct _Node* right;
-    } cons;
-    struct {
-      int ctype;
-      int not;
-    } ctype;
   } u;
 } Node;
 
+
 #define NULL_NODE  ((Node* )0)
 
 #define SCANENV_MEMNODES_SIZE               8
@@ -295,7 +330,7 @@ extern void   onig_node_conv_to_str_node P_((Node* node, int raw));
 extern int    onig_node_str_cat P_((Node* node, const UChar* s, const UChar* end));
 extern int    onig_node_str_set P_((Node* node, const UChar* s, const UChar* end));
 extern void   onig_node_free P_((Node* node));
-extern Node*  onig_node_new_effect P_((int type));
+extern Node*  onig_node_new_enclose P_((int type));
 extern Node*  onig_node_new_anchor P_((int type));
 extern Node*  onig_node_new_str P_((const UChar* s, const UChar* end));
 extern Node*  onig_node_new_list P_((Node* left, Node* right));