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

Jump to bottom

Small bugfixes #52

Closed
wants to merge 2 commits into from
Closed

Small bugfixes #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f7d8d5
Clamp interval end to sourcemap size
Jul 14, 2020
8afcaeb
Handle special root node case
Jul 16, 2020
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
1 change: 1 addition & 0 deletions packages/Ohm-Core.package/OhmNode.class/instance/enclosingRule.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ enclosingRule

| aParent |
aParent := self parent.
aParent ifNil: [ ^ self ].
[aParent ruleName = OhmParsingExpression listRuleIdentifier] whileTrue: [
aParent := aParent parent].
^ aParent
2 changes: 1 addition & 1 deletion packages/Ohm-Core.package/OhmNode.class/methodProperties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"calculateSourceMap" : "pre 7/13/2020 10:41",
"children" : "pre 1/5/2015 16:06",
"children:" : "pre 1/5/2015 16:06",
"enclosingRule" : "pre 7/13/2020 11:20",
"enclosingRule" : "fau 7/16/2020 16:17",
"grammar" : "pre 1/5/2015 15:38",
"grammar:" : "pre 1/5/2015 15:38",
"initialize" : "pre 11/21/2017 15:29",
Expand Down
5 changes: 3 additions & 2 deletions packages/Ohm-Core.package/OhmSourceMapping.class/instance/terminalExpression..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
standard attributes
terminalExpression: aNode

aNode interval start to: aNode interval end do: [:i |
(self sourceMap at: i) add: aNode]
aNode interval start
to: (aNode interval end min: self sourceMap size)
do: [:i | (self sourceMap at: i) add: aNode]
2 changes: 1 addition & 1 deletion packages/Ohm-Core.package/OhmSourceMapping.class/methodProperties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
"defaultExpression:" : "pre 7/13/2020 11:02",
"sourceMap" : "pre 4/29/2020 10:20",
"sourceMap:" : "pre 4/29/2020 10:20",
"terminalExpression:" : "pre 7/13/2020 11:01" } }
"terminalExpression:" : "fau 7/14/2020 15:24" } }