Skip to content

Manually revert termination tracking work. #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 11, 2021
Merged

Manually revert termination tracking work. #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e12c61
Manually revert termination tracking work.
walkie Sep 11, 2021
97efd0e
No statements after transition/change-state.
walkie Sep 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
344 changes: 4 additions & 340 deletions framec/src/frame_c/ast.rs
View file
Open in desktop

Large diffs are not rendered by default.

294 changes: 60 additions & 234 deletions framec/src/frame_c/parser.rs
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 2 additions & 4 deletions framec/src/frame_c/visitors/cpp_visitor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1351,10 +1351,8 @@ impl AstVisitor for CppVisitor {
// Generate statements
self.visit_decl_stmts(&evt_handler_node.statements);

let terminator_node_opt = &evt_handler_node.terminator_node_opt;
if let Some(terminator_node) = terminator_node_opt {
terminator_node.accept(self);
}
let terminator_node = &evt_handler_node.terminator_node;
terminator_node.accept(self);

self.outdent();

Expand Down
6 changes: 2 additions & 4 deletions framec/src/frame_c/visitors/cs_visitor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1432,10 +1432,8 @@ impl AstVisitor for CsVisitor {
// Generate statements
self.visit_decl_stmts(&evt_handler_node.statements);

let terminator_node_opt = &evt_handler_node.terminator_node_opt;
if let Some(terminator_node) = terminator_node_opt {
terminator_node.accept(self);
}
let terminator_node = &evt_handler_node.terminator_node;
terminator_node.accept(self);
self.outdent();
self.newline();
self.add_code(&format!("}}"));
Expand Down
6 changes: 2 additions & 4 deletions framec/src/frame_c/visitors/cs_visitor_for_bob.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1479,10 +1479,8 @@ impl AstVisitor for CsVisitorForBob {
// Generate statements
self.visit_decl_stmts(&evt_handler_node.statements);

let terminator_node_opt = &evt_handler_node.terminator_node_opt;
if let Some(terminator_node) = terminator_node_opt {
terminator_node.accept(self);
}
let terminator_node = &evt_handler_node.terminator_node;
terminator_node.accept(self);
self.outdent();

self.newline();
Expand Down
6 changes: 2 additions & 4 deletions framec/src/frame_c/visitors/gdscript_3_2_visitor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1307,10 +1307,8 @@ impl AstVisitor for GdScript32Visitor {
self.visit_decl_stmts(&evt_handler_node.statements);

self.event_handler_has_code = evt_handler_node.statements.len() > 0usize;
let terminator_node_opt = &evt_handler_node.terminator_node_opt;
if let Some(terminator_node) = terminator_node_opt {
terminator_node.accept(self);
}
let terminator_node = &evt_handler_node.terminator_node;
terminator_node.accept(self);
self.outdent();
self.newline();

Expand Down
6 changes: 2 additions & 4 deletions framec/src/frame_c/visitors/java_8_visitor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1431,10 +1431,8 @@ impl AstVisitor for Java8Visitor {
// Generate statements
self.visit_decl_stmts(&evt_handler_node.statements);

let terminator_node_opt = &evt_handler_node.terminator_node_opt;
if let Some(terminator_node) = terminator_node_opt {
terminator_node.accept(self);
}
let terminator_node = &evt_handler_node.terminator_node;
terminator_node.accept(self);
self.outdent();
self.newline();
self.add_code(&format!("}}"));
Expand Down
6 changes: 2 additions & 4 deletions framec/src/frame_c/visitors/javascript_visitor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1356,10 +1356,8 @@ impl AstVisitor for JavaScriptVisitor {
// Generate statements
self.visit_decl_stmts(&evt_handler_node.statements);

let terminator_node_opt = &evt_handler_node.terminator_node_opt;
if let Some(terminator_node) = terminator_node_opt {
terminator_node.accept(self);
}
let terminator_node = &evt_handler_node.terminator_node;
terminator_node.accept(self);
self.outdent();
self.newline();
self.add_code(&format!("}}"));
Expand Down
6 changes: 2 additions & 4 deletions framec/src/frame_c/visitors/plantuml_visitor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1249,10 +1249,8 @@ impl AstVisitor for PlantUmlVisitor {
// Generate statements
self.visit_decl_stmts(&evt_handler_node.statements);

let terminator_node_opt = &evt_handler_node.terminator_node_opt;
if let Some(terminator_node) = terminator_node_opt {
terminator_node.accept(self);
}
let terminator_node = &evt_handler_node.terminator_node;
terminator_node.accept(self);

// this controls formatting here
self.first_event_handler = false;
Expand Down
6 changes: 2 additions & 4 deletions framec/src/frame_c/visitors/python_visitor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1323,10 +1323,8 @@ impl AstVisitor for PythonVisitor {
self.visit_decl_stmts(&evt_handler_node.statements);

self.event_handler_has_code = evt_handler_node.statements.len() > 0usize;
let terminator_node_opt = &evt_handler_node.terminator_node_opt;
if let Some(terminator_node) = terminator_node_opt {
terminator_node.accept(self);
}
let terminator_node = &evt_handler_node.terminator_node;
terminator_node.accept(self);
self.outdent();
self.newline();

Expand Down
6 changes: 2 additions & 4 deletions framec/src/frame_c/visitors/rust_visitor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3375,10 +3375,8 @@ impl AstVisitor for RustVisitor {
// Generate statements
self.visit_decl_stmts(&evt_handler_node.statements);

let terminator_node_opt = &evt_handler_node.terminator_node_opt;
if let Some(terminator_node) = terminator_node_opt {
terminator_node.accept(self);
}
let terminator_node = &evt_handler_node.terminator_node;
terminator_node.accept(self);
self.outdent();
self.newline();
self.add_code(&format!("}}"));
Expand Down
2 changes: 1 addition & 1 deletion framec_tests/src/match.frm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
|Simple| -> $SimpleMatch ^
|Multi| -> $MultiMatch ^
|Nested| -> $NestedMatch ^
|Child| -> $ChildMatch
|Child| -> $ChildMatch ^

$EmptyMatch
|OnString| [s:String]
Expand Down