Skip to content

Commit

Permalink
Null pointer check in assignment statement (#17736)
Browse files Browse the repository at this point in the history
* change lexer prio for ID

* update CL

* add NPE check and unit test

* revert change to grammar
  • Loading branch information
patrickmann authored Jan 4, 2024
1 parent 5ce6371 commit f473373
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 5 deletions.
5 changes: 5 additions & 0 deletions changelog/unreleased/issue-7006.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
type = "c"
message = "Flag an error in rule source editor when variable name is a reserved word."

issues = ["7006"]
pulls = ["17736"]
Original file line number Diff line number Diff line change
Expand Up @@ -294,11 +294,13 @@ public void exitFuncStmt(RuleLangParser.FuncStmtContext ctx) {

@Override
public void exitVarAssignStmt(RuleLangParser.VarAssignStmtContext ctx) {
final String name = unquote(ctx.varName.getText(), '`');
final Expression expr = exprs.get(ctx.expression());
parseContext.defineVar(name, expr);
definedVars.add(name);
parseContext.statements.add(new VarAssignStatement(name, expr));
if (ctx.varName != null) {
final String name = unquote(ctx.varName.getText(), '`');
final Expression expr = exprs.get(ctx.expression());
parseContext.defineVar(name, expr);
definedVars.add(name);
parseContext.statements.add(new VarAssignStatement(name, expr));
}
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,16 @@ public void issue185() {
}
}

@Test
public void invalidIdentifier() {
try {
parseRuleWithOptionalCodegen();
fail("Should have thrown parse exception");
} catch (ParseException e) {
assertEquals(1, e.getErrors().size());
assertEquals(SyntaxError.class, Iterables.getOnlyElement(e.getErrors()).getClass());
}
}

public static class CustomObject {
private final String id;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
rule "invalid identifier"
when true
then
let match=1;
end

0 comments on commit f473373

Please sign in to comment.