-
-
Notifications
You must be signed in to change notification settings - Fork 480
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(minifier): add
Normalize ast pass (#8120)
- Loading branch information
Showing
4 changed files
with
82 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| use oxc_ast::ast::*; | ||
| use oxc_syntax::scope::ScopeFlags; | ||
| use oxc_traverse::{traverse_mut_with_ctx, ReusableTraverseCtx, Traverse, TraverseCtx}; | ||
|
|
||
| use crate::CompressorPass; | ||
|
|
||
| /// Normalize AST | ||
| /// | ||
| /// Make subsequent AST passes easier to analyze: | ||
| /// | ||
| /// * convert whiles to fors | ||
| /// | ||
| /// <https://github.com/google/closure-compiler/blob/v20240609/src/com/google/javascript/jscomp/Normalize.java> | ||
| pub struct Normalize; | ||
|
|
||
| impl<'a> CompressorPass<'a> for Normalize { | ||
| fn build(&mut self, program: &mut Program<'a>, ctx: &mut ReusableTraverseCtx<'a>) { | ||
| traverse_mut_with_ctx(self, program, ctx); | ||
| } | ||
| } | ||
|
|
||
| impl<'a> Traverse<'a> for Normalize { | ||
| fn exit_statement(&mut self, stmt: &mut Statement<'a>, ctx: &mut TraverseCtx<'a>) { | ||
| if matches!(stmt, Statement::WhileStatement(_)) { | ||
| Self::convert_while_to_for(stmt, ctx); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl<'a> Normalize { | ||
| pub fn new() -> Self { | ||
| Self | ||
| } | ||
|
|
||
| fn convert_while_to_for(stmt: &mut Statement<'a>, ctx: &mut TraverseCtx<'a>) { | ||
| let Statement::WhileStatement(while_stmt) = ctx.ast.move_statement(stmt) else { return }; | ||
| let while_stmt = while_stmt.unbox(); | ||
| let for_stmt = ctx.ast.alloc_for_statement_with_scope_id( | ||
| while_stmt.span, | ||
| None, | ||
| Some(while_stmt.test), | ||
| None, | ||
| while_stmt.body, | ||
| ctx.create_child_scope_of_current(ScopeFlags::empty()), | ||
| ); | ||
| *stmt = Statement::ForStatement(for_stmt); | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod test { | ||
| use oxc_allocator::Allocator; | ||
|
|
||
| use crate::tester; | ||
|
|
||
| fn test(source_text: &str, expected: &str) { | ||
| let allocator = Allocator::default(); | ||
| let mut pass = super::Normalize::new(); | ||
| tester::test(&allocator, source_text, expected, &mut pass); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_while() { | ||
| // Verify while loops are converted to FOR loops. | ||
| test("while(c < b) foo()", "for(; c < b;) foo()"); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters