Facebook/react
1
0
Fork 0
mirror of https://github.com/facebook/react.git synced 2025-11-01 09:12:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

[rust] Semantic analysis resolves break/continue

Browse Source
This commit is contained in:
Joe Savona
2023-08-10 10:59:51 -04:00
parent ee13c30d10
commit c3ad8a86b1
6 changed files with 127 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/forget/crates/forget_semantic_analysis/src/analyzer.rs
+114 -64
View File
@@ -5,7 +5,9 @@ use forget_estree::{
Pattern, Program, SourceRange, SourceType, Statement, VariableDeclarationKind, Visitor,
};
use crate::{AstNode, DeclarationKind, LabelKind, ReferenceKind, ScopeId, ScopeKind, ScopeManager};
use crate::{
AstNode, DeclarationKind, LabelId, LabelKind, ReferenceKind, ScopeId, ScopeKind, ScopeManager,
};
pub fn analyze(ast: &Program) -> ScopeManager {
let mut analyzer = Analyzer::new();
@@ -15,6 +17,7 @@ pub fn analyze(ast: &Program) -> ScopeManager {
struct Analyzer {
manager: ScopeManager,
labels: Vec<LabelId>,
current: ScopeId,
}
@@ -22,7 +25,64 @@ impl Analyzer {
fn new() -> Self {
let manager = ScopeManager::new();
let current = manager.root_id();
Self { manager, current }
let labels = Default::default();
Self {
manager,
labels,
current,
}
}
fn enter_label<F>(&mut self, id: LabelId, mut f: F)
where
F: FnMut(&mut Self) -> (),
{
self.labels.push(id);
f(self);
let last = self.labels.pop().unwrap();
assert_eq!(last, id);
}
fn lookup_break(&self, name: Option<&str>) -> Option<LabelId> {
for id in self.labels.iter().rev() {
let label = self.manager.label(*id);
match (name, &label.name) {
// If this is a labeled break, only return if an exact match
// is in scope
(Some(name), Some(label_name)) if name == label_name => {
return Some(label.id);
}
// If this is an unlabeld break, return the innermost label id
(None, _) => {
return Some(label.id);
}
_ => { /* no-op */ }
}
}
None
}
fn lookup_continue(&self, name: Option<&str>) -> Option<LabelId> {
for id in self.labels.iter().rev() {
let label = self.manager.label(*id);
// Skip labels that are not for loops, can only continue to a loop
if label.kind != LabelKind::Loop {
continue;
}
match (name, &label.name) {
// If this is a labeled break, only return if an exact match
// is in scope
(Some(name), Some(label_name)) if &name == label_name => {
return Some(label.id);
}
// If this is an unlabeld break, return the innermost label id
(None, _) => {
return Some(label.id);
}
_ => { /* no-op */ }
}
}
None
}
fn enter<F>(&mut self, kind: ScopeKind, mut f: F) -> ScopeId
@@ -196,12 +256,6 @@ impl Analyzer {
body: &Statement,
_range: Option<SourceRange>,
) {
// Record an anonymous label for the statement to resolve unlabeled break/continue
let label = self
.manager
.add_anonymous_label(self.current, LabelKind::Loop);
self.manager.node_labels.insert(ast, label);
let mut for_scope: Option<ScopeId> = None;
match left {
ForInInit::VariableDeclaration(left) => {
@@ -215,7 +269,13 @@ impl Analyzer {
}
}
self.visit_expression(right);
self.visit_statement(body);
let id = self
.manager
.add_anonymous_label(self.current, LabelKind::Loop);
self.manager.node_labels.insert(ast, id);
self.enter_label(id, |visitor| {
visitor.visit_statement(body);
});
if let Some(for_scope) = for_scope {
self.close_scope(for_scope);
}
@@ -365,34 +425,22 @@ impl Visitor for Analyzer {
}
fn visit_break_statement(&mut self, ast: &forget_estree::BreakStatement) {
if let Some(label_node) = &ast.label {
if let Some(label) = self
.manager
.lookup_label(self.current, &label_node.name)
.cloned()
{
if let Some(label_id) =
self.lookup_break(ast.label.as_ref().map(|ident| ident.name.as_str()))
{
self.manager
.node_labels
.insert(AstNode::from(ast), label_id);
if let Some(label_node) = &ast.label {
self.manager
.node_labels
.insert(AstNode::from(ast), label.id);
self.manager
.node_labels
.insert(AstNode::from(label_node), label.id);
} else {
self.manager.diagnostics.push(Diagnostic::invalid_syntax(
"Unknown break label",
label_node.range,
));
.insert(AstNode::from(label_node), label_id);
}
} else {
if let Some(label) = self.manager.lookup_break(self.current).cloned() {
self.manager
.node_labels
.insert(AstNode::from(ast), label.id);
} else {
self.manager
.diagnostics
.push(Diagnostic::invalid_syntax("Invalid break", ast.range));
}
self.manager.diagnostics.push(Diagnostic::invalid_syntax(
"Non-syntactic break, could not resolve break target",
ast.range,
));
}
}
@@ -414,34 +462,22 @@ impl Visitor for Analyzer {
}
fn visit_continue_statement(&mut self, ast: &forget_estree::ContinueStatement) {
if let Some(label_node) = &ast.label {
if let Some(label) = self
.manager
.lookup_label(self.current, &label_node.name)
.cloned()
{
if let Some(label_id) =
self.lookup_continue(ast.label.as_ref().map(|ident| ident.name.as_str()))
{
self.manager
.node_labels
.insert(AstNode::from(ast), label_id);
if let Some(label_node) = &ast.label {
self.manager
.node_labels
.insert(AstNode::from(ast), label.id);
self.manager
.node_labels
.insert(AstNode::from(label_node), label.id);
} else {
self.manager.diagnostics.push(Diagnostic::invalid_syntax(
"Unknown continue label",
label_node.range,
));
.insert(AstNode::from(label_node), label_id);
}
} else {
if let Some(label) = self.manager.lookup_continue(self.current).cloned() {
self.manager
.node_labels
.insert(AstNode::from(ast), label.id);
} else {
self.manager
.diagnostics
.push(Diagnostic::invalid_syntax("Invalid continue", ast.range));
}
self.manager.diagnostics.push(Diagnostic::invalid_syntax(
"Non-syntactic continue, could not resolve continue target",
ast.range,
));
}
}
@@ -485,7 +521,13 @@ impl Visitor for Analyzer {
if let Some(update) = &ast.update {
self.visit_expression(update);
}
self.visit_statement(&ast.body);
let id = self
.manager
.add_anonymous_label(self.current, LabelKind::Loop);
self.manager.node_labels.insert(AstNode::from(ast), id);
self.enter_label(id, |visitor| {
visitor.visit_statement(&ast.body);
});
if let Some(for_scope) = for_scope {
self.close_scope(for_scope);
}
@@ -522,7 +564,9 @@ impl Visitor for Analyzer {
.manager
.add_label(self.current, kind, ast.label.name.clone());
self.manager.node_labels.insert(AstNode::from(ast), id);
self.visit_statement(body);
self.enter_label(id, |visitor| {
visitor.visit_statement(body);
})
}
fn visit_member_expression(&mut self, ast: &forget_estree::MemberExpression) {
@@ -578,10 +622,16 @@ impl Visitor for Analyzer {
fn visit_switch_statement(&mut self, ast: &forget_estree::SwitchStatement) {
self.visit_expression(&ast.discriminant);
self.enter(ScopeKind::Switch, |visitor| {
for case_ in &ast.cases {
visitor.visit_switch_case(case_);
}
let id = self
.manager
.add_anonymous_label(self.current, LabelKind::Other);
self.manager.node_labels.insert(AstNode::from(ast), id);
self.enter_label(id, |visitor| {
visitor.enter(ScopeKind::Switch, |visitor| {
for case_ in &ast.cases {
visitor.visit_switch_case(case_);
}
});
});
}
@@ -651,7 +701,7 @@ impl Visitor for Analyzer {
// should never result in an empty JSXIdentifier node. but just in
// case we report this rather than silently fail
self.manager.diagnostics.push(Diagnostic::invalid_syntax(
"Expected JSXOpenintElement.name to be non-empty",
"Expected JSXOpeningElement.name to be non-empty",
name.range,
));
}
compiler/forget/crates/forget_semantic_analysis/src/scope_manager.rs
+13 -30
View File
@@ -40,7 +40,6 @@ impl ScopeManager {
id: root_id,
kind: ScopeKind::Global,
parent: None,
labels: Default::default(),
declarations: Default::default(),
references: Default::default(),
children: Default::default(),
@@ -166,28 +165,6 @@ impl ScopeManager {
})
}
pub fn lookup_label(&self, scope: ScopeId, name: &str) -> Option<&Label> {
let mut current = &self.scopes[scope.0];
loop {
if let Some(id) = current.labels.get(name) {
return Some(&self.labels[id.0]);
}
if let Some(parent) = current.parent {
current = &self.scopes[parent.0];
} else {
return None;
}
}
}
pub fn lookup_break(&self, _scope: ScopeId) -> Option<&Label> {
todo!()
}
pub fn lookup_continue(&self, _scope: ScopeId) -> Option<&Label> {
todo!()
}
pub fn lookup_declaration(&self, scope: ScopeId, name: &str) -> Option<&Declaration> {
let mut current = &self.scopes[scope.0];
loop {
@@ -212,7 +189,6 @@ impl ScopeManager {
id,
kind,
parent: Some(parent),
labels: Default::default(),
declarations: Default::default(),
references: Default::default(),
children: Default::default(),
@@ -223,16 +199,23 @@ impl ScopeManager {
pub(crate) fn add_label(&mut self, scope: ScopeId, kind: LabelKind, name: String) -> LabelId {
let id = LabelId(self.labels.len());
self.labels.push(Label { id, kind, scope });
self.scopes[scope.0].labels.insert(name, id);
self.labels.push(Label {
id,
kind,
scope,
name: Some(name),
});
id
}
pub(crate) fn add_anonymous_label(&mut self, scope: ScopeId, kind: LabelKind) -> LabelId {
let id = LabelId(self.labels.len());
let name = format!("#{}", id.0);
self.labels.push(Label { id, kind, scope });
self.scopes[scope.0].labels.insert(name, id);
self.labels.push(Label {
id,
kind,
scope,
name: None,
});
id
}
@@ -300,7 +283,6 @@ pub struct Scope {
pub id: ScopeId,
pub kind: ScopeKind,
pub parent: Option<ScopeId>,
pub labels: IndexMap<String, LabelId>,
pub declarations: IndexMap<String, DeclarationId>,
pub references: Vec<ReferenceId>,
pub children: Vec<ScopeId>,
@@ -317,6 +299,7 @@ pub struct Label {
pub id: LabelId,
pub kind: LabelKind,
pub scope: ScopeId,
pub name: Option<String>,
}
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Copy, Clone)]
compiler/forget/crates/forget_semantic_analysis/src/scope_view.rs
-15
View File
@@ -83,20 +83,6 @@ impl<'m> ScopeView<'m> {
impl<'m> std::fmt::Debug for ScopeView<'m> {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
let labels: IndexMap<_, _> = self
.scope
.labels
.iter()
.map(|(name, label)| {
(
name.clone(),
LabelView {
manager: &self.manager,
label: self.manager.label(*label),
},
)
})
.collect();
let declarations: IndexMap<_, _> = self
.scope
.declarations
@@ -132,7 +118,6 @@ impl<'m> std::fmt::Debug for ScopeView<'m> {
f.debug_struct("Scope")
.field("id", &self.scope.id)
.field("kind", &self.scope.kind)
.field("labels", &labels)
.field("declarations", &declarations)
.field("references", &references)
.field("children", &children)
compiler/forget/crates/forget_semantic_analysis/tests/snapshots/analysis_test__fixtures@globals-and-imports.js.snap
-5
View File
@@ -29,7 +29,6 @@ Scope {
0,
),
kind: Global,
labels: {},
declarations: {},
references: [],
children: [
@@ -38,7 +37,6 @@ Scope {
1,
),
kind: Module,
labels: {},
declarations: {
"Component": Declaration {
id: DeclarationId(
@@ -57,7 +55,6 @@ Scope {
2,
),
kind: Function,
labels: {},
declarations: {
"props": Declaration {
id: DeclarationId(
@@ -170,7 +167,6 @@ Scope {
3,
),
kind: Function,
labels: {},
declarations: {},
references: [],
children: [],
@@ -180,7 +176,6 @@ Scope {
4,
),
kind: Function,
labels: {},
declarations: {},
references: [],
children: [],
compiler/forget/crates/forget_semantic_analysis/tests/snapshots/analysis_test__fixtures@labels.js.snap
-26
View File
@@ -25,7 +25,6 @@ Scope {
0,
),
kind: Global,
labels: {},
declarations: {},
references: [],
children: [
@@ -34,7 +33,6 @@ Scope {
1,
),
kind: Module,
labels: {},
declarations: {
"Component": Declaration {
id: DeclarationId(
@@ -53,26 +51,6 @@ Scope {
2,
),
kind: Function,
labels: {
"foo": Label {
id: LabelId(
0,
),
kind: Loop,
scope: ScopeId(
2,
),
},
"bar": Label {
id: LabelId(
1,
),
kind: Other,
scope: ScopeId(
2,
),
},
},
declarations: {
"props": Declaration {
id: DeclarationId(
@@ -114,7 +92,6 @@ Scope {
3,
),
kind: For,
labels: {},
declarations: {
"x": Declaration {
id: DeclarationId(
@@ -160,7 +137,6 @@ Scope {
4,
),
kind: Block,
labels: {},
declarations: {},
references: [
Reference {
@@ -222,7 +198,6 @@ Scope {
5,
),
kind: Block,
labels: {},
declarations: {},
references: [],
children: [],
@@ -236,7 +211,6 @@ Scope {
6,
),
kind: Block,
labels: {},
declarations: {},
references: [],
children: [],
compiler/forget/crates/forget_semantic_analysis/tests/snapshots/analysis_test__fixtures@simple-function.js.snap
-5
View File
@@ -21,7 +21,6 @@ Scope {
0,
),
kind: Global,
labels: {},
declarations: {},
references: [],
children: [
@@ -30,7 +29,6 @@ Scope {
1,
),
kind: Module,
labels: {},
declarations: {
"Component": Declaration {
id: DeclarationId(
@@ -49,7 +47,6 @@ Scope {
2,
),
kind: Function,
labels: {},
declarations: {
"a": Declaration {
id: DeclarationId(
@@ -100,7 +97,6 @@ Scope {
3,
),
kind: Function,
labels: {},
declarations: {
"foo_": Declaration {
id: DeclarationId(
@@ -119,7 +115,6 @@ Scope {
4,
),
kind: Function,
labels: {},
declarations: {
"c": Declaration {
id: DeclarationId(