From 8ec48cb06417129f46e21851d4580c4e3e4966c8 Mon Sep 17 00:00:00 2001 From: matz Date: Mon, 22 Aug 2005 14:53:51 +0000 Subject: [PATCH] * parse.y: ONIG_OPTION_CAPTURE_GROUP conflicts with RE_OPTION_ONCE. [ruby-dev:26852] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9018 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ parse.y | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4a9e0fe5b2..e6e41e9d15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Aug 22 23:51:19 2005 Yukihiro Matsumoto + + * parse.y: ONIG_OPTION_CAPTURE_GROUP conflicts with + RE_OPTION_ONCE. [ruby-dev:26852] + Mon Aug 22 20:11:35 2005 Nobuyoshi Nakada * missing/vsnprintf.c (BSD__sprint): needs to call vwrite function diff --git a/parse.y b/parse.y index ddff8aada8..bab737f0e9 100644 --- a/parse.y +++ b/parse.y @@ -318,7 +318,7 @@ static void top_local_setup_gen _((struct parser_params*)); static int lvar_defined_gen _((struct parser_params*, ID)); #define lvar_defined(id) lvar_defined_gen(parser, id) -#define RE_OPTION_ONCE 0x80 +#define RE_OPTION_ONCE (1<<16) #define NODE_STRTERM NODE_ZARRAY /* nothing to gc */ #define NODE_HEREDOC NODE_ARRAY /* 1, 3 to gc */