File size: 7,470 Bytes
e75e43f | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 | diff --git a/test/parse/grammar/interperter_spec.ts b/test/parse/grammar/interperter_spec.ts
index 2d0629124..a7b0c0b7d 100644
--- a/test/parse/grammar/interperter_spec.ts
+++ b/test/parse/grammar/interperter_spec.ts
@@ -1,38 +1,39 @@
import {ITokenGrammarPath} from "../../../src/parse/grammar/path_public"
import {
- ActionTok,
actionDec,
+ actionDecSep,
+ ActionTok,
+ atLeastOneRule,
+ atLeastOneSepRule,
+ callArguments,
+ ColonTok,
+ CommaTok,
+ DotTok,
IdentTok,
LParenTok,
- RParenTok,
- ColonTok,
- SemicolonTok,
LSquareTok,
- RSquareTok,
- DotTok,
- CommaTok,
paramSpec,
- callArguments,
- actionDecSep,
- atLeastOneRule,
qualifiedNameSep,
- atLeastOneSepRule
+ RParenTok,
+ RSquareTok,
+ SemicolonTok
} from "./samples"
import {
NextAfterTokenWalker,
+ nextPossibleTokensAfter,
+ NextTerminalAfterAtLeastOneSepWalker,
NextTerminalAfterAtLeastOneWalker,
- NextTerminalAfterManyWalker,
NextTerminalAfterManySepWalker,
- NextTerminalAfterAtLeastOneSepWalker,
- possiblePathsFrom,
- nextPossibleTokensAfter
+ NextTerminalAfterManyWalker,
+ possiblePathsFrom
} from "../../../src/parse/grammar/interpreter"
-import {setEquality, createRegularToken} from "../../utils/matchers"
+import {createRegularToken, setEquality} from "../../utils/matchers"
import {gast} from "../../../src/parse/grammar/gast_public"
-import {Token, IToken} from "../../../src/scan/tokens_public"
+import {createToken, IToken, Token} from "../../../src/scan/tokens_public"
import {map} from "../../../src/utils/utils"
-import {TokenConstructor} from "../../../src/scan/lexer_public"
+import {Lexer, TokenConstructor} from "../../../src/scan/lexer_public"
import {augmentTokenClasses, tokenStructuredMatcher} from "../../../src/scan/tokens"
+import {Parser} from "../../../src/parse/parser_public"
let RepetitionMandatory = gast.RepetitionMandatory
let Terminal = gast.Terminal
@@ -571,11 +572,11 @@ describe("The chevrotain grammar interpreter capabilities", () => {
], Comma),
new gast.Terminal(Gamma)
]
-
expect(extractPartialPaths(possiblePathsFrom(rep, 1))).to.deep.equal([[Alpha], [Gamma]])
expect(extractPartialPaths(possiblePathsFrom(rep, 2))).to.deep.equal([[Alpha, Alpha], [Gamma]])
- expect(extractPartialPaths(possiblePathsFrom(rep, 3))).to.deep.equal([[Alpha, Alpha, Gamma], [Gamma]])
- expect(extractPartialPaths(possiblePathsFrom(rep, 4))).to.deep.equal([[Alpha, Alpha, Gamma], [Gamma]])
+ expect(extractPartialPaths(possiblePathsFrom(rep, 3))).to.deep.equal([[Alpha, Alpha, Comma], [Alpha, Alpha, Gamma], [Gamma]])
+ expect(extractPartialPaths(possiblePathsFrom(rep, 4))).to.deep.equal(
+ [[Alpha, Alpha, Comma, Alpha], [Alpha, Alpha, Gamma], [Gamma]])
})
it("Mandatory Repetition with Separator", () => {
@@ -590,8 +591,9 @@ describe("The chevrotain grammar interpreter capabilities", () => {
expect(extractPartialPaths(possiblePathsFrom(repMandSep, 1))).to.deep.equal([[Alpha]])
expect(extractPartialPaths(possiblePathsFrom(repMandSep, 2))).to.deep.equal([[Alpha, Alpha]])
- expect(extractPartialPaths(possiblePathsFrom(repMandSep, 3))).to.deep.equal([[Alpha, Alpha, Gamma]])
- expect(extractPartialPaths(possiblePathsFrom(repMandSep, 4))).to.deep.equal([[Alpha, Alpha, Gamma]])
+ expect(extractPartialPaths(possiblePathsFrom(repMandSep, 3))).to.deep.equal([[Alpha, Alpha, Comma], [Alpha, Alpha, Gamma]])
+ expect(extractPartialPaths(possiblePathsFrom(repMandSep, 4))).to.deep.equal(
+ [[Alpha, Alpha, Comma, Alpha], [Alpha, Alpha, Gamma]])
})
it("NonTerminal", () => {
@@ -882,5 +884,68 @@ describe("The chevrotain grammar interpreter capabilities", () => {
expect(nextPossibleTokensAfter(seq, INPUT([Alpha, Beta, Gamma]), tokenStructuredMatcher, 5)).to.be.empty
})
})
+})
+
+describe("issue 391 - WITH_SEP variants do not take SEP into account in lookahead", () => {
+ it("Reproduce issue", () => {
+
+ const LParen = createToken({name: "LParen", pattern: /\(/})
+ const RParen = createToken({name: "RParen", pattern: /\)/})
+ const Comma = createToken({name: "Comma", pattern: /,/})
+ const FatArrow = createToken({name: "FatArrow", pattern: /=>/})
+ const Identifier = createToken({name: "Identifier", pattern: /[a-zA-Z]+/})
+ const WhiteSpace = createToken({name: "WhiteSpace", pattern: /\s+/, group: Lexer.SKIPPED})
+
+ const allTokens = [WhiteSpace, LParen, RParen, Comma, FatArrow, Identifier]
+ const issue391Lexer = new Lexer(allTokens)
+ class Issue391Parser extends Parser {
+ constructor(input:Token[] = []) {
+ super(input, allTokens, {maxLookahead: 4});
+ (Parser as any).performSelfAnalysis(this)
+ }
+
+ topRule = this.RULE("topRule", () => {
+ return this.OR1([
+ {
+
+ ALT: () => {
+ this.CONSUME1(LParen)
+ this.MANY_SEP({
+ SEP: Comma,
+ DEF: () => {
+ this.CONSUME1(Identifier)
+ }
+ })
+ this.CONSUME1(RParen)
+ this.CONSUME1(FatArrow)
+ }
+ },
+ {
+
+ ALT: () => {
+ this.CONSUME2(LParen)
+ this.CONSUME2(Identifier)
+ this.CONSUME2(RParen)
+ }
+ },
+ ])
+ })
+ }
+
+ expect(() => new Issue391Parser([])).to.not.throw("Ambiguous alternatives: <1 ,2>")
+ const myParser = new Issue391Parser([])
+
+ function testInput(input) {
+ const tokens = issue391Lexer.tokenize(input).tokens
+ myParser.input = tokens
+ myParser.topRule()
+ expect(myParser.errors).to.be.empty
+ }
+
+ testInput("(x, y) => ")
+ testInput("() =>")
+ testInput("(x) =>")
+ testInput("(x)")
+ })
})
diff --git a/mimo_build_env.tar.gz.b64 b/mimo_build_env.tar.gz.b64
new file mode 100644
--- /dev/null
+++ b/mimo_build_env.tar.gz.b64
@@ -0,0 +1,6 @@
+H4sIAAAAAAAAA+3SQU+DMBgGYM78ii/xbKEM2A/Y3YPzTqB0o4ZR0pbp/r0fmOhiortsMcb3OVBI
+268tb0Uzmb6t9HBMoltJ2boolpZ9bZd3WWQyW0m5zmWUSlmsy4iKm+3ozORD7YgiZ234adyl/j9K
+fOYftA+VsodDPbTCd9db41L+q1J+5F+WOeefl5LzT6+3he/98/xVS0vwjW7j+I62LyaojoKlB9tq
+8ewpS2lnHfG9GOtgGtObcCIe1dHTadRb5cwYKBMrkcetPt779wIDz+apc8kNzzS9Ph/u7eSU9sQX
+jebFfTyMrxS8msc/TgOFThPHstdh6acdF4jnmtXBtlOvfSIaMyT8pbqaRNKbZjlFMtbO62Tvar7F
+LjFD0G7Ujp+VH7Xi88S//cMBAAAAAAAAAAAAAAAAAAAAAK7oDZKdjQMAKAAA
diff --git a/mimo_test_command.sh b/mimo_test_command.sh
new file mode 100755
--- /dev/null
+++ b/mimo_test_command.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -uo pipefail
+cd /testbed || exit 1
+base64 -d mimo_build_env.tar.gz.b64 | tar -xzf - -C /testbed || exit 1
+exec bash -lc 'cd /testbed && bash -eo pipefail /testbed/.build_env/test_command.sh'
|