Normalize SOURCE_DIRECTORY in tests and specify custom debugToken for…

… KEYWORD_STRING token
vipentti · Dec 26, 2023 · b507fbf · b507fbf
1 parent c1fb001
commit b507fbf
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/src/Visp.Compiler/ParseUtils.fs b/src/Visp.Compiler/ParseUtils.fs
@@ -137,6 +137,7 @@ let debugTokenOutput args (lexbuf: LexBuffer<_>) =
         function
         | STRING(text, kind, cont) ->
             Syntax.StringWriterUtils.writeDebugStringType "STRING" text kind cont
+        | KEYWORD_STRING(lhs, rhs) -> sprintf "KEYWORD_STRING (\"%s\", \"%s\")" lhs rhs
         | it -> sprintf "%A" it
 
     seq {

diff --git a/src/Visp.Compiler/Syntax/LexHelpers.fs b/src/Visp.Compiler/Syntax/LexHelpers.fs
@@ -461,11 +461,19 @@ let symbolOrKeywordToken (args: LexArgs) (lexbuf: FSharp.Text.Lexing.LexBuffer<_
     | "__SOURCE_DIRECTORY__" ->
         let filename = lexbuf.StartPos.FileName
 
-        if String.IsNullOrWhiteSpace(filename) then
-            String.Empty
-        else
-            filename |> System.IO.Path.GetFullPath |> System.IO.Path.GetDirectoryName
-        |> fun dir -> KEYWORD_STRING(s, dir)
+        let dirname =
+            if String.IsNullOrWhiteSpace(filename) then
+                String.Empty
+            else
+                filename |> System.IO.Path.GetFullPath |> System.IO.Path.GetDirectoryName
+
+        let dirname =
+            if Syntax.SyntaxWriteUtilThreadStatics.NormalizeLineEndings then
+                dirname.Replace('\\', '/')
+            else
+                dirname
+
+        dirname |> fun dir -> KEYWORD_STRING(s, dir)
     | it ->
         if args.IsTokenStreamMode then
             match s with

diff --git a/tests/Visp.Compiler.UnitTests/Program.fs b/tests/Visp.Compiler.UnitTests/Program.fs
@@ -2,8 +2,6 @@
 // Distributed under the MIT License.
 // https://github.com/vipentti/visp-fs/blob/main/LICENSE.md
 
-open VerifyTests
-
 module Program =
     [<EntryPoint>]
     let main _ = 0
diff --git a/...ler.UnitTests/token-snapshots/tests_parsing_keyword-strings-0.returns tokens.verified.txt b/...ler.UnitTests/token-snapshots/tests_parsing_keyword-strings-0.returns tokens.verified.txt
@@ -11,8 +11,7 @@ RPAREN Default 0 1 LParen
 LPAREN Default 0 2 LParen
 SYMBOL "printfn" Default 0 2 LParen
 STRING ("Source Directory: %s", Regular, Token []) Default 0 2 LParen
-KEYWORD_STRING
-  ("__SOURCE_DIRECTORY__", "{SolutionDirectory}visp/tests/parsing") Default 0 2 LParen
+KEYWORD_STRING ("__SOURCE_DIRECTORY__", "{SolutionDirectory}visp/tests/parsing") Default 0 2 LParen
 RPAREN Default 0 1 LParen
 LPAREN Default 0 2 LParen
 SYMBOL "printfn" Default 0 2 LParen