Skip to content

Remove the unreachable VAR (FINAL | STATIC) alternative #69

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

Merged
ghedwards merged 1 commit into from
Aug 13, 2026
+251 −3
Merged

Remove the unreachable VAR (FINAL | STATIC) alternative #69

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
13 changes: 10 additions & 3 deletions cfml.parsing/src/main/antlr4/cfml/CFSCRIPTParser.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,13 +509,20 @@ cfmlExpression
| importStatement EOF
;

// FINAL is Lucee's immutable local; it takes the same shape as VAR and may combine
// with it, as in `final var x = 1;`.
// FINAL is Lucee's immutable local; it takes the same shape as VAR and may lead it, as in
// `final var x = 1;`.
// STATIC sits here alongside FINAL because `static x = 1;` is a declaration, not a function.
// Without it, STATIC is only reachable as a functionModifier, so functionDeclaration wins
// prediction and then finds no FUNCTION token -- see #63.
//
// The modifier only ever leads. A trailing `VAR (FINAL | STATIC)` alternative used to sit here
// and could not match anything: both words are in the identifier rule, put there by #46 so code
// naming a variable `final` keeps working, so `var final` matches the plain VAR alternative with
// `final` as the identifier before the longer one is considered. That reading is the correct one
// -- tree-sitter-cfml's corpus tests `var final = getValue();` as a local named final -- so the
// alternative was removed rather than made reachable. See #68.
localAssignmentExpression
: (VAR | (FINAL | STATIC) VAR? | VAR (FINAL | STATIC)) left=startExpression ( (EQUALSOP otherIdentifiers)* EQUALSOP right=startExpression )? //-> ^( VARLOCAL identifier ( EQUALSOP baseExpression )? )
: (VAR | (FINAL | STATIC) VAR?) left=startExpression ( (EQUALSOP otherIdentifiers)* EQUALSOP right=startExpression )? //-> ^( VARLOCAL identifier ( EQUALSOP baseExpression )? )
;

otherIdentifiers:
Expand Down
9 changes: 9 additions & 0 deletions cfml.parsing/src/test/resources/cfml/tests/expressions/var_modifiers_68.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
var plain = 1;
final immutable = 2;
static shared = 3;
final var finalLocal = 4;
static var staticLocal = 5;
final = getValue();
var final = getValue();
static = getValue();
var static = getValue();
232 changes: 232 additions & 0 deletions cfml.parsing/src/test/resources/cfml/tests/expressions/var_modifiers_68.expected.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,232 @@
/*===TOKENS===*/
VAR <var>
IDENTIFIER <plain>
'=' <=>
INTEGER_LITERAL <1>
';' <;>
Hidden:NEWLINE <>
FINAL <final>
IDENTIFIER <immutable>
'=' <=>
INTEGER_LITERAL <2>
';' <;>
Hidden:NEWLINE <>
STATIC <static>
IDENTIFIER <shared>
'=' <=>
INTEGER_LITERAL <3>
';' <;>
Hidden:NEWLINE <>
FINAL <final>
VAR <var>
IDENTIFIER <finalLocal>
'=' <=>
INTEGER_LITERAL <4>
';' <;>
Hidden:NEWLINE <>
STATIC <static>
VAR <var>
IDENTIFIER <staticLocal>
'=' <=>
INTEGER_LITERAL <5>
';' <;>
Hidden:NEWLINE <>
FINAL <final>
'=' <=>
IDENTIFIER <getValue>
'(' <(>
')' <)>
';' <;>
Hidden:NEWLINE <>
VAR <var>
FINAL <final>
'=' <=>
IDENTIFIER <getValue>
'(' <(>
')' <)>
';' <;>
Hidden:NEWLINE <>
STATIC <static>
'=' <=>
IDENTIFIER <getValue>
'(' <(>
')' <)>
';' <;>
Hidden:NEWLINE <>
VAR <var>
STATIC <static>
'=' <=>
IDENTIFIER <getValue>
'(' <(>
')' <)>
';' <;>
Hidden:NEWLINE <>
/*===TREE===*/
(scriptBlock
(element
(statement
(localAssignmentExpression
var
(startExpression
(baseExpression (unaryExpression (memberExpression (identifier plain))))
)
=
(startExpression
(baseExpression (unaryExpression (primaryExpression (literalExpression 1))))
)
)
(endOfStatement ;)
)
)
(element
(statement
(localAssignmentExpression
final
(startExpression
(baseExpression (unaryExpression (memberExpression (identifier immutable))))
)
=
(startExpression
(baseExpression (unaryExpression (primaryExpression (literalExpression 2))))
)
)
(endOfStatement ;)
)
)
(element
(statement
(localAssignmentExpression
static
(startExpression
(baseExpression (unaryExpression (memberExpression (identifier shared))))
)
=
(startExpression
(baseExpression (unaryExpression (primaryExpression (literalExpression 3))))
)
)
(endOfStatement ;)
)
)
(element
(statement
(localAssignmentExpression
final
var
(startExpression
(baseExpression (unaryExpression (memberExpression (identifier finalLocal))))
)
=
(startExpression
(baseExpression (unaryExpression (primaryExpression (literalExpression 4))))
)
)
(endOfStatement ;)
)
)
(element
(statement
(localAssignmentExpression
static
var
(startExpression
(baseExpression (unaryExpression (memberExpression (identifier staticLocal))))
)
=
(startExpression
(baseExpression (unaryExpression (primaryExpression (literalExpression 5))))
)
)
(endOfStatement ;)
)
)
(element
(statement
(assignmentExpression
(startExpression
(baseExpression (unaryExpression (memberExpression (identifier final))))
)
=
(startExpression
(baseExpression
(unaryExpression
(memberExpression (functionCall (identifier getValue) ( argumentList )))
)
)
)
)
(endOfStatement ;)
)
)
(element
(statement
(localAssignmentExpression
var
(startExpression
(baseExpression (unaryExpression (memberExpression (identifier final))))
)
=
(startExpression
(baseExpression
(unaryExpression
(memberExpression (functionCall (identifier getValue) ( argumentList )))
)
)
)
)
(endOfStatement ;)
)
)
(element
(statement
(assignmentExpression
(startExpression
(baseExpression (unaryExpression (memberExpression (identifier static))))
)
=
(startExpression
(baseExpression
(unaryExpression
(memberExpression (functionCall (identifier getValue) ( argumentList )))
)
)
)
)
(endOfStatement ;)
)
)
(element
(statement
(localAssignmentExpression
var
(startExpression
(baseExpression (unaryExpression (memberExpression (identifier static))))
)
=
(startExpression
(baseExpression
(unaryExpression
(memberExpression (functionCall (identifier getValue) ( argumentList )))
)
)
)
)
(endOfStatement ;)
)
)
)
/*======*/
/*===DECOMPILE===*/
{
var plain = 1;
final immutable = 2;
static shared = 3;
final finalLocal = 4;
static staticLocal = 5;
final = getValue();
var final = getValue();
static = getValue();
var static = getValue();

}
/*======*/
Loading