From 5bddd28d6ba1bcf1b6245771ae3ce715c3079f93 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Fri, 9 Jun 2023 17:48:54 +0100 Subject: Move untyped nodes into untyped package --- .../compiler/ast/UntypedArgsNodeMatcher.java | 35 ----------- .../compiler/ast/UntypedCallNodeMatcher.java | 40 ------------ .../ast/UntypedFunctionDefinitionNodeMatcher.java | 50 --------------- .../shedlang/compiler/ast/UntypedNodeMatchers.java | 72 ---------------------- .../ast/untyped/UntypedArgsNodeMatcher.java | 35 +++++++++++ .../ast/untyped/UntypedCallNodeMatcher.java | 40 ++++++++++++ .../UntypedFunctionDefinitionNodeMatcher.java | 50 +++++++++++++++ .../compiler/ast/untyped/UntypedNodeMatchers.java | 72 ++++++++++++++++++++++ .../shedlang/compiler/parser/ParserCallTests.java | 2 +- .../parser/ParserExpressionStatementTests.java | 2 +- .../parser/ParserFunctionDefinitionTests.java | 2 +- .../compiler/parser/ParserNamespaceTests.java | 4 +- .../compiler/parser/ParserReferenceTests.java | 2 +- .../compiler/parser/ParserStringLiteralTests.java | 2 +- .../parser/ParserTypeLevelReferenceTests.java | 2 +- 15 files changed, 205 insertions(+), 205 deletions(-) delete mode 100644 src/test/java/org/shedlang/compiler/ast/UntypedArgsNodeMatcher.java delete mode 100644 src/test/java/org/shedlang/compiler/ast/UntypedCallNodeMatcher.java delete mode 100644 src/test/java/org/shedlang/compiler/ast/UntypedFunctionDefinitionNodeMatcher.java delete mode 100644 src/test/java/org/shedlang/compiler/ast/UntypedNodeMatchers.java create mode 100644 src/test/java/org/shedlang/compiler/ast/untyped/UntypedArgsNodeMatcher.java create mode 100644 src/test/java/org/shedlang/compiler/ast/untyped/UntypedCallNodeMatcher.java create mode 100644 src/test/java/org/shedlang/compiler/ast/untyped/UntypedFunctionDefinitionNodeMatcher.java create mode 100644 src/test/java/org/shedlang/compiler/ast/untyped/UntypedNodeMatchers.java (limited to 'src/test/java') diff --git a/src/test/java/org/shedlang/compiler/ast/UntypedArgsNodeMatcher.java b/src/test/java/org/shedlang/compiler/ast/UntypedArgsNodeMatcher.java deleted file mode 100644 index 315f87d3..00000000 --- a/src/test/java/org/shedlang/compiler/ast/UntypedArgsNodeMatcher.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.shedlang.compiler.ast; - -import org.pcollections.PVector; -import org.shedlang.compiler.testing.MatcherBuilder; -import org.zwobble.precisely.Matcher; - -import static org.zwobble.precisely.Matchers.has; - -public class UntypedArgsNodeMatcher extends MatcherBuilder { - public UntypedArgsNodeMatcher() { - super(); - } - - public UntypedArgsNodeMatcher(PVector> submatchers) { - super(submatchers); - } - - @Override - protected Class expectedType() { - return UntypedArgsNode.class; - } - - @Override - protected UntypedArgsNodeMatcher create(PVector> submatchers) { - return new UntypedArgsNodeMatcher(); - } - - public UntypedArgsNodeMatcher withPositional(Matcher> positional) { - return with(has("positional", x -> x.positional(), positional)); - } - - public UntypedArgsNodeMatcher withNamed(Matcher> named) { - return with(has("named", x -> x.named(), named)); - } -} diff --git a/src/test/java/org/shedlang/compiler/ast/UntypedCallNodeMatcher.java b/src/test/java/org/shedlang/compiler/ast/UntypedCallNodeMatcher.java deleted file mode 100644 index ef4ad9da..00000000 --- a/src/test/java/org/shedlang/compiler/ast/UntypedCallNodeMatcher.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.shedlang.compiler.ast; - -import org.pcollections.PVector; -import org.shedlang.compiler.testing.MatcherBuilder; -import org.zwobble.precisely.Matcher; - -import static org.zwobble.precisely.Matchers.equalTo; -import static org.zwobble.precisely.Matchers.has; - -public class UntypedCallNodeMatcher extends MatcherBuilder { - public UntypedCallNodeMatcher() { - super(); - } - - public UntypedCallNodeMatcher(PVector> submatchers) { - super(submatchers); - } - - @Override - protected Class expectedType() { - return UntypedCallNode.class; - } - - @Override - protected UntypedCallNodeMatcher create(PVector> submatchers) { - return new UntypedCallNodeMatcher(); - } - - public UntypedCallNodeMatcher withArgs(Matcher args) { - return with(has("args", x -> x.args(), args)); - } - - public UntypedCallNodeMatcher withHasEffects(boolean hasEffects) { - return with(has("hasEffects", x -> x.hasEffects(), equalTo(hasEffects))); - } - - public UntypedCallNodeMatcher withReceiver(Matcher receiver) { - return with(has("receiver", x -> x.receiver(), receiver)); - } -} diff --git a/src/test/java/org/shedlang/compiler/ast/UntypedFunctionDefinitionNodeMatcher.java b/src/test/java/org/shedlang/compiler/ast/UntypedFunctionDefinitionNodeMatcher.java deleted file mode 100644 index 0a52482d..00000000 --- a/src/test/java/org/shedlang/compiler/ast/UntypedFunctionDefinitionNodeMatcher.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.shedlang.compiler.ast; - -import org.pcollections.PVector; -import org.shedlang.compiler.testing.MatcherBuilder; -import org.zwobble.precisely.Matcher; - -import java.util.Optional; - -import static org.zwobble.precisely.Matchers.equalTo; -import static org.zwobble.precisely.Matchers.has; - -public class UntypedFunctionDefinitionNodeMatcher extends MatcherBuilder { - public UntypedFunctionDefinitionNodeMatcher() { - super(); - } - - public UntypedFunctionDefinitionNodeMatcher(PVector> submatchers) { - super(submatchers); - } - - @Override - protected Class expectedType() { - return UntypedFunctionDefinitionNode.class; - } - - @Override - protected UntypedFunctionDefinitionNodeMatcher create(PVector> submatchers) { - return new UntypedFunctionDefinitionNodeMatcher(); - } - - public UntypedFunctionDefinitionNodeMatcher withBody(Matcher> body) { - return with(has("body", x -> x.body(), body)); - } - - public UntypedFunctionDefinitionNodeMatcher withEffect(Matcher> effect) { - return with(has("effect", x -> x.effect(), effect)); - } - - public UntypedFunctionDefinitionNodeMatcher withName(String name) { - return with(has("name", x -> x.name(), equalTo(name))); - } - - public UntypedFunctionDefinitionNodeMatcher withParams(Matcher params) { - return with(has("params", x -> x.params(), params)); - } - - public UntypedFunctionDefinitionNodeMatcher withReturnType(Matcher returnType) { - return with(has("returnType", x -> x.returnType(), returnType)); - } -} diff --git a/src/test/java/org/shedlang/compiler/ast/UntypedNodeMatchers.java b/src/test/java/org/shedlang/compiler/ast/UntypedNodeMatchers.java deleted file mode 100644 index ca538a97..00000000 --- a/src/test/java/org/shedlang/compiler/ast/UntypedNodeMatchers.java +++ /dev/null @@ -1,72 +0,0 @@ -package org.shedlang.compiler.ast; - -import org.zwobble.precisely.Matcher; - -import static org.zwobble.precisely.Matchers.*; - -public class UntypedNodeMatchers { - private UntypedNodeMatchers() { - } - - public static UntypedArgsNodeMatcher isUntypedArgsNode() { - return new UntypedArgsNodeMatcher(); - } - - public static UntypedCallNodeMatcher isUntypedCallNode() { - return new UntypedCallNodeMatcher(); - } - - public static Matcher isUntypedExpressionStatementNode( - Matcher expression - ) { - return instanceOf( - UntypedExpressionStatementNode.class, - has("expression", x -> x.expression(), expression) - ); - } - - public static UntypedFunctionDefinitionNodeMatcher isUntypedFunctionDefinitionNode() { - return new UntypedFunctionDefinitionNodeMatcher(); - } - - public static Matcher isUntypedNamedArgNode( - String name, - Matcher expression - ) { - return allOf( - has("name", x -> x.name(), equalTo(name)), - has("expression", x -> x.expression(), expression) - ); - } - - public static Matcher isUntypedParamsNode( - Matcher> positional, - Matcher> named - ) { - return allOf( - has("positional", x -> x.positional(), positional), - has("named", x -> x.named(), named) - ); - } - - public static Matcher isUntypedReferenceNode(String name) { - return instanceOf( - UntypedReferenceNode.class, - has("name", x -> x.name(), equalTo(name)) - ); - } - - public static Matcher isUntypedStringLiteralNode(String value) { - return instanceOf( - UntypedStringLiteralNode.class, - has("value", x -> x.value(), equalTo(value)) - ); - } - - public static Matcher isUntypedTypeLevelReferenceNode(String name) { - return instanceOf( - UntypedTypeLevelReferenceNode.class, - has("name", x -> x.name(), equalTo(name)) - ); - } -} diff --git a/src/test/java/org/shedlang/compiler/ast/untyped/UntypedArgsNodeMatcher.java b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedArgsNodeMatcher.java new file mode 100644 index 00000000..ce782c0d --- /dev/null +++ b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedArgsNodeMatcher.java @@ -0,0 +1,35 @@ +package org.shedlang.compiler.ast.untyped; + +import org.pcollections.PVector; +import org.shedlang.compiler.testing.MatcherBuilder; +import org.zwobble.precisely.Matcher; + +import static org.zwobble.precisely.Matchers.has; + +public class UntypedArgsNodeMatcher extends MatcherBuilder { + public UntypedArgsNodeMatcher() { + super(); + } + + public UntypedArgsNodeMatcher(PVector> submatchers) { + super(submatchers); + } + + @Override + protected Class expectedType() { + return UntypedArgsNode.class; + } + + @Override + protected UntypedArgsNodeMatcher create(PVector> submatchers) { + return new UntypedArgsNodeMatcher(); + } + + public UntypedArgsNodeMatcher withPositional(Matcher> positional) { + return with(has("positional", x -> x.positional(), positional)); + } + + public UntypedArgsNodeMatcher withNamed(Matcher> named) { + return with(has("named", x -> x.named(), named)); + } +} diff --git a/src/test/java/org/shedlang/compiler/ast/untyped/UntypedCallNodeMatcher.java b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedCallNodeMatcher.java new file mode 100644 index 00000000..b9411fec --- /dev/null +++ b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedCallNodeMatcher.java @@ -0,0 +1,40 @@ +package org.shedlang.compiler.ast.untyped; + +import org.pcollections.PVector; +import org.shedlang.compiler.testing.MatcherBuilder; +import org.zwobble.precisely.Matcher; + +import static org.zwobble.precisely.Matchers.equalTo; +import static org.zwobble.precisely.Matchers.has; + +public class UntypedCallNodeMatcher extends MatcherBuilder { + public UntypedCallNodeMatcher() { + super(); + } + + public UntypedCallNodeMatcher(PVector> submatchers) { + super(submatchers); + } + + @Override + protected Class expectedType() { + return UntypedCallNode.class; + } + + @Override + protected UntypedCallNodeMatcher create(PVector> submatchers) { + return new UntypedCallNodeMatcher(); + } + + public UntypedCallNodeMatcher withArgs(Matcher args) { + return with(has("args", x -> x.args(), args)); + } + + public UntypedCallNodeMatcher withHasEffects(boolean hasEffects) { + return with(has("hasEffects", x -> x.hasEffects(), equalTo(hasEffects))); + } + + public UntypedCallNodeMatcher withReceiver(Matcher receiver) { + return with(has("receiver", x -> x.receiver(), receiver)); + } +} diff --git a/src/test/java/org/shedlang/compiler/ast/untyped/UntypedFunctionDefinitionNodeMatcher.java b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedFunctionDefinitionNodeMatcher.java new file mode 100644 index 00000000..e8a227c3 --- /dev/null +++ b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedFunctionDefinitionNodeMatcher.java @@ -0,0 +1,50 @@ +package org.shedlang.compiler.ast.untyped; + +import org.pcollections.PVector; +import org.shedlang.compiler.testing.MatcherBuilder; +import org.zwobble.precisely.Matcher; + +import java.util.Optional; + +import static org.zwobble.precisely.Matchers.equalTo; +import static org.zwobble.precisely.Matchers.has; + +public class UntypedFunctionDefinitionNodeMatcher extends MatcherBuilder { + public UntypedFunctionDefinitionNodeMatcher() { + super(); + } + + public UntypedFunctionDefinitionNodeMatcher(PVector> submatchers) { + super(submatchers); + } + + @Override + protected Class expectedType() { + return UntypedFunctionDefinitionNode.class; + } + + @Override + protected UntypedFunctionDefinitionNodeMatcher create(PVector> submatchers) { + return new UntypedFunctionDefinitionNodeMatcher(); + } + + public UntypedFunctionDefinitionNodeMatcher withBody(Matcher> body) { + return with(has("body", x -> x.body(), body)); + } + + public UntypedFunctionDefinitionNodeMatcher withEffect(Matcher> effect) { + return with(has("effect", x -> x.effect(), effect)); + } + + public UntypedFunctionDefinitionNodeMatcher withName(String name) { + return with(has("name", x -> x.name(), equalTo(name))); + } + + public UntypedFunctionDefinitionNodeMatcher withParams(Matcher params) { + return with(has("params", x -> x.params(), params)); + } + + public UntypedFunctionDefinitionNodeMatcher withReturnType(Matcher returnType) { + return with(has("returnType", x -> x.returnType(), returnType)); + } +} diff --git a/src/test/java/org/shedlang/compiler/ast/untyped/UntypedNodeMatchers.java b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedNodeMatchers.java new file mode 100644 index 00000000..04c56443 --- /dev/null +++ b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedNodeMatchers.java @@ -0,0 +1,72 @@ +package org.shedlang.compiler.ast.untyped; + +import org.zwobble.precisely.Matcher; + +import static org.zwobble.precisely.Matchers.*; + +public class UntypedNodeMatchers { + private UntypedNodeMatchers() { + } + + public static UntypedArgsNodeMatcher isUntypedArgsNode() { + return new UntypedArgsNodeMatcher(); + } + + public static UntypedCallNodeMatcher isUntypedCallNode() { + return new UntypedCallNodeMatcher(); + } + + public static Matcher isUntypedExpressionStatementNode( + Matcher expression + ) { + return instanceOf( + UntypedExpressionStatementNode.class, + has("expression", x -> x.expression(), expression) + ); + } + + public static UntypedFunctionDefinitionNodeMatcher isUntypedFunctionDefinitionNode() { + return new UntypedFunctionDefinitionNodeMatcher(); + } + + public static Matcher isUntypedNamedArgNode( + String name, + Matcher expression + ) { + return allOf( + has("name", x -> x.name(), equalTo(name)), + has("expression", x -> x.expression(), expression) + ); + } + + public static Matcher isUntypedParamsNode( + Matcher> positional, + Matcher> named + ) { + return allOf( + has("positional", x -> x.positional(), positional), + has("named", x -> x.named(), named) + ); + } + + public static Matcher isUntypedReferenceNode(String name) { + return instanceOf( + UntypedReferenceNode.class, + has("name", x -> x.name(), equalTo(name)) + ); + } + + public static Matcher isUntypedStringLiteralNode(String value) { + return instanceOf( + UntypedStringLiteralNode.class, + has("value", x -> x.value(), equalTo(value)) + ); + } + + public static Matcher isUntypedTypeLevelReferenceNode(String name) { + return instanceOf( + UntypedTypeLevelReferenceNode.class, + has("name", x -> x.name(), equalTo(name)) + ); + } +} diff --git a/src/test/java/org/shedlang/compiler/parser/ParserCallTests.java b/src/test/java/org/shedlang/compiler/parser/ParserCallTests.java index d75c6643..22018d44 100644 --- a/src/test/java/org/shedlang/compiler/parser/ParserCallTests.java +++ b/src/test/java/org/shedlang/compiler/parser/ParserCallTests.java @@ -3,7 +3,7 @@ package org.shedlang.compiler.parser; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.shedlang.compiler.ast.UntypedNodeMatchers.*; +import static org.shedlang.compiler.ast.untyped.UntypedNodeMatchers.*; import static org.shedlang.compiler.parser.ParserTesting.parseString; import static org.zwobble.precisely.AssertThat.assertThat; import static org.zwobble.precisely.Matchers.isSequence; diff --git a/src/test/java/org/shedlang/compiler/parser/ParserExpressionStatementTests.java b/src/test/java/org/shedlang/compiler/parser/ParserExpressionStatementTests.java index 7d455f00..d962e68e 100644 --- a/src/test/java/org/shedlang/compiler/parser/ParserExpressionStatementTests.java +++ b/src/test/java/org/shedlang/compiler/parser/ParserExpressionStatementTests.java @@ -2,7 +2,7 @@ package org.shedlang.compiler.parser; import org.junit.jupiter.api.Test; -import static org.shedlang.compiler.ast.UntypedNodeMatchers.*; +import static org.shedlang.compiler.ast.untyped.UntypedNodeMatchers.*; import static org.shedlang.compiler.parser.ParserTesting.parseString; import static org.zwobble.precisely.AssertThat.assertThat; diff --git a/src/test/java/org/shedlang/compiler/parser/ParserFunctionDefinitionTests.java b/src/test/java/org/shedlang/compiler/parser/ParserFunctionDefinitionTests.java index a05642dc..f718bfca 100644 --- a/src/test/java/org/shedlang/compiler/parser/ParserFunctionDefinitionTests.java +++ b/src/test/java/org/shedlang/compiler/parser/ParserFunctionDefinitionTests.java @@ -2,7 +2,7 @@ package org.shedlang.compiler.parser; import org.junit.jupiter.api.Test; -import static org.shedlang.compiler.ast.UntypedNodeMatchers.*; +import static org.shedlang.compiler.ast.untyped.UntypedNodeMatchers.*; import static org.shedlang.compiler.parser.ParserTesting.parseString; import static org.zwobble.precisely.AssertThat.assertThat; import static org.zwobble.precisely.Matchers.*; diff --git a/src/test/java/org/shedlang/compiler/parser/ParserNamespaceTests.java b/src/test/java/org/shedlang/compiler/parser/ParserNamespaceTests.java index 15666dc7..7770575f 100644 --- a/src/test/java/org/shedlang/compiler/parser/ParserNamespaceTests.java +++ b/src/test/java/org/shedlang/compiler/parser/ParserNamespaceTests.java @@ -1,9 +1,9 @@ package org.shedlang.compiler.parser; import org.junit.jupiter.api.Test; -import org.shedlang.compiler.ast.UntypedNamespaceNode; +import org.shedlang.compiler.ast.untyped.UntypedNamespaceNode; -import static org.shedlang.compiler.ast.UntypedNodeMatchers.isUntypedFunctionDefinitionNode; +import static org.shedlang.compiler.ast.untyped.UntypedNodeMatchers.isUntypedFunctionDefinitionNode; import static org.shedlang.compiler.parser.ParserTesting.parseString; import static org.zwobble.precisely.AssertThat.assertThat; import static org.zwobble.precisely.Matchers.*; diff --git a/src/test/java/org/shedlang/compiler/parser/ParserReferenceTests.java b/src/test/java/org/shedlang/compiler/parser/ParserReferenceTests.java index d2956144..bc6c96f2 100644 --- a/src/test/java/org/shedlang/compiler/parser/ParserReferenceTests.java +++ b/src/test/java/org/shedlang/compiler/parser/ParserReferenceTests.java @@ -2,7 +2,7 @@ package org.shedlang.compiler.parser; import org.junit.jupiter.api.Test; -import static org.shedlang.compiler.ast.UntypedNodeMatchers.isUntypedReferenceNode; +import static org.shedlang.compiler.ast.untyped.UntypedNodeMatchers.isUntypedReferenceNode; import static org.shedlang.compiler.parser.ParserTesting.parseString; import static org.zwobble.precisely.AssertThat.assertThat; diff --git a/src/test/java/org/shedlang/compiler/parser/ParserStringLiteralTests.java b/src/test/java/org/shedlang/compiler/parser/ParserStringLiteralTests.java index d625a603..6f4dbfc3 100644 --- a/src/test/java/org/shedlang/compiler/parser/ParserStringLiteralTests.java +++ b/src/test/java/org/shedlang/compiler/parser/ParserStringLiteralTests.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; import org.shedlang.compiler.sources.FileFragmentSource; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.shedlang.compiler.ast.UntypedNodeMatchers.isUntypedStringLiteralNode; +import static org.shedlang.compiler.ast.untyped.UntypedNodeMatchers.isUntypedStringLiteralNode; import static org.shedlang.compiler.parser.ParserTesting.parseString; import static org.zwobble.precisely.AssertThat.assertThat; import static org.zwobble.precisely.Matchers.*; diff --git a/src/test/java/org/shedlang/compiler/parser/ParserTypeLevelReferenceTests.java b/src/test/java/org/shedlang/compiler/parser/ParserTypeLevelReferenceTests.java index 9e72ee25..d3e74110 100644 --- a/src/test/java/org/shedlang/compiler/parser/ParserTypeLevelReferenceTests.java +++ b/src/test/java/org/shedlang/compiler/parser/ParserTypeLevelReferenceTests.java @@ -2,7 +2,7 @@ package org.shedlang.compiler.parser; import org.junit.jupiter.api.Test; -import static org.shedlang.compiler.ast.UntypedNodeMatchers.isUntypedTypeLevelReferenceNode; +import static org.shedlang.compiler.ast.untyped.UntypedNodeMatchers.isUntypedTypeLevelReferenceNode; import static org.shedlang.compiler.parser.ParserTesting.parseString; import static org.zwobble.precisely.AssertThat.assertThat; -- cgit v1.2.3