Remove typ field from VarRef

ysthakur · Dec 1, 2024 · c27b212 · c27b212
1 parent 886c7c6
commit c27b212
Show file tree

Hide file tree

Showing 11 changed files with 44 additions and 42 deletions.
diff --git a/src/main/scala/fred/AST.scala b/src/main/scala/fred/AST.scala
@@ -62,7 +62,9 @@ case class StringLiteral(value: String, span: Span) extends Expr {
 
 sealed trait LHSExpr extends Expr
 
-case class VarRef(name: String, typ: Option[Type], span: Span) extends LHSExpr
+case class VarRef(name: String, span: Span) extends LHSExpr {
+  override def typ: Option[Type] = None
+}
 
 case class FieldAccess(obj: Expr, field: Spanned[String], typ: Option[Type])
     extends LHSExpr {

diff --git a/src/main/scala/fred/Parser.scala b/src/main/scala/fred/Parser.scala
@@ -101,7 +101,7 @@ object Parser {
           .? ~ P.index)
         .map {
           case (start -> name -> None -> end) =>
-            VarRef(name, None, Span(start, start + name.length))
+            VarRef(name, Span(start, start + name.length))
           case (start -> name -> Some(Right(args)) -> end) =>
             FnCall(
               Spanned(name, Span(start, start + name.length)),

diff --git a/src/main/scala/fred/Translator.scala b/src/main/scala/fred/Translator.scala
@@ -503,7 +503,7 @@ object Translator {
         case IntLiteral(value, _) => ("", value.toString, "")
         case StringLiteral(value, _) =>
           ("", s"\"${value.replace("\"", "\\\"")}\"", "")
-        case VarRef(name, _, _) =>
+        case VarRef(name, _) =>
           ("", mangledVars.getOrElse(bindings.vars(name), name), "")
         case SetFieldExpr(obj, field, value, span) =>
           val (valSetup, valTranslated, valTeardown) = exprToC(value)

diff --git a/src/main/scala/fred/Typer.scala b/src/main/scala/fred/Typer.scala
@@ -118,13 +118,13 @@ object Typer {
       case StringLiteral(_, _) =>
         types.put(expr, BuiltinType.Str)
         BuiltinType.Str
-      case varRef @ VarRef(_, _, _) =>
+      case varRef @ VarRef(_, _) =>
         val typ = bindings.getVar(varRef).typ
         types.put(expr, typ)
         typ
       case SetFieldExpr(obj, field, value, span) =>
         val objType =
-          bindings.getVar(VarRef(obj.value, None, obj.span)).typ match {
+          bindings.getVar(VarRef(obj.value, obj.span)).typ match {
             case td: TypeDef => td
             case builtinType =>
               throw new CompileError(

diff --git a/src/test/resources/snapshot/parser/basic-expr-q8p3hfe.scala b/src/test/resources/snapshot/parser/basic-expr-q8p3hfe.scala
diff --git a/src/test/resources/snapshot/parser/if-expr-asp8eyof7.scala b/src/test/resources/snapshot/parser/if-expr-asp8eyof7.scala
diff --git a/src/test/resources/snapshot/parser/match-expr-qpw8jf.scala b/src/test/resources/snapshot/parser/match-expr-qpw8jf.scala
diff --git a/src/test/resources/snapshot/parser/set-d8ulsb.scala b/src/test/resources/snapshot/parser/set-d8ulsb.scala
diff --git a/src/test/resources/snapshot/typer/aslid7fy.scala b/src/test/resources/snapshot/typer/aslid7fy.scala
diff --git a/src/test/resources/snapshot/typer/scope-li8ae4.scala b/src/test/resources/snapshot/typer/scope-li8ae4.scala
diff --git a/src/test/scala/fred/FuzzTests.scala b/src/test/scala/fred/FuzzTests.scala
@@ -38,7 +38,7 @@ class FuzzTests
                 case Some(vars) =>
                   Gen
                     .oneOf(vars.keySet)
-                    .map(field.name -> VarRef(_, None, Span.synth))
+                    .map(field.name -> VarRef(_, Span.synth))
                 case None =>
                   Gen.const(
                     field.name -> CtorCall(
@@ -90,7 +90,7 @@ class FuzzTests
                         List(
                           (
                             Spanned(GenerateTypes.SomeField, Span.synth),
-                            VarRef(ref, None, Span.synth)
+                            VarRef(ref, Span.synth)
                           )
                         ),
                         Span.synth