dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-24 12:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(traverse): remove support for #[scope(if(...))] attr (#5114)

Browse source 
Closes #5008.

There are no longer any nodes with conditional scopes. Remove support for `#[scope(if(...))]` attr from `oxc_traverse` codegen - it's no longer needed.
This commit is contained in:
overlookmotel 2024-08-23 09:28:18 +00:00
parent 8650d3e773
commit fc2e9adeff
2 changed files with 12 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
crates/oxc_traverse/scripts/lib/parse.mjs
View file

@ -187,8 +187,10 @@ function parseScopeArgs(lines, scopeArgs) {
return parseScopeArgsStr(scopeArgsStr, scopeArgs, position); return parseScopeArgsStr(scopeArgsStr, scopeArgs, position);
} }
const SCOPE_ARGS_KEYS = {flags: 'flags', strict_if: 'strictIf'};
function parseScopeArgsStr(argsStr, args, position) { function parseScopeArgsStr(argsStr, args, position) {
if (!args) args = {flags: 'ScopeFlags::empty()', if: null, strictIf: null}; if (!args) args = {flags: 'ScopeFlags::empty()', strictIf: null, enterScopeBefore: null};
if (!argsStr) return args; if (!argsStr) return args;
@ -201,9 +203,9 @@ function parseScopeArgsStr(argsStr, args, position) {
try { try {
while (true) { while (true) {
let [key] = matchAndConsume(/^([a-z_]+)\(/); const [keyRaw] = matchAndConsume(/^([a-z_]+)\(/);
key = key.replace(/_([a-z])/g, (_, c) => c.toUpperCase()); const key = SCOPE_ARGS_KEYS[keyRaw];
position.assert(Object.hasOwn(args, key), `Unexpected scope macro arg: ${key}`); position.assert(key, `Unexpected scope macro arg: ${key}`);
let bracketCount = 1, let bracketCount = 1,
index = 0; index = 0;

19
crates/oxc_traverse/scripts/lib/walk.mjs
View file

@ -74,33 +74,16 @@ function generateWalkForStruct(type, types) {
} }
// TODO: Maybe this isn't quite right. `scope_id` fields are `Cell<Option<ScopeId>>`, // TODO: Maybe this isn't quite right. `scope_id` fields are `Cell<Option<ScopeId>>`,
// so visitor is able to alter the `scope_id` of a node higher up the tree, // so visitor is able to alter the `scope_id` of a node from higher up the tree,
// but we don't take that into account. // but we don't take that into account.
// Visitor should not do that though, so maybe it's OK. // Visitor should not do that though, so maybe it's OK.
// In final version, we should not make `scope_id` fields `Cell`s to prevent this. // In final version, we should not make `scope_id` fields `Cell`s to prevent this.
if (scopeArgs.if) {
enterScopeCode = `
let mut previous_scope_id = None;
if let Some(scope_id) = (*(${makeFieldCode(scopeIdField)})).get() {
previous_scope_id = Some(ctx.current_scope_id());
ctx.set_current_scope_id(scope_id);
}
`;
exitScopeCode = `
if let Some(previous_scope_id) = previous_scope_id {
ctx.set_current_scope_id(previous_scope_id);
}
`;
} else {
enterScopeCode = ` enterScopeCode = `
let previous_scope_id = ctx.current_scope_id(); let previous_scope_id = ctx.current_scope_id();
ctx.set_current_scope_id((*(${makeFieldCode(scopeIdField)})).get().unwrap()); ctx.set_current_scope_id((*(${makeFieldCode(scopeIdField)})).get().unwrap());
`; `;
exitScopeCode = `ctx.set_current_scope_id(previous_scope_id);`; exitScopeCode = `ctx.set_current_scope_id(previous_scope_id);`;
} }
}
const fieldsCodes = visitedFields.map((field, index) => { const fieldsCodes = visitedFields.map((field, index) => {
const fieldWalkName = `walk_${camelToSnake(field.innerTypeName)}`, const fieldWalkName = `walk_${camelToSnake(field.innerTypeName)}`,