From bf55e95953edeefad8e83c034bfb4920d99c29ba Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 9 Jul 2023 19:13:02 +0100 Subject: Add UntypedBlockNode --- .../parser/ParserFunctionDefinitionTests.java | 10 +++--- .../shedlang/compiler/parser/ParserIfTests.java | 36 +++++++++++----------- 2 files changed, 23 insertions(+), 23 deletions(-) (limited to 'src/test/java/org/shedlang/compiler/parser') diff --git a/src/test/java/org/shedlang/compiler/parser/ParserFunctionDefinitionTests.java b/src/test/java/org/shedlang/compiler/parser/ParserFunctionDefinitionTests.java index 279309f6..d799fa4d 100644 --- a/src/test/java/org/shedlang/compiler/parser/ParserFunctionDefinitionTests.java +++ b/src/test/java/org/shedlang/compiler/parser/ParserFunctionDefinitionTests.java @@ -25,7 +25,7 @@ public class ParserFunctionDefinitionTests { .withParams(isUntypedParamsNode(isSequence(), isSequence())) .withEffect(isOptionalEmpty()) .withReturnType(isUntypedTypeLevelReferenceNode("Unit")) - .withBody(isSequence()) + .withBody(isUntypedBlockNode(isSequence())) ); } @@ -196,11 +196,11 @@ public class ParserFunctionDefinitionTests { assertThat( node, isUntypedFunctionDefinitionNode() - .withBody(isSequence( + .withBody(isUntypedBlockNode(isSequence( isUntypedExpressionStatementNode(isUntypedReferenceNode("a")), isUntypedExpressionStatementNode(isUntypedReferenceNode("b")), isUntypedExpressionStatementNode(isUntypedReferenceNode("c")) - )) + ))) ); } @@ -218,11 +218,11 @@ public class ParserFunctionDefinitionTests { assertThat( node, isUntypedFunctionDefinitionNode() - .withBody(isSequence( + .withBody(isUntypedBlockNode(isSequence( isUntypedExpressionStatementNode(isUntypedReferenceNode("a")), isUntypedExpressionStatementNode(isUntypedReferenceNode("b")), isUntypedBlockReturnNode(isUntypedReferenceNode("c")) - )) + ))) ); } diff --git a/src/test/java/org/shedlang/compiler/parser/ParserIfTests.java b/src/test/java/org/shedlang/compiler/parser/ParserIfTests.java index 5de0988d..5814dbf1 100644 --- a/src/test/java/org/shedlang/compiler/parser/ParserIfTests.java +++ b/src/test/java/org/shedlang/compiler/parser/ParserIfTests.java @@ -18,12 +18,12 @@ public class ParserIfTests { isSequence( isUntypedConditionalBranchNode( isUntypedReferenceNode("a"), - isSequence( + isUntypedBlockNode(isSequence( isUntypedExpressionStatementNode(isUntypedIntLiteralNode(1)) - ) + )) ) ), - isSequence() + isUntypedBlockNode(isSequence()) )); } @@ -37,14 +37,14 @@ public class ParserIfTests { isSequence( isUntypedConditionalBranchNode( isUntypedReferenceNode("a"), - isSequence( + isUntypedBlockNode(isSequence( isUntypedExpressionStatementNode(isUntypedIntLiteralNode(1)) - ) + )) ) ), - isSequence( + isUntypedBlockNode(isSequence( isUntypedExpressionStatementNode(isUntypedIntLiteralNode(2)) - ) + )) )); } @@ -58,18 +58,18 @@ public class ParserIfTests { isSequence( isUntypedConditionalBranchNode( isUntypedReferenceNode("a"), - isSequence( + isUntypedBlockNode(isSequence( isUntypedExpressionStatementNode(isUntypedIntLiteralNode(1)) - ) + )) ), isUntypedConditionalBranchNode( isUntypedReferenceNode("b"), - isSequence( + isUntypedBlockNode(isSequence( isUntypedExpressionStatementNode(isUntypedIntLiteralNode(2)) - ) + )) ) ), - isSequence() + isUntypedBlockNode(isSequence()) )); } @@ -83,20 +83,20 @@ public class ParserIfTests { isSequence( isUntypedConditionalBranchNode( isUntypedReferenceNode("a"), - isSequence( + isUntypedBlockNode(isSequence( isUntypedExpressionStatementNode(isUntypedIntLiteralNode(1)) - ) + )) ), isUntypedConditionalBranchNode( isUntypedReferenceNode("b"), - isSequence( + isUntypedBlockNode(isSequence( isUntypedExpressionStatementNode(isUntypedIntLiteralNode(2)) - ) + )) ) ), - isSequence( + isUntypedBlockNode(isSequence( isUntypedExpressionStatementNode(isUntypedIntLiteralNode(3)) - ) + )) )); } } -- cgit v1.2.3