Added @ as an implicit label meaning "this line"

martindevans · Nov 7, 2020 · 46618a9 · 46618a9
1 parent 5031972
commit 46618a9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/YololAssembler/Grammar/AST/Program.cs b/YololAssembler/Grammar/AST/Program.cs
@@ -25,6 +25,9 @@ public Result Compile(bool compress = true)
  // Replace line labels
  lines = Apply(Labels().ToArray(), lines.ToArray()).ToArray();
 
+ // Replace implicit line labels
+ lines = ApplyImplicitLabels(lines).ToArray();
+
  // Early out if compression should not be applied
  var yolol = string.Join("\n", lines);
  if (!compress)
@@ -39,6 +42,16 @@ public Result Compile(bool compress = true)
  return new Result(Compress(parsedYolol.Ok));
  }
 
+ private IEnumerable<string> ApplyImplicitLabels(IEnumerable<string> lines)
+ {
+ var lineNum = 1;
+ foreach (var line in lines)
+ {
+ yield return line.Replace("@", lineNum.ToString());
+ lineNum++;
+ }
+ }
+
  private static string Compress(Yolol.Grammar.AST.Program yolol)
  {
  //todo: compress

diff --git a/YololAssembler/YololAssembler.csproj b/YololAssembler/YololAssembler.csproj
@@ -4,6 +4,9 @@
  <OutputType>Exe</OutputType>
  <TargetFramework>netcoreapp3.1</TargetFramework>
  <Nullable>enable</Nullable>
+ <StartupObject>YololAssembler.Program</StartupObject>
+ <Authors>Martin Evans</Authors>
+ <Company>Cylon</Company>
  </PropertyGroup>
 
  <ItemGroup>