diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-12-10 17:47:04 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-12-10 17:47:04 +0000 |
| commit | 1b7d03b9d0d60d4dede7d38739503e59a8b25d06 (patch) | |
| tree | deb58ca3dc6d6cd71c1740e62aa7e47bea5ed37e /regsyntax.c | |
| parent | 5a5ea533fd8c5c95ca0dcd5e4cce2558ebba62c5 (diff) | |
| download | ruby-1b7d03b9d0d60d4dede7d38739503e59a8b25d06.tar.gz | |
Merge Onigmo 6.0.0
* https://github.com/k-takata/Onigmo/blob/Onigmo-6.0.0/HISTORY
* fix for ruby 2.4: https://github.com/k-takata/Onigmo/pull/78
* suppress warning: https://github.com/k-takata/Onigmo/pull/79
* include/ruby/oniguruma.h: include onigmo.h.
* template/encdb.h.tmpl: ignore duplicated definition of EUC-CN in
enc/euc_kr.c. It is defined in enc/gb2313.c with CRuby macro.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57045 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'regsyntax.c')
| -rw-r--r-- | regsyntax.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/regsyntax.c b/regsyntax.c index 7cb98f2d46..657ffcd0f3 100644 --- a/regsyntax.c +++ b/regsyntax.c @@ -3,7 +3,7 @@ **********************************************************************/ /*- * Copyright (c) 2002-2006 K.Kosako <sndgk393 AT ybb DOT ne DOT jp> - * Copyright (c) 2011-2012 K.Takata <kentkt AT csc DOT jp> + * Copyright (c) 2011-2016 K.Takata <kentkt AT csc DOT jp> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -229,7 +229,7 @@ const OnigSyntaxType OnigSyntaxPerl = { (( SYN_GNU_REGEX_OP | ONIG_SYN_OP_QMARK_NON_GREEDY | ONIG_SYN_OP_ESC_OCTAL3 | ONIG_SYN_OP_ESC_X_HEX2 | ONIG_SYN_OP_ESC_X_BRACE_HEX8 | ONIG_SYN_OP_ESC_CONTROL_CHARS | - ONIG_SYN_OP_ESC_C_CONTROL ) + ONIG_SYN_OP_ESC_O_BRACE_OCTAL | ONIG_SYN_OP_ESC_C_CONTROL ) & ~ONIG_SYN_OP_ESC_LTGT_WORD_BEGIN_END ) , ( ONIG_SYN_OP2_ESC_CAPITAL_Q_QUOTE | ONIG_SYN_OP2_QMARK_GROUP_EFFECT | ONIG_SYN_OP2_OPTION_PERL | @@ -248,7 +248,8 @@ const OnigSyntaxType OnigSyntaxPerl = { ONIG_SYN_OP2_ESC_K_NAMED_BACKREF ) , ( SYN_GNU_REGEX_BV | ONIG_SYN_ALLOW_MULTIPLEX_DEFINITION_NAME | - ONIG_SYN_ALLOW_MULTIPLEX_DEFINITION_NAME_CALL ) + ONIG_SYN_ALLOW_MULTIPLEX_DEFINITION_NAME_CALL | + ONIG_SYN_USE_LEFT_MOST_NAMED_GROUP ) , ( ONIG_OPTION_SINGLELINE | ONIG_OPTION_CAPTURE_GROUP ) , { @@ -332,25 +333,25 @@ onig_set_syntax_options(OnigSyntaxType* syntax, OnigOptionType options) } extern unsigned int -onig_get_syntax_op(OnigSyntaxType* syntax) +onig_get_syntax_op(const OnigSyntaxType* syntax) { return syntax->op; } extern unsigned int -onig_get_syntax_op2(OnigSyntaxType* syntax) +onig_get_syntax_op2(const OnigSyntaxType* syntax) { return syntax->op2; } extern unsigned int -onig_get_syntax_behavior(OnigSyntaxType* syntax) +onig_get_syntax_behavior(const OnigSyntaxType* syntax) { return syntax->behavior; } extern OnigOptionType -onig_get_syntax_options(OnigSyntaxType* syntax) +onig_get_syntax_options(const OnigSyntaxType* syntax) { return syntax->options; } |