Merge pull request #539 from returntocorp/matthew/pa-1579-scala-for-l…

…oops-parse-error Scala: allow ellipsis in for loop headers
semgrep · Jun 30, 2022 · d636ec7 · d636ec7
2 parents f80b02c + 71bbc15
commit d636ec7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lang_scala/parsing/AST_scala.ml b/lang_scala/parsing/AST_scala.ml
@@ -340,7 +340,7 @@ and for_header = enumerators bracket
 and enumerators = enumerator list
 and enumerator =
   | G of generator
-  | GIf of guard list
+  | GEllipsis of tok
   (* less: GAssign *)
 
 and generator = {

diff --git a/lang_scala/parsing/Parser_scala_recursive_descent.ml b/lang_scala/parsing/Parser_scala_recursive_descent.ml
@@ -2255,9 +2255,9 @@ and guard_loop in_ : guard list =
 and enumerator ~isFirst ?(allowNestedIf=true) in_ : enumerator =
   in_ |> with_logging "enumerator" (fun () ->
     match in_.token with
-    | Kif _ when not isFirst ->
-        let xs = guard_loop in_ in
-        GIf xs
+    | Ellipsis tok ->
+        nextToken in_;
+        GEllipsis tok
     | _ ->
         let g = generator ~eqOK:(not isFirst) ~allowNestedIf in_ in
         G g