From 09dcc2a2c64eb2544d810bbc586241346130d258 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 9 Feb 2025 17:12:36 +0000 Subject: Parse type-level params for function type --- src/main/java/org/shedlang/compiler/parser/Parser.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/main/java/org/shedlang/compiler/parser') diff --git a/src/main/java/org/shedlang/compiler/parser/Parser.java b/src/main/java/org/shedlang/compiler/parser/Parser.java index 003d909c..8a55de2d 100644 --- a/src/main/java/org/shedlang/compiler/parser/Parser.java +++ b/src/main/java/org/shedlang/compiler/parser/Parser.java @@ -338,7 +338,13 @@ public class Parser { var end = tokens.endPosition(); var source = new FileFragmentSource(start.to(end)); - return new UntypedFunctionTypeNode(params, Optional.empty(), returnType, source); + return new UntypedFunctionTypeNode( + Optional.empty(), + params, + Optional.empty(), + returnType, + source + ); } private static final Map> OPERATION_PARSERS = Stream.of( @@ -579,6 +585,7 @@ public class Parser { var source = new FileFragmentSource(start.to(end)); return new UntypedFunctionTypeNode( + signature.typeLevelParams(), signature.params(), signature.effect(), signature.returnType(), @@ -591,6 +598,8 @@ public class Parser { ) { var start = tokens.startPosition(); + var typeLevelParams = parseTypeLevelParamsOptional(tokens); + tokens.skip(TokenType.SYMBOL_PAREN_OPEN); var params = parseParamTypes(tokens); tokens.skip(TokenType.SYMBOL_PAREN_CLOSE); @@ -605,6 +614,7 @@ public class Parser { var source = new FileFragmentSource(start.to(end)); return new UntypedFunctionTypeNode( + typeLevelParams, params, effect, returnType, -- cgit v1.2.3