- Fix speling and add docu

diff --git a/re2c/code.cc b/re2c/code.cc
index a1ac9364bd38b77e0c397c8ae37940fb1ccf323b..64af1ab033fe04aaea971062150794bb48dd70c0 100644 (file)
--- a/re2c/code.cc
+++ b/re2c/code.cc
@@ -1715,9 +1715,9 @@ void DFA::emit(std::ostream &o, uint& ind, const RegExpMap* specMap, const std::
 
        if (cFlag && !condName.empty())
        {
-               if (condDevider.length())
+               if (condDivider.length())
                {
-                       o << replaceParam(condDevider, condDeviderState, condName) << "\n";
+                       o << replaceParam(condDivider, condDividerParam, condName) << "\n";
                }
                o << condPrefix << condName << ":\n";
        }
@@ -2130,13 +2130,13 @@ void Scanner::config(const Str& cfg, const Str& val)
        {
                condEnumPrefix = strVal;
        }
-       else if (cfg.to_string() == "cond:devider")
+       else if (cfg.to_string() == "cond:divider")
        {
-               condDevider = strVal;
+               condDivider = strVal;
        }
-       else if (cfg.to_string() == "cond:devider@state")
+       else if (cfg.to_string() == "cond:divider@cond")
        {
-               condDeviderState = strVal;
+               condDividerParam = strVal;
        }
        else if (cfg.to_string() == "define:YYFILL@len")
        {

diff --git a/re2c/globals.h b/re2c/globals.h
index 1ef8e5b76f291a6f22a590d4df35c778c760a4d9..b04b0ffe8981a214869de7c12c0e62f90f1b0e13 100644 (file)
--- a/re2c/globals.h
+++ b/re2c/globals.h
@@ -43,8 +43,8 @@ extern std::string startLabelName;
 extern std::string labelPrefix;
 extern std::string condPrefix;
 extern std::string condEnumPrefix;
-extern std::string condDevider;
-extern std::string condDeviderState;
+extern std::string condDivider;
+extern std::string condDividerParam;
 extern std::string yychConversion;
 extern std::string yyFillLength;
 extern std::string yySetConditionParam;

diff --git a/re2c/htdocs/manual.html b/re2c/htdocs/manual.html
index d02a263b4ab0b67da60ec00d722c4ae7d28dfb2f..c263e03808d0f5fad462490be472534b422dcb06 100755 (executable)
--- a/re2c/htdocs/manual.html
+++ b/re2c/htdocs/manual.html
@@ -414,6 +414,13 @@ together have equal precedence.</p>
 <p>It is possible to configure code generation inside re2c blocks. The
 following lists the available configurations:</p>
 <dl compact="compact">
+<dt><i>re2c:cond:divider</i> <b>=</b> "/* *********************************** */" <b>;</b></dt>
+<dd>Allows to customize the devider for condition blocks. You can use '@@' to 
+put the name of the condition or ustomize the plaeholder
+using <i>re2c:cond:divider@cond</i>.</dd>
+<dt><i>re2c:cond:divider@cond</i> <b>=</b> @@ <b>;</b></dt>
+<dd>Specify the placeholder that will be replaced with the condition name
+in <i>re2c:cond:divider\fP</i>.</dd>
 <dt><i>re2c:indent:top</i> <b>=</b> 0 <b>;</b></dt>
 <dd>Specifies the minimum number of indendation to use. Requires a numeric
 value greater than or equal zero.</dd>

diff --git a/re2c/main.cc b/re2c/main.cc
index 243b72226337297160c4087a3ed493744236d129..a7c9df09a3bd7da36c50ca5620550710d578a775 100644 (file)
--- a/re2c/main.cc
+++ b/re2c/main.cc
@@ -59,8 +59,8 @@ std::string startLabelName;
 std::string labelPrefix("yy");
 std::string condPrefix("yyc_");
 std::string condEnumPrefix("yyc");
-std::string condDevider("/* *********************************** */");
-std::string condDeviderState("@@");
+std::string condDivider("/* *********************************** */");
+std::string condDividerParam("@@");
 std::string yychConversion("");
 std::string yyFillLength("@@");
 std::string yySetConditionParam("@@");

diff --git a/re2c/test/condition_01a.c.re b/re2c/test/condition_01a.c.re
index ca10ac03eb089b42c35d1a819309c6121fd10b64..6992778c424655ab5ceab0398000d15de0c15e64 100755 (executable)
--- a/re2c/test/condition_01a.c.re
+++ b/re2c/test/condition_01a.c.re
@@ -1,5 +1,5 @@
 /*!re2c
-re2c:cond:devider = "/**** State @@ ***\/";
+re2c:cond:divider = "/**** State @@ ***\/";
 < a , b >      "ab"    { }
 
 */

diff --git a/re2c/test/condition_01b.c.re b/re2c/test/condition_01b.c.re
index 0289fc0db067ccf38d0a2bec6f40abd7b8e561ea..424d1648b7d45b84a9f9059d2c3f81d6cdb8f3c9 100755 (executable)
--- a/re2c/test/condition_01b.c.re
+++ b/re2c/test/condition_01b.c.re
@@ -1,5 +1,5 @@
 /*!re2c
-re2c:cond:devider = ;
+re2c:cond:divider = ;
 < a , b >      "ab"    { }
 
 */