Parser: != and ! conflict

nois-lang · Mar 12, 2024 · e9372c4 · e9372c4
1 parent 4ebe8b9
commit e9372c4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/src/parser/fns/expr.ts b/src/parser/fns/expr.ts
@@ -1,14 +1,7 @@
 import { Parser } from '..'
 import { syntaxError } from '../../error'
 import { TokenKind } from '../../lexer/lexer'
-import {
-    exprFirstTokens,
-    infixOpFirstTokens,
-    nameLikeTokens,
-    numberFirstTokens,
-    parseClosureExpr,
-    postfixOpFirstTokens
-} from './index'
+import { exprFirstTokens, infixOpFirstTokens, nameLikeTokens, numberFirstTokens, parseClosureExpr } from './index'
 import { parseMatchExpr, parsePattern } from './match'
 import { parseInfixOp, parsePostfixOp } from './op'
 import { parseBlock } from './statement'
@@ -33,7 +26,7 @@ export const parseExpr = (parser: Parser): void => {
 export const parseSubExpr = (parser: Parser): void => {
     const mark = parser.open()
     parseOperand(parser)
-    while (parser.atAny(postfixOpFirstTokens)) {
+    while (parser.at('o-paren') || (parser.at('excl') && parser.nth(1) !== 'equals') || parser.at('qmark')) {
         parsePostfixOp(parser)
     }
     parser.close(mark, 'sub-expr')

diff --git a/src/scope/trait.spec.ts b/src/scope/trait.spec.ts
@@ -46,7 +46,8 @@ describe('trait', () => {
 
         expect(formatImplTypes(findSuperRelChains(vidFromString('std::string::String'), ctx))).toEqual([
             ['std::io::Display'],
-            ['std::eq::Eq']
+            ['std::eq::Eq'],
+            ['std::iter::Collector<std::string::String>']
         ])
 
         expect(formatImplTypes(findSuperRelChains(vidFromString('std::list::List'), ctx))).toEqual([