diff --git a/lang_scala/parsing/AST_scala.ml b/lang_scala/parsing/AST_scala.ml index 6b0cbac9e..d3e5da606 100644 --- 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 index 75d4a6605..7583b7f8b 100644 --- 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