regparse.h - Oniguruma (regular expression library)\r
**********************************************************************/\r
/*-\r
- * Copyright (c) 2002-2018 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>\r
+ * Copyright (c) 2002-2019 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>\r
* All rights reserved.\r
*\r
* Redistribution and use in source and binary forms, with or without\r
\r
#include "regint.h"\r
\r
+#define NODE_STRING_MARGIN 16\r
+#define NODE_STRING_BUF_SIZE 24 /* sizeof(CClassNode) - sizeof(int)*4 */\r
+#define NODE_BACKREFS_SIZE 6\r
+\r
/* node type */\r
typedef enum {\r
NODE_STRING = 0,\r
NODE_CTYPE = 2,\r
NODE_BACKREF = 3,\r
NODE_QUANT = 4,\r
- NODE_ENCLOSURE = 5,\r
+ NODE_BAG = 5,\r
NODE_ANCHOR = 6,\r
NODE_LIST = 7,\r
NODE_ALT = 8,\r
NODE_GIMMICK = 10\r
} NodeType;\r
\r
+enum BagType {\r
+ BAG_MEMORY = 0,\r
+ BAG_OPTION = 1,\r
+ BAG_STOP_BACKTRACK = 2,\r
+ BAG_IF_ELSE = 3,\r
+};\r
+\r
enum GimmickType {\r
- GIMMICK_FAIL = 0,\r
- GIMMICK_KEEP = 1,\r
- GIMMICK_SAVE = 2,\r
- GIMMICK_UPDATE_VAR = 3,\r
+ GIMMICK_FAIL = 0,\r
+ GIMMICK_SAVE = 1,\r
+ GIMMICK_UPDATE_VAR = 2,\r
#ifdef USE_CALLOUT\r
- GIMMICK_CALLOUT = 4,\r
+ GIMMICK_CALLOUT = 3,\r
#endif\r
};\r
\r
-\r
-/* node type bit */\r
-#define NODE_TYPE2BIT(type) (1<<(type))\r
-\r
-#define NODE_BIT_STRING NODE_TYPE2BIT(NODE_STRING)\r
-#define NODE_BIT_CCLASS NODE_TYPE2BIT(NODE_CCLASS)\r
-#define NODE_BIT_CTYPE NODE_TYPE2BIT(NODE_CTYPE)\r
-#define NODE_BIT_BACKREF NODE_TYPE2BIT(NODE_BACKREF)\r
-#define NODE_BIT_QUANT NODE_TYPE2BIT(NODE_QUANT)\r
-#define NODE_BIT_ENCLOSURE NODE_TYPE2BIT(NODE_ENCLOSURE)\r
-#define NODE_BIT_ANCHOR NODE_TYPE2BIT(NODE_ANCHOR)\r
-#define NODE_BIT_LIST NODE_TYPE2BIT(NODE_LIST)\r
-#define NODE_BIT_ALT NODE_TYPE2BIT(NODE_ALT)\r
-#define NODE_BIT_CALL NODE_TYPE2BIT(NODE_CALL)\r
-#define NODE_BIT_GIMMICK NODE_TYPE2BIT(NODE_GIMMICK)\r
-\r
-#define NODE_IS_SIMPLE_TYPE(node) \\r
- ((NODE_TYPE2BIT(NODE_TYPE(node)) & \\r
- (NODE_BIT_STRING | NODE_BIT_CCLASS | NODE_BIT_CTYPE | NODE_BIT_BACKREF)) != 0)\r
-\r
-#define NODE_TYPE(node) ((node)->u.base.node_type)\r
-#define NODE_SET_TYPE(node, ntype) (node)->u.base.node_type = (ntype)\r
-\r
-#define STR_(node) (&((node)->u.str))\r
-#define CCLASS_(node) (&((node)->u.cclass))\r
-#define CTYPE_(node) (&((node)->u.ctype))\r
-#define BACKREF_(node) (&((node)->u.backref))\r
-#define QUANT_(node) (&((node)->u.quant))\r
-#define ENCLOSURE_(node) (&((node)->u.enclosure))\r
-#define ANCHOR_(node) (&((node)->u.anchor))\r
-#define CONS_(node) (&((node)->u.cons))\r
-#define CALL_(node) (&((node)->u.call))\r
-#define GIMMICK_(node) (&((node)->u.gimmick))\r
-\r
-#define NODE_CAR(node) (CONS_(node)->car)\r
-#define NODE_CDR(node) (CONS_(node)->cdr)\r
-\r
-#define CTYPE_ANYCHAR -1\r
-#define NODE_IS_ANYCHAR(node) \\r
- (NODE_TYPE(node) == NODE_CTYPE && CTYPE_(node)->ctype == CTYPE_ANYCHAR)\r
-\r
-#define CTYPE_OPTION(node, reg) \\r
- (NODE_IS_FIXED_OPTION(node) ? CTYPE_(node)->options : reg->options)\r
-\r
-\r
-#define ANCHOR_ANYCHAR_INF_MASK (ANCHOR_ANYCHAR_INF | ANCHOR_ANYCHAR_INF_ML)\r
-#define ANCHOR_END_BUF_MASK (ANCHOR_END_BUF | ANCHOR_SEMI_END_BUF)\r
-\r
-enum EnclosureType {\r
- ENCLOSURE_MEMORY = 0,\r
- ENCLOSURE_OPTION = 1,\r
- ENCLOSURE_STOP_BACKTRACK = 2,\r
- ENCLOSURE_IF_ELSE = 3,\r
+enum BodyEmptyType {\r
+ BODY_IS_NOT_EMPTY = 0,\r
+ BODY_IS_EMPTY_POSSIBILITY = 1,\r
+ BODY_IS_EMPTY_POSSIBILITY_MEM = 2,\r
+ BODY_IS_EMPTY_POSSIBILITY_REC = 3\r
};\r
\r
-#define NODE_STRING_MARGIN 16\r
-#define NODE_STRING_BUF_SIZE 24 /* sizeof(CClassNode) - sizeof(int)*4 */\r
-#define NODE_BACKREFS_SIZE 6\r
-\r
-#define NODE_STRING_RAW (1<<0) /* by backslashed number */\r
-#define NODE_STRING_AMBIG (1<<1)\r
-#define NODE_STRING_DONT_GET_OPT_INFO (1<<2)\r
-\r
-#define NODE_STRING_LEN(node) (int )((node)->u.str.end - (node)->u.str.s)\r
-#define NODE_STRING_SET_RAW(node) (node)->u.str.flag |= NODE_STRING_RAW\r
-#define NODE_STRING_CLEAR_RAW(node) (node)->u.str.flag &= ~NODE_STRING_RAW\r
-#define NODE_STRING_SET_AMBIG(node) (node)->u.str.flag |= NODE_STRING_AMBIG\r
-#define NODE_STRING_SET_DONT_GET_OPT_INFO(node) \\r
- (node)->u.str.flag |= NODE_STRING_DONT_GET_OPT_INFO\r
-#define NODE_STRING_IS_RAW(node) \\r
- (((node)->u.str.flag & NODE_STRING_RAW) != 0)\r
-#define NODE_STRING_IS_AMBIG(node) \\r
- (((node)->u.str.flag & NODE_STRING_AMBIG) != 0)\r
-#define NODE_STRING_IS_DONT_GET_OPT_INFO(node) \\r
- (((node)->u.str.flag & NODE_STRING_DONT_GET_OPT_INFO) != 0)\r
-\r
-#define BACKREFS_P(br) \\r
- (IS_NOT_NULL((br)->back_dynamic) ? (br)->back_dynamic : (br)->back_static)\r
-\r
-enum QuantBodyEmpty {\r
- QUANT_BODY_IS_NOT_EMPTY = 0,\r
- QUANT_BODY_IS_EMPTY = 1,\r
- QUANT_BODY_IS_EMPTY_MEM = 2,\r
- QUANT_BODY_IS_EMPTY_REC = 3\r
-};\r
-\r
-/* node status bits */\r
-#define NODE_ST_MIN_FIXED (1<<0)\r
-#define NODE_ST_MAX_FIXED (1<<1)\r
-#define NODE_ST_CLEN_FIXED (1<<2)\r
-#define NODE_ST_MARK1 (1<<3)\r
-#define NODE_ST_MARK2 (1<<4)\r
-#define NODE_ST_STOP_BT_SIMPLE_REPEAT (1<<5)\r
-#define NODE_ST_RECURSION (1<<6)\r
-#define NODE_ST_CALLED (1<<7)\r
-#define NODE_ST_ADDR_FIXED (1<<8)\r
-#define NODE_ST_NAMED_GROUP (1<<9)\r
-#define NODE_ST_IN_REAL_REPEAT (1<<10) /* STK_REPEAT is nested in stack. */\r
-#define NODE_ST_IN_ZERO_REPEAT (1<<11) /* (....){0} */\r
-#define NODE_ST_IN_MULTI_ENTRY (1<<12)\r
-#define NODE_ST_NEST_LEVEL (1<<13)\r
-#define NODE_ST_BY_NUMBER (1<<14) /* {n,m} */\r
-#define NODE_ST_BY_NAME (1<<15) /* backref by name */\r
-#define NODE_ST_BACKREF (1<<16)\r
-#define NODE_ST_CHECKER (1<<17)\r
-#define NODE_ST_FIXED_OPTION (1<<18)\r
-#define NODE_ST_PROHIBIT_RECURSION (1<<19)\r
-#define NODE_ST_SUPER (1<<20)\r
-\r
-\r
-#define NODE_STATUS(node) (((Node* )node)->u.base.status)\r
-#define NODE_STATUS_ADD(node,f) (NODE_STATUS(node) |= (NODE_ST_ ## f))\r
-#define NODE_STATUS_REMOVE(node,f) (NODE_STATUS(node) &= ~(NODE_ST_ ## f))\r
-\r
-#define NODE_IS_BY_NUMBER(node) ((NODE_STATUS(node) & NODE_ST_BY_NUMBER) != 0)\r
-#define NODE_IS_IN_REAL_REPEAT(node) ((NODE_STATUS(node) & NODE_ST_IN_REAL_REPEAT) != 0)\r
-#define NODE_IS_CALLED(node) ((NODE_STATUS(node) & NODE_ST_CALLED) != 0)\r
-#define NODE_IS_IN_MULTI_ENTRY(node) ((NODE_STATUS(node) & NODE_ST_IN_MULTI_ENTRY) != 0)\r
-#define NODE_IS_RECURSION(node) ((NODE_STATUS(node) & NODE_ST_RECURSION) != 0)\r
-#define NODE_IS_IN_ZERO_REPEAT(node) ((NODE_STATUS(node) & NODE_ST_IN_ZERO_REPEAT) != 0)\r
-#define NODE_IS_NAMED_GROUP(node) ((NODE_STATUS(node) & NODE_ST_NAMED_GROUP) != 0)\r
-#define NODE_IS_ADDR_FIXED(node) ((NODE_STATUS(node) & NODE_ST_ADDR_FIXED) != 0)\r
-#define NODE_IS_CLEN_FIXED(node) ((NODE_STATUS(node) & NODE_ST_CLEN_FIXED) != 0)\r
-#define NODE_IS_MIN_FIXED(node) ((NODE_STATUS(node) & NODE_ST_MIN_FIXED) != 0)\r
-#define NODE_IS_MAX_FIXED(node) ((NODE_STATUS(node) & NODE_ST_MAX_FIXED) != 0)\r
-#define NODE_IS_MARK1(node) ((NODE_STATUS(node) & NODE_ST_MARK1) != 0)\r
-#define NODE_IS_MARK2(node) ((NODE_STATUS(node) & NODE_ST_MARK2) != 0)\r
-#define NODE_IS_NEST_LEVEL(node) ((NODE_STATUS(node) & NODE_ST_NEST_LEVEL) != 0)\r
-#define NODE_IS_BY_NAME(node) ((NODE_STATUS(node) & NODE_ST_BY_NAME) != 0)\r
-#define NODE_IS_BACKREF(node) ((NODE_STATUS(node) & NODE_ST_BACKREF) != 0)\r
-#define NODE_IS_CHECKER(node) ((NODE_STATUS(node) & NODE_ST_CHECKER) != 0)\r
-#define NODE_IS_FIXED_OPTION(node) ((NODE_STATUS(node) & NODE_ST_FIXED_OPTION) != 0)\r
-#define NODE_IS_SUPER(node) ((NODE_STATUS(node) & NODE_ST_SUPER) != 0)\r
-#define NODE_IS_PROHIBIT_RECURSION(node) \\r
- ((NODE_STATUS(node) & NODE_ST_PROHIBIT_RECURSION) != 0)\r
-#define NODE_IS_STOP_BT_SIMPLE_REPEAT(node) \\r
- ((NODE_STATUS(node) & NODE_ST_STOP_BT_SIMPLE_REPEAT) != 0)\r
-\r
-#define NODE_BODY(node) ((node)->u.base.body)\r
-#define NODE_QUANT_BODY(node) ((node)->body)\r
-#define NODE_ENCLOSURE_BODY(node) ((node)->body)\r
-#define NODE_CALL_BODY(node) ((node)->body)\r
-#define NODE_ANCHOR_BODY(node) ((node)->body)\r
-\r
-\r
typedef struct {\r
NodeType node_type;\r
int status;\r
UChar* s;\r
UChar* end;\r
unsigned int flag;\r
- int capa; /* (allocated size - 1) or 0: use buf[] */\r
+ int capacity; /* (allocated size - 1) or 0: use buf[] */\r
UChar buf[NODE_STRING_BUF_SIZE];\r
} StrNode;\r
\r
int lower;\r
int upper;\r
int greedy;\r
- enum QuantBodyEmpty body_empty_info;\r
+ enum BodyEmptyType emptiness;\r
struct _Node* head_exact;\r
struct _Node* next_head_exact;\r
int is_refered; /* include called node. don't eliminate even if {0} */\r
int status;\r
struct _Node* body;\r
\r
- enum EnclosureType type;\r
+ enum BagType type;\r
union {\r
struct {\r
int regnum;\r
OnigLen max_len; /* max length (byte) */\r
int char_len; /* character length */\r
int opt_count; /* referenced count in optimize_nodes() */\r
-} EnclosureNode;\r
+} BagNode;\r
\r
#ifdef USE_CALL\r
\r
typedef struct {\r
NodeType node_type;\r
int status;\r
- struct _Node* body; /* to EnclosureNode : ENCLOSURE_MEMORY */\r
+ struct _Node* body; /* to BagNode : BAG_MEMORY */\r
\r
int by_number;\r
int group_num;\r
StrNode str;\r
CClassNode cclass;\r
QuantNode quant;\r
- EnclosureNode enclosure;\r
+ BagNode bag;\r
BackRefNode backref;\r
AnchorNode anchor;\r
ConsAltNode cons;\r
} u;\r
} Node;\r
\r
-\r
#define NULL_NODE ((Node* )0)\r
\r
+\r
+/* node type bit */\r
+#define NODE_TYPE2BIT(type) (1<<(type))\r
+\r
+#define NODE_BIT_STRING NODE_TYPE2BIT(NODE_STRING)\r
+#define NODE_BIT_CCLASS NODE_TYPE2BIT(NODE_CCLASS)\r
+#define NODE_BIT_CTYPE NODE_TYPE2BIT(NODE_CTYPE)\r
+#define NODE_BIT_BACKREF NODE_TYPE2BIT(NODE_BACKREF)\r
+#define NODE_BIT_QUANT NODE_TYPE2BIT(NODE_QUANT)\r
+#define NODE_BIT_BAG NODE_TYPE2BIT(NODE_BAG)\r
+#define NODE_BIT_ANCHOR NODE_TYPE2BIT(NODE_ANCHOR)\r
+#define NODE_BIT_LIST NODE_TYPE2BIT(NODE_LIST)\r
+#define NODE_BIT_ALT NODE_TYPE2BIT(NODE_ALT)\r
+#define NODE_BIT_CALL NODE_TYPE2BIT(NODE_CALL)\r
+#define NODE_BIT_GIMMICK NODE_TYPE2BIT(NODE_GIMMICK)\r
+\r
+#define NODE_TYPE(node) ((node)->u.base.node_type)\r
+#define NODE_SET_TYPE(node, ntype) (node)->u.base.node_type = (ntype)\r
+\r
+#define STR_(node) (&((node)->u.str))\r
+#define CCLASS_(node) (&((node)->u.cclass))\r
+#define CTYPE_(node) (&((node)->u.ctype))\r
+#define BACKREF_(node) (&((node)->u.backref))\r
+#define QUANT_(node) (&((node)->u.quant))\r
+#define BAG_(node) (&((node)->u.bag))\r
+#define ANCHOR_(node) (&((node)->u.anchor))\r
+#define CONS_(node) (&((node)->u.cons))\r
+#define CALL_(node) (&((node)->u.call))\r
+#define GIMMICK_(node) (&((node)->u.gimmick))\r
+\r
+#define NODE_CAR(node) (CONS_(node)->car)\r
+#define NODE_CDR(node) (CONS_(node)->cdr)\r
+\r
+#define CTYPE_ANYCHAR -1\r
+#define NODE_IS_ANYCHAR(node) \\r
+ (NODE_TYPE(node) == NODE_CTYPE && CTYPE_(node)->ctype == CTYPE_ANYCHAR)\r
+\r
+#define CTYPE_OPTION(node, reg) \\r
+ (NODE_IS_FIXED_OPTION(node) ? CTYPE_(node)->options : reg->options)\r
+\r
+\r
+#define ANCR_ANYCHAR_INF_MASK (ANCR_ANYCHAR_INF | ANCR_ANYCHAR_INF_ML)\r
+#define ANCR_END_BUF_MASK (ANCR_END_BUF | ANCR_SEMI_END_BUF)\r
+\r
+#define NODE_STRING_RAW (1<<0) /* by backslashed number */\r
+#define NODE_STRING_AMBIG (1<<1)\r
+#define NODE_STRING_GOOD_AMBIG (1<<2)\r
+#define NODE_STRING_DONT_GET_OPT_INFO (1<<3)\r
+\r
+#define NODE_STRING_LEN(node) (int )((node)->u.str.end - (node)->u.str.s)\r
+#define NODE_STRING_SET_RAW(node) (node)->u.str.flag |= NODE_STRING_RAW\r
+#define NODE_STRING_CLEAR_RAW(node) (node)->u.str.flag &= ~NODE_STRING_RAW\r
+#define NODE_STRING_SET_AMBIG(node) (node)->u.str.flag |= NODE_STRING_AMBIG\r
+#define NODE_STRING_SET_GOOD_AMBIG(node) (node)->u.str.flag |= NODE_STRING_GOOD_AMBIG\r
+#define NODE_STRING_SET_DONT_GET_OPT_INFO(node) \\r
+ (node)->u.str.flag |= NODE_STRING_DONT_GET_OPT_INFO\r
+#define NODE_STRING_IS_RAW(node) \\r
+ (((node)->u.str.flag & NODE_STRING_RAW) != 0)\r
+#define NODE_STRING_IS_AMBIG(node) \\r
+ (((node)->u.str.flag & NODE_STRING_AMBIG) != 0)\r
+#define NODE_STRING_IS_GOOD_AMBIG(node) \\r
+ (((node)->u.str.flag & NODE_STRING_GOOD_AMBIG) != 0)\r
+#define NODE_STRING_IS_DONT_GET_OPT_INFO(node) \\r
+ (((node)->u.str.flag & NODE_STRING_DONT_GET_OPT_INFO) != 0)\r
+\r
+#define BACKREFS_P(br) \\r
+ (IS_NOT_NULL((br)->back_dynamic) ? (br)->back_dynamic : (br)->back_static)\r
+\r
+/* node status bits */\r
+#define NODE_ST_MIN_FIXED (1<<0)\r
+#define NODE_ST_MAX_FIXED (1<<1)\r
+#define NODE_ST_CLEN_FIXED (1<<2)\r
+#define NODE_ST_MARK1 (1<<3)\r
+#define NODE_ST_MARK2 (1<<4)\r
+#define NODE_ST_STRICT_REAL_REPEAT (1<<5)\r
+#define NODE_ST_RECURSION (1<<6)\r
+#define NODE_ST_CALLED (1<<7)\r
+#define NODE_ST_ADDR_FIXED (1<<8)\r
+#define NODE_ST_NAMED_GROUP (1<<9)\r
+#define NODE_ST_IN_REAL_REPEAT (1<<10) /* STK_REPEAT is nested in stack. */\r
+#define NODE_ST_IN_ZERO_REPEAT (1<<11) /* (....){0} */\r
+#define NODE_ST_IN_MULTI_ENTRY (1<<12)\r
+#define NODE_ST_NEST_LEVEL (1<<13)\r
+#define NODE_ST_BY_NUMBER (1<<14) /* {n,m} */\r
+#define NODE_ST_BY_NAME (1<<15) /* backref by name */\r
+#define NODE_ST_BACKREF (1<<16)\r
+#define NODE_ST_CHECKER (1<<17)\r
+#define NODE_ST_FIXED_OPTION (1<<18)\r
+#define NODE_ST_PROHIBIT_RECURSION (1<<19)\r
+#define NODE_ST_SUPER (1<<20)\r
+\r
+\r
+#define NODE_STATUS(node) (((Node* )node)->u.base.status)\r
+#define NODE_STATUS_ADD(node,f) (NODE_STATUS(node) |= (NODE_ST_ ## f))\r
+#define NODE_STATUS_REMOVE(node,f) (NODE_STATUS(node) &= ~(NODE_ST_ ## f))\r
+\r
+#define NODE_IS_BY_NUMBER(node) ((NODE_STATUS(node) & NODE_ST_BY_NUMBER) != 0)\r
+#define NODE_IS_IN_REAL_REPEAT(node) ((NODE_STATUS(node) & NODE_ST_IN_REAL_REPEAT) != 0)\r
+#define NODE_IS_CALLED(node) ((NODE_STATUS(node) & NODE_ST_CALLED) != 0)\r
+#define NODE_IS_IN_MULTI_ENTRY(node) ((NODE_STATUS(node) & NODE_ST_IN_MULTI_ENTRY) != 0)\r
+#define NODE_IS_RECURSION(node) ((NODE_STATUS(node) & NODE_ST_RECURSION) != 0)\r
+#define NODE_IS_IN_ZERO_REPEAT(node) ((NODE_STATUS(node) & NODE_ST_IN_ZERO_REPEAT) != 0)\r
+#define NODE_IS_NAMED_GROUP(node) ((NODE_STATUS(node) & NODE_ST_NAMED_GROUP) != 0)\r
+#define NODE_IS_ADDR_FIXED(node) ((NODE_STATUS(node) & NODE_ST_ADDR_FIXED) != 0)\r
+#define NODE_IS_CLEN_FIXED(node) ((NODE_STATUS(node) & NODE_ST_CLEN_FIXED) != 0)\r
+#define NODE_IS_MIN_FIXED(node) ((NODE_STATUS(node) & NODE_ST_MIN_FIXED) != 0)\r
+#define NODE_IS_MAX_FIXED(node) ((NODE_STATUS(node) & NODE_ST_MAX_FIXED) != 0)\r
+#define NODE_IS_MARK1(node) ((NODE_STATUS(node) & NODE_ST_MARK1) != 0)\r
+#define NODE_IS_MARK2(node) ((NODE_STATUS(node) & NODE_ST_MARK2) != 0)\r
+#define NODE_IS_NEST_LEVEL(node) ((NODE_STATUS(node) & NODE_ST_NEST_LEVEL) != 0)\r
+#define NODE_IS_BY_NAME(node) ((NODE_STATUS(node) & NODE_ST_BY_NAME) != 0)\r
+#define NODE_IS_BACKREF(node) ((NODE_STATUS(node) & NODE_ST_BACKREF) != 0)\r
+#define NODE_IS_CHECKER(node) ((NODE_STATUS(node) & NODE_ST_CHECKER) != 0)\r
+#define NODE_IS_FIXED_OPTION(node) ((NODE_STATUS(node) & NODE_ST_FIXED_OPTION) != 0)\r
+#define NODE_IS_SUPER(node) ((NODE_STATUS(node) & NODE_ST_SUPER) != 0)\r
+#define NODE_IS_PROHIBIT_RECURSION(node) \\r
+ ((NODE_STATUS(node) & NODE_ST_PROHIBIT_RECURSION) != 0)\r
+#define NODE_IS_STRICT_REAL_REPEAT(node) \\r
+ ((NODE_STATUS(node) & NODE_ST_STRICT_REAL_REPEAT) != 0)\r
+\r
+#define NODE_BODY(node) ((node)->u.base.body)\r
+#define NODE_QUANT_BODY(node) ((node)->body)\r
+#define NODE_BAG_BODY(node) ((node)->body)\r
+#define NODE_CALL_BODY(node) ((node)->body)\r
+#define NODE_ANCHOR_BODY(node) ((node)->body)\r
+\r
#define SCANENV_MEMENV_SIZE 8\r
#define SCANENV_MEMENV(senv) \\r
(IS_NOT_NULL((senv)->mem_env_dynamic) ? \\r
extern int onig_node_str_cat P_((Node* node, const UChar* s, const UChar* end));\r
extern int onig_node_str_set P_((Node* node, const UChar* s, const UChar* end));\r
extern void onig_node_free P_((Node* node));\r
-extern Node* onig_node_new_enclosure P_((int type));\r
+extern Node* onig_node_new_bag P_((enum BagType type));\r
extern Node* onig_node_new_anchor P_((int type, int ascii_mode));\r
extern Node* onig_node_new_str P_((const UChar* s, const UChar* end));\r
extern Node* onig_node_new_list P_((Node* left, Node* right));\r
projects / mirror_edk2.git / blobdiff