diff --git a/package.json b/package.json index 0238063c1..1e8a54c57 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "scrollsdk", - "version": "100.3.0", + "version": "101.0.0", "description": "This npm package includes the Particles class, the Parsers compiler-compiler, a Parsers IDE, and more, all implemented in Particles, Parsers, and TypeScript.", "types": "./built/scrollsdk.node.d.ts", "main": "./products/Particle.js", diff --git a/particle/Particle.ts b/particle/Particle.ts index aa73484d4..0d6efebbd 100644 --- a/particle/Particle.ts +++ b/particle/Particle.ts @@ -3119,7 +3119,7 @@ class Particle extends AbstractParticle { return str ? indent + str.replace(/\n/g, indent) : "" } - static getVersion = () => "100.3.0" + static getVersion = () => "101.0.0" static fromDisk(path: string): Particle { const format = this._getFileFormat(path) diff --git a/products/DesignerApp.browser.js b/products/DesignerApp.browser.js index 5443361be..bdeb52a48 100644 --- a/products/DesignerApp.browser.js +++ b/products/DesignerApp.browser.js @@ -9,8 +9,8 @@ class DesignerApp extends AbstractParticleComponentParser { } this.codeWidgets = [] } - createParserCombinator() { - return new Particle.ParserCombinator(undefined, { + createParserPool() { + return new Particle.ParserPool(undefined, { githubTriangleComponent, samplesComponent, tableComponent, @@ -432,8 +432,8 @@ class explainResultsComponent extends AbstractParticleComponentParser { } } class tableComponent extends AbstractParticleComponentParser { - createParserCombinator() { - return new Particle.ParserCombinator(undefined, { + createParserPool() { + return new Particle.ParserPool(undefined, { compiledResultsComponent: compiledResultsComponent, executionResultsComponent: executionResultsComponent, explainResultsComponent: explainResultsComponent diff --git a/products/Parsers.js b/products/Parsers.js index 7c1951859..0dd159e1c 100644 --- a/products/Parsers.js +++ b/products/Parsers.js @@ -424,8 +424,8 @@ class ParserBackedParticle extends Particle { this._cache_paintParticles = new Particle(this.toPaintParticles()) this._cache_programAtomTypeStringMTime = particleMTime } - createParserCombinator() { - return this.isRoot() ? new Particle.ParserCombinator(BlobParser) : new Particle.ParserCombinator(this.parent._getParser()._getCatchAllParser(this.parent), {}) + createParserPool() { + return this.isRoot() ? new Particle.ParserPool(BlobParser) : new Particle.ParserPool(this.parent._getParserPool()._getCatchAllParser(this.parent), {}) } get parserId() { return this.definition.parserIdFromDefinition @@ -614,8 +614,8 @@ ${indent}${closeSubparticlesString}` } } class BlobParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(BlobParser, {}) + createParserPool() { + return new Particle.ParserPool(BlobParser, {}) } getErrors() { return [] @@ -623,8 +623,8 @@ class BlobParser extends ParserBackedParticle { } // todo: can we remove this? hard to extend. class UnknownParserParticle extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(UnknownParserParticle, {}) + createParserPool() { + return new Particle.ParserPool(UnknownParserParticle, {}) } getErrors() { return [new UnknownParserError(this)] @@ -1033,7 +1033,7 @@ class UnknownParserError extends AbstractParticleError { get message() { const particle = this.getParticle() const parentParticle = particle.parent - const options = parentParticle._getParser().getCueOptions() + const options = parentParticle._getParserPool().getCueOptions() return super.message + ` Invalid parser "${particle.cue}". Valid parsers are: ${Utils._listToEnglishText(options, 7)}.` } get atomSuggestion() { @@ -1203,7 +1203,7 @@ class ParsersEnumTestParticle extends AbstractParsersAtomTestParser { } } class atomTypeDefinitionParser extends AbstractExtendibleParticle { - createParserCombinator() { + createParserPool() { const types = {} types[ParsersConstants.regex] = ParsersRegexTestParser types[ParsersConstants.reservedAtoms] = ParsersReservedAtomsTestParser @@ -1216,7 +1216,7 @@ class atomTypeDefinitionParser extends AbstractExtendibleParticle { types[ParsersConstants.max] = Particle types[ParsersConstants.description] = Particle types[ParsersConstants.extends] = Particle - return new Particle.ParserCombinator(undefined, types) + return new Particle.ParserPool(undefined, types) } get id() { return this.getAtom(0) @@ -1396,7 +1396,7 @@ class OmnifixAtomParser extends AbstractAtomParser { } class ParsersExampleParser extends Particle {} class ParsersCompilerParser extends Particle { - createParserCombinator() { + createParserPool() { const types = [ ParsersConstantsCompiler.stringTemplate, ParsersConstantsCompiler.indentCharacter, @@ -1409,7 +1409,7 @@ class ParsersCompilerParser extends Particle { types.forEach(type => { map[type] = Particle }) - return new Particle.ParserCombinator(undefined, map) + return new Particle.ParserPool(undefined, map) } } class AbstractParserConstantParser extends Particle { @@ -1447,7 +1447,7 @@ class AbstractParserDefinitionParser extends AbstractExtendibleParticle { super(...arguments) this._isLooping = false } - createParserCombinator() { + createParserPool() { // todo: some of these should just be on nonRootParticles const types = [ ParsersConstants.popularity, @@ -1486,7 +1486,7 @@ class AbstractParserDefinitionParser extends AbstractExtendibleParticle { map[ParsersConstantsConstantTypes.float] = ParsersParserConstantFloat map[ParsersConstants.compilerParser] = ParsersCompilerParser map[ParsersConstants.example] = ParsersExampleParser - return new Particle.ParserCombinator(undefined, map, [{ regex: HandParsersProgram.parserFullRegex, parser: parserDefinitionParser }]) + return new Particle.ParserPool(undefined, map, [{ regex: HandParsersProgram.parserFullRegex, parser: parserDefinitionParser }]) } toTypeScriptInterface(used = new Set()) { let subparticlesInterfaces = [] @@ -1572,7 +1572,7 @@ ${properties.join("\n")} } // todo: remove get runTimeCuesInScope() { - return this._getParser().getCueOptions() + return this._getParserPool().getCueOptions() } _getMyAtomTypeDefs() { const requiredAtoms = this.get(ParsersConstants.atoms) @@ -1685,7 +1685,7 @@ ${properties.join("\n")} get parserAsJavascript() { if (this._isBlobParser()) // todo: do we need this? - return "createParserCombinator() { return new Particle.ParserCombinator(this._getBlobParserCatchAllParser())}" + return "createParserPool() { return new Particle.ParserPool(this._getBlobParserCatchAllParser())}" const parserInfo = this._createParserInfo(this._getMyInScopeParserIds()) const myCueMap = parserInfo.cueMap const regexRules = parserInfo.regexTests @@ -1695,7 +1695,7 @@ ${properties.join("\n")} const hasCues = cues.length const catchAllParser = this.catchAllParserToJavascript if (!hasCues && !catchAllParser && !regexRules.length) return "" - const cuesStr = hasCues ? `Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), {` + cues.map(cue => `"${cue}" : ${myCueMap[cue].parserIdFromDefinition}`).join(",\n") + "})" : "undefined" + const cuesStr = hasCues ? `Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), {` + cues.map(cue => `"${cue}" : ${myCueMap[cue].parserIdFromDefinition}`).join(",\n") + "})" : "undefined" const regexStr = regexRules.length ? `[${regexRules .map(rule => { @@ -1705,8 +1705,8 @@ ${properties.join("\n")} : "undefined" const catchAllStr = catchAllParser ? catchAllParser : this._amIRoot() ? `this._getBlobParserCatchAllParser()` : "undefined" const scopedParserJavascript = this.myScopedParserDefinitions.map(def => def.asJavascriptClass).join("\n\n") - return `createParserCombinator() {${scopedParserJavascript} - return new Particle.ParserCombinator(${catchAllStr}, ${cuesStr}, ${regexStr}) + return `createParserPool() {${scopedParserJavascript} + return new Particle.ParserPool(${catchAllStr}, ${cuesStr}, ${regexStr}) }` } get myScopedParserDefinitions() { @@ -1948,10 +1948,10 @@ class parserDefinitionParser extends AbstractParserDefinitionParser {} // HandParsersProgram is a constructor that takes a parsers file, and builds a new // constructor for new language that takes files in that language to execute, compile, etc. class HandParsersProgram extends AbstractParserDefinitionParser { - createParserCombinator() { + createParserPool() { const map = {} map[ParsersConstants.comment] = Particle - return new Particle.ParserCombinator(UnknownParserParticle, map, [ + return new Particle.ParserPool(UnknownParserParticle, map, [ { regex: HandParsersProgram.blankLineRegex, parser: Particle }, { regex: HandParsersProgram.parserFullRegex, parser: parserDefinitionParser }, { regex: HandParsersProgram.atomTypeFullRegex, parser: atomTypeDefinitionParser } diff --git a/products/Parsers.ts.browser.js b/products/Parsers.ts.browser.js index 8c48676dc..9ebdfc87f 100644 --- a/products/Parsers.ts.browser.js +++ b/products/Parsers.ts.browser.js @@ -422,8 +422,8 @@ class ParserBackedParticle extends Particle { this._cache_paintParticles = new Particle(this.toPaintParticles()) this._cache_programAtomTypeStringMTime = particleMTime } - createParserCombinator() { - return this.isRoot() ? new Particle.ParserCombinator(BlobParser) : new Particle.ParserCombinator(this.parent._getParser()._getCatchAllParser(this.parent), {}) + createParserPool() { + return this.isRoot() ? new Particle.ParserPool(BlobParser) : new Particle.ParserPool(this.parent._getParserPool()._getCatchAllParser(this.parent), {}) } get parserId() { return this.definition.parserIdFromDefinition @@ -612,8 +612,8 @@ ${indent}${closeSubparticlesString}` } } class BlobParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(BlobParser, {}) + createParserPool() { + return new Particle.ParserPool(BlobParser, {}) } getErrors() { return [] @@ -621,8 +621,8 @@ class BlobParser extends ParserBackedParticle { } // todo: can we remove this? hard to extend. class UnknownParserParticle extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(UnknownParserParticle, {}) + createParserPool() { + return new Particle.ParserPool(UnknownParserParticle, {}) } getErrors() { return [new UnknownParserError(this)] @@ -1031,7 +1031,7 @@ class UnknownParserError extends AbstractParticleError { get message() { const particle = this.getParticle() const parentParticle = particle.parent - const options = parentParticle._getParser().getCueOptions() + const options = parentParticle._getParserPool().getCueOptions() return super.message + ` Invalid parser "${particle.cue}". Valid parsers are: ${Utils._listToEnglishText(options, 7)}.` } get atomSuggestion() { @@ -1201,7 +1201,7 @@ class ParsersEnumTestParticle extends AbstractParsersAtomTestParser { } } class atomTypeDefinitionParser extends AbstractExtendibleParticle { - createParserCombinator() { + createParserPool() { const types = {} types[ParsersConstants.regex] = ParsersRegexTestParser types[ParsersConstants.reservedAtoms] = ParsersReservedAtomsTestParser @@ -1214,7 +1214,7 @@ class atomTypeDefinitionParser extends AbstractExtendibleParticle { types[ParsersConstants.max] = Particle types[ParsersConstants.description] = Particle types[ParsersConstants.extends] = Particle - return new Particle.ParserCombinator(undefined, types) + return new Particle.ParserPool(undefined, types) } get id() { return this.getAtom(0) @@ -1394,7 +1394,7 @@ class OmnifixAtomParser extends AbstractAtomParser { } class ParsersExampleParser extends Particle {} class ParsersCompilerParser extends Particle { - createParserCombinator() { + createParserPool() { const types = [ ParsersConstantsCompiler.stringTemplate, ParsersConstantsCompiler.indentCharacter, @@ -1407,7 +1407,7 @@ class ParsersCompilerParser extends Particle { types.forEach(type => { map[type] = Particle }) - return new Particle.ParserCombinator(undefined, map) + return new Particle.ParserPool(undefined, map) } } class AbstractParserConstantParser extends Particle { @@ -1445,7 +1445,7 @@ class AbstractParserDefinitionParser extends AbstractExtendibleParticle { super(...arguments) this._isLooping = false } - createParserCombinator() { + createParserPool() { // todo: some of these should just be on nonRootParticles const types = [ ParsersConstants.popularity, @@ -1484,7 +1484,7 @@ class AbstractParserDefinitionParser extends AbstractExtendibleParticle { map[ParsersConstantsConstantTypes.float] = ParsersParserConstantFloat map[ParsersConstants.compilerParser] = ParsersCompilerParser map[ParsersConstants.example] = ParsersExampleParser - return new Particle.ParserCombinator(undefined, map, [{ regex: HandParsersProgram.parserFullRegex, parser: parserDefinitionParser }]) + return new Particle.ParserPool(undefined, map, [{ regex: HandParsersProgram.parserFullRegex, parser: parserDefinitionParser }]) } toTypeScriptInterface(used = new Set()) { let subparticlesInterfaces = [] @@ -1570,7 +1570,7 @@ ${properties.join("\n")} } // todo: remove get runTimeCuesInScope() { - return this._getParser().getCueOptions() + return this._getParserPool().getCueOptions() } _getMyAtomTypeDefs() { const requiredAtoms = this.get(ParsersConstants.atoms) @@ -1683,7 +1683,7 @@ ${properties.join("\n")} get parserAsJavascript() { if (this._isBlobParser()) // todo: do we need this? - return "createParserCombinator() { return new Particle.ParserCombinator(this._getBlobParserCatchAllParser())}" + return "createParserPool() { return new Particle.ParserPool(this._getBlobParserCatchAllParser())}" const parserInfo = this._createParserInfo(this._getMyInScopeParserIds()) const myCueMap = parserInfo.cueMap const regexRules = parserInfo.regexTests @@ -1693,7 +1693,7 @@ ${properties.join("\n")} const hasCues = cues.length const catchAllParser = this.catchAllParserToJavascript if (!hasCues && !catchAllParser && !regexRules.length) return "" - const cuesStr = hasCues ? `Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), {` + cues.map(cue => `"${cue}" : ${myCueMap[cue].parserIdFromDefinition}`).join(",\n") + "})" : "undefined" + const cuesStr = hasCues ? `Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), {` + cues.map(cue => `"${cue}" : ${myCueMap[cue].parserIdFromDefinition}`).join(",\n") + "})" : "undefined" const regexStr = regexRules.length ? `[${regexRules .map(rule => { @@ -1703,8 +1703,8 @@ ${properties.join("\n")} : "undefined" const catchAllStr = catchAllParser ? catchAllParser : this._amIRoot() ? `this._getBlobParserCatchAllParser()` : "undefined" const scopedParserJavascript = this.myScopedParserDefinitions.map(def => def.asJavascriptClass).join("\n\n") - return `createParserCombinator() {${scopedParserJavascript} - return new Particle.ParserCombinator(${catchAllStr}, ${cuesStr}, ${regexStr}) + return `createParserPool() {${scopedParserJavascript} + return new Particle.ParserPool(${catchAllStr}, ${cuesStr}, ${regexStr}) }` } get myScopedParserDefinitions() { @@ -1946,10 +1946,10 @@ class parserDefinitionParser extends AbstractParserDefinitionParser {} // HandParsersProgram is a constructor that takes a parsers file, and builds a new // constructor for new language that takes files in that language to execute, compile, etc. class HandParsersProgram extends AbstractParserDefinitionParser { - createParserCombinator() { + createParserPool() { const map = {} map[ParsersConstants.comment] = Particle - return new Particle.ParserCombinator(UnknownParserParticle, map, [ + return new Particle.ParserPool(UnknownParserParticle, map, [ { regex: HandParsersProgram.blankLineRegex, parser: Particle }, { regex: HandParsersProgram.parserFullRegex, parser: parserDefinitionParser }, { regex: HandParsersProgram.atomTypeFullRegex, parser: atomTypeDefinitionParser } diff --git a/products/Particle.browser.js b/products/Particle.browser.js index 14bd07234..b188d223b 100644 --- a/products/Particle.browser.js +++ b/products/Particle.browser.js @@ -65,7 +65,7 @@ var ParticlesConstants ;(function (ParticlesConstants) { ParticlesConstants["extends"] = "extends" })(ParticlesConstants || (ParticlesConstants = {})) -class ParserCombinator { +class ParserPool { constructor(catchAllParser, cueMap = {}, regexTests = undefined) { this._catchAllParser = catchAllParser this._cueMap = new Map(Object.entries(cueMap)) @@ -87,13 +87,13 @@ class ParserCombinator { } return obj } - _getParser(line, contextParticle, atomBreakSymbol = TN_WORD_BREAK_SYMBOL) { + _getMatchingParser(line, contextParticle, atomBreakSymbol = TN_WORD_BREAK_SYMBOL) { return this._getCueMap().get(this._getCue(line, atomBreakSymbol)) || this._getParserFromRegexTests(line) || this._getCatchAllParser(contextParticle) } _getCatchAllParser(contextParticle) { if (this._catchAllParser) return this._catchAllParser const parent = contextParticle.parent - if (parent) return parent._getParser()._getCatchAllParser(parent) + if (parent) return parent._getParserPool()._getCatchAllParser(parent) return contextParticle.constructor } _getParserFromRegexTests(line) { @@ -1435,7 +1435,7 @@ class Particle extends AbstractParticle { this._insertLineAndSubparticles(line, subparticles) } _insertLineAndSubparticles(line, subparticles, index = this.length) { - const parser = this._getParser()._getParser(line, this) + const parser = this._getParserPool()._getMatchingParser(line, this) const newParticle = new parser(subparticles, line, this) const adjustedIndex = index < 0 ? this.length + index : index this._getSubparticlesArray().splice(adjustedIndex, 0, newParticle) @@ -1474,7 +1474,7 @@ class Particle extends AbstractParticle { } const lineContent = line.substr(currentIndentCount) const parent = parentStack[parentStack.length - 1] - const parser = parent._getParser()._getParser(lineContent, parent) + const parser = parent._getParserPool()._getMatchingParser(lineContent, parent) lastParticle = new parser(undefined, lineContent, parent) parent._getSubparticlesArray().push(lastParticle) }) @@ -1636,12 +1636,12 @@ class Particle extends AbstractParticle { _getGrandParent() { return this.isRoot() || this.parent.isRoot() ? undefined : this.parent.parent } - _getParser() { - if (!Particle._parserCombinators.has(this.constructor)) Particle._parserCombinators.set(this.constructor, this.createParserCombinator()) - return Particle._parserCombinators.get(this.constructor) + _getParserPool() { + if (!Particle._parserPools.has(this.constructor)) Particle._parserPools.set(this.constructor, this.createParserPool()) + return Particle._parserPools.get(this.constructor) } - createParserCombinator() { - return new ParserCombinator(this.constructor) + createParserPool() { + return new ParserPool(this.constructor) } static _makeUniqueId() { if (this._uniqueId === undefined) this._uniqueId = 0 @@ -2609,8 +2609,8 @@ class Particle extends AbstractParticle { return particle } } -Particle._parserCombinators = new Map() -Particle.ParserCombinator = ParserCombinator +Particle._parserPools = new Map() +Particle.ParserPool = ParserPool Particle.iris = `sepal_length,sepal_width,petal_length,petal_width,species 6.1,3,4.9,1.8,virginica 5.6,2.7,4.2,1.3,versicolor @@ -2622,7 +2622,7 @@ Particle.iris = `sepal_length,sepal_width,petal_length,petal_width,species 4.9,2.5,4.5,1.7,virginica 5.1,3.5,1.4,0.2,setosa 5,3.4,1.5,0.2,setosa` -Particle.getVersion = () => "100.3.0" +Particle.getVersion = () => "101.0.0" class AbstractExtendibleParticle extends Particle { _getFromExtended(cuePath) { const hit = this._getParticleFromExtended(cuePath) diff --git a/products/Particle.js b/products/Particle.js index dec6862d8..1b699e9c2 100644 --- a/products/Particle.js +++ b/products/Particle.js @@ -55,7 +55,7 @@ var ParticlesConstants ;(function (ParticlesConstants) { ParticlesConstants["extends"] = "extends" })(ParticlesConstants || (ParticlesConstants = {})) -class ParserCombinator { +class ParserPool { constructor(catchAllParser, cueMap = {}, regexTests = undefined) { this._catchAllParser = catchAllParser this._cueMap = new Map(Object.entries(cueMap)) @@ -77,13 +77,13 @@ class ParserCombinator { } return obj } - _getParser(line, contextParticle, atomBreakSymbol = TN_WORD_BREAK_SYMBOL) { + _getMatchingParser(line, contextParticle, atomBreakSymbol = TN_WORD_BREAK_SYMBOL) { return this._getCueMap().get(this._getCue(line, atomBreakSymbol)) || this._getParserFromRegexTests(line) || this._getCatchAllParser(contextParticle) } _getCatchAllParser(contextParticle) { if (this._catchAllParser) return this._catchAllParser const parent = contextParticle.parent - if (parent) return parent._getParser()._getCatchAllParser(parent) + if (parent) return parent._getParserPool()._getCatchAllParser(parent) return contextParticle.constructor } _getParserFromRegexTests(line) { @@ -1425,7 +1425,7 @@ class Particle extends AbstractParticle { this._insertLineAndSubparticles(line, subparticles) } _insertLineAndSubparticles(line, subparticles, index = this.length) { - const parser = this._getParser()._getParser(line, this) + const parser = this._getParserPool()._getMatchingParser(line, this) const newParticle = new parser(subparticles, line, this) const adjustedIndex = index < 0 ? this.length + index : index this._getSubparticlesArray().splice(adjustedIndex, 0, newParticle) @@ -1464,7 +1464,7 @@ class Particle extends AbstractParticle { } const lineContent = line.substr(currentIndentCount) const parent = parentStack[parentStack.length - 1] - const parser = parent._getParser()._getParser(lineContent, parent) + const parser = parent._getParserPool()._getMatchingParser(lineContent, parent) lastParticle = new parser(undefined, lineContent, parent) parent._getSubparticlesArray().push(lastParticle) }) @@ -1626,12 +1626,12 @@ class Particle extends AbstractParticle { _getGrandParent() { return this.isRoot() || this.parent.isRoot() ? undefined : this.parent.parent } - _getParser() { - if (!Particle._parserCombinators.has(this.constructor)) Particle._parserCombinators.set(this.constructor, this.createParserCombinator()) - return Particle._parserCombinators.get(this.constructor) + _getParserPool() { + if (!Particle._parserPools.has(this.constructor)) Particle._parserPools.set(this.constructor, this.createParserPool()) + return Particle._parserPools.get(this.constructor) } - createParserCombinator() { - return new ParserCombinator(this.constructor) + createParserPool() { + return new ParserPool(this.constructor) } static _makeUniqueId() { if (this._uniqueId === undefined) this._uniqueId = 0 @@ -2599,8 +2599,8 @@ class Particle extends AbstractParticle { return particle } } -Particle._parserCombinators = new Map() -Particle.ParserCombinator = ParserCombinator +Particle._parserPools = new Map() +Particle.ParserPool = ParserPool Particle.iris = `sepal_length,sepal_width,petal_length,petal_width,species 6.1,3,4.9,1.8,virginica 5.6,2.7,4.2,1.3,versicolor @@ -2612,7 +2612,7 @@ Particle.iris = `sepal_length,sepal_width,petal_length,petal_width,species 4.9,2.5,4.5,1.7,virginica 5.1,3.5,1.4,0.2,setosa 5,3.4,1.5,0.2,setosa` -Particle.getVersion = () => "100.3.0" +Particle.getVersion = () => "101.0.0" class AbstractExtendibleParticle extends Particle { _getFromExtended(cuePath) { const hit = this._getParticleFromExtended(cuePath) diff --git a/products/Particle.test.browser.js b/products/Particle.test.browser.js index 36c120c40..137fb3a2d 100644 --- a/products/Particle.test.browser.js +++ b/products/Particle.test.browser.js @@ -1447,8 +1447,8 @@ testParticles.simpleParticleLanguage = equal => { // Arrange class MathProgramParser extends Particle { // Look! You created a top down parser! - createParserCombinator() { - return new Particle.ParserCombinator(undefined, { "+": AdditionParticleParser, "-": SubstractionParticleParser }) + createParserPool() { + return new Particle.ParserPool(undefined, { "+": AdditionParticleParser, "-": SubstractionParticleParser }) } execute() { return this.map(subparticle => subparticle.execute()) @@ -2167,13 +2167,13 @@ testParticles.setAtom = equal => { testParticles.particleLanguageDependingOnParent = equal => { // Arrange class ReverseEtnParticle extends Particle { - createParserCombinator() { - return new Particle.ParserCombinator(Particle, {}) + createParserPool() { + return new Particle.ParserPool(Particle, {}) } } class TestLanguage extends Particle { - createParserCombinator() { - return new Particle.ParserCombinator(ReverseEtnParticle, {}) + createParserPool() { + return new Particle.ParserPool(ReverseEtnParticle, {}) } } // Act @@ -2254,13 +2254,13 @@ testParticles.parseParticle = equal => { // Arrange class LeafParticle extends Particle {} class SubclassParticle extends Particle { - createParserCombinator() { - return new Particle.ParserCombinator(SubclassParticle, {}, [{ regex: /^leaf/, parser: LeafParticle }]) + createParserPool() { + return new Particle.ParserPool(SubclassParticle, {}, [{ regex: /^leaf/, parser: LeafParticle }]) } } class TestLanguageParticle extends Particle { - createParserCombinator() { - return new Particle.ParserCombinator(TestLanguageParticle, {}, [ + createParserPool() { + return new Particle.ParserPool(TestLanguageParticle, {}, [ { regex: /^particle/, parser: Particle }, { regex: /^sub/, parser: SubclassParticle } ]) diff --git a/products/SandboxApp.browser.js b/products/SandboxApp.browser.js index 145b5f9fc..2305dfb74 100644 --- a/products/SandboxApp.browser.js +++ b/products/SandboxApp.browser.js @@ -1,8 +1,8 @@ //onsave scrollsdk build produce SandboxApp.browser.js // Todo: add inputs at the top to change the edge, particle, and atom delimiters. class SandboxApp extends AbstractParticleComponentParser { - createParserCombinator() { - return new Particle.ParserCombinator(undefined, { + createParserPool() { + return new Particle.ParserPool(undefined, { tableComponent, shareComponent, githubTriangleComponent, diff --git a/products/SweeperCraft.browser.js b/products/SweeperCraft.browser.js index a8e2ffaf7..e0d5e4be4 100644 --- a/products/SweeperCraft.browser.js +++ b/products/SweeperCraft.browser.js @@ -345,8 +345,8 @@ class SweeperCraftApp extends AbstractParticleComponentParser { super(...arguments) this.keyboardShortcuts = this._getKeyboardShortcuts() } - createParserCombinator() { - return new Particle.ParserCombinator(undefined, { + createParserPool() { + return new Particle.ParserPool(undefined, { headerComponent, boardComponent, controlsComponent, @@ -673,8 +673,8 @@ class headerComponent extends AbstractSweeperCraftComponent { } } class boardComponent extends AbstractSweeperCraftComponent { - createParserCombinator() { - return new Particle.ParserCombinator(undefined, { + createParserPool() { + return new Particle.ParserPool(undefined, { rowComponent: rowComponent }) } @@ -689,8 +689,8 @@ class boardComponent extends AbstractSweeperCraftComponent { } } class rowComponent extends AbstractParticleComponentParser { - createParserCombinator() { - return new Particle.ParserCombinator(undefined, { + createParserPool() { + return new Particle.ParserPool(undefined, { squareComponent: squareComponent }) } diff --git a/products/arrow.browser.js b/products/arrow.browser.js index 9fc5558af..a00d3a3b3 100644 --- a/products/arrow.browser.js +++ b/products/arrow.browser.js @@ -12,8 +12,8 @@ } class arrowParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(errorParser, Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { Comment: commentParser, charge: chargeParser }), undefined) + createParserPool() { + return new Particle.ParserPool(errorParser, Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { Comment: commentParser, charge: chargeParser }), undefined) } compile() { return this.asJsonSubset @@ -109,10 +109,10 @@ tokenParser } class chargeParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( undefined, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { cardNumber: cardNumberParser, amount: amountParser, currency: currencyParser, description: descriptionParser, token: tokenParser }), + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { cardNumber: cardNumberParser, amount: amountParser, currency: currencyParser, description: descriptionParser, token: tokenParser }), undefined ) } diff --git a/products/arrow.nodejs.js b/products/arrow.nodejs.js index 1267288a4..251d62633 100755 --- a/products/arrow.nodejs.js +++ b/products/arrow.nodejs.js @@ -18,8 +18,8 @@ } class arrowParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(errorParser, Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { Comment: commentParser, charge: chargeParser }), undefined) + createParserPool() { + return new Particle.ParserPool(errorParser, Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { Comment: commentParser, charge: chargeParser }), undefined) } compile() { return this.asJsonSubset @@ -115,10 +115,10 @@ tokenParser } class chargeParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( undefined, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { cardNumber: cardNumberParser, amount: amountParser, currency: currencyParser, description: descriptionParser, token: tokenParser }), + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { cardNumber: cardNumberParser, amount: amountParser, currency: currencyParser, description: descriptionParser, token: tokenParser }), undefined ) } diff --git a/products/chuck.browser.js b/products/chuck.browser.js index 7418d68cf..a7bc03afb 100644 --- a/products/chuck.browser.js +++ b/products/chuck.browser.js @@ -1,7 +1,7 @@ { class chuckParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(this._getBlobParserCatchAllParser(), undefined, [ + createParserPool() { + return new Particle.ParserPool(this._getBlobParserCatchAllParser(), undefined, [ { regex: /\+/, parser: addParser }, { regex: /\*/, parser: multiplyParser }, { regex: /print/, parser: printParser }, diff --git a/products/chuck.nodejs.js b/products/chuck.nodejs.js index e852291bb..3378dbe89 100755 --- a/products/chuck.nodejs.js +++ b/products/chuck.nodejs.js @@ -6,8 +6,8 @@ const { ParserBackedParticle } = require("./Parsers.js") class chuckParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(this._getBlobParserCatchAllParser(), undefined, [ + createParserPool() { + return new Particle.ParserPool(this._getBlobParserCatchAllParser(), undefined, [ { regex: /\+/, parser: addParser }, { regex: /\*/, parser: multiplyParser }, { regex: /print/, parser: printParser }, diff --git a/products/dug.browser.js b/products/dug.browser.js index 014e36b94..aa1786ad0 100644 --- a/products/dug.browser.js +++ b/products/dug.browser.js @@ -1,9 +1,9 @@ { class dugParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( errorParser, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { null: nullParser, number: numberParser, string: stringParser, boolean: booleanParser, object: objectParser, array: arrayParser }), + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { null: nullParser, number: numberParser, string: stringParser, boolean: booleanParser, object: objectParser, array: arrayParser }), undefined ) } @@ -121,26 +121,26 @@ errorParser } class objectParser extends abstractValueParser { - createParserCombinator() { - return new Particle.ParserCombinator(memberParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(memberParser, undefined, undefined) } } class arrayParser extends abstractValueParser { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( undefined, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { null: nullParser, number: numberParser, string: stringParser, boolean: booleanParser, object: objectParser, array: arrayParser }), + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { null: nullParser, number: numberParser, string: stringParser, boolean: booleanParser, object: objectParser, array: arrayParser }), undefined ) } } class memberParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( undefined, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { null: nullParser, number: numberParser, string: stringParser, boolean: booleanParser, object: objectParser, array: arrayParser }), + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { null: nullParser, number: numberParser, string: stringParser, boolean: booleanParser, object: objectParser, array: arrayParser }), undefined ) } diff --git a/products/dug.nodejs.js b/products/dug.nodejs.js index 296bff5cd..25269206c 100755 --- a/products/dug.nodejs.js +++ b/products/dug.nodejs.js @@ -6,10 +6,10 @@ const { ParserBackedParticle } = require("./Parsers.js") class dugParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( errorParser, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { null: nullParser, number: numberParser, string: stringParser, boolean: booleanParser, object: objectParser, array: arrayParser }), + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { null: nullParser, number: numberParser, string: stringParser, boolean: booleanParser, object: objectParser, array: arrayParser }), undefined ) } @@ -127,26 +127,26 @@ errorParser } class objectParser extends abstractValueParser { - createParserCombinator() { - return new Particle.ParserCombinator(memberParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(memberParser, undefined, undefined) } } class arrayParser extends abstractValueParser { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( undefined, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { null: nullParser, number: numberParser, string: stringParser, boolean: booleanParser, object: objectParser, array: arrayParser }), + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { null: nullParser, number: numberParser, string: stringParser, boolean: booleanParser, object: objectParser, array: arrayParser }), undefined ) } } class memberParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( undefined, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { null: nullParser, number: numberParser, string: stringParser, boolean: booleanParser, object: objectParser, array: arrayParser }), + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { null: nullParser, number: numberParser, string: stringParser, boolean: booleanParser, object: objectParser, array: arrayParser }), undefined ) } diff --git a/products/dumbdown.browser.js b/products/dumbdown.browser.js index 27e9ca5d5..d4142b125 100644 --- a/products/dumbdown.browser.js +++ b/products/dumbdown.browser.js @@ -6,10 +6,10 @@ } class dumbdownParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( quickParagraphParser, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { link: linkParser, paragraph: paragraphParser, code: codeParser, @@ -181,8 +181,8 @@ quickParagraphParser } class paragraphParser extends abstractTopLevelParser { - createParserCombinator() { - return new Particle.ParserCombinator(paragraphContentParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(paragraphContentParser, undefined, undefined) } } @@ -193,8 +193,8 @@ quickParagraphParser } class codeParser extends abstractTopLevelParser { - createParserCombinator() { - return new Particle.ParserCombinator(lineOfCodeParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(lineOfCodeParser, undefined, undefined) } compile() { return `${this.indentation + this.subparticlesToString()}` @@ -202,8 +202,8 @@ quickParagraphParser } class listParser extends abstractTopLevelParser { - createParserCombinator() { - return new Particle.ParserCombinator(undefined, Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { "-": dashParser }), undefined) + createParserPool() { + return new Particle.ParserPool(undefined, Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { "-": dashParser }), undefined) } } @@ -214,8 +214,8 @@ quickParagraphParser } class lineOfCodeParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(lineOfCodeParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(lineOfCodeParser, undefined, undefined) } get codeAtom() { return this.getAtomsFrom(0) diff --git a/products/dumbdown.nodejs.js b/products/dumbdown.nodejs.js index a53ed8d6f..b7a349dab 100755 --- a/products/dumbdown.nodejs.js +++ b/products/dumbdown.nodejs.js @@ -12,10 +12,10 @@ } class dumbdownParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( quickParagraphParser, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { link: linkParser, paragraph: paragraphParser, code: codeParser, @@ -187,8 +187,8 @@ quickParagraphParser } class paragraphParser extends abstractTopLevelParser { - createParserCombinator() { - return new Particle.ParserCombinator(paragraphContentParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(paragraphContentParser, undefined, undefined) } } @@ -199,8 +199,8 @@ quickParagraphParser } class codeParser extends abstractTopLevelParser { - createParserCombinator() { - return new Particle.ParserCombinator(lineOfCodeParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(lineOfCodeParser, undefined, undefined) } compile() { return `${this.indentation + this.subparticlesToString()}` @@ -208,8 +208,8 @@ quickParagraphParser } class listParser extends abstractTopLevelParser { - createParserCombinator() { - return new Particle.ParserCombinator(undefined, Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { "-": dashParser }), undefined) + createParserPool() { + return new Particle.ParserPool(undefined, Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { "-": dashParser }), undefined) } } @@ -220,8 +220,8 @@ quickParagraphParser } class lineOfCodeParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(lineOfCodeParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(lineOfCodeParser, undefined, undefined) } get codeAtom() { return this.getAtomsFrom(0) diff --git a/products/fire.browser.js b/products/fire.browser.js index 4dc4056d9..68b15e470 100644 --- a/products/fire.browser.js +++ b/products/fire.browser.js @@ -1,9 +1,9 @@ { class fireParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( errorParser, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { block: blockParser, function: functionParser, if: ifParser, @@ -403,10 +403,10 @@ errorParser } class abstractNonTerminalParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( undefined, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { block: blockParser, function: functionParser, if: ifParser, diff --git a/products/fire.nodejs.js b/products/fire.nodejs.js index 14605719a..f9722d644 100755 --- a/products/fire.nodejs.js +++ b/products/fire.nodejs.js @@ -6,10 +6,10 @@ const { ParserBackedParticle } = require("./Parsers.js") class fireParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( errorParser, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { block: blockParser, function: functionParser, if: ifParser, @@ -409,10 +409,10 @@ errorParser } class abstractNonTerminalParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( undefined, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { block: blockParser, function: functionParser, if: ifParser, diff --git a/products/fruit.browser.js b/products/fruit.browser.js index ef7ff8d47..b1fd99f17 100644 --- a/products/fruit.browser.js +++ b/products/fruit.browser.js @@ -1,7 +1,7 @@ { class fruitParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(errorParser, Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { apple: appleParser }), undefined) + createParserPool() { + return new Particle.ParserPool(errorParser, Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { apple: appleParser }), undefined) } static cachedHandParsersProgramRoot = new HandParsersProgram(`fruitNameAtom paint keyword @@ -36,9 +36,9 @@ errorParser } class appleParser extends abstractFruitParser { - createParserCombinator() { + createParserPool() { class bananaParser extends abstractFruitParser {} - return new Particle.ParserCombinator(undefined, Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { apple: appleParser, banana: bananaParser }), undefined) + return new Particle.ParserPool(undefined, Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { apple: appleParser, banana: bananaParser }), undefined) } } diff --git a/products/fruit.nodejs.js b/products/fruit.nodejs.js index 0c3bd5076..feb896a07 100755 --- a/products/fruit.nodejs.js +++ b/products/fruit.nodejs.js @@ -6,8 +6,8 @@ const { ParserBackedParticle } = require("./Parsers.js") class fruitParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(errorParser, Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { apple: appleParser }), undefined) + createParserPool() { + return new Particle.ParserPool(errorParser, Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { apple: appleParser }), undefined) } static cachedHandParsersProgramRoot = new HandParsersProgram(`fruitNameAtom paint keyword @@ -42,9 +42,9 @@ errorParser } class appleParser extends abstractFruitParser { - createParserCombinator() { + createParserPool() { class bananaParser extends abstractFruitParser {} - return new Particle.ParserCombinator(undefined, Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { apple: appleParser, banana: bananaParser }), undefined) + return new Particle.ParserPool(undefined, Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { apple: appleParser, banana: bananaParser }), undefined) } } diff --git a/products/hakon.browser.js b/products/hakon.browser.js index 02ecc0963..a580cf910 100644 --- a/products/hakon.browser.js +++ b/products/hakon.browser.js @@ -1,7 +1,7 @@ { class hakonParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(selectorParser, Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { comment: commentParser }), undefined) + createParserPool() { + return new Particle.ParserPool(selectorParser, Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { comment: commentParser }), undefined) } getSelector() { return "" @@ -120,8 +120,8 @@ selectorParser } class propertyParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(errorParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(errorParser, undefined, undefined) } get propertyNameAtom() { return this.getAtom(0) @@ -143,8 +143,8 @@ selectorParser } class errorParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(errorParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(errorParser, undefined, undefined) } getErrors() { return this._getErrorParserErrors() @@ -155,8 +155,8 @@ selectorParser } class commentParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(commentParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(commentParser, undefined, undefined) } get commentKeywordAtom() { return this.getAtom(0) @@ -167,10 +167,10 @@ selectorParser } class selectorParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( selectorParser, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { "border-bottom-right-radius": propertyParser, "transition-timing-function": propertyParser, "animation-iteration-count": propertyParser, diff --git a/products/hakon.nodejs.js b/products/hakon.nodejs.js index f9e00cb16..36506b79d 100755 --- a/products/hakon.nodejs.js +++ b/products/hakon.nodejs.js @@ -6,8 +6,8 @@ const { ParserBackedParticle } = require("./Parsers.js") class hakonParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(selectorParser, Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { comment: commentParser }), undefined) + createParserPool() { + return new Particle.ParserPool(selectorParser, Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { comment: commentParser }), undefined) } getSelector() { return "" @@ -126,8 +126,8 @@ selectorParser } class propertyParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(errorParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(errorParser, undefined, undefined) } get propertyNameAtom() { return this.getAtom(0) @@ -149,8 +149,8 @@ selectorParser } class errorParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(errorParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(errorParser, undefined, undefined) } getErrors() { return this._getErrorParserErrors() @@ -161,8 +161,8 @@ selectorParser } class commentParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(commentParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(commentParser, undefined, undefined) } get commentKeywordAtom() { return this.getAtom(0) @@ -173,10 +173,10 @@ selectorParser } class selectorParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( selectorParser, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { "border-bottom-right-radius": propertyParser, "transition-timing-function": propertyParser, "animation-iteration-count": propertyParser, diff --git a/products/jibberish.browser.js b/products/jibberish.browser.js index cceb00a8e..e08c7fa26 100644 --- a/products/jibberish.browser.js +++ b/products/jibberish.browser.js @@ -1,9 +1,9 @@ { class jibberishParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( errorParser, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { extendsAbstract: extendsAbstractParser, hue: hueParser, saturation: saturationParser, @@ -210,8 +210,8 @@ scoresParser class constrastParser extends abstractColorPropertiesParser {} class abstractHtmlParser extends abstractTopLevelParser { - createParserCombinator() { - return new Particle.ParserCombinator(undefined, Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { content: contentParser }), undefined) + createParserPool() { + return new Particle.ParserPool(undefined, Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { content: contentParser }), undefined) } } @@ -229,10 +229,10 @@ scoresParser } class blockParser extends abstractTopLevelParser { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( undefined, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { hue: hueParser, saturation: saturationParser, constrast: constrastParser, @@ -257,8 +257,8 @@ scoresParser } class scoreBlockParser extends blockParser { - createParserCombinator() { - return new Particle.ParserCombinator(undefined, Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { scores: scoresParser }), undefined) + createParserPool() { + return new Particle.ParserPool(undefined, Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { scores: scoresParser }), undefined) } } @@ -331,8 +331,8 @@ world` } class someCodeParser extends abstractTopLevelParser { - createParserCombinator() { - return new Particle.ParserCombinator(lineOfCodeParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(lineOfCodeParser, undefined, undefined) } } @@ -346,8 +346,8 @@ world` } class contentParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(this._getBlobParserCatchAllParser()) + createParserPool() { + return new Particle.ParserPool(this._getBlobParserCatchAllParser()) } getErrors() { return [] @@ -373,8 +373,8 @@ world` } class textParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(this._getBlobParserCatchAllParser()) + createParserPool() { + return new Particle.ParserPool(this._getBlobParserCatchAllParser()) } getErrors() { return [] diff --git a/products/jibberish.nodejs.js b/products/jibberish.nodejs.js index 5ee4230b1..e66b156ab 100755 --- a/products/jibberish.nodejs.js +++ b/products/jibberish.nodejs.js @@ -6,10 +6,10 @@ const { ParserBackedParticle } = require("./Parsers.js") class jibberishParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( errorParser, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { extendsAbstract: extendsAbstractParser, hue: hueParser, saturation: saturationParser, @@ -216,8 +216,8 @@ scoresParser class constrastParser extends abstractColorPropertiesParser {} class abstractHtmlParser extends abstractTopLevelParser { - createParserCombinator() { - return new Particle.ParserCombinator(undefined, Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { content: contentParser }), undefined) + createParserPool() { + return new Particle.ParserPool(undefined, Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { content: contentParser }), undefined) } } @@ -235,10 +235,10 @@ scoresParser } class blockParser extends abstractTopLevelParser { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( undefined, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { hue: hueParser, saturation: saturationParser, constrast: constrastParser, @@ -263,8 +263,8 @@ scoresParser } class scoreBlockParser extends blockParser { - createParserCombinator() { - return new Particle.ParserCombinator(undefined, Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { scores: scoresParser }), undefined) + createParserPool() { + return new Particle.ParserPool(undefined, Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { scores: scoresParser }), undefined) } } @@ -337,8 +337,8 @@ world` } class someCodeParser extends abstractTopLevelParser { - createParserCombinator() { - return new Particle.ParserCombinator(lineOfCodeParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(lineOfCodeParser, undefined, undefined) } } @@ -352,8 +352,8 @@ world` } class contentParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(this._getBlobParserCatchAllParser()) + createParserPool() { + return new Particle.ParserPool(this._getBlobParserCatchAllParser()) } getErrors() { return [] @@ -379,8 +379,8 @@ world` } class textParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(this._getBlobParserCatchAllParser()) + createParserPool() { + return new Particle.ParserPool(this._getBlobParserCatchAllParser()) } getErrors() { return [] diff --git a/products/jibjab.browser.js b/products/jibjab.browser.js index cdf2d91c7..687aae4c9 100644 --- a/products/jibjab.browser.js +++ b/products/jibjab.browser.js @@ -1,9 +1,9 @@ { class jibberishParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( errorParser, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { extendsAbstract: extendsAbstractParser, hue: hueParser, saturation: saturationParser, @@ -223,8 +223,8 @@ scoresParser class constrastParser extends abstractColorPropertiesParser {} class abstractHtmlParser extends abstractTopLevelParser { - createParserCombinator() { - return new Particle.ParserCombinator(undefined, Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { content: contentParser }), undefined) + createParserPool() { + return new Particle.ParserPool(undefined, Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { content: contentParser }), undefined) } } @@ -242,10 +242,10 @@ scoresParser } class blockParser extends abstractTopLevelParser { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( undefined, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { hue: hueParser, saturation: saturationParser, constrast: constrastParser, @@ -271,8 +271,8 @@ scoresParser } class scoreBlockParser extends blockParser { - createParserCombinator() { - return new Particle.ParserCombinator(undefined, Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { scores: scoresParser }), undefined) + createParserPool() { + return new Particle.ParserPool(undefined, Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { scores: scoresParser }), undefined) } } @@ -345,8 +345,8 @@ world` } class someCodeParser extends abstractTopLevelParser { - createParserCombinator() { - return new Particle.ParserCombinator(lineOfCodeParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(lineOfCodeParser, undefined, undefined) } } @@ -360,8 +360,8 @@ world` } class commentParser extends abstractTopLevelParser { - createParserCombinator() { - return new Particle.ParserCombinator(commentParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(commentParser, undefined, undefined) } get commentAtom() { return this.getAtomsFrom(0) @@ -369,8 +369,8 @@ world` } class contentParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(this._getBlobParserCatchAllParser()) + createParserPool() { + return new Particle.ParserPool(this._getBlobParserCatchAllParser()) } getErrors() { return [] @@ -396,8 +396,8 @@ world` } class textParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(this._getBlobParserCatchAllParser()) + createParserPool() { + return new Particle.ParserPool(this._getBlobParserCatchAllParser()) } getErrors() { return [] diff --git a/products/jibjab.nodejs.js b/products/jibjab.nodejs.js index 49eea94eb..d66bc0b11 100755 --- a/products/jibjab.nodejs.js +++ b/products/jibjab.nodejs.js @@ -6,10 +6,10 @@ const { ParserBackedParticle } = require("./Parsers.js") class jibberishParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( errorParser, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { extendsAbstract: extendsAbstractParser, hue: hueParser, saturation: saturationParser, @@ -229,8 +229,8 @@ scoresParser class constrastParser extends abstractColorPropertiesParser {} class abstractHtmlParser extends abstractTopLevelParser { - createParserCombinator() { - return new Particle.ParserCombinator(undefined, Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { content: contentParser }), undefined) + createParserPool() { + return new Particle.ParserPool(undefined, Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { content: contentParser }), undefined) } } @@ -248,10 +248,10 @@ scoresParser } class blockParser extends abstractTopLevelParser { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( undefined, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { hue: hueParser, saturation: saturationParser, constrast: constrastParser, @@ -277,8 +277,8 @@ scoresParser } class scoreBlockParser extends blockParser { - createParserCombinator() { - return new Particle.ParserCombinator(undefined, Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { scores: scoresParser }), undefined) + createParserPool() { + return new Particle.ParserPool(undefined, Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { scores: scoresParser }), undefined) } } @@ -351,8 +351,8 @@ world` } class someCodeParser extends abstractTopLevelParser { - createParserCombinator() { - return new Particle.ParserCombinator(lineOfCodeParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(lineOfCodeParser, undefined, undefined) } } @@ -366,8 +366,8 @@ world` } class commentParser extends abstractTopLevelParser { - createParserCombinator() { - return new Particle.ParserCombinator(commentParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(commentParser, undefined, undefined) } get commentAtom() { return this.getAtomsFrom(0) @@ -375,8 +375,8 @@ world` } class contentParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(this._getBlobParserCatchAllParser()) + createParserPool() { + return new Particle.ParserPool(this._getBlobParserCatchAllParser()) } getErrors() { return [] @@ -402,8 +402,8 @@ world` } class textParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(this._getBlobParserCatchAllParser()) + createParserPool() { + return new Particle.ParserPool(this._getBlobParserCatchAllParser()) } getErrors() { return [] diff --git a/products/numbers.browser.js b/products/numbers.browser.js index 9f1f1bf67..9a90173f2 100644 --- a/products/numbers.browser.js +++ b/products/numbers.browser.js @@ -1,9 +1,9 @@ { class numbersParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( errorParser, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { "%": modParser, "*": timesParser, "+": addParser, "-": substractParser, "/": divideParser, comment: commentParser, "#!": hashBangParser }), + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { "%": modParser, "*": timesParser, "+": addParser, "-": substractParser, "/": divideParser, comment: commentParser, "#!": hashBangParser }), undefined ) } @@ -99,10 +99,10 @@ errorParser } class abstractArithmeticReducerParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( undefined, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { "%": modParser, "*": timesParser, "+": addParser, "-": substractParser, "/": divideParser, comment: commentParser }), + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { "%": modParser, "*": timesParser, "+": addParser, "-": substractParser, "/": divideParser, comment: commentParser }), undefined ) } @@ -148,8 +148,8 @@ errorParser } class commentParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(commentContentParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(commentContentParser, undefined, undefined) } get commentKeywordAtom() { return this.getAtom(0) @@ -160,8 +160,8 @@ errorParser } class commentContentParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(commentContentParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(commentContentParser, undefined, undefined) } get commentAtom() { return this.getAtomsFrom(0) diff --git a/products/numbers.nodejs.js b/products/numbers.nodejs.js index 2dfa5fbfb..bee6974b8 100755 --- a/products/numbers.nodejs.js +++ b/products/numbers.nodejs.js @@ -6,10 +6,10 @@ const { ParserBackedParticle } = require("./Parsers.js") class numbersParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( errorParser, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { "%": modParser, "*": timesParser, "+": addParser, "-": substractParser, "/": divideParser, comment: commentParser, "#!": hashBangParser }), + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { "%": modParser, "*": timesParser, "+": addParser, "-": substractParser, "/": divideParser, comment: commentParser, "#!": hashBangParser }), undefined ) } @@ -105,10 +105,10 @@ errorParser } class abstractArithmeticReducerParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( undefined, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { "%": modParser, "*": timesParser, "+": addParser, "-": substractParser, "/": divideParser, comment: commentParser }), + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { "%": modParser, "*": timesParser, "+": addParser, "-": substractParser, "/": divideParser, comment: commentParser }), undefined ) } @@ -154,8 +154,8 @@ errorParser } class commentParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(commentContentParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(commentContentParser, undefined, undefined) } get commentKeywordAtom() { return this.getAtom(0) @@ -166,8 +166,8 @@ errorParser } class commentContentParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(commentContentParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(commentContentParser, undefined, undefined) } get commentAtom() { return this.getAtomsFrom(0) diff --git a/products/parsers.browser.js b/products/parsers.browser.js index 9847129bc..5f4bd5c1a 100644 --- a/products/parsers.browser.js +++ b/products/parsers.browser.js @@ -1,7 +1,7 @@ { class parsersParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(catchAllErrorParser, Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { "//": slashCommentParser }), [ + createParserPool() { + return new Particle.ParserPool(catchAllErrorParser, Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { "//": slashCommentParser }), [ { regex: /^$/, parser: blankLineParser }, { regex: /^[a-zA-Z0-9_]+Atom$/, parser: atomTypeDefinitionParser }, { regex: /^[a-zA-Z0-9_]+Parser$/, parser: parserDefinitionParser } @@ -651,8 +651,8 @@ extendsAtomTypeParser } class parsersStringParser extends abstractConstantParser { - createParserCombinator() { - return new Particle.ParserCombinator(catchAllMultilineStringConstantParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(catchAllMultilineStringConstantParser, undefined, undefined) } get cueAtom() { return this.getAtom(0) @@ -716,10 +716,10 @@ extendsAtomTypeParser } class parsersCompilerParser extends abstractParserRuleParser { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( undefined, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { closeSubparticles: closeSubparticlesParser, indentCharacter: indentCharacterParser, catchAllAtomDelimiter: catchAllAtomDelimiterParser, @@ -748,8 +748,8 @@ extendsAtomTypeParser } class parsersExampleParser extends abstractParserRuleParser { - createParserCombinator() { - return new Particle.ParserCombinator(catchAllExampleLineParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(catchAllExampleLineParser, undefined, undefined) } get exampleAnyAtom() { return this.getAtomsFrom(0) @@ -781,8 +781,8 @@ extendsAtomTypeParser } class parsersJavascriptParser extends abstractParserRuleParser { - createParserCombinator() { - return new Particle.ParserCombinator(catchAllJavascriptCodeLineParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(catchAllJavascriptCodeLineParser, undefined, undefined) } format() { if (this.isNodeJs()) { @@ -874,8 +874,8 @@ extendsAtomTypeParser } class catchAllExampleLineParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(catchAllExampleLineParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(catchAllExampleLineParser, undefined, undefined) } get exampleAnyAtom() { return this.getAtom(0) @@ -886,8 +886,8 @@ extendsAtomTypeParser } class catchAllJavascriptCodeLineParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(catchAllJavascriptCodeLineParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(catchAllJavascriptCodeLineParser, undefined, undefined) } get javascriptCodeAtom() { return this.getAtomsFrom(0) @@ -895,8 +895,8 @@ extendsAtomTypeParser } class catchAllMultilineStringConstantParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(catchAllMultilineStringConstantParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(catchAllMultilineStringConstantParser, undefined, undefined) } get stringAtom() { return this.getAtom(0) @@ -907,10 +907,10 @@ extendsAtomTypeParser } class atomTypeDefinitionParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( undefined, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { description: atomTypeDescriptionParser, enumFromAtomTypes: enumFromAtomTypesParser, enum: parsersEnumParser, @@ -995,10 +995,10 @@ extendsAtomTypeParser } class parserDefinitionParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( catchAllErrorParser, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { boolean: parsersBooleanParser, float: parsersFloatParser, int: parsersIntParser, @@ -1065,8 +1065,8 @@ extendsAtomTypeParser } class slashCommentParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(commentLineParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(commentLineParser, undefined, undefined) } get commentAtom() { return this.getAtomsFrom(0) diff --git a/products/parsers.nodejs.js b/products/parsers.nodejs.js index e90af4fe8..0930b79a9 100755 --- a/products/parsers.nodejs.js +++ b/products/parsers.nodejs.js @@ -6,8 +6,8 @@ const { ParserBackedParticle } = require("./Parsers.js") class parsersParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(catchAllErrorParser, Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { "//": slashCommentParser }), [ + createParserPool() { + return new Particle.ParserPool(catchAllErrorParser, Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { "//": slashCommentParser }), [ { regex: /^$/, parser: blankLineParser }, { regex: /^[a-zA-Z0-9_]+Atom$/, parser: atomTypeDefinitionParser }, { regex: /^[a-zA-Z0-9_]+Parser$/, parser: parserDefinitionParser } @@ -657,8 +657,8 @@ extendsAtomTypeParser } class parsersStringParser extends abstractConstantParser { - createParserCombinator() { - return new Particle.ParserCombinator(catchAllMultilineStringConstantParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(catchAllMultilineStringConstantParser, undefined, undefined) } get cueAtom() { return this.getAtom(0) @@ -722,10 +722,10 @@ extendsAtomTypeParser } class parsersCompilerParser extends abstractParserRuleParser { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( undefined, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { closeSubparticles: closeSubparticlesParser, indentCharacter: indentCharacterParser, catchAllAtomDelimiter: catchAllAtomDelimiterParser, @@ -754,8 +754,8 @@ extendsAtomTypeParser } class parsersExampleParser extends abstractParserRuleParser { - createParserCombinator() { - return new Particle.ParserCombinator(catchAllExampleLineParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(catchAllExampleLineParser, undefined, undefined) } get exampleAnyAtom() { return this.getAtomsFrom(0) @@ -787,8 +787,8 @@ extendsAtomTypeParser } class parsersJavascriptParser extends abstractParserRuleParser { - createParserCombinator() { - return new Particle.ParserCombinator(catchAllJavascriptCodeLineParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(catchAllJavascriptCodeLineParser, undefined, undefined) } format() { if (this.isNodeJs()) { @@ -880,8 +880,8 @@ extendsAtomTypeParser } class catchAllExampleLineParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(catchAllExampleLineParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(catchAllExampleLineParser, undefined, undefined) } get exampleAnyAtom() { return this.getAtom(0) @@ -892,8 +892,8 @@ extendsAtomTypeParser } class catchAllJavascriptCodeLineParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(catchAllJavascriptCodeLineParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(catchAllJavascriptCodeLineParser, undefined, undefined) } get javascriptCodeAtom() { return this.getAtomsFrom(0) @@ -901,8 +901,8 @@ extendsAtomTypeParser } class catchAllMultilineStringConstantParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(catchAllMultilineStringConstantParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(catchAllMultilineStringConstantParser, undefined, undefined) } get stringAtom() { return this.getAtom(0) @@ -913,10 +913,10 @@ extendsAtomTypeParser } class atomTypeDefinitionParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( undefined, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { description: atomTypeDescriptionParser, enumFromAtomTypes: enumFromAtomTypesParser, enum: parsersEnumParser, @@ -1001,10 +1001,10 @@ extendsAtomTypeParser } class parserDefinitionParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( catchAllErrorParser, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { boolean: parsersBooleanParser, float: parsersFloatParser, int: parsersIntParser, @@ -1071,8 +1071,8 @@ extendsAtomTypeParser } class slashCommentParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(commentLineParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(commentLineParser, undefined, undefined) } get commentAtom() { return this.getAtomsFrom(0) diff --git a/products/poop.browser.js b/products/poop.browser.js index 8166abf6e..f064c5b40 100644 --- a/products/poop.browser.js +++ b/products/poop.browser.js @@ -1,7 +1,7 @@ { class poopParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(this._getBlobParserCatchAllParser(), Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { "🌄": dayParser }), [ + createParserPool() { + return new Particle.ParserPool(this._getBlobParserCatchAllParser(), Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { "🌄": dayParser }), [ { regex: /💩/, parser: bowelParser }, { regex: /✨/, parser: bladderParser }, { regex: /🍼/, parser: bottleParser }, diff --git a/products/poop.nodejs.js b/products/poop.nodejs.js index f27399fa8..c44081d03 100755 --- a/products/poop.nodejs.js +++ b/products/poop.nodejs.js @@ -6,8 +6,8 @@ const { ParserBackedParticle } = require("./Parsers.js") class poopParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(this._getBlobParserCatchAllParser(), Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { "🌄": dayParser }), [ + createParserPool() { + return new Particle.ParserPool(this._getBlobParserCatchAllParser(), Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { "🌄": dayParser }), [ { regex: /💩/, parser: bowelParser }, { regex: /✨/, parser: bladderParser }, { regex: /🍼/, parser: bottleParser }, diff --git a/products/project.browser.js b/products/project.browser.js index df9c3b370..122286426 100644 --- a/products/project.browser.js +++ b/products/project.browser.js @@ -1,7 +1,7 @@ { class projectParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(errorParser, Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { file: fileParser }), undefined) + createParserPool() { + return new Particle.ParserPool(errorParser, Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { file: fileParser }), undefined) } getScriptPathsInCorrectDependencyOrder() { const cloned = this.clone() @@ -217,8 +217,8 @@ fileParser } class fileParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(undefined, Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { absolute: absoluteParser, external: externalParser, relative: relativeParser }), undefined) + createParserPool() { + return new Particle.ParserPool(undefined, Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { absolute: absoluteParser, external: externalParser, relative: relativeParser }), undefined) } get fileConstantAtom() { return this.getAtom(0) diff --git a/products/project.nodejs.js b/products/project.nodejs.js index 77ff339ca..32b052712 100755 --- a/products/project.nodejs.js +++ b/products/project.nodejs.js @@ -6,8 +6,8 @@ const { ParserBackedParticle } = require("./Parsers.js") class projectParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(errorParser, Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { file: fileParser }), undefined) + createParserPool() { + return new Particle.ParserPool(errorParser, Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { file: fileParser }), undefined) } getScriptPathsInCorrectDependencyOrder() { const cloned = this.clone() @@ -223,8 +223,8 @@ fileParser } class fileParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(undefined, Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { absolute: absoluteParser, external: externalParser, relative: relativeParser }), undefined) + createParserPool() { + return new Particle.ParserPool(undefined, Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { absolute: absoluteParser, external: externalParser, relative: relativeParser }), undefined) } get fileConstantAtom() { return this.getAtom(0) diff --git a/products/stamp.browser.js b/products/stamp.browser.js index 63a8b1e00..8ed77b7dc 100644 --- a/products/stamp.browser.js +++ b/products/stamp.browser.js @@ -1,7 +1,7 @@ { class stampParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(errorParser, Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { "#!": hashbangParser, file: fileParser, folder: folderParser }), undefined) + createParserPool() { + return new Particle.ParserPool(errorParser, Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { "#!": hashbangParser, file: fileParser, folder: folderParser }), undefined) } async executeSeries(parentDir) { const length = this.length @@ -245,8 +245,8 @@ folderParser } class catchAllAnyLineParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(catchAllAnyLineParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(catchAllAnyLineParser, undefined, undefined) } get anyAtom() { return this.getAtom(0) @@ -257,8 +257,8 @@ folderParser } class dataParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(catchAllAnyLineParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(catchAllAnyLineParser, undefined, undefined) } get cueAtom() { return this.getAtom(0) @@ -278,8 +278,8 @@ folderParser } class fileParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(undefined, Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { data: dataParser, executable: executableParser }), undefined) + createParserPool() { + return new Particle.ParserPool(undefined, Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { data: dataParser, executable: executableParser }), undefined) } get cueAtom() { return this.getAtom(0) diff --git a/products/stamp.nodejs.js b/products/stamp.nodejs.js index 827e8a284..5e169a073 100755 --- a/products/stamp.nodejs.js +++ b/products/stamp.nodejs.js @@ -6,8 +6,8 @@ const { ParserBackedParticle } = require("./Parsers.js") class stampParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(errorParser, Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { "#!": hashbangParser, file: fileParser, folder: folderParser }), undefined) + createParserPool() { + return new Particle.ParserPool(errorParser, Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { "#!": hashbangParser, file: fileParser, folder: folderParser }), undefined) } async executeSeries(parentDir) { const length = this.length @@ -251,8 +251,8 @@ folderParser } class catchAllAnyLineParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(catchAllAnyLineParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(catchAllAnyLineParser, undefined, undefined) } get anyAtom() { return this.getAtom(0) @@ -263,8 +263,8 @@ folderParser } class dataParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(catchAllAnyLineParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(catchAllAnyLineParser, undefined, undefined) } get cueAtom() { return this.getAtom(0) @@ -284,8 +284,8 @@ folderParser } class fileParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(undefined, Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { data: dataParser, executable: executableParser }), undefined) + createParserPool() { + return new Particle.ParserPool(undefined, Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { data: dataParser, executable: executableParser }), undefined) } get cueAtom() { return this.getAtom(0) diff --git a/products/stump.browser.js b/products/stump.browser.js index a1b3043e6..bc4015a8f 100644 --- a/products/stump.browser.js +++ b/products/stump.browser.js @@ -1,9 +1,9 @@ { class stumpParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( errorParser, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { blockquote: htmlTagParser, colgroup: htmlTagParser, datalist: htmlTagParser, @@ -414,10 +414,10 @@ bernParser } class htmlTagParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( undefined, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { blockquote: htmlTagParser, colgroup: htmlTagParser, datalist: htmlTagParser, @@ -888,8 +888,8 @@ bernParser } class htmlAttributeParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(errorParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(errorParser, undefined, undefined) } get htmlAttributeNameAtom() { return this.getAtom(0) @@ -921,8 +921,8 @@ bernParser } class lineOfHtmlContentParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(lineOfHtmlContentParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(lineOfHtmlContentParser, undefined, undefined) } get anyHtmlContentAtom() { return this.getAtomsFrom(0) @@ -936,8 +936,8 @@ bernParser } class bernParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(lineOfHtmlContentParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(lineOfHtmlContentParser, undefined, undefined) } get bernKeywordAtom() { return this.getAtom(0) diff --git a/products/stump.nodejs.js b/products/stump.nodejs.js index ff1da5dc3..a2cf6a36d 100755 --- a/products/stump.nodejs.js +++ b/products/stump.nodejs.js @@ -6,10 +6,10 @@ const { ParserBackedParticle } = require("./Parsers.js") class stumpParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( errorParser, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { blockquote: htmlTagParser, colgroup: htmlTagParser, datalist: htmlTagParser, @@ -420,10 +420,10 @@ bernParser } class htmlTagParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( undefined, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { blockquote: htmlTagParser, colgroup: htmlTagParser, datalist: htmlTagParser, @@ -894,8 +894,8 @@ bernParser } class htmlAttributeParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(errorParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(errorParser, undefined, undefined) } get htmlAttributeNameAtom() { return this.getAtom(0) @@ -927,8 +927,8 @@ bernParser } class lineOfHtmlContentParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(lineOfHtmlContentParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(lineOfHtmlContentParser, undefined, undefined) } get anyHtmlContentAtom() { return this.getAtomsFrom(0) @@ -942,8 +942,8 @@ bernParser } class bernParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(lineOfHtmlContentParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(lineOfHtmlContentParser, undefined, undefined) } get bernKeywordAtom() { return this.getAtom(0) diff --git a/products/swarm.browser.js b/products/swarm.browser.js index 4cce1b0ed..998634651 100644 --- a/products/swarm.browser.js +++ b/products/swarm.browser.js @@ -1,9 +1,9 @@ { class swarmParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( errorParser, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { test: testParser, testOnly: testOnlyParser, skipTest: skipTestParser, "#!": hashbangParser, arrange: arrangeParser }), + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { test: testParser, testOnly: testOnlyParser, skipTest: skipTestParser, "#!": hashbangParser, arrange: arrangeParser }), undefined ) } @@ -402,8 +402,8 @@ todoParser } class assertParagraphIsParser extends abstractAssertionParser { - createParserCombinator() { - return new Particle.ParserCombinator(paragraphLineParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(paragraphLineParser, undefined, undefined) } getExpected() { return this.subparticlesToString() @@ -493,8 +493,8 @@ todoParser class arrangeStaticParser extends abstractArrangeFlagParser {} class abstractTestBlockParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(actParser, Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { arrange: arrangeParser }), undefined) + createParserPool() { + return new Particle.ParserPool(actParser, Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { arrange: arrangeParser }), undefined) } get cueAtom() { return this.getAtom(0) @@ -557,10 +557,10 @@ todoParser } class arrangeParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( undefined, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { async: arrangeAsyncParser, require: arrangeRequireParser, static: arrangeStaticParser, @@ -600,8 +600,8 @@ todoParser } class withParagraphParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(paragraphLineParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(paragraphLineParser, undefined, undefined) } get parameterKeywordAtom() { return this.getAtom(0) @@ -610,10 +610,10 @@ todoParser } class actParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( actParser, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { assertParagraphIs: assertParagraphIsParser, assertLengthIs: assertLengthIsParser, assertStringExcludes: assertStringExcludesParser, @@ -660,8 +660,8 @@ todoParser } class constructWithParagraphParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(paragraphLineParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(paragraphLineParser, undefined, undefined) } get cueAtom() { return this.getAtom(0) @@ -676,8 +676,8 @@ todoParser } class paragraphLineParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(paragraphLineParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(paragraphLineParser, undefined, undefined) } get anyAtom() { return this.getAtom(0) @@ -688,8 +688,8 @@ todoParser } class todoParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(todoParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(todoParser, undefined, undefined) } get todoKeywordAtom() { return this.getAtom(0) diff --git a/products/swarm.nodejs.js b/products/swarm.nodejs.js index 27de985b2..9298d4e76 100755 --- a/products/swarm.nodejs.js +++ b/products/swarm.nodejs.js @@ -6,10 +6,10 @@ const { ParserBackedParticle } = require("./Parsers.js") class swarmParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( errorParser, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { test: testParser, testOnly: testOnlyParser, skipTest: skipTestParser, "#!": hashbangParser, arrange: arrangeParser }), + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { test: testParser, testOnly: testOnlyParser, skipTest: skipTestParser, "#!": hashbangParser, arrange: arrangeParser }), undefined ) } @@ -408,8 +408,8 @@ todoParser } class assertParagraphIsParser extends abstractAssertionParser { - createParserCombinator() { - return new Particle.ParserCombinator(paragraphLineParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(paragraphLineParser, undefined, undefined) } getExpected() { return this.subparticlesToString() @@ -499,8 +499,8 @@ todoParser class arrangeStaticParser extends abstractArrangeFlagParser {} class abstractTestBlockParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(actParser, Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { arrange: arrangeParser }), undefined) + createParserPool() { + return new Particle.ParserPool(actParser, Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { arrange: arrangeParser }), undefined) } get cueAtom() { return this.getAtom(0) @@ -563,10 +563,10 @@ todoParser } class arrangeParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( undefined, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { async: arrangeAsyncParser, require: arrangeRequireParser, static: arrangeStaticParser, @@ -606,8 +606,8 @@ todoParser } class withParagraphParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(paragraphLineParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(paragraphLineParser, undefined, undefined) } get parameterKeywordAtom() { return this.getAtom(0) @@ -616,10 +616,10 @@ todoParser } class actParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator( + createParserPool() { + return new Particle.ParserPool( actParser, - Object.assign(Object.assign({}, super.createParserCombinator()._getCueMapAsObject()), { + Object.assign(Object.assign({}, super.createParserPool()._getCueMapAsObject()), { assertParagraphIs: assertParagraphIsParser, assertLengthIs: assertLengthIsParser, assertStringExcludes: assertStringExcludesParser, @@ -666,8 +666,8 @@ todoParser } class constructWithParagraphParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(paragraphLineParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(paragraphLineParser, undefined, undefined) } get cueAtom() { return this.getAtom(0) @@ -682,8 +682,8 @@ todoParser } class paragraphLineParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(paragraphLineParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(paragraphLineParser, undefined, undefined) } get anyAtom() { return this.getAtom(0) @@ -694,8 +694,8 @@ todoParser } class todoParser extends ParserBackedParticle { - createParserCombinator() { - return new Particle.ParserCombinator(todoParser, undefined, undefined) + createParserPool() { + return new Particle.ParserPool(todoParser, undefined, undefined) } get todoKeywordAtom() { return this.getAtom(0) diff --git a/releaseNotes.scroll b/releaseNotes.scroll index c844a0295..a604916ad 100644 --- a/releaseNotes.scroll +++ b/releaseNotes.scroll @@ -20,6 +20,10 @@ node_modules/scroll-cli/microlangs/changes.parsers thinColumns 4 +📦 101.0.0 2025-01-31 +⚠️ BREAKING: (no one should be affected) renamed ParserCombinator to ParserPool +⚠️ BREAKING: (no one should be affected) renamed internal methods: _getParser > _getMatchingParser; _getParser > _getParserPool + 📦 100.3.0 2025-01-24 🏥 catch circular import errors in Fusion