Fixed: loop labels

CircuitCoder · CircuitCoder · commit 723a5390ba0e · 2019-10-27T03:17:33.000+08:00
diff --git a/src/main/scala/plus/meow/MeowRust/parser/expression.scala b/src/main/scala/plus/meow/MeowRust/parser/expression.scala
@@ -151,7 +151,7 @@ trait Expression extends RegexParsers with Literal with Pattern with Identifier
   // TODO: add type ascription
   lazy val CLOSURE_PARAM = PATTERN
 
-  lazy val LOOP_EXPRESSION: Parser[Expr] = (LOOP_LABEL?) ~ (
+  lazy val LOOP_EXPRESSION: Parser[Expr] = ((LOOP_LABEL?) <~ separator) ~? (
       "loop" ~>? BLOCK_EXPRESSION ^^ { b => l: Option[String] => InftyLoopExpr(l, b) }
     | "while" ~>! EXPRESSION ~? BLOCK_EXPRESSION ^^ { (c, b) => l: Option[String] => WhileExpr(l, c, b) }
     | (("while" ~! "let") ~>! MATCH_ARM_PATTERNS <~? "=") ~? EXPRESSION ~? BLOCK_EXPRESSION ^^ { (p, u, b) => l: Option[String] => WhileLetExpr(l, p, u, b) }
diff --git a/testcases/typing_loop.txt b/testcases/typing_loop.txt
@@ -1,8 +1,10 @@
-loop {
-  let ident = (1, "b", 222.222f64);
-  break if true {
-    ident.1
-  } else {
-    "456"
+'outer: loop {
+  while true {
+    let ident = (1, "b", 222.222f64);
+    break 'outer if true {
+      ident.1
+    } else {
+      "456"
+    }
   }
 }
