summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2026-10-31 10:38:04 +0000
committerMichael Williamson <mike@zwobble.org>2026-10-31 10:38:34 +0000
commitda5f2e83708371b1497665c7d0ee8f382898247c (patch)
treef21f27e34278b2bdae61f3bbc49775e80f63c3c1 /src
parent6efdb8a8aaa87d5497de989b4f8e4ee26d2bdd54 (diff)
Evaluate reference in query body
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/zwobble/hobgoblin/compiler/ast/typed/TypedQueryDefinitionNode.java16
-rw-r--r--src/main/java/org/zwobble/hobgoblin/compiler/typechecker/TypeChecker.java52
-rw-r--r--src/main/java/org/zwobble/hobgoblin/compiler/types/HobgoblinNativeTypes.java8
-rw-r--r--src/main/java/org/zwobble/hobgoblin/compiler/types/Table.java8
-rw-r--r--src/main/java/org/zwobble/hobgoblin/compiler/types/TypeLevelValue.java2
-rw-r--r--src/main/java/org/zwobble/hobgoblin/compiler/types/Types.java4
-rw-r--r--src/test/java/org/zwobble/hobgoblin/compiler/ast/typed/TypedQueryDefinitionNodeMatcher.java6
-rw-r--r--src/test/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerQueryDefinitionTests.java31
8 files changed, 99 insertions, 28 deletions
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/ast/typed/TypedQueryDefinitionNode.java b/src/main/java/org/zwobble/hobgoblin/compiler/ast/typed/TypedQueryDefinitionNode.java
index abfe470..2c3f518 100644
--- a/src/main/java/org/zwobble/hobgoblin/compiler/ast/typed/TypedQueryDefinitionNode.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/ast/typed/TypedQueryDefinitionNode.java
@@ -7,32 +7,38 @@ package org.zwobble.hobgoblin.compiler.ast.typed;
public record TypedQueryDefinitionNode(
String name,
+ org.zwobble.hobgoblin.compiler.types.Table table,
org.zwobble.hobgoblin.compiler.ast.DocComment docComment,
org.zwobble.hobgoblin.compiler.sources.Source source
) implements org.zwobble.hobgoblin.compiler.ast.typed.TypedNamespaceStatementNode {
public static org.zwobble.hobgoblin.compiler.ast.typed.TypedQueryDefinitionNode.Builder arbitrary() {
- return new org.zwobble.hobgoblin.compiler.ast.typed.TypedQueryDefinitionNode.Builder("", org.zwobble.hobgoblin.compiler.ast.HobgoblinNativeAst.arbitraryDocComment(), org.zwobble.hobgoblin.compiler.sources.HobgoblinNativeSources.arbitrarySource());
+ return new org.zwobble.hobgoblin.compiler.ast.typed.TypedQueryDefinitionNode.Builder("", org.zwobble.hobgoblin.compiler.types.HobgoblinNativeTypes.arbitraryTable(), org.zwobble.hobgoblin.compiler.ast.HobgoblinNativeAst.arbitraryDocComment(), org.zwobble.hobgoblin.compiler.sources.HobgoblinNativeSources.arbitrarySource());
}
public record Builder(
String name,
+ org.zwobble.hobgoblin.compiler.types.Table table,
org.zwobble.hobgoblin.compiler.ast.DocComment docComment,
org.zwobble.hobgoblin.compiler.sources.Source source
) implements org.zwobble.hobgoblin.compiler.ast.typed.TypedNamespaceStatementNode.Builder {
public org.zwobble.hobgoblin.compiler.ast.typed.TypedQueryDefinitionNode build() {
- return new org.zwobble.hobgoblin.compiler.ast.typed.TypedQueryDefinitionNode(name, docComment, source);
+ return new org.zwobble.hobgoblin.compiler.ast.typed.TypedQueryDefinitionNode(name, table, docComment, source);
}
public org.zwobble.hobgoblin.compiler.ast.typed.TypedQueryDefinitionNode.Builder withName(String name) {
- return new org.zwobble.hobgoblin.compiler.ast.typed.TypedQueryDefinitionNode.Builder(name, docComment, source);
+ return new org.zwobble.hobgoblin.compiler.ast.typed.TypedQueryDefinitionNode.Builder(name, table, docComment, source);
+ }
+
+ public org.zwobble.hobgoblin.compiler.ast.typed.TypedQueryDefinitionNode.Builder withTable(org.zwobble.hobgoblin.compiler.types.Table table) {
+ return new org.zwobble.hobgoblin.compiler.ast.typed.TypedQueryDefinitionNode.Builder(name, table, docComment, source);
}
public org.zwobble.hobgoblin.compiler.ast.typed.TypedQueryDefinitionNode.Builder withDocComment(org.zwobble.hobgoblin.compiler.ast.DocComment docComment) {
- return new org.zwobble.hobgoblin.compiler.ast.typed.TypedQueryDefinitionNode.Builder(name, docComment, source);
+ return new org.zwobble.hobgoblin.compiler.ast.typed.TypedQueryDefinitionNode.Builder(name, table, docComment, source);
}
public org.zwobble.hobgoblin.compiler.ast.typed.TypedQueryDefinitionNode.Builder withSource(org.zwobble.hobgoblin.compiler.sources.Source source) {
- return new org.zwobble.hobgoblin.compiler.ast.typed.TypedQueryDefinitionNode.Builder(name, docComment, source);
+ return new org.zwobble.hobgoblin.compiler.ast.typed.TypedQueryDefinitionNode.Builder(name, table, docComment, source);
}
// Custom area start: org.zwobble.hobgoblin.compiler.ast.typed.TypedQueryDefinitionNode.Builder body
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/typechecker/TypeChecker.java b/src/main/java/org/zwobble/hobgoblin/compiler/typechecker/TypeChecker.java
index 10dfc20..32acc82 100644
--- a/src/main/java/org/zwobble/hobgoblin/compiler/typechecker/TypeChecker.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/typechecker/TypeChecker.java
@@ -22,6 +22,8 @@ public class TypeChecker {
private TypeChecker() {
}
+ // == Namespaces ==
+
public static List<TypedNamespaceNode> typeCheckNamespaces(
List<UntypedNamespaceNode> untypedNamespaces,
TypeCheckerGlobalContext context
@@ -90,6 +92,8 @@ public class TypeChecker {
return typedNamespaceNodes;
}
+ // == Namespace statements ==
+
static Optional<Type> declareNamespaceStatement(
UntypedNamespaceStatementNode untyped,
TypeCheckerNamespaceContext context
@@ -282,8 +286,12 @@ public class TypeChecker {
UntypedQueryDefinitionNode untyped,
TypeCheckerNamespaceContext context
) {
+ var value = evalStatements(untyped.statements(), context);
+ var table = (Table) value;
+
return new TypedQueryDefinitionNode(
untyped.name(),
+ table,
untyped.docComment(),
untyped.source()
);
@@ -497,6 +505,8 @@ public class TypeChecker {
}
}
+ // == Database schema statements ==
+
static TypedDatabaseSchemaStatementNode typeCheckDatabaseSchemaStatement(
UntypedDatabaseSchemaStatementNode statement,
DatabaseSchemaInfo databaseSchemaInfo,
@@ -545,6 +555,8 @@ public class TypeChecker {
);
}
+ // == Type-level expressions ==
+
static TypedTypeLevelExpressionNode<? extends TypeLevelValue> typeCheckTypeLevelExpression(
UntypedTypeLevelExpressionNode untyped,
TypeCheckerNamespaceContext context
@@ -650,4 +662,44 @@ public class TypeChecker {
);
}
}
+
+ // == Statements ==
+
+ private static TypeLevelValue evalStatements(
+ List<UntypedStatementNode> statements,
+ TypeCheckerNamespaceContext context
+ ) {
+ for (var statement : statements) {
+ switch (statement) {
+ case UntypedReturnNode untypedReturn -> {
+ // TODO: test multiple returns.
+ return evalExpression(untypedReturn.expression(), context);
+ }
+ }
+ }
+
+ throw new UnsupportedOperationException("TODO");
+ }
+
+ // == Expressions ==
+
+ private static TypeLevelValue evalExpression(
+ UntypedExpressionNode expression,
+ TypeCheckerNamespaceContext context
+ ) {
+ switch (expression) {
+ case UntypedCallNode _ -> {
+ throw new UnsupportedOperationException("TODO");
+ }
+ case UntypedFunctionExpressionNode _ -> {
+ throw new UnsupportedOperationException("TODO");
+ }
+ case UntypedMemberAccessNode _ -> {
+ throw new UnsupportedOperationException("TODO");
+ }
+ case UntypedReferenceNode reference -> {
+ return lookupTypeLevelValue(reference.name(), reference.source(), context);
+ }
+ }
+ }
}
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/types/HobgoblinNativeTypes.java b/src/main/java/org/zwobble/hobgoblin/compiler/types/HobgoblinNativeTypes.java
index 96efbd2..186557e 100644
--- a/src/main/java/org/zwobble/hobgoblin/compiler/types/HobgoblinNativeTypes.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/types/HobgoblinNativeTypes.java
@@ -40,4 +40,12 @@ public class HobgoblinNativeTypes {
public static Field arbitraryField() {
return new Field("", arbitraryType(), NullSource.INSTANCE);
}
+
+ public static DatabaseSchema arbitraryDatabaseSchema() {
+ return new DatabaseSchema(arbitraryNamespaceName(), "");
+ }
+
+ public static Table arbitraryTable() {
+ return new Table(arbitraryDatabaseSchema(), "");
+ }
}
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/types/Table.java b/src/main/java/org/zwobble/hobgoblin/compiler/types/Table.java
new file mode 100644
index 0000000..a33e226
--- /dev/null
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/types/Table.java
@@ -0,0 +1,8 @@
+package org.zwobble.hobgoblin.compiler.types;
+
+public record Table(DatabaseSchema databaseSchema, String name) implements TypeLevelValue {
+ @Override
+ public String describe() {
+ return databaseSchema.describe() + "." + name;
+ }
+}
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/types/TypeLevelValue.java b/src/main/java/org/zwobble/hobgoblin/compiler/types/TypeLevelValue.java
index 8208521..8d12c2e 100644
--- a/src/main/java/org/zwobble/hobgoblin/compiler/types/TypeLevelValue.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/types/TypeLevelValue.java
@@ -1,5 +1,5 @@
package org.zwobble.hobgoblin.compiler.types;
-public sealed interface TypeLevelValue permits DatabaseSchema, Type, TypeConstructor {
+public sealed interface TypeLevelValue permits DatabaseSchema, Table, Type, TypeConstructor {
String describe();
}
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/types/Types.java b/src/main/java/org/zwobble/hobgoblin/compiler/types/Types.java
index a914081..0d321a0 100644
--- a/src/main/java/org/zwobble/hobgoblin/compiler/types/Types.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/types/Types.java
@@ -30,4 +30,8 @@ public class Types {
public static Type databaseSchema(DatabaseSchema databaseSchema) {
return new TypeLevelValueType(databaseSchema);
}
+
+ public static Type table(Table table) {
+ return new TypeLevelValueType(table);
+ }
}
diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/ast/typed/TypedQueryDefinitionNodeMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/ast/typed/TypedQueryDefinitionNodeMatcher.java
index bf3272d..651ede0 100644
--- a/src/test/java/org/zwobble/hobgoblin/compiler/ast/typed/TypedQueryDefinitionNodeMatcher.java
+++ b/src/test/java/org/zwobble/hobgoblin/compiler/ast/typed/TypedQueryDefinitionNodeMatcher.java
@@ -36,6 +36,12 @@ public final class TypedQueryDefinitionNodeMatcher implements org.zwobble.precis
return new org.zwobble.hobgoblin.compiler.ast.typed.TypedQueryDefinitionNodeMatcher(submatchers);
}
+ public org.zwobble.hobgoblin.compiler.ast.typed.TypedQueryDefinitionNodeMatcher withTable(org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.types.Table> table) {
+ var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.ast.typed.TypedQueryDefinitionNode>>(this.submatchers);
+ submatchers.add(org.zwobble.precisely.Matchers.has("table", org.zwobble.hobgoblin.compiler.ast.typed.TypedQueryDefinitionNode::table, (org.zwobble.precisely.Matcher) table));
+ return new org.zwobble.hobgoblin.compiler.ast.typed.TypedQueryDefinitionNodeMatcher(submatchers);
+ }
+
public org.zwobble.hobgoblin.compiler.ast.typed.TypedQueryDefinitionNodeMatcher withDocComment(org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.ast.DocComment> docComment) {
var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.ast.typed.TypedQueryDefinitionNode>>(this.submatchers);
submatchers.add(org.zwobble.precisely.Matchers.has("docComment", org.zwobble.hobgoblin.compiler.ast.typed.TypedQueryDefinitionNode::docComment, (org.zwobble.precisely.Matcher) docComment));
diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerQueryDefinitionTests.java b/src/test/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerQueryDefinitionTests.java
index 84b3e25..4ecc1c6 100644
--- a/src/test/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerQueryDefinitionTests.java
+++ b/src/test/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerQueryDefinitionTests.java
@@ -1,20 +1,17 @@
package org.zwobble.hobgoblin.compiler.typechecker;
import org.junit.jupiter.api.Test;
-import org.zwobble.hobgoblin.compiler.ast.untyped.*;
-import org.zwobble.hobgoblin.compiler.builtins.NativeTypes;
+import org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryDefinitionNode;
+import org.zwobble.hobgoblin.compiler.ast.untyped.UntypedReferenceNode;
+import org.zwobble.hobgoblin.compiler.ast.untyped.UntypedReturnNode;
+import org.zwobble.hobgoblin.compiler.ast.untyped.UntypedTypeLevelReferenceNode;
import org.zwobble.hobgoblin.compiler.sources.NullSource;
import org.zwobble.hobgoblin.compiler.types.*;
-import org.zwobble.hobgoblin.compiler.util.SequencedMaps;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
import static org.zwobble.hobgoblin.compiler.ast.typed.TypedQueryDefinitionNodeMatcher.isTypedQueryDefinitionNode;
import static org.zwobble.hobgoblin.compiler.typechecker.TypeCheckerTesting.typeCheckNamespaceStatement;
import static org.zwobble.precisely.AssertThat.assertThat;
-import static org.zwobble.precisely.Matchers.*;
+import static org.zwobble.precisely.Matchers.equalTo;
public class TypeCheckerQueryDefinitionTests {
@Test
@@ -23,31 +20,21 @@ public class TypeCheckerQueryDefinitionTests {
.withName("allAuthors")
.withDatabaseSchema(UntypedTypeLevelReferenceNode.arbitrary().withName("blogApp"))
.addStatement(UntypedReturnNode.arbitrary().withExpression(
- UntypedMemberAccessNode.arbitrary()
- .withReceiver(UntypedReferenceNode.arbitrary().withName("blogApp"))
- .withFieldName("authors")
+ UntypedReferenceNode.arbitrary().withName("authors")
))
.build();
var globalContext = TypeCheckerContextArb.globalContext();
var namespaceName = NamespaceName.of("App");
var namespaceContext = globalContext.enterNamespace(namespaceName);
- var authorType = new SimpleStructType(namespaceName, "Author");
- namespaceContext.declare("Author", Types.metaType(authorType), NullSource.INSTANCE);
- var authorIdField = new Field("id", NativeTypes.INT_32, NullSource.INSTANCE);
- namespaceContext.defineStructType(authorType, Optional.of(List.of(
- authorIdField
- )));
var databaseSchema = new DatabaseSchema(namespaceName, "blogApp");
- namespaceContext.defineDatabaseSchema(databaseSchema, new DatabaseSchemaInfo(
- SequencedMaps.ofEntries(
- Map.entry("authors", new TableInfo(authorType, authorIdField))
- )
- ));
+ var table = new Table(databaseSchema, "authors");
+ namespaceContext.declare("authors", Types.table(table), NullSource.INSTANCE);
var typed = typeCheckNamespaceStatement(untyped, namespaceContext);
assertThat(typed, isTypedQueryDefinitionNode()
.withName(equalTo("allAuthors"))
+ .withTable(equalTo(table))
);
}
}