AST: Remove the "rawText" property from "class" nodes

It isn't used anymore.
redux
David Majda 8 years ago
parent 35c8280743
commit e7d03825e0

@ -341,7 +341,6 @@
parts: filterEmptyStrings(parts), parts: filterEmptyStrings(parts),
inverted: inverted !== null, inverted: inverted !== null,
ignoreCase: ignoreCase !== null, ignoreCase: ignoreCase !== null,
rawText: text(),
location: location() location: location()
}; };
}, },

@ -79,13 +79,12 @@ describe("PEG.js grammar parser", function() {
); );
} }
function classGrammar(parts, inverted, ignoreCase, rawText) { function classGrammar(parts, inverted, ignoreCase) {
return oneRuleGrammar({ return oneRuleGrammar({
type: "class", type: "class",
parts: parts, parts: parts,
inverted: inverted, inverted: inverted,
ignoreCase: ignoreCase, ignoreCase: ignoreCase
rawText: rawText
}); });
} }
@ -360,7 +359,7 @@ describe("PEG.js grammar parser", function() {
/* Canonical PrimaryExpression is "\"abcd\"". */ /* Canonical PrimaryExpression is "\"abcd\"". */
it("parses PrimaryExpression", function() { it("parses PrimaryExpression", function() {
expect('start = "abcd"' ).toParseAs(trivialGrammar); expect('start = "abcd"' ).toParseAs(trivialGrammar);
expect('start = [a-d]' ).toParseAs(classGrammar([["a", "d"]], false, false, '[a-d]')); expect('start = [a-d]' ).toParseAs(classGrammar([["a", "d"]], false, false));
expect('start = .' ).toParseAs(anyGrammar()); expect('start = .' ).toParseAs(anyGrammar());
expect('start = a' ).toParseAs(ruleRefGrammar("a")); expect('start = a' ).toParseAs(ruleRefGrammar("a"));
expect('start = &{ code }').toParseAs(oneRuleGrammar(semanticAnd)); expect('start = &{ code }').toParseAs(oneRuleGrammar(semanticAnd));
@ -527,43 +526,38 @@ describe("PEG.js grammar parser", function() {
/* Canonical CharacterClassMatcher is "[a-d]". */ /* Canonical CharacterClassMatcher is "[a-d]". */
it("parses CharacterClassMatcher", function() { it("parses CharacterClassMatcher", function() {
expect('start = []').toParseAs( expect('start = []').toParseAs(
classGrammar([], false, false, '[]') classGrammar([], false, false)
); );
expect('start = [a-d]').toParseAs( expect('start = [a-d]').toParseAs(
classGrammar([["a", "d"]], false, false, '[a-d]') classGrammar([["a", "d"]], false, false)
); );
expect('start = [a]').toParseAs( expect('start = [a]').toParseAs(
classGrammar(["a"], false, false, '[a]') classGrammar(["a"], false, false)
); );
expect('start = [a-de-hi-l]').toParseAs( expect('start = [a-de-hi-l]').toParseAs(
classGrammar( classGrammar(
[["a", "d"], ["e", "h"], ["i", "l"]], [["a", "d"], ["e", "h"], ["i", "l"]],
false, false,
false, false
'[a-de-hi-l]'
) )
); );
expect('start = [^a-d]').toParseAs( expect('start = [^a-d]').toParseAs(
classGrammar([["a", "d"]], true, false, '[^a-d]') classGrammar([["a", "d"]], true, false)
); );
expect('start = [a-d]i').toParseAs( expect('start = [a-d]i').toParseAs(
classGrammar([["a", "d"]], false, true, '[a-d]i') classGrammar([["a", "d"]], false, true)
); );
expect('start = [\\\n]').toParseAs( expect('start = [\\\n]').toParseAs(
classGrammar([], false, false, '[\\\n]') classGrammar([], false, false)
); );
}); });
/* Canonical ClassCharacterRange is "a-d". */ /* Canonical ClassCharacterRange is "a-d". */
it("parses ClassCharacterRange", function() { it("parses ClassCharacterRange", function() {
expect('start = [a-d]').toParseAs( expect('start = [a-d]').toParseAs(classGrammar([["a", "d"]], false, false));
classGrammar([["a", "d"]], false, false, '[a-d]')
);
expect('start = [a-a]').toParseAs( expect('start = [a-a]').toParseAs(classGrammar([["a", "a"]], false, false));
classGrammar([["a", "a"]], false, false, '[a-a]')
);
expect('start = [b-a]').toFailToParse({ expect('start = [b-a]').toFailToParse({
message: "Invalid character range: b-a." message: "Invalid character range: b-a."
}); });
@ -571,15 +565,9 @@ describe("PEG.js grammar parser", function() {
/* Canonical ClassCharacter is "a". */ /* Canonical ClassCharacter is "a". */
it("parses ClassCharacter", function() { it("parses ClassCharacter", function() {
expect('start = [a]' ).toParseAs( expect('start = [a]' ).toParseAs(classGrammar(["a"], false, false));
classGrammar(["a"], false, false, '[a]') expect('start = [\\n]' ).toParseAs(classGrammar(["\n"], false, false));
); expect('start = [\\\n]').toParseAs(classGrammar([], false, false));
expect('start = [\\n]' ).toParseAs(
classGrammar(["\n"], false, false, '[\\n]')
);
expect('start = [\\\n]').toParseAs(
classGrammar([], false, false, '[\\\n]')
);
expect('start = []]' ).toFailToParse(); expect('start = []]' ).toFailToParse();
expect('start = [\\]').toFailToParse(); expect('start = [\\]').toFailToParse();

@ -385,7 +385,6 @@ CharacterClassMatcher "character class"
parts: filterEmptyStrings(parts), parts: filterEmptyStrings(parts),
inverted: inverted !== null, inverted: inverted !== null,
ignoreCase: ignoreCase !== null, ignoreCase: ignoreCase !== null,
rawText: text(),
location: location() location: location()
}; };
} }

Loading…
Cancel
Save