mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-12 11:59:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix potential infinite loop on calling macros

Browse Source
This commit is contained in:
Jarred Sumner
2021-09-30 22:33:36 -07:00
parent f8297aee4d
commit db24a27e61
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/js_parser/js_parser.zig
View File

@@ -11337,7 +11337,7 @@ pub fn NewParser(
const name = p.symbols.items[ref.inner_index].original_name;
const record = &p.import_records.items[import_record_id];
// We must visit it to convert inline_identifiers and record usage
return p.visitExpr(p.options.macro_context.call(
const macro_result = (p.options.macro_context.call(
record.path.text,
p.source.path.sourceDir(),
p.log,
@@ -11349,6 +11349,9 @@ pub fn NewParser(
MacroVisitor,
MacroVisitor{ .p = p, .loc = expr.loc },
) catch return expr);
if (macro_result.data != .e_template) {
return p.visitExpr(macro_result);
}
}
}
}
@@ -12252,20 +12255,23 @@ pub fn NewParser(
const name = p.symbols.items[ref.inner_index].original_name;
const record = &p.import_records.items[import_record_id];
const copied = Expr{ .loc = expr.loc, .data = .{ .e_call = e_ } };
return p.visitExpr(
const macro_result =
p.options.macro_context.call(
record.path.text,
p.source.path.sourceDir(),
p.log,
p.source,
record.range,
copied,
&.{},
name,
MacroVisitor,
MacroVisitor{ .p = p, .loc = expr.loc },
) catch return expr,
);
record.path.text,
p.source.path.sourceDir(),
p.log,
p.source,
record.range,
copied,
&.{},
name,
MacroVisitor,
MacroVisitor{ .p = p, .loc = expr.loc },
) catch return expr;
if (macro_result.data != .e_call) {
return p.visitExpr(macro_result);
}
}
}