if significant whitespace
#16
Conversation
- Use stack to track `if` blocks and match alternate blocks correctly - catch out-of-place `elif` keywords - Add fixtures
wcjohnson
force-pushed
the
upstream/if-significant-whitespace
branch
from
002b09c to
bfa1aa8
Compare
| } | ||
|
|
||
| case tt._else: | ||
| case tt._else: case tt._elif: |
src/plugins/lightscript.js
Outdated
| }; | ||
|
|
||
| pp.pushBlockState = function (blockType, indentLevel) { | ||
| this.state.blockStack = this.state.blockStack || []; |
There was a problem hiding this comment.
let's just initialize in src/tokenizer/state.js
src/plugins/lightscript.js
Outdated
|
|
||
| pp.matchBlockState = function(blockType, indentLevel) { | ||
| const stack = this.state.blockStack; | ||
| return (stack && stack.find( (x) => x.blockType === blockType && x.indentLevel === indentLevel )) |
There was a problem hiding this comment.
just return stack.some(x => x.blockType === blockType && x.indentLevel === indentLevel) should be good
src/plugins/lightscript.js
Outdated
| // clause does not match the current `if` -- so unwind the recursive descent. | ||
| const alternateIndentLevel = this.state.indentLevel; | ||
| if ( | ||
| ( alternateIndentLevel !== ifIndentLevel ) && |
There was a problem hiding this comment.
I try to avoid style nits, but the extra spaces here don't match (though I personally prefer them as well)
| @@ -0,0 +1,3 @@ | |||
| { | |||
There was a problem hiding this comment.
this test should be changed to:
x =
if false: 1
elif true:
2and should still pass.
An additional test should be added with the name over-indented-elif (or similar) that fails with this error message.
| @@ -0,0 +1,6 @@ | |||
| x = if a: | |||
| if(b) { | |||
| @@ -0,0 +1,4 @@ | |||
| x = if a: | |||
| if b: c | |||
There was a problem hiding this comment.
should also have
x = if a:
if b: c
elif d: e
else:
fshould probably also have
if (a) {
b
if c:
d
elif e:
f
} else {
g
}|
|
||
| pp.pushBlockState = function (blockType, indentLevel) { | ||
| this.state.blockStack = this.state.blockStack || []; | ||
| this.state.blockStack.push({ blockType, indentLevel }); |
There was a problem hiding this comment.
have you played with try/catch at all yet? would rather just track indentLevel in something like this.state.ifBlockStack instead of an object if we're only using one blockType.
There was a problem hiding this comment.
Definitely some issues with try/catch:
try:
a()
try:
b()
catch e:
c()
finally:
d()unknown: Missing catch or finally clause (1:0)
> 1 | try:
| ^
2 | a()
3 | try:
4 | b()
- Initialize state in tokenizer/state - Misc cleanup
|
Comments have been addressed |
2 participants
Fixes lightscript/lightscript#22
ifs: if an alternate clause could close a higher whiteblockifat the same indent level, it always closes the matching whiteblock rather than any innerif.elifas an unexpected else block.