Merge branch 'hotfix/v2.2.1'

youxkei · Sep 9, 2013 · e86ddf3 · e86ddf3
2 parents 48c31e3 + 3819578
commit e86ddf3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -2,6 +2,7 @@
 https://github.com/youkei/ctpg/wiki
 
 # History
+- 2.2.1: Fix unintended fall-through
 - 2.2.0: Fix error message line of undefined parser
 - 2.1.0: Add comment feature to DSL
 - 2.0.0: Full scratch

diff --git a/src/ctpg.d b/src/ctpg.d
@@ -5,8 +5,8 @@ import std.range       : ElementEncodingType, isForwardRange, isRandomAccessRang
 import std.traits      : CommonType, EnumMembers, ReturnType, Unqual, isArray, isSomeChar, isSomeString;
 import std.typecons    : Tuple, tuple;
 
-debug = ctpg;
-debug = ctpgSuppressErrorMsg;
+// debug = ctpg;
+// debug = ctpgSuppressErrorMsg;
 
 debug(ctpg) version(unittest)
 {
@@ -2266,7 +2266,7 @@ debug(ctpg) unittest
         }
 
         return true;
-    };
+    }
 
     static assert(test());
     test();
@@ -4006,6 +4006,7 @@ Node expandSkip(Node node, Node skip = Node.init)
 
         case TokenType.SKIP_WITH:
             node.children[1] = node.children[1].expandSkip(skip);
+            break;
 
         case TokenType.DEFINITIONS:
             foreach(ref child; node.children)