Parser: fn type as type arg

nois-lang · Apr 8, 2024 · d68e637 · d68e637
1 parent bd979d2
commit d68e637
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/parser/fns/expr.ts b/src/parser/fns/expr.ts
@@ -164,7 +164,7 @@ export const parseIdentifier = (parser: Parser): void => {
     }
     if (
         parser.at('o-angle') &&
-        parser.encounter('c-angle', [...nameLikeTokens, 'colon', 'comma', 'o-angle', 'underscore'])
+        parser.encounter('c-angle', [...nameLikeTokens, 'colon', 'comma', 'o-angle', 'underscore', 'pipe'])
     ) {
         parseTypeArgs(parser)
     }

diff --git a/src/parser/fns/type.ts b/src/parser/fns/type.ts
@@ -64,7 +64,7 @@ export const parseFnType = (parser: Parser): void => {
 export const parseFnTypeParams = (parser: Parser): void => {
     const mark = parser.open()
     parser.expect('pipe')
-    while (!parser.at('pipe') && !parser.eof()) {
+    while (!(parser.at('pipe') && parser.nth(1) === 'colon') && !parser.eof()) {
         parseType(parser)
         if (!parser.at('pipe')) {
             parser.expect('comma')