CSY/reowolf Changeset - 07b6378685f2 · Centrum Wiskunde & Informatica (CWI)

Changeset - 07b6378685f2

Parent rev.

Child rev.

[Not reviewed]

0 4 0

MH - 4 years ago 2021-11-12 20:02:26
contact@maxhenger.nl

Add forking to the AST walker

4 files changed with 48 insertions and 1 deletions:

src/protocol/ast.rs

src/protocol/eval/executor.rs

src/protocol/mod.rs

src/protocol/parser/pass_validation_linking.rs

0 comments (0 inline, 0 general)

src/protocol/ast.rs

➞

Show inline comments

@@ @@ -1301,7 +1301,7 @@ pub struct ForkStatement { @@
 #[derive(Debug, Clone)]
 pub struct EndForkStatement {
-    pub this: EndForKStatementId,
+    pub this: EndForkStatementId,
     pub start_fork: ForkStatementId,
     pub next: StatementId,
+}

src/protocol/eval/executor.rs

➞

Show inline comments

@@ @@ -200,6 +200,7 @@ pub enum EvalContinuation { @@
     SyncBlockEnd,
     NewComponent(DefinitionId, i32, ValueGroup),
     NewChannel,
     NewFork,
     BlockFires(PortId),
     BlockGet(PortId),
     Put(PortId, Value),
@@ @@ -886,6 +887,33 @@ impl Prompt { @@
                 Ok(EvalContinuation::SyncBlockEnd)
             },
             Statement::Fork(stmt) => {
                 if stmt.right_body.is_none() {
                     // No reason to fork
                     cur_frame.position = stmt.left_body.upcast();
                 } else {
                     // Need to fork
                     if let Some(go_left) = ctx.get_fork() {
                         // Runtime has created a fork
                         if go_left {
                             cur_frame.position = stmt.left_body.upcast();
                         } else {
                             cur_frame.position = stmt.right_body.unwrap().upcast();
+                        }
                     } else {
                         // Request the runtime to create a fork of the current
                         // branch
                         return Ok(EvalContinuation::NewFork);
+                    }
+                }
                 Ok(EvalContinuation::Stepping)
             },
             Statement::EndFork(stmt) => {
                 cur_frame.position = stmt.next;
                 Ok(EvalContinuation::Stepping)
+            }
             Statement::Return(_stmt) => {
                 debug_assert!(heap[cur_frame.definition].is_function());
                 debug_assert_eq!(cur_frame.expr_values.len(), 1, "expected one expr value for return statement");

src/protocol/mod.rs

➞

Show inline comments

@@ @@ -287,6 +287,7 @@ pub trait RunContext { @@
     fn did_put(&mut self, port: PortId) -> bool;
     fn get(&mut self, port: PortId) -> Option<ValueGroup>; // None if still waiting on message
     fn fires(&mut self, port: PortId) -> Option<Value>; // None if not yet branched
     fn get_fork(&mut self) -> Option<bool>; // None if not yet forked
     fn get_channel(&mut self) -> Option<(Value, Value)>; // None if not yet prepared
+}
@@ @@ -302,6 +303,7 @@ pub enum RunResult { @@
     BranchMissingPortState(PortId), // branch doesn't know about port firing
     BranchMissingPortValue(PortId), // branch hasn't received message on input port yet
     BranchAtSyncEnd,
     BranchFork,
     BranchPut(PortId, ValueGroup),
+}
@@ @@ -329,6 +331,8 @@ impl ComponentState { @@
                         return RR::NewComponent(definition_id, monomorph_idx, args),
                     EC::NewChannel =>
                         return RR::NewChannel,
                     EC::NewFork =>
                         return RR::BranchFork,
                     EC::BlockFires(port_id) => return RR::BranchMissingPortState(port_id),
                     EC::BlockGet(port_id) => return RR::BranchMissingPortValue(port_id),
                     EC::Put(port_id, value) => {
@@ @@ -398,6 +402,7 @@ impl ComponentState { @@
                         // to the runtime
                         unreachable!();
                     },
                     EvalContinuation::NewFork => unreachable!(),
                     // Outside synchronous blocks, no fires/get/put happens
                     EvalContinuation::BlockFires(_) => unreachable!(),
                     EvalContinuation::BlockGet(_) => unreachable!(),
@@ @@ -431,6 +436,7 @@ impl ComponentState { @@
                     // Not possible to create component in sync block
                     EvalContinuation::NewComponent(_, _, _) => unreachable!(),
                     EvalContinuation::NewChannel => unreachable!(),
                     EvalContinuation::NewFork => unreachable!(),
                     EvalContinuation::BlockFires(port) => {
                         return SyncBlocker::CouldntCheckFiring(port);
                     },
@@ @@ -524,6 +530,11 @@ impl RunContext for EvalContext<'_> { @@
             EvalContext::Sync(_) => unreachable!(),
+        }
+    }
     fn get_fork(&mut self) -> Option<bool> {
         // Never actually used in the old runtime
         return None;
+    }
+}
 // TODO: @remove once old runtime has disappeared

src/protocol/parser/pass_validation_linking.rs

➞

Show inline comments

@@ @@ -414,6 +414,14 @@ impl Visitor for PassValidationLinking { @@
         let left_body_id = fork_stmt.left_body;
         let right_body_id = fork_stmt.right_body;
         // Fork statements may only occur inside sync blocks
         if self.in_sync.is_invalid() {
             return Err(ParseError::new_error_str_at_span(
                 &ctx.module().source, fork_stmt.span,
                 "Forking may only occur inside sync blocks"
             ));
+        }
         // Visit the respective bodies. Like the if statement, a fork statement
         // does not have a single static subsequent statement. It forks and then
         // each fork has a different next statement.

0 comments (0 inline, 0 general)