Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

perf(parser): remove backtracking #25

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

perf(parser): remove backtracking #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions src/parser/base.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,13 @@ class BaseParser extends EmbeddedActionsParser {
})

/**
* Consume a value
* @method #value
* Consume a non-string value
* @method #nonStringValue
* @memberof module:kdljs.parser.base.BaseParser
* @return {module:kdljs~Value}
*/
this.RULE('value', () => {
this.RULE('nonStringValue', () => {
return this.OR([
{ ALT: () => this.SUBRULE(this.string) },
{ ALT: () => this.CONSUME(Tokens.Boolean).image === '#true' },
{
ALT: () => {
Expand Down Expand Up @@ -117,6 +116,19 @@ class BaseParser extends EmbeddedActionsParser {
])
})

/**
* Consume a value
* @method #value
* @memberof module:kdljs.parser.base.BaseParser
* @return {module:kdljs~Value}
*/
this.RULE('value', () => {
return this.OR([
{ ALT: () => this.SUBRULE(this.string) },
{ ALT: () => this.SUBRULE(this.nonStringValue) }
])
})

/**
* Consume a normal string
* @method #string
Expand Down Expand Up @@ -376,12 +388,15 @@ class BaseParser extends EmbeddedActionsParser {
* Consume node space
* @method #nodeSpace
* @memberof module:kdljs.parser.kdl.BaseParser
* @returns {boolean}
*/
this.RULE('nodeSpace', () => {
this.AT_LEAST_ONE(() => this.OR([
{ ALT: () => this.SUBRULE(this.whiteSpace) },
{ ALT: () => this.SUBRULE(this.lineContinuation) }
]))

return true
})

/**
Expand Down
118 changes: 68 additions & 50 deletions src/parser/kdl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,26 +143,24 @@ class KdlParser extends BaseParser {
let entriesEnded = false
let childrenEnded = false

let hasSpace = this.OPTION2(() => this.SUBRULE1(this.nodeSpace))

this.MANY({
GATE: () => !nodeEndTokens.has(this.LA(1).tokenType),
GATE: () => hasSpace && !nodeEndTokens.has(this.LA(1).tokenType),
DEF: () => {
this.SUBRULE1(this.nodeSpace)

this.OR([
{
GATE: () => !entriesEnded && this.BACKTRACK(this.property).call(this),
GATE: () => !entriesEnded,
ALT: () => {
const parts = this.SUBRULE(this.property)
node.properties[parts[0]] = parts[1]
node.tags.properties[parts[0]] = parts[2]
}
},
{
GATE: () => !entriesEnded && this.BACKTRACK(this.argument).call(this),
ALT: () => {
const parts = this.SUBRULE(this.argument)
node.values.push(parts[0])
node.tags.values.push(parts[1])
const parts = this.SUBRULE(this.propertyOrArgument)
if (parts[0] != null) {
node.properties[parts[0]] = parts[1]
node.tags.properties[parts[0]] = parts[2]
} else {
node.values.push(parts[1])
node.tags.values.push(parts[2])
}
hasSpace = parts[3]
}
},
{
Expand All @@ -171,33 +169,30 @@ class KdlParser extends BaseParser {
node.children = this.SUBRULE(this.nodeChildren)
entriesEnded = true
childrenEnded = true
hasSpace = this.OPTION3(() => this.SUBRULE2(this.nodeSpace))
}
},
{
ALT: () => {
this.CONSUME(Tokens.BlockComment)
this.OPTION2(() => this.SUBRULE(this.lineSpace))
this.OPTION4(() => this.SUBRULE(this.lineSpace))
this.OR1([
{
GATE: () => !entriesEnded && this.BACKTRACK(this.property).call(this),
ALT: () => this.SUBRULE1(this.property)
},
{
GATE: () => !entriesEnded && this.BACKTRACK(this.argument).call(this),
ALT: () => this.SUBRULE1(this.argument)
GATE: () => !entriesEnded,
ALT: () => {
const parts = this.SUBRULE1(this.propertyOrArgument)
hasSpace = parts[3]
}
},
{
ALT: () => {
this.SUBRULE1(this.nodeChildren)
entriesEnded = true
hasSpace = this.OPTION5(() => this.SUBRULE3(this.nodeSpace))
}
}
])
}
},
{
GATE: () => nodeEndTokens.has(this.LA(1).tokenType),
ALT: () => {}
}
])
}
Expand All @@ -211,34 +206,57 @@ class KdlParser extends BaseParser {
})

/**
* Consume a property
* @method #property
* Consume a property or an argument
* @method #propertyOrArgument
* @memberof module:kdljs.parser.kdl.KdlParser
* @return {Array<module:kdljs~Value>} key-value-type tuple
*/
this.RULE('property', () => {
const key = this.SUBRULE(this.string)
this.OPTION(() => this.SUBRULE(this.nodeSpace))
this.CONSUME(Tokens.Equals)
this.OPTION1(() => this.SUBRULE1(this.nodeSpace))
const parts = this.SUBRULE(this.argument)
return [key, parts[0], parts[1]]
})
this.RULE('propertyOrArgument', () => {
return this.OR([
{
ALT: () => {
const tag = this.SUBRULE(this.tag)
this.OPTION(() => this.SUBRULE(this.nodeSpace))
const value = this.SUBRULE(this.value)
const hasSpaceAfter = this.OPTION1(() => this.SUBRULE1(this.nodeSpace))
return [undefined, value, tag, hasSpaceAfter]
}
},
{
ALT: () => {
const value = this.SUBRULE(this.nonStringValue)
const hasSpaceAfter = this.OPTION2(() => this.SUBRULE2(this.nodeSpace))
return [undefined, value, undefined, hasSpaceAfter]
}
},
{
ALT: () => {
let name
let tag

/**
* Consume an argument
* @method #argument
* @memberof module:kdljs.parser.kdl.KdlParser
* @return {Array<module:kdljs~Value>} value-type tuple
*/
this.RULE('argument', () => {
const tag = this.OPTION(() => {
const tag = this.SUBRULE(this.tag)
this.OPTION1(() => this.SUBRULE(this.nodeSpace))
return tag
})
const value = this.SUBRULE(this.value)
return [value, tag]
let value = this.SUBRULE(this.string)
let hasSpaceAfter = this.OPTION3(() => this.SUBRULE3(this.nodeSpace))

this.OPTION4(() => {
this.CONSUME(Tokens.Equals)
this.OPTION5(() => this.SUBRULE4(this.nodeSpace))

name = value

tag = this.OPTION6(() => {
const tag = this.SUBRULE1(this.tag)
this.OPTION7(() => this.SUBRULE5(this.nodeSpace))
return tag
})

value = this.SUBRULE1(this.value)
hasSpaceAfter = this.OPTION8(() => this.SUBRULE6(this.nodeSpace))
})

return [name, value, tag, hasSpaceAfter]
}
}
])
})

/**
Expand Down