github/ValueScript
1
1
Fork 0
mirror of https://github.com/voltrevo/ValueScript.git synced 2026-04-18 03:00:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Include non-mutations in assignment

Browse Source
This commit is contained in:
Andrew Morris
2023-03-24 11:16:48 +11:00
parent fe2e281d0b
commit 6a87fbb2c2
2 changed files with 61 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
valuescript_compiler/src/expression_compiler.rs
View File

@@ -1239,7 +1239,7 @@ impl<'a> ExpressionCompiler<'a> {
None => {
self.fnc.todo(
ident.span,
format!("Failed to find identifier {:?}", ident.sym).as_str(),
format!("Failed to find identifier {}", ident.sym).as_str(),
);
Value::Register(self.fnc.allocate_numbered_reg("_todo_identifier"))

67
valuescript_compiler/src/scope_analysis.rs
View File

@@ -906,14 +906,20 @@ impl ScopeAnalysis {
self.expr(scope, &bin.left);
self.expr(scope, &bin.right);
}
Expr::Assign(assign) => match &assign.left {
swc_ecma_ast::PatOrExpr::Pat(pat) => {
self.mutate_pat(scope, pat);
Expr::Assign(assign) => {
match &assign.left {
swc_ecma_ast::PatOrExpr::Pat(pat) => {
self.pat(scope, pat);
self.mutate_pat(scope, pat);
}
swc_ecma_ast::PatOrExpr::Expr(expr) => {
self.expr(scope, expr);
self.mutate_expr(scope, expr);
}
}
swc_ecma_ast::PatOrExpr::Expr(expr) => {
self.mutate_expr(scope, expr);
}
},
self.expr(scope, &assign.right);
}
Expr::Seq(seq) => {
for expr in &seq.exprs {
self.expr(scope, expr);
@@ -1039,6 +1045,53 @@ impl ScopeAnalysis {
}
}
fn pat(&mut self, scope: &XScope, pat: &swc_ecma_ast::Pat) {
use swc_ecma_ast::Pat;
match pat {
Pat::Ident(ident) => {
self.ident(scope, &ident.id);
}
Pat::Array(array) => {
for elem in &array.elems {
if let Some(elem) = elem {
self.pat(scope, elem);
}
}
}
Pat::Rest(rest) => {
self.pat(scope, &rest.arg);
}
Pat::Object(object) => {
for prop in &object.props {
match prop {
swc_ecma_ast::ObjectPatProp::KeyValue(key_value) => {
self.pat(scope, &key_value.value);
}
swc_ecma_ast::ObjectPatProp::Assign(assign) => {
self.ident(scope, &assign.key);
if let Some(value) = &assign.value {
self.expr(scope, value);
}
}
swc_ecma_ast::ObjectPatProp::Rest(rest) => {
self.pat(scope, &rest.arg);
}
}
}
}
Pat::Assign(assign) => {
self.pat(scope, &assign.left);
self.expr(scope, &assign.right);
}
Pat::Invalid(_) => {}
Pat::Expr(expr) => {
self.expr(scope, expr);
}
}
}
fn mutate_expr(&mut self, scope: &XScope, expr: &swc_ecma_ast::Expr) {
use swc_ecma_ast::Expr;