Add params to environment in function

1 files changed, 70 insertions, 0 deletions

diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionDefinitionTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionDefinitionTests.java
index 7ce8c7db..3eb177cc 100644
--- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionDefinitionTests.java
+++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionDefinitionTests.java
@@ -105,6 +105,54 @@ public class TypeCheckerFunctionDefinitionTests {
     }
 
     @Test
+    public void canReferencePositionalArgInBody() {
+        var untyped = UntypedFunctionDefinitionNode.builder()
+            .addPositionalParam("x", Untyped.typeLevelReference("String"))
+            .withReturnType(Untyped.typeLevelReference("Unit"))
+            .addStatement(Untyped.expressionStatement(Untyped.reference("x")))
+            .build();
+        var context = TypeCheckerContext.EMPTY
+            .enter(P.map(
+                Map.entry("String", Types.metaType(Types.STRING)),
+                Map.entry("Unit", Types.metaType(Types.UNIT))
+            ));
+
+        var typed = TypeChecker.typeCheckNamespaceStatement(untyped, context);
+
+        assertThat(
+            typed,
+            isTypedFunctionDefinitionNode()
+                .withBody(isSequence(
+                    isTypedExpressionStatementNode(isTypedReferenceNode("x", Types.STRING))
+                ))
+        );
+    }
+
+    @Test
+    public void canReferenceNamedArgInBody() {
+        var untyped = UntypedFunctionDefinitionNode.builder()
+            .addNamedParam("x", Untyped.typeLevelReference("String"))
+            .withReturnType(Untyped.typeLevelReference("Unit"))
+            .addStatement(Untyped.expressionStatement(Untyped.reference("x")))
+            .build();
+        var context = TypeCheckerContext.EMPTY
+            .enter(P.map(
+                Map.entry("String", Types.metaType(Types.STRING)),
+                Map.entry("Unit", Types.metaType(Types.UNIT))
+            ));
+
+        var typed = TypeChecker.typeCheckNamespaceStatement(untyped, context);
+
+        assertThat(
+            typed,
+            isTypedFunctionDefinitionNode()
+                .withBody(isSequence(
+                    isTypedExpressionStatementNode(isTypedReferenceNode("x", Types.STRING))
+                ))
+        );
+    }
+
+    @Test
     public void freeVariablesIncludeVariablesReferencedInFunctionButDefinedOutsideOfFunction() {
         var untyped = UntypedFunctionDefinitionNode.builder()
             .withReturnType(Untyped.typeLevelReference("Unit"))
@@ -125,4 +173,26 @@ public class TypeCheckerFunctionDefinitionTests {
                 .withFreeVariables(containsExactly(equalTo("y")))
         );
     }
+
+    @Test
+    public void freeVariablesDoNotIncludeArgsReferencedInFunction() {
+        var untyped = UntypedFunctionDefinitionNode.builder()
+            .addPositionalParam("x", Untyped.typeLevelReference("String"))
+            .withReturnType(Untyped.typeLevelReference("Unit"))
+            .addStatement(Untyped.expressionStatement(Untyped.reference("x")))
+            .build();
+        var context = TypeCheckerContext.EMPTY
+            .enter(P.map(
+                Map.entry("String", Types.metaType(Types.STRING)),
+                Map.entry("Unit", Types.metaType(Types.UNIT))
+            ));
+
+        var typed = TypeChecker.typeCheckNamespaceStatement(untyped, context);
+
+        assertThat(
+            typed,
+            isTypedFunctionDefinitionNode()
+                .withFreeVariables(containsExactly())
+        );
+    }
 }