From 84e2d449b9e51863db0edbe305feceb6a331e38a Mon Sep 17 00:00:00 2001
From: Jason Turner <jason@emptycrate.com>
Date: Thu, 15 Oct 2015 15:02:49 -0600
Subject: [PATCH] Support `default` case in the non-last position

---
 .../chaiscript/language/chaiscript_eval.hpp    |  2 +-
 .../chaiscript/language/chaiscript_parser.hpp  |  2 ++
 unittests/switch_default_2.chai                | 18 ++++++++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 unittests/switch_default_2.chai

diff --git a/include/chaiscript/language/chaiscript_eval.hpp b/include/chaiscript/language/chaiscript_eval.hpp
index f6fde402..aa01de96 100644
--- a/include/chaiscript/language/chaiscript_eval.hpp
+++ b/include/chaiscript/language/chaiscript_eval.hpp
@@ -950,7 +950,7 @@ namespace chaiscript
               }
               else if (this->children[currentCase]->identifier == AST_Node_Type::Default) {
                 this->children[currentCase]->eval(t_ss);
-                breaking = true;
+                hasMatched = true;
               }
             }
             catch (detail::Break_Loop &) {
diff --git a/include/chaiscript/language/chaiscript_parser.hpp b/include/chaiscript/language/chaiscript_parser.hpp
index 11a2d04c..d012e268 100644
--- a/include/chaiscript/language/chaiscript_parser.hpp
+++ b/include/chaiscript/language/chaiscript_parser.hpp
@@ -1807,6 +1807,8 @@ namespace chaiscript
 
           build_match<eval::Case_AST_Node>(prev_stack_top);
         } else if (Keyword("default")) {
+          retval = true;
+
           while (Eol()) {}
 
           if (!Block()) {
diff --git a/unittests/switch_default_2.chai b/unittests/switch_default_2.chai
new file mode 100644
index 00000000..5082ab61
--- /dev/null
+++ b/unittests/switch_default_2.chai
@@ -0,0 +1,18 @@
+var total = 0;
+
+switch(2) { 
+  case (1) { 
+    total += 1; 
+  } 
+  default {
+    total += 16;
+  }
+  case (3) { 
+    total += 4;
+  } 
+  case (4) { 
+    total += 8; 
+  } 
+}
+
+assert_equal(total, 28)