Output condition name with '-Wnaked-default' in '-c' mode.

diff --git a/re2c/src/codegen/prepare_dfa.cc b/re2c/src/codegen/prepare_dfa.cc
index 4286419e7c0120f1fdaa25ba73c0a85de2e0b3c9..8322a6da66ab503e56e2482d2f24a6c766530a55 100644 (file)
--- a/re2c/src/codegen/prepare_dfa.cc
+++ b/re2c/src/codegen/prepare_dfa.cc
@@ -154,7 +154,7 @@ void DFA::findBaseState()
        operator delete (span);
 }
 
-void DFA::prepare(OutputFile & o, uint32_t & max_fill)
+void DFA::prepare(OutputFile & o, uint32_t & max_fill, const std::string & cond)
 {
        bUsedYYBitmap = false;
 
@@ -251,7 +251,7 @@ void DFA::prepare(OutputFile & o, uint32_t & max_fill)
        // warn if default case is not handled
        if (default_state && !stray_cunits.empty () && !empty_rule)
        {
-               warn.naked_default (o.get_block_line (), stray_cunits);
+               warn.naked_default (o.get_block_line (), stray_cunits, cond);
        }
 
        // warn about not shadowed rule that matches empty string

diff --git a/re2c/src/conf/warn.cc b/re2c/src/conf/warn.cc
index 23714d04d4be9f8298a4bc7e8dc982fdf7983e9a..54b3cce25340f5162ad87dfa109091cb41f28cdc 100644 (file)
--- a/re2c/src/conf/warn.cc
+++ b/re2c/src/conf/warn.cc
@@ -86,7 +86,7 @@ void Warn::match_empty_string (uint32_t line)
        }
 }
 
-void Warn::naked_default (uint32_t line, const std::vector<std::pair<uint32_t, uint32_t> > & stray_cunits)
+void Warn::naked_default (uint32_t line, const std::vector<std::pair<uint32_t, uint32_t> > & stray_cunits, const std::string & cond)
 {
        if (mask[NAKED_DEFAULT] & WARNING)
        {
@@ -94,12 +94,22 @@ void Warn::naked_default (uint32_t line, const std::vector<std::pair<uint32_t, u
                {
                        error_accuml = true;
                }
-               std::ostringstream s;
+               std::ostringstream cunits;
                for (uint32_t i = 0; i < stray_cunits.size (); ++i)
                {
-                       printSpan (s, stray_cunits[i].first, stray_cunits[i].second);
+                       printSpan (cunits, stray_cunits[i].first, stray_cunits[i].second);
                }
-               warning (names[NAKED_DEFAULT], line, "naked default case (stray code units: %s), better add default rule *", s.str ().c_str ());
+               const char * cond_prefix = cond == ""
+                       ? ""
+                       : " in condition ";
+               warning
+                       ( names[NAKED_DEFAULT]
+                       , line
+                       , "naked default case%s%s (stray code units: %s), better add default rule *"
+                       , cond_prefix
+                       , cond.c_str ()
+                       , cunits.str ().c_str ()
+                       );
        }
 }
 

diff --git a/re2c/src/conf/warn.h b/re2c/src/conf/warn.h
index 69a477a5a97165fa428d2240a7e5ec2229cfd498..44229bd4d587a1127e6a9b813b82f085776e29cb 100644 (file)
--- a/re2c/src/conf/warn.h
+++ b/re2c/src/conf/warn.h
@@ -45,7 +45,7 @@ public:
        void set_all (option_t o);
        void empty_class (uint32_t line);
        void match_empty_string (uint32_t line);
-       void naked_default (uint32_t line, const std::vector<std::pair<uint32_t, uint32_t> > & stray_cunits);
+       void naked_default (uint32_t line, const std::vector<std::pair<uint32_t, uint32_t> > & stray_cunits, const std::string & cond);
 };
 
 } // namespace re2c

diff --git a/re2c/src/ir/bytecode/bytecode.cc b/re2c/src/ir/bytecode/bytecode.cc
index 0fda50b29658e6612c963f60308259ff403e43e1..352ac0d3cd50fb2184a316066f1da838ce794b72 100644 (file)
--- a/re2c/src/ir/bytecode/bytecode.cc
+++ b/re2c/src/ir/bytecode/bytecode.cc
@@ -8,7 +8,7 @@ namespace re2c {
 
 static void optimize (Ins * i);
 
-smart_ptr<DFA> genCode (RegExp *re, Output & output, uint32_t ind)
+smart_ptr<DFA> genCode (RegExp *re, Output & output, uint32_t ind, const std::string & cond)
 {
        CharSet cs;
        re->split(cs);
@@ -61,7 +61,7 @@ smart_ptr<DFA> genCode (RegExp *re, Output & output, uint32_t ind)
                skeleton.emit_data (output.data);
                skeleton::emit_prolog (output.source, ind, output.data.file_name.c_str ());
        }
-       dfa->prepare (output.source, output.max_fill);
+       dfa->prepare (output.source, output.max_fill, cond);
 
        return dfa;
 }

diff --git a/re2c/src/ir/bytecode/bytecode.h b/re2c/src/ir/bytecode/bytecode.h
index 50757e12637f85927ac0f9bcb44aaa3f24647ed3..9a675a8f68091e452ba1dcf2e324730347b9ec0c 100644 (file)
--- a/re2c/src/ir/bytecode/bytecode.h
+++ b/re2c/src/ir/bytecode/bytecode.h
@@ -9,7 +9,7 @@
 namespace re2c
 {
 
-smart_ptr<DFA> genCode (RegExp * re, Output & output, uint32_t ind);
+smart_ptr<DFA> genCode (RegExp * re, Output & output, uint32_t ind, const std::string & cond);
 
 } // namespace re2c
 

diff --git a/re2c/src/ir/dfa/dfa.h b/re2c/src/ir/dfa/dfa.h
index 98229f670071c9552f2b7273a16677704644b24d..2cbd3703fde52976379ecdaa8e6742b858642586 100644 (file)
--- a/re2c/src/ir/dfa/dfa.h
+++ b/re2c/src/ir/dfa/dfa.h
@@ -34,7 +34,7 @@ public:
 
        void findSCCs ();
        void findBaseState ();
-       void prepare (OutputFile & o, uint32_t &);
+       void prepare (OutputFile & o, uint32_t &, const std::string & cond);
        void count_used_labels (std::set<label_t> & used, label_t prolog, label_t start, bool force_start) const;
        void emit (Output &, uint32_t &, const RegExpMap *, const std::string &, bool, bool &);
 

diff --git a/re2c/src/parse/parser.ypp b/re2c/src/parse/parser.ypp
index e29204b8bee0653756d8cedd427465350b981c61..4eb6522d6b5618114f1b64f9925caf8a66330833 100644 (file)
--- a/re2c/src/parse/parser.ypp
+++ b/re2c/src/parse/parser.ypp
@@ -665,7 +665,7 @@ void parse(Scanner& i, Output & o)
                                                        it->second.second = it->second.second ? mkAlt(def, it->second.second) : def;
                                                }
                                        }
-                                       dfa_map[it->first] = genCode(it->second.second, o, topIndent);
+                                       dfa_map[it->first] = genCode(it->second.second, o, topIndent, it->first);
                                }
                                if (parseMode != Scanner::Rules && dfa_map.find(it->first) != dfa_map.end())
                                {
@@ -686,7 +686,7 @@ void parse(Scanner& i, Output & o)
                        {
                                if (parseMode != Scanner::Reuse)
                                {
-                                       dfa_map[""] = genCode(spec, o, topIndent);
+                                       dfa_map[""] = genCode(spec, o, topIndent, "");
                                }
                                if (parseMode != Scanner::Rules && dfa_map.find("") != dfa_map.end())
                                {

diff --git a/re2c/test/bug59_bogus_yyaccept.ci.c b/re2c/test/bug59_bogus_yyaccept.ci.c
index f190c4e0b03cbf309d754b866dfdee9b6a933c86..d6ba3b46a463690916cccdbbf27f3c20e6cb18e2 100644 (file)
--- a/re2c/test/bug59_bogus_yyaccept.ci.c
+++ b/re2c/test/bug59_bogus_yyaccept.ci.c
@@ -1,5 +1,5 @@
-re2c: warning: line 10: naked default case (stray code units: [0x00-a][c-0xFF]), better add default rule * [-Wnaked-default]
-re2c: warning: line 10: naked default case (stray code units: [0x00-`][b-0xFF]), better add default rule * [-Wnaked-default]
+re2c: warning: line 10: naked default case in condition c1 (stray code units: [0x00-a][c-0xFF]), better add default rule * [-Wnaked-default]
+re2c: warning: line 10: naked default case in condition c2 (stray code units: [0x00-`][b-0xFF]), better add default rule * [-Wnaked-default]
 /* Generated by re2c */
 
 {

diff --git a/re2c/test/bug60_redundant_yymarker.ci.c b/re2c/test/bug60_redundant_yymarker.ci.c
index 48c4638c3fe9f6e0d5f971244f32fbc58becbbb2..418671ab925d544fe924ae16e1232a43d5a49ce0 100644 (file)
--- a/re2c/test/bug60_redundant_yymarker.ci.c
+++ b/re2c/test/bug60_redundant_yymarker.ci.c
@@ -1,4 +1,4 @@
-re2c: warning: line 9: naked default case (stray code units: [0x00-c][e-0xFF]), better add default rule * [-Wnaked-default]
+re2c: warning: line 9: naked default case in condition c2 (stray code units: [0x00-c][e-0xFF]), better add default rule * [-Wnaked-default]
 /* Generated by re2c */
 
 {

diff --git a/re2c/test/cond_error_10.c.c b/re2c/test/cond_error_10.c.c
index 410a7ad1e16c7517ac0d91f904549ed5919bf288..9f1b573d73643dc03e74bc8ed83d4d05eda882ec 100644 (file)
--- a/re2c/test/cond_error_10.c.c
+++ b/re2c/test/cond_error_10.c.c
@@ -1,3 +1,3 @@
-re2c: warning: line 8: naked default case (stray code units: [0x00-`][b-0xFF]), better add default rule * [-Wnaked-default]
-re2c: warning: line 8: naked default case (stray code units: [0x00-a][c-0xFF]), better add default rule * [-Wnaked-default]
+re2c: warning: line 8: naked default case in condition a (stray code units: [0x00-`][b-0xFF]), better add default rule * [-Wnaked-default]
+re2c: warning: line 8: naked default case in condition b (stray code units: [0x00-a][c-0xFF]), better add default rule * [-Wnaked-default]
 re2c: error: line 6, column 1: setup for non existing rule 'c' found

diff --git a/re2c/test/cond_error_11.c.c b/re2c/test/cond_error_11.c.c
index b1065648836398dc99288ccf458df0ae2fca7d83..cfd13f217763bd8386a05fd66f6bc17e963f77e1 100644 (file)
--- a/re2c/test/cond_error_11.c.c
+++ b/re2c/test/cond_error_11.c.c
@@ -1,3 +1,3 @@
-re2c: warning: line 9: naked default case (stray code units: [0x00-`][b-0xFF]), better add default rule * [-Wnaked-default]
-re2c: warning: line 9: naked default case (stray code units: [0x00-a][c-0xFF]), better add default rule * [-Wnaked-default]
+re2c: warning: line 9: naked default case in condition a (stray code units: [0x00-`][b-0xFF]), better add default rule * [-Wnaked-default]
+re2c: warning: line 9: naked default case in condition b (stray code units: [0x00-a][c-0xFF]), better add default rule * [-Wnaked-default]
 re2c: error: line 7, column 1: setup for all rules with '*' not possible when all rules are setup explicitly

diff --git a/re2c/test/condition_01.c.c b/re2c/test/condition_01.c.c
index 1dacb60eea4e753428ddc9a63395948754ffdf67..935e08d1782520205c9227b55ec0522af94df8f4 100644 (file)
--- a/re2c/test/condition_01.c.c
+++ b/re2c/test/condition_01.c.c
@@ -1,5 +1,5 @@
-re2c: warning: line 5: naked default case (stray code units: [0x00-`][a][b-0xFF]), better add default rule * [-Wnaked-default]
-re2c: warning: line 5: naked default case (stray code units: [0x00-`][a][b-0xFF]), better add default rule * [-Wnaked-default]
+re2c: warning: line 5: naked default case in condition a (stray code units: [0x00-`][a][b-0xFF]), better add default rule * [-Wnaked-default]
+re2c: warning: line 5: naked default case in condition b (stray code units: [0x00-`][a][b-0xFF]), better add default rule * [-Wnaked-default]
 /* Generated by re2c */
 #line 1 "condition_01.c.re"
 

diff --git a/re2c/test/condition_01a.c.c b/re2c/test/condition_01a.c.c
index f8dcd54d6631947d9a6121a3a788be50d5336267..c45c4c7701b64448c87447e1f8aec021334fed5d 100644 (file)
--- a/re2c/test/condition_01a.c.c
+++ b/re2c/test/condition_01a.c.c
@@ -1,5 +1,5 @@
-re2c: warning: line 5: naked default case (stray code units: [0x00-`][a][b-0xFF]), better add default rule * [-Wnaked-default]
-re2c: warning: line 5: naked default case (stray code units: [0x00-`][a][b-0xFF]), better add default rule * [-Wnaked-default]
+re2c: warning: line 5: naked default case in condition a (stray code units: [0x00-`][a][b-0xFF]), better add default rule * [-Wnaked-default]
+re2c: warning: line 5: naked default case in condition b (stray code units: [0x00-`][a][b-0xFF]), better add default rule * [-Wnaked-default]
 /* Generated by re2c */
 #line 1 "condition_01a.c.re"
 

diff --git a/re2c/test/condition_01b.c.c b/re2c/test/condition_01b.c.c
index 251f23329a1a8fd9e4b0b2f9e3b6d0e6cab49edf..9d7384c4fdf4e107d366a7ec7b42e5360969ca22 100644 (file)
--- a/re2c/test/condition_01b.c.c
+++ b/re2c/test/condition_01b.c.c
@@ -1,5 +1,5 @@
-re2c: warning: line 5: naked default case (stray code units: [0x00-`][a][b-0xFF]), better add default rule * [-Wnaked-default]
-re2c: warning: line 5: naked default case (stray code units: [0x00-`][a][b-0xFF]), better add default rule * [-Wnaked-default]
+re2c: warning: line 5: naked default case in condition a (stray code units: [0x00-`][a][b-0xFF]), better add default rule * [-Wnaked-default]
+re2c: warning: line 5: naked default case in condition b (stray code units: [0x00-`][a][b-0xFF]), better add default rule * [-Wnaked-default]
 /* Generated by re2c */
 #line 1 "condition_01b.c.re"
 

diff --git a/re2c/test/condition_02.c.c b/re2c/test/condition_02.c.c
index c74a002afc2f9a5c29a8231063b1223f4d86de92..07cf5e600608eba0709ff48c613d6eaad5daf40a 100644 (file)
--- a/re2c/test/condition_02.c.c
+++ b/re2c/test/condition_02.c.c
@@ -1,6 +1,6 @@
 re2c: warning: line 3: rule matches empty string [-Wmatch-empty-string]
-re2c: warning: line 7: naked default case (stray code units: [0x00-`][c-0xFF]), better add default rule * [-Wnaked-default]
-re2c: warning: line 7: naked default case (stray code units: [0x00-a][c-0xFF]), better add default rule * [-Wnaked-default]
+re2c: warning: line 7: naked default case in condition r1 (stray code units: [0x00-`][c-0xFF]), better add default rule * [-Wnaked-default]
+re2c: warning: line 7: naked default case in condition r2 (stray code units: [0x00-a][c-0xFF]), better add default rule * [-Wnaked-default]
 /* Generated by re2c */
 #line 1 "condition_02.c.re"
 

diff --git a/re2c/test/condition_02.cg.c b/re2c/test/condition_02.cg.c
index d0c0d0fb456676b92ea5aaee51b4519fb3c88fa0..f96e8f5a2313377f054d7db61aec6e6c002eb759 100644 (file)
--- a/re2c/test/condition_02.cg.c
+++ b/re2c/test/condition_02.cg.c
@@ -1,6 +1,6 @@
 re2c: warning: line 3: rule matches empty string [-Wmatch-empty-string]
-re2c: warning: line 7: naked default case (stray code units: [0x00-`][c-0xFF]), better add default rule * [-Wnaked-default]
-re2c: warning: line 7: naked default case (stray code units: [0x00-a][c-0xFF]), better add default rule * [-Wnaked-default]
+re2c: warning: line 7: naked default case in condition r1 (stray code units: [0x00-`][c-0xFF]), better add default rule * [-Wnaked-default]
+re2c: warning: line 7: naked default case in condition r2 (stray code units: [0x00-a][c-0xFF]), better add default rule * [-Wnaked-default]
 /* Generated by re2c */
 #line 1 "condition_02.cg.re"
 

diff --git a/re2c/test/condition_03.cg.c b/re2c/test/condition_03.cg.c
index b304d603d73b7da6cabe45032a36ce90dffdfde2..ab76e9f0ec0770bc3db0500d04ee6c8d8f45930c 100644 (file)
--- a/re2c/test/condition_03.cg.c
+++ b/re2c/test/condition_03.cg.c
@@ -1,6 +1,6 @@
 re2c: warning: line 3: rule matches empty string [-Wmatch-empty-string]
-re2c: warning: line 9: naked default case (stray code units: [0x00-0][3-`][c-0xFF]), better add default rule * [-Wnaked-default]
-re2c: warning: line 9: naked default case (stray code units: [0x00-0][3-a][c-0xFF]), better add default rule * [-Wnaked-default]
+re2c: warning: line 9: naked default case in condition r1 (stray code units: [0x00-0][3-`][c-0xFF]), better add default rule * [-Wnaked-default]
+re2c: warning: line 9: naked default case in condition r2 (stray code units: [0x00-0][3-a][c-0xFF]), better add default rule * [-Wnaked-default]
 /* Generated by re2c */
 #line 1 "condition_03.cg.re"
 

diff --git a/re2c/test/condition_04.cg.c b/re2c/test/condition_04.cg.c
index aed187103dde007591588811863bc85ca7ece87d..c1fd98c3ed2101fd54782c5246dcd466ab61a82d 100644 (file)
--- a/re2c/test/condition_04.cg.c
+++ b/re2c/test/condition_04.cg.c
@@ -1,5 +1,5 @@
-re2c: warning: line 8: naked default case (stray code units: [0x00-0][3-`][c-0xFF]), better add default rule * [-Wnaked-default]
-re2c: warning: line 8: naked default case (stray code units: [0x00-0][3-a][c-0xFF]), better add default rule * [-Wnaked-default]
+re2c: warning: line 8: naked default case in condition r1 (stray code units: [0x00-0][3-`][c-0xFF]), better add default rule * [-Wnaked-default]
+re2c: warning: line 8: naked default case in condition r2 (stray code units: [0x00-0][3-a][c-0xFF]), better add default rule * [-Wnaked-default]
 /* Generated by re2c */
 #line 1 "condition_04.cg.re"
 

diff --git a/re2c/test/condition_11.cg.c b/re2c/test/condition_11.cg.c
index 76d2972b48e03bc4a2ab7cb3baeeb35873b4609b..84f4e1c87e9cb41d1b388f4cbdfb752f2034e106 100644 (file)
--- a/re2c/test/condition_11.cg.c
+++ b/re2c/test/condition_11.cg.c
@@ -1,6 +1,6 @@
 re2c: warning: line 3: rule matches empty string [-Wmatch-empty-string]
-re2c: warning: line 9: naked default case (stray code units: [0x00-0][3-`][c-0xFF]), better add default rule * [-Wnaked-default]
-re2c: warning: line 9: naked default case (stray code units: [0x00-0][3-a][c-0xFF]), better add default rule * [-Wnaked-default]
+re2c: warning: line 9: naked default case in condition r1 (stray code units: [0x00-0][3-`][c-0xFF]), better add default rule * [-Wnaked-default]
+re2c: warning: line 9: naked default case in condition r2 (stray code units: [0x00-0][3-a][c-0xFF]), better add default rule * [-Wnaked-default]
 /* Generated by re2c */
 #line 1 "condition_11.cg.re"
 

diff --git a/re2c/test/condition_13.cg.c b/re2c/test/condition_13.cg.c
index 962c2caa8cc183c2aa879c284acba7cac98ffc53..7eebd5692b9d5e5d43db975e78e19e66a01959f5 100644 (file)
--- a/re2c/test/condition_13.cg.c
+++ b/re2c/test/condition_13.cg.c
@@ -1,6 +1,6 @@
 re2c: warning: line 3: rule matches empty string [-Wmatch-empty-string]
-re2c: warning: line 9: naked default case (stray code units: [0x00-0][3-`][c-0xFF]), better add default rule * [-Wnaked-default]
-re2c: warning: line 9: naked default case (stray code units: [0x00-0][3-a][c-0xFF]), better add default rule * [-Wnaked-default]
+re2c: warning: line 9: naked default case in condition r1 (stray code units: [0x00-0][3-`][c-0xFF]), better add default rule * [-Wnaked-default]
+re2c: warning: line 9: naked default case in condition r2 (stray code units: [0x00-0][3-a][c-0xFF]), better add default rule * [-Wnaked-default]
 /* Generated by re2c */
 #line 1 "condition_13.cg.re"
 

diff --git a/re2c/test/dot_conditions.Dc.c b/re2c/test/dot_conditions.Dc.c
index 7673e7ec0a990386d87bbdb23b9e53a4049234e7..d7e41b7e50517c4368e08a6a943e202e5fbe69e3 100644 (file)
--- a/re2c/test/dot_conditions.Dc.c
+++ b/re2c/test/dot_conditions.Dc.c
@@ -1,5 +1,5 @@
-re2c: warning: line 10: naked default case (stray code units: [0x00-`][a][b-e][f][g-0xFF]), better add default rule * [-Wnaked-default]
-re2c: warning: line 10: naked default case (stray code units: [0x00-`][a][b-0xFF]), better add default rule * [-Wnaked-default]
+re2c: warning: line 10: naked default case in condition state1 (stray code units: [0x00-`][a][b-e][f][g-0xFF]), better add default rule * [-Wnaked-default]
+re2c: warning: line 10: naked default case in condition state2 (stray code units: [0x00-`][a][b-0xFF]), better add default rule * [-Wnaked-default]
 /* Generated by re2c */
 
 digraph re2c {

diff --git a/re2c/test/repeat-01.cgir.c b/re2c/test/repeat-01.cgir.c
index 3c5e8856edeed513ce52e2eca29130d683b5e253..a24c92a430a5e9ac64dbe35cb41fbfd114ee1fda 100644 (file)
--- a/re2c/test/repeat-01.cgir.c
+++ b/re2c/test/repeat-01.cgir.c
@@ -1,5 +1,5 @@
-re2c: warning: line 13: naked default case (stray code units: [0x00-0][3-`][c-0xFF]), better add default rule * [-Wnaked-default]
-re2c: warning: line 13: naked default case (stray code units: [0x00-0][3-a][c-0xFF]), better add default rule * [-Wnaked-default]
+re2c: warning: line 13: naked default case in condition r1 (stray code units: [0x00-0][3-`][c-0xFF]), better add default rule * [-Wnaked-default]
+re2c: warning: line 13: naked default case in condition r2 (stray code units: [0x00-0][3-a][c-0xFF]), better add default rule * [-Wnaked-default]
 /* Generated by re2c */
 // multiple scanners
 

diff --git a/re2c/test/repeat-02.cgir.c b/re2c/test/repeat-02.cgir.c
index a5a110c11450ab04db41f59a596ec7e61de5390d..a37dfd088ce1bd2cc914e66c19e15f6a41768e24 100644 (file)
--- a/re2c/test/repeat-02.cgir.c
+++ b/re2c/test/repeat-02.cgir.c
@@ -1,5 +1,5 @@
-re2c: warning: line 13: naked default case (stray code units: [0x00-0][3-`][c-0xFF]), better add default rule * [-Wnaked-default]
-re2c: warning: line 13: naked default case (stray code units: [0x00-0][3-a][c-0xFF]), better add default rule * [-Wnaked-default]
+re2c: warning: line 13: naked default case in condition r1 (stray code units: [0x00-0][3-`][c-0xFF]), better add default rule * [-Wnaked-default]
+re2c: warning: line 13: naked default case in condition r2 (stray code units: [0x00-0][3-a][c-0xFF]), better add default rule * [-Wnaked-default]
 /* Generated by re2c */
 // multiple scanners
 

diff --git a/re2c/test/repeat-03.cgir.c b/re2c/test/repeat-03.cgir.c
index 3e2e4305509e9d240e8dbfa8a5f1738a09ecc876..fd30485520b38046a199d13ef89412321bf19f6e 100644 (file)
--- a/re2c/test/repeat-03.cgir.c
+++ b/re2c/test/repeat-03.cgir.c
@@ -1,9 +1,9 @@
-re2c: warning: line 14: naked default case (stray code units: [0x0A]), better add default rule * [-Wnaked-default]
-re2c: warning: line 14: naked default case (stray code units: [0x0A]), better add default rule * [-Wnaked-default]
-re2c: warning: line 18: naked default case (stray code units: [0x0A]), better add default rule * [-Wnaked-default]
-re2c: warning: line 18: naked default case (stray code units: [0x0A]), better add default rule * [-Wnaked-default]
-re2c: warning: line 28: naked default case (stray code units: [0x0A]), better add default rule * [-Wnaked-default]
-re2c: warning: line 28: naked default case (stray code units: [0x0A]), better add default rule * [-Wnaked-default]
+re2c: warning: line 14: naked default case in condition r1 (stray code units: [0x0A]), better add default rule * [-Wnaked-default]
+re2c: warning: line 14: naked default case in condition r2 (stray code units: [0x0A]), better add default rule * [-Wnaked-default]
+re2c: warning: line 18: naked default case in condition r1 (stray code units: [0x0A]), better add default rule * [-Wnaked-default]
+re2c: warning: line 18: naked default case in condition r2 (stray code units: [0x0A]), better add default rule * [-Wnaked-default]
+re2c: warning: line 28: naked default case in condition r1 (stray code units: [0x0A]), better add default rule * [-Wnaked-default]
+re2c: warning: line 28: naked default case in condition r2 (stray code units: [0x0A]), better add default rule * [-Wnaked-default]
 /* Generated by re2c */
 // multiple scanners
 

diff --git a/re2c/test/repeat-04.cgir.c b/re2c/test/repeat-04.cgir.c
index 9e9077ff58cf9dea90dcaf0fb4c6a29651f1be45..7ee373abcad1342bd6355b10ea3f54bb9c72a643 100644 (file)
--- a/re2c/test/repeat-04.cgir.c
+++ b/re2c/test/repeat-04.cgir.c
@@ -1,3 +1,3 @@
-re2c: warning: line 14: naked default case (stray code units: [0x00-0][3-`][c-0xFF]), better add default rule * [-Wnaked-default]
-re2c: warning: line 14: naked default case (stray code units: [0x00-0][3-a][c-0xFF]), better add default rule * [-Wnaked-default]
+re2c: warning: line 14: naked default case in condition r1 (stray code units: [0x00-0][3-`][c-0xFF]), better add default rule * [-Wnaked-default]
+re2c: warning: line 14: naked default case in condition r2 (stray code units: [0x00-0][3-a][c-0xFF]), better add default rule * [-Wnaked-default]
 re2c: error: line 20, column 1: cannot have a second 'rules:re2c' block

diff --git a/re2c/test/reuse_conds_default_0.cgir.c b/re2c/test/reuse_conds_default_0.cgir.c
index 36967a20ba0863451d884c1aa6042b9f4b291a1b..751d2fb093b71174ed4506c2c602596f66aa8ec8 100644 (file)
--- a/re2c/test/reuse_conds_default_0.cgir.c
+++ b/re2c/test/reuse_conds_default_0.cgir.c
@@ -1,3 +1,3 @@
-re2c: warning: line 10: naked default case (stray code units: [0x0A]), better add default rule * [-Wnaked-default]
-re2c: warning: line 10: naked default case (stray code units: [0x0A]), better add default rule * [-Wnaked-default]
+re2c: warning: line 10: naked default case in condition r1 (stray code units: [0x0A]), better add default rule * [-Wnaked-default]
+re2c: warning: line 10: naked default case in condition r2 (stray code units: [0x0A]), better add default rule * [-Wnaked-default]
 re2c: error: line 13, column 9: code to default rule 'r1' is already defined

diff --git a/re2c/test/reuse_conds_default_1.cgir.c b/re2c/test/reuse_conds_default_1.cgir.c
index 0162390ce584c6cf6c960a30d85e13913b49553c..fde830437486b4d0fd0edcd14a5eb21ef9aa8f1c 100644 (file)
--- a/re2c/test/reuse_conds_default_1.cgir.c
+++ b/re2c/test/reuse_conds_default_1.cgir.c
@@ -1,2 +1,2 @@
-re2c: warning: line 17: naked default case (stray code units: [0x0A]), better add default rule * [-Wnaked-default]
+re2c: warning: line 17: naked default case in condition r2 (stray code units: [0x0A]), better add default rule * [-Wnaked-default]
 re2c: error: line 11, column 9: code to default rule 'r1' is already defined

diff --git a/re2c/test/reuse_conds_setup_0.cgir.c b/re2c/test/reuse_conds_setup_0.cgir.c
index 6521dadf833c21824f6261058205269cfaa0790e..41c8b1e7073961e0303f2039545bb28b7749a744 100644 (file)
--- a/re2c/test/reuse_conds_setup_0.cgir.c
+++ b/re2c/test/reuse_conds_setup_0.cgir.c
@@ -1,3 +1,3 @@
-re2c: warning: line 10: naked default case (stray code units: [0x0A]), better add default rule * [-Wnaked-default]
-re2c: warning: line 10: naked default case (stray code units: [0x0A]), better add default rule * [-Wnaked-default]
+re2c: warning: line 10: naked default case in condition r1 (stray code units: [0x0A]), better add default rule * [-Wnaked-default]
+re2c: warning: line 10: naked default case in condition r2 (stray code units: [0x0A]), better add default rule * [-Wnaked-default]
 re2c: error: line 13, column 9: code to setup rule 'r1' is already defined

diff --git a/re2c/test/reuse_conds_setup_1.cgir.c b/re2c/test/reuse_conds_setup_1.cgir.c
index 3df23ef74335fc9541078ed1826129805488f53e..ee31e769e0213bcd34c89101ae7bb3a03e5e9cac 100644 (file)
--- a/re2c/test/reuse_conds_setup_1.cgir.c
+++ b/re2c/test/reuse_conds_setup_1.cgir.c
@@ -1,3 +1,3 @@
-re2c: warning: line 17: naked default case (stray code units: [0x0A]), better add default rule * [-Wnaked-default]
-re2c: warning: line 17: naked default case (stray code units: [0x0A]), better add default rule * [-Wnaked-default]
+re2c: warning: line 17: naked default case in condition r1 (stray code units: [0x0A]), better add default rule * [-Wnaked-default]
+re2c: warning: line 17: naked default case in condition r2 (stray code units: [0x0A]), better add default rule * [-Wnaked-default]
 re2c: error: line 11, column 9: code to setup rule 'r1' is already defined