1 files changed, 47 insertions, 24 deletions
diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerEvalExpressionTests.java b/src/test/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerEvalExpressionTests.java
index cf1e73c..a112c1d 100644
--- a/src/test/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerEvalExpressionTests.java
+++ b/src/test/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerEvalExpressionTests.java
@@ -2,6 +2,7 @@ package org.zwobble.hobgoblin.compiler.typechecker;
 
 import org.junit.jupiter.api.Test;
 import org.zwobble.hobgoblin.compiler.ast.untyped.UntypedMemberAccessNode;
+import org.zwobble.hobgoblin.compiler.ast.untyped.UntypedNumberLiteralNode;
 import org.zwobble.hobgoblin.compiler.ast.untyped.UntypedReferenceNode;
 import org.zwobble.hobgoblin.compiler.builtins.NativeTypes;
 import org.zwobble.hobgoblin.compiler.sources.NullSource;
@@ -10,6 +11,7 @@ import org.zwobble.hobgoblin.compiler.typechecker.errors.UnexpectedTypeError;
 import org.zwobble.hobgoblin.compiler.types.*;
 import org.zwobble.hobgoblin.compiler.util.SequencedMaps;
 
+import java.math.BigDecimal;
 import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -17,6 +19,51 @@ import static org.zwobble.precisely.AssertThat.assertThat;
 import static org.zwobble.precisely.Matchers.equalTo;
 
 public class TypeCheckerEvalExpressionTests {
+    // == Member access ==
+
+    @Test
+    public void canReadMemberField() {
+        var untyped = UntypedMemberAccessNode.arbitrary()
+            .withReceiver(UntypedReferenceNode.arbitrary().withName("blogApp"))
+            .withMemberName("authors")
+            .build();
+        var globalContext = TypeCheckerContextArb.globalContext();
+        var namespaceName = NamespaceName.of("App");
+        var namespaceContext = globalContext.enterNamespace(namespaceName);
+        var databaseSchema = new DatabaseSchema(namespaceName, "blogApp");
+        namespaceContext.declare("blogApp", Types.databaseSchema(databaseSchema), NullSource.INSTANCE);
+        var table = new Table(databaseSchema, "authors");
+        var rowType = new SimpleStructType(namespaceName, "Author");
+        var idField = new Field("id", NativeTypes.INT_32, NullSource.INSTANCE);
+        var databaseSchemaInfo = new DatabaseSchemaInfo(SequencedMaps.ofEntries(
+            Map.entry("authors", new TableInfo(table, rowType, idField))
+        ));
+        namespaceContext.defineDatabaseSchema(databaseSchema, databaseSchemaInfo);
+
+        var typed = TypeChecker.evalExpression(untyped, namespaceContext);
+
+        assertThat(typed, equalTo(table));
+    }
+
+    // == Number literal ==
+
+    @Test
+    public void canEvaluateNumber() {
+        // TODO: infer more precise type for number
+        var untyped = UntypedNumberLiteralNode.arbitrary()
+            .withValue(BigDecimal.valueOf(42))
+            .build();
+        var globalContext = TypeCheckerContextArb.globalContext();
+        var namespaceName = NamespaceName.of("App");
+        var namespaceContext = globalContext.enterNamespace(namespaceName);
+
+        var typed = TypeChecker.evalExpression(untyped, namespaceContext);
+
+        assertThat(typed, equalTo(new ConstantNumber(BigDecimal.valueOf(42))));
+    }
+
+    // == References ==
+
     @Test
     public void whenVariableIsTypeLevelValueThenCanEvaluateReference() {
         var untyped = UntypedReferenceNode.arbitrary()
@@ -68,28 +115,4 @@ public class TypeCheckerEvalExpressionTests {
 
         assertThat(error.variableName(), equalTo("count"));
     }
-
-    @Test
-    public void canReadMemberField() {
-        var untyped = UntypedMemberAccessNode.arbitrary()
-            .withReceiver(UntypedReferenceNode.arbitrary().withName("blogApp"))
-            .withMemberName("authors")
-            .build();
-        var globalContext = TypeCheckerContextArb.globalContext();
-        var namespaceName = NamespaceName.of("App");
-        var namespaceContext = globalContext.enterNamespace(namespaceName);
-        var databaseSchema = new DatabaseSchema(namespaceName, "blogApp");
-        namespaceContext.declare("blogApp", Types.databaseSchema(databaseSchema), NullSource.INSTANCE);
-        var table = new Table(databaseSchema, "authors");
-        var rowType = new SimpleStructType(namespaceName, "Author");
-        var idField = new Field("id", NativeTypes.INT_32, NullSource.INSTANCE);
-        var databaseSchemaInfo = new DatabaseSchemaInfo(SequencedMaps.ofEntries(
-            Map.entry("authors", new TableInfo(table, rowType, idField))
-        ));
-        namespaceContext.defineDatabaseSchema(databaseSchema, databaseSchemaInfo);
-
-        var typed = TypeChecker.evalExpression(untyped, namespaceContext);
-
-        assertThat(typed, equalTo(table));
-    }
 }