diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-17 07:42:23 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-17 07:42:23 +0000 |
| commit | 0424e152c684a85f4b0691f1e84aec203115333d (patch) | |
| tree | ccb4af1c7fa12a09934f315edba0b9d839e57ceb /regparse.h | |
| parent | 5362e7fcddf70d16fc4261383f99175c90881353 (diff) | |
| download | ruby-0424e152c684a85f4b0691f1e84aec203115333d.tar.gz | |
* Merge Onigmo-5.13.1. [ruby-dev:45057] [Feature #5820]
https://github.com/k-takata/Onigmo
cp reg{comp,enc,error,exec,parse,syntax}.c reg{enc,int,parse}.h
cp oniguruma.h
cp tool/enc-unicode.rb
cp -r enc/
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34663 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'regparse.h')
| -rw-r--r-- | regparse.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/regparse.h b/regparse.h index e1a00ddfda..4f45e2b72c 100644 --- a/regparse.h +++ b/regparse.h @@ -1,10 +1,11 @@ #ifndef ONIGURUMA_REGPARSE_H #define ONIGURUMA_REGPARSE_H /********************************************************************** - regparse.h - Oniguruma (regular expression library) + regparse.h - Onigmo (Oniguruma-mod) (regular expression library) **********************************************************************/ /*- * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp> + * Copyright (c) 2011 K.Takata <kentkt AT csc DOT jp> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -91,6 +92,7 @@ #define ENCLOSE_MEMORY (1<<0) #define ENCLOSE_OPTION (1<<1) #define ENCLOSE_STOP_BACKTRACK (1<<2) +#define ENCLOSE_CONDITION (1<<3) #define NODE_STR_MARGIN 16 #define NODE_STR_BUF_SIZE 24 /* sizeof(CClassNode) - sizeof(int)*4 */ @@ -100,7 +102,7 @@ #define NSTR_AMBIG (1<<1) #define NSTR_DONT_GET_OPT_INFO (1<<2) -#define NSTRING_LEN(node) (OnigDistance)((node)->u.str.end - (node)->u.str.s) +#define NSTRING_LEN(node) (OnigDistance )((node)->u.str.end - (node)->u.str.s) #define NSTRING_SET_RAW(node) (node)->u.str.flag |= NSTR_RAW #define NSTRING_CLEAR_RAW(node) (node)->u.str.flag &= ~NSTR_RAW #define NSTRING_SET_AMBIG(node) (node)->u.str.flag |= NSTR_AMBIG @@ -150,6 +152,7 @@ #define IS_ENCLOSE_STOP_BT_SIMPLE_REPEAT(en) \ (((en)->state & NST_STOP_BT_SIMPLE_REPEAT) != 0) #define IS_ENCLOSE_NAMED_GROUP(en) (((en)->state & NST_NAMED_GROUP) != 0) +#define IS_ENCLOSE_NAME_REF(en) (((en)->state & NST_NAME_REF) != 0) #define SET_CALL_RECURSION(node) (node)->u.call.state |= NST_RECURSION #define IS_CALL_RECURSION(cn) (((cn)->state & NST_RECURSION) != 0) @@ -240,6 +243,7 @@ typedef struct { int type; struct _Node* target; int char_len; + int ascii_range; } AnchorNode; typedef struct { @@ -252,6 +256,7 @@ typedef struct { NodeBase base; int ctype; int not; + int ascii_range; } CtypeNode; typedef struct _Node { |