Skip to content

[BUGFIX/FEATURE] Fix Map Comprehension not working #528

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
AbnormalPoof merged 1 commit into from
Oct 5, 2026
Merged

[BUGFIX/FEATURE] Fix Map Comprehension not working #528

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
11 changes: 10 additions & 1 deletion polymod/hscript/_internal/Interp.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2095,7 +2095,16 @@ class Interp
});

// Evaluate the expression before assigning, applying typing if possible.
var result = (expression != null) ? exprWithType(expression, type) : null;
var result:Dynamic = null;
switch (name)
{
case _.startsWith('_g') => true:
result = this.exprMap([]);
case _.startsWith('__a_') => true:
result = this.exprArray([]);
default:
result = (expression != null) ? exprWithType(expression, type) : null;
}

locals.set(name, {
r: result,
Expand Down
32 changes: 31 additions & 1 deletion polymod/hscript/_internal/Parser.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,8 @@ class Parser
if (a.length == 1 && a[0] != null) switch (expr(a[0]))
{
case EFor(_), EWhile(_), EDoWhile(_):
var tmp = "__a_" + (uid++);
var tmpId:String = getComprId(a[0]);
var tmp = '$tmpId${uid++}';
var e = mk(EBlock([
mk(EVar(tmp, null, mk(EArrayDecl([]), p1)), p1),
mapCompr(tmp, a[0]),
Expand Down Expand Up @@ -702,6 +703,33 @@ class Parser
}
}

function getComprId(e:Expr):String
{
return switch (expr(e))
{
case EFor(v, it, e2):
getComprId(e2);
case EForGen(it, e2):
getComprId(e2);
case EWhile(cond, e2):
getComprId(e2);
case EDoWhile(cond, e2):
getComprId(e2);
case EIf(cond, e1, e2) if (e2 == null):
getComprId(e1);
case EBlock([e]):
getComprId(e);
case EParent(e2):
getComprId(e2);
case EBinop('=>', e1, e2):
'_g';
case EIdent(_):
'__a_';
default:
'__a_';
}
}

function mapCompr(tmp:String, e:Expr)
{
if (e == null) return null;
Expand All @@ -721,6 +749,8 @@ class Parser
EBlock([mapCompr(tmp, e)]);
case EParent(e2):
EParent(mapCompr(tmp, e2));
case EBinop('=>', e1, e2):
ECall(mk(EField(mk(EIdent(tmp), pmin(e), pmax(e)), "set"), pmin(e), pmax(e)), [e1, e2]);
default:
ECall(mk(EField(mk(EIdent(tmp), pmin(e), pmax(e)), "push"), pmin(e), pmax(e)), [e]);
}
Expand Down
Loading