Skip to content

Fix null safe field access for pt?.sub.x, pt?.call() #154

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
ncannasse merged 1 commit into from
Nov 28, 2025
Merged

Fix null safe field access for pt?.sub.x, pt?.call() #154

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
10 changes: 9 additions & 1 deletion TestHScript.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,19 +141,27 @@ class TestHScript extends TestCase {
}

function testNullFieldAccess():Void {
var pt = {x : 10};
var pt = {
x : 10,
call : function() { return 11; }
};
var vars = {
ptnull : null,
pt: pt,
pt2null : {pt : null},
pt2: {pt : pt}
}
assertScript("ptnull?.x", null, vars);
assertScript("ptnull?.pt.x", null, vars);
assertScript("ptnull?.call()", null, vars);
assertScript("pt?.x", 10, vars);
assertScript("pt?.call()", 11, vars);
assertScript("pt2null?.pt", null, vars);
assertScript("pt2null?.pt?.x", null, vars);
assertScript("pt2null?.pt?.call()", null, vars);
assertScript("pt2?.pt", pt, vars);
assertScript("pt2?.pt?.x", 10, vars);
assertScript("pt2?.pt?.call()", 11, vars);
}

function testIsOperator():Void {
Expand Down
7 changes: 4 additions & 3 deletions hscript/Parser.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -865,17 +865,18 @@ class Parser {
var field = getIdent();
return parseExprNext(mk(EField(e1,field),pmin(e1)));
case TQuestionDot:
var field = getIdent();
var tmp = "__a_" + (uid++);
push(TDot);
var e2 = parseExprNext(mk(EIdent(tmp),pmin(e1),pmax(e1)));
var e = mk(EBlock([
mk(EVar(tmp, null, e1), pmin(e1), pmax(e1)),
mk(ETernary(
mk(EBinop("==", mk(EIdent(tmp),pmin(e1),pmax(e1)), mk(EIdent("null"),pmin(e1),pmax(e1)))),
mk(EIdent("null"),pmin(e1),pmax(e1)),
mk(EField(mk(EIdent(tmp),pmin(e1),pmax(e1)),field),pmin(e1))
e2,
))
]),pmin(e1));
return parseExprNext(e);
return e;
case TPOpen:
return parseExprNext(mk(ECall(e1,parseExprList(TPClose)),pmin(e1)));
case TBkOpen:
Expand Down