rename ONIG_SYN_OP2_ESC_CAPITAL_N_NO_NEWLINE to ONIG_SYN_OP2_ESC_CAPITAL_N_O_SUPER_DOT

diff --git a/src/oniguruma.h b/src/oniguruma.h
index f2507dfd23d8e1391ef7721391a277a96e3ce6cb..e93928ff47965c52bbc908ccbb1a372c98d8139f 100644 (file)
--- a/src/oniguruma.h
+++ b/src/oniguruma.h
@@ -499,7 +499,7 @@ ONIG_EXTERN OnigSyntaxType*   OnigDefaultSyntax;
 #define ONIG_SYN_OP2_QMARK_LPAREN_IF_ELSE       (1U<<21) /* (?(n)) (?(...)...|...) */
 #define ONIG_SYN_OP2_ESC_CAPITAL_K_KEEP         (1U<<22) /* \K */
 #define ONIG_SYN_OP2_ESC_CAPITAL_R_GENERAL_NEWLINE (1U<<23) /* \R \r\n else [\x0a-\x0d] */
-#define ONIG_SYN_OP2_ESC_CAPITAL_N_NO_NEWLINE   (1U<<24) /* \N [^\n] */
+#define ONIG_SYN_OP2_ESC_CAPITAL_N_O_SUPER_DOT  (1U<<24) /* \N (?-m:.), \O (?m:.) */
 
 /* syntax (behavior) */
 #define ONIG_SYN_CONTEXT_INDEP_ANCHORS           (1U<<31) /* not implemented */

diff --git a/src/regparse.c b/src/regparse.c
index a25292b9dd56537d035d3addbdfbe2a909451878..f8619d9648c0e86e08443d651eaf3cea8e350531 100644 (file)
--- a/src/regparse.c
+++ b/src/regparse.c
@@ -50,7 +50,7 @@ OnigSyntaxType OnigSyntaxRuby = {
       ONIG_SYN_OP2_QMARK_LT_NAMED_GROUP | ONIG_SYN_OP2_ESC_K_NAMED_BACKREF |
       ONIG_SYN_OP2_QMARK_LPAREN_IF_ELSE |
       ONIG_SYN_OP2_ESC_CAPITAL_R_GENERAL_NEWLINE |
-      ONIG_SYN_OP2_ESC_CAPITAL_N_NO_NEWLINE |
+      ONIG_SYN_OP2_ESC_CAPITAL_N_O_SUPER_DOT |
       ONIG_SYN_OP2_ESC_CAPITAL_K_KEEP |
       ONIG_SYN_OP2_ESC_G_SUBEXP_CALL |
       ONIG_SYN_OP2_ESC_P_BRACE_CHAR_PROPERTY  |
@@ -3592,7 +3592,7 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
       break;
 
     case 'N':
-      if (! IS_SYNTAX_OP2(syn, ONIG_SYN_OP2_ESC_CAPITAL_N_NO_NEWLINE)) break;
+      if (! IS_SYNTAX_OP2(syn, ONIG_SYN_OP2_ESC_CAPITAL_N_O_SUPER_DOT)) break;
       tok->type = TK_NO_NEWLINE;
       break;
 

diff --git a/src/regsyntax.c b/src/regsyntax.c
index d05f97ddd9ccabeed095e98226549688cc0f6bfe..b01611d4643e927dc254baacf68864de79f5332f 100644 (file)
--- a/src/regsyntax.c
+++ b/src/regsyntax.c
@@ -179,7 +179,7 @@ OnigSyntaxType OnigSyntaxPerl = {
       ONIG_SYN_OP2_ESC_P_BRACE_CIRCUMFLEX_NOT |
       ONIG_SYN_OP2_ESC_CAPITAL_K_KEEP |
       ONIG_SYN_OP2_ESC_CAPITAL_R_GENERAL_NEWLINE |
-      ONIG_SYN_OP2_ESC_CAPITAL_N_NO_NEWLINE )
+      ONIG_SYN_OP2_ESC_CAPITAL_N_O_SUPER_DOT )
   , SYN_GNU_REGEX_BV
   , ONIG_OPTION_SINGLELINE
   ,
@@ -211,7 +211,7 @@ OnigSyntaxType OnigSyntaxPerl_NG = {
       ONIG_SYN_OP2_ESC_G_SUBEXP_CALL |
       ONIG_SYN_OP2_ESC_CAPITAL_K_KEEP |
       ONIG_SYN_OP2_ESC_CAPITAL_R_GENERAL_NEWLINE |
-      ONIG_SYN_OP2_ESC_CAPITAL_N_NO_NEWLINE )
+      ONIG_SYN_OP2_ESC_CAPITAL_N_O_SUPER_DOT )
   , ( SYN_GNU_REGEX_BV |
       ONIG_SYN_CAPTURE_ONLY_NAMED_GROUP |
       ONIG_SYN_ALLOW_MULTIPLEX_DEFINITION_NAME )