Parser patterns and whitespace

RockstarLang · Jul 4, 2024 · 6acac71 · 6acac71
1 parent b19ae75
commit 6acac71
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 49 deletions.
diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
@@ -148,17 +148,17 @@
   },
   "active": "af9edaf1541aa592",
   "lastOpenFiles": [
-    "Starship/Rockstar.Test/ParserTests.cs~RF12443f04.TMP",
-    "Starship/Rockstar.Engine/rockstar.peg~RF124412d4.TMP",
-    "Starship/Rockstar.Engine/rockstar.peg~RF12438411.TMP",
-    "Starship/Rockstar.Engine/obj/Debug/net8.0/nCrunchTemp_f5669261-0dd5-4eda-8f98-23a933a271fd.csproj.AssemblyReference.cache",
-    "Starship/Rockstar.Engine/obj/Debug/net8.0/nCrunchTemp_f5669261-0dd5-4eda-8f98-23a933a271fd.GlobalUsings.g.cs",
-    "Starship/Rockstar.Engine/obj/Debug/net8.0/nCrunchTemp_f5669261-0dd5-4eda-8f98-23a933a271fd.assets.cache",
-    "Starship/Rockstar.Engine/nCrunchTemp_f5669261-0dd5-4eda-8f98-23a933a271fd.csproj",
-    "Starship/Rockstar.Engine/obj/nCrunchTemp_f5669261-0dd5-4eda-8f98-23a933a271fd.csproj.nuget.g.targets",
-    "Starship/Rockstar.Engine/obj/nCrunchTemp_f5669261-0dd5-4eda-8f98-23a933a271fd.csproj.nuget.g.props",
-    "Starship/Rockstar.Wasm/obj/Debug/net8.0/Rockstar.E1D2EFD7.Up2Date",
-    "Starship/Rockstar.Engine/rockstar.peg~RF1242aa89.TMP",
+    "Starship/Rockstar.Engine/rockstar.peg~RF124923d3.TMP",
+    "Starship/Rockstar.Engine/rockstar.peg~RF12485c8b.TMP",
+    "Starship/Rockstar.Engine/rockstar.peg~RF1248134d.TMP",
+    "Starship/Rockstar.Engine/rockstar.peg~RF1247a736.TMP",
+    "Starship/Rockstar.Test/obj/Debug/net8.0/nCrunchTemp_e59725f3-e34e-45ad-b839-f26baadb0d56.csproj.AssemblyReference.cache",
+    "Starship/Rockstar.Test/obj/Debug/net8.0/nCrunchTemp_e59725f3-e34e-45ad-b839-f26baadb0d56.GlobalUsings.g.cs",
+    "Starship/Rockstar.Test/obj/Debug/net8.0/nCrunchTemp_e59725f3-e34e-45ad-b839-f26baadb0d56.assets.cache",
+    "Starship/Rockstar.Test/nCrunchTemp_e59725f3-e34e-45ad-b839-f26baadb0d56.csproj",
+    "Starship/Rockstar.Test/obj/nCrunchTemp_e59725f3-e34e-45ad-b839-f26baadb0d56.csproj.nuget.g.targets",
+    "Starship/Rockstar.Test/obj/nCrunchTemp_e59725f3-e34e-45ad-b839-f26baadb0d56.csproj.nuget.g.props",
+    "Starship/Rockstar.Test/obj/Debug/net8.0/nCrunchTemp_ebe5d74d-b100-42d4-a1bb-c2c597f279cf.csproj.AssemblyReference.cache",
     "codewithrockstar.com/getting-started.md",
     "codewithrockstar.com/index copy.md"
   ]

diff --git a/Starship/Rockstar.Engine/rockstar.peg b/Starship/Rockstar.Engine/rockstar.peg
@@ -17,7 +17,7 @@ program <Progräm>
 	/ #error{ "Program error at line " + state.Line + ", col " + state.Column }
 
 __ = _? EOS*
-EOS	= EOL _?
+EOS	= _? EOL _?
 EOL = '\r'? '\n'
 EOF	= !.
 

diff --git a/Starship/Rockstar.Test/fixtures/whitespace/apostrophesIgnored.rock b/Starship/Rockstar.Test/fixtures/whitespace/apostrophesIgnored.rock
@@ -1,10 +1,10 @@
 ('s is valid in poetic assignments with the apostrophe ignored)
 
 my soul is the Devil's to take
-shout my soul
+shout my soul (prints: 3624)
 
 my soul is the Devil'sto take
-shout my soul
+shout my soul (prints: 384)
 
 my soul is the Devil 's to take
-shout my soul
+shout my soul (prints: 35124)
diff --git a/Starship/Rockstar.Test/fixtures/whitespace/apostrophesIgnored.rock.out b/Starship/Rockstar.Test/fixtures/whitespace/apostrophesIgnored.rock.out
diff --git a/Starship/Rockstar.Test/fixtures/whitespace/leading_whitespace.rock b/Starship/Rockstar.Test/fixtures/whitespace/leading_whitespace.rock
@@ -1,6 +1,4 @@
-Rockstar is a big bad monster truck
-While Rockstar is greater than nothing
-   Shout Rockstar
-   Put Rockstar without 500 into Rockstar
+  Rockstar is 1337
+  Shout Rockstar (prints: 1337)
 
 
diff --git a/Starship/Rockstar.Test/fixtures/whitespace/leading_whitespace.rock.out b/Starship/Rockstar.Test/fixtures/whitespace/leading_whitespace.rock.out