Don't specialise expressions for queries

6 files changed, 79 insertions, 79 deletions

diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedQueryExpressionNode.java b/src/main/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedExpressionNode.java
index 268e47a..c15736d 100644
--- a/src/main/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedQueryExpressionNode.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedExpressionNode.java
@@ -2,17 +2,17 @@
 
 package org.zwobble.hobgoblin.compiler.ast.untyped;
 
-// Custom area start: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionNode imports
-// Custom area end: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionNode imports
+// Custom area start: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedExpressionNode imports
+// Custom area end: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedExpressionNode imports
 
-public sealed interface UntypedQueryExpressionNode permits org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionReferenceNode {
+public sealed interface UntypedExpressionNode permits org.zwobble.hobgoblin.compiler.ast.untyped.UntypedReferenceNode {
     public interface Builder {
-        public org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionNode build();
+        public org.zwobble.hobgoblin.compiler.ast.untyped.UntypedExpressionNode build();
 
-        // Custom area start: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionNode.Builder body
-        // Custom area end: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionNode.Builder body
+        // Custom area start: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedExpressionNode.Builder body
+        // Custom area end: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedExpressionNode.Builder body
     }
 
-    // Custom area start: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionNode body
-    // Custom area end: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionNode body
+    // Custom area start: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedExpressionNode body
+    // Custom area end: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedExpressionNode body
 }
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedQueryExpressionReferenceNode.java b/src/main/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedReferenceNode.java
index e45a6bf..edd3066 100644
--- a/src/main/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedQueryExpressionReferenceNode.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedReferenceNode.java
@@ -2,37 +2,37 @@
 
 package org.zwobble.hobgoblin.compiler.ast.untyped;
 
-// Custom area start: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionReferenceNode imports
-// Custom area end: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionReferenceNode imports
+// Custom area start: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedReferenceNode imports
+// Custom area end: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedReferenceNode imports
 
-public record UntypedQueryExpressionReferenceNode(
+public record UntypedReferenceNode(
     String name,
     org.zwobble.hobgoblin.compiler.sources.Source source
-) implements org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionNode {
-    public static org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionReferenceNode.Builder arbitrary() {
-        return new org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionReferenceNode.Builder("", org.zwobble.hobgoblin.compiler.sources.HobgoblinNativeSources.arbitrarySource());
+) implements org.zwobble.hobgoblin.compiler.ast.untyped.UntypedExpressionNode {
+    public static org.zwobble.hobgoblin.compiler.ast.untyped.UntypedReferenceNode.Builder arbitrary() {
+        return new org.zwobble.hobgoblin.compiler.ast.untyped.UntypedReferenceNode.Builder("", org.zwobble.hobgoblin.compiler.sources.HobgoblinNativeSources.arbitrarySource());
     }
 
     public record Builder(
         String name,
         org.zwobble.hobgoblin.compiler.sources.Source source
-    ) implements org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionNode.Builder {
-        public org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionReferenceNode build() {
-            return new org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionReferenceNode(name, source);
+    ) implements org.zwobble.hobgoblin.compiler.ast.untyped.UntypedExpressionNode.Builder {
+        public org.zwobble.hobgoblin.compiler.ast.untyped.UntypedReferenceNode build() {
+            return new org.zwobble.hobgoblin.compiler.ast.untyped.UntypedReferenceNode(name, source);
         }
 
-        public org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionReferenceNode.Builder withName(String name) {
-            return new org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionReferenceNode.Builder(name, source);
+        public org.zwobble.hobgoblin.compiler.ast.untyped.UntypedReferenceNode.Builder withName(String name) {
+            return new org.zwobble.hobgoblin.compiler.ast.untyped.UntypedReferenceNode.Builder(name, source);
         }
 
-        public org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionReferenceNode.Builder withSource(org.zwobble.hobgoblin.compiler.sources.Source source) {
-            return new org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionReferenceNode.Builder(name, source);
+        public org.zwobble.hobgoblin.compiler.ast.untyped.UntypedReferenceNode.Builder withSource(org.zwobble.hobgoblin.compiler.sources.Source source) {
+            return new org.zwobble.hobgoblin.compiler.ast.untyped.UntypedReferenceNode.Builder(name, source);
         }
 
-        // Custom area start: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionReferenceNode.Builder body
-        // Custom area end: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionReferenceNode.Builder body
+        // Custom area start: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedReferenceNode.Builder body
+        // Custom area end: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedReferenceNode.Builder body
     }
 
-    // Custom area start: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionReferenceNode body
-    // Custom area end: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionReferenceNode body
+    // Custom area start: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedReferenceNode body
+    // Custom area end: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedReferenceNode body
 }
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/parser/Parser.java b/src/main/java/org/zwobble/hobgoblin/compiler/parser/Parser.java
index 4003368..5a77616 100644
--- a/src/main/java/org/zwobble/hobgoblin/compiler/parser/Parser.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/parser/Parser.java
@@ -455,9 +455,9 @@ public class Parser {
         );
     }
 
-    // == Query expressions ==
+    // == Expressions ==
 
-    static UntypedQueryExpressionNode parseQueryExpression(TokenIterator tokens) {
+    static UntypedExpressionNode parseExpression(TokenIterator tokens) {
         var start = tokens.startPosition();
 
         var name = parseIdentifier(tokens);
@@ -465,7 +465,7 @@ public class Parser {
         var end = tokens.endPosition();
         var source = createSource(start, end);
 
-        return new UntypedQueryExpressionReferenceNode(name, source);
+        return new UntypedReferenceNode(name, source);
     }
 
     // == Qualified type names ==
diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedQueryExpressionReferenceNodeMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedQueryExpressionReferenceNodeMatcher.java
deleted file mode 100644
index 3e4dd49..0000000
--- a/src/test/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedQueryExpressionReferenceNodeMatcher.java
+++ /dev/null
@@ -1,47 +0,0 @@
-// Generated by hobgoblin.
-
-package org.zwobble.hobgoblin.compiler.ast.untyped;
-
-// Custom area start: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionReferenceNodeMatcher imports
-// Custom area end: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionReferenceNodeMatcher imports
-
-public final class UntypedQueryExpressionReferenceNodeMatcher implements org.zwobble.precisely.Matcher<java.lang.Object> {
-    public static org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionReferenceNodeMatcher isUntypedQueryExpressionReferenceNode() {
-        return new org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionReferenceNodeMatcher(java.util.List.of());
-    }
-
-    private final java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionReferenceNode>> submatchers;
-
-    private UntypedQueryExpressionReferenceNodeMatcher(
-        java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionReferenceNode>> submatchers
-    ) {
-        this.submatchers = submatchers;
-    }
-
-    public org.zwobble.precisely.MatchResult match(java.lang.Object actual) {
-        return this.toMatcher().match(actual);
-    }
-
-    public org.zwobble.precisely.TextTree describe() {
-        return this.toMatcher().describe();
-    }
-
-    private org.zwobble.precisely.Matcher<java.lang.Object> toMatcher() {
-        return org.zwobble.precisely.Matchers.instanceOf(org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionReferenceNode.class, this.submatchers);
-    }
-
-    public org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionReferenceNodeMatcher withName(org.zwobble.precisely.Matcher<? super String> name) {
-        var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionReferenceNode>>(this.submatchers);
-        submatchers.add(org.zwobble.precisely.Matchers.has("name", org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionReferenceNode::name, (org.zwobble.precisely.Matcher) name));
-        return new org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionReferenceNodeMatcher(submatchers);
-    }
-
-    public org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionReferenceNodeMatcher withSource(org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.sources.Source> source) {
-        var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionReferenceNode>>(this.submatchers);
-        submatchers.add(org.zwobble.precisely.Matchers.has("source", org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionReferenceNode::source, (org.zwobble.precisely.Matcher) source));
-        return new org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionReferenceNodeMatcher(submatchers);
-    }
-
-    // Custom area start: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionReferenceNodeMatcher body
-    // Custom area end: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionReferenceNodeMatcher body
-}
diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedReferenceNodeMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedReferenceNodeMatcher.java
new file mode 100644
index 0000000..311f24d
--- /dev/null
+++ b/src/test/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedReferenceNodeMatcher.java
@@ -0,0 +1,47 @@
+// Generated by hobgoblin.
+
+package org.zwobble.hobgoblin.compiler.ast.untyped;
+
+// Custom area start: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedReferenceNodeMatcher imports
+// Custom area end: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedReferenceNodeMatcher imports
+
+public final class UntypedReferenceNodeMatcher implements org.zwobble.precisely.Matcher<java.lang.Object> {
+    public static org.zwobble.hobgoblin.compiler.ast.untyped.UntypedReferenceNodeMatcher isUntypedReferenceNode() {
+        return new org.zwobble.hobgoblin.compiler.ast.untyped.UntypedReferenceNodeMatcher(java.util.List.of());
+    }
+
+    private final java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.ast.untyped.UntypedReferenceNode>> submatchers;
+
+    private UntypedReferenceNodeMatcher(
+        java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.ast.untyped.UntypedReferenceNode>> submatchers
+    ) {
+        this.submatchers = submatchers;
+    }
+
+    public org.zwobble.precisely.MatchResult match(java.lang.Object actual) {
+        return this.toMatcher().match(actual);
+    }
+
+    public org.zwobble.precisely.TextTree describe() {
+        return this.toMatcher().describe();
+    }
+
+    private org.zwobble.precisely.Matcher<java.lang.Object> toMatcher() {
+        return org.zwobble.precisely.Matchers.instanceOf(org.zwobble.hobgoblin.compiler.ast.untyped.UntypedReferenceNode.class, this.submatchers);
+    }
+
+    public org.zwobble.hobgoblin.compiler.ast.untyped.UntypedReferenceNodeMatcher withName(org.zwobble.precisely.Matcher<? super String> name) {
+        var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.ast.untyped.UntypedReferenceNode>>(this.submatchers);
+        submatchers.add(org.zwobble.precisely.Matchers.has("name", org.zwobble.hobgoblin.compiler.ast.untyped.UntypedReferenceNode::name, (org.zwobble.precisely.Matcher) name));
+        return new org.zwobble.hobgoblin.compiler.ast.untyped.UntypedReferenceNodeMatcher(submatchers);
+    }
+
+    public org.zwobble.hobgoblin.compiler.ast.untyped.UntypedReferenceNodeMatcher withSource(org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.sources.Source> source) {
+        var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.ast.untyped.UntypedReferenceNode>>(this.submatchers);
+        submatchers.add(org.zwobble.precisely.Matchers.has("source", org.zwobble.hobgoblin.compiler.ast.untyped.UntypedReferenceNode::source, (org.zwobble.precisely.Matcher) source));
+        return new org.zwobble.hobgoblin.compiler.ast.untyped.UntypedReferenceNodeMatcher(submatchers);
+    }
+
+    // Custom area start: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedReferenceNodeMatcher body
+    // Custom area end: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedReferenceNodeMatcher body
+}
diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/parser/ParserQueryExpressionReferenceTests.java b/src/test/java/org/zwobble/hobgoblin/compiler/parser/ParserReferenceTests.java
index bc911dc..8a390c6 100644
--- a/src/test/java/org/zwobble/hobgoblin/compiler/parser/ParserQueryExpressionReferenceTests.java
+++ b/src/test/java/org/zwobble/hobgoblin/compiler/parser/ParserReferenceTests.java
@@ -2,19 +2,19 @@ package org.zwobble.hobgoblin.compiler.parser;
 
 import org.junit.jupiter.api.Test;
 
-import static org.zwobble.hobgoblin.compiler.ast.untyped.UntypedQueryExpressionReferenceNodeMatcher.isUntypedQueryExpressionReferenceNode;
+import static org.zwobble.hobgoblin.compiler.ast.untyped.UntypedReferenceNodeMatcher.isUntypedReferenceNode;
 import static org.zwobble.hobgoblin.compiler.parser.ParserTesting.parseString;
 import static org.zwobble.precisely.AssertThat.assertThat;
 import static org.zwobble.precisely.Matchers.equalTo;
 
-public class ParserQueryExpressionReferenceTests {
+public class ParserReferenceTests {
     @Test
     public void canParseReference() {
         var source = "authors";
 
-        var node = parseString(source, Parser::parseQueryExpression);
+        var node = parseString(source, Parser::parseExpression);
 
-        assertThat(node, isUntypedQueryExpressionReferenceNode()
+        assertThat(node, isUntypedReferenceNode()
             .withName(equalTo("authors"))
         );
     }