Pop string nesting before error in nested quotes

dotnet · Nov 3, 2022 · 67ed33a · 67ed33a
1 parent 4ffb1cc
commit 67ed33a
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/Compiler/lex.fsl b/src/Compiler/lex.fsl
@@ -601,7 +601,9 @@ rule token args skip = parse
        // Single quote in triple quote ok, others disallowed
        match args.stringNest with
        | (_, LexerStringStyle.TripleQuote, _) :: _ -> ()
-       | _ :: _ -> errorR(Error(FSComp.SR.lexSingleQuoteInSingleQuote(), m))
+       | _ :: rest ->
+           args.stringNest <- rest
+           errorR(Error(FSComp.SR.lexSingleQuoteInSingleQuote(), m))
        | [] -> ()
 
        if not skip then STRING_TEXT (LexCont.String(args.ifdefStack, args.stringNest, LexerStringStyle.SingleQuote, LexerStringKind.String, m))
@@ -635,7 +637,9 @@ rule token args skip = parse
 
        // Single quote in triple quote ok, others disallowed
        match args.stringNest with
-       | _ :: _ -> errorR(Error(FSComp.SR.lexTripleQuoteInTripleQuote(), m))
+       | _ :: rest ->
+           args.stringNest <- rest
+           errorR(Error(FSComp.SR.lexTripleQuoteInTripleQuote(), m))
        | _ -> ()
 
        if not skip then STRING_TEXT (LexCont.String(args.ifdefStack, args.stringNest, LexerStringStyle.TripleQuote, LexerStringKind.String, m))