CSY/reowolf Changeset - 77315308b8b8 · Centrum Wiskunde & Informatica (CWI)

Changeset - 77315308b8b8

Parent rev.

Child rev.

[Not reviewed]

0 4 0

mh - 3 years ago 2022-03-02 11:03:16
contact@maxhenger.nl

WIP: Fixing bug with empty select statement

4 files changed with 45 insertions and 4 deletions:

src/protocol/eval/executor.rs

src/protocol/mod.rs

src/runtime2/component/component_pdl.rs

src/runtime2/tests/mod.rs

0 comments (0 inline, 0 general)

src/protocol/eval/executor.rs

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ use crate::protocol::*; @@
 use crate::protocol::ast::*;
 use crate::protocol::type_table::*;
-macro_rules! debug_enabled { () => { false }; }
+macro_rules! debug_enabled { () => { true }; }
 macro_rules! debug_log {
     ($format:literal) => {
-        enabled_debug_print!(false, "exec", $format);
+        enabled_debug_print!(true, "exec", $format);
     };
     ($format:literal, $($args:expr),*) => {
-        enabled_debug_print!(false, "exec", $format, $($args),*);
+        enabled_debug_print!(true, "exec", $format, $($args),*);
     };
+}
@@ @@ -300,7 +300,7 @@ impl Prompt { @@
             return Ok(EvalContinuation::ComponentTerminated);
+        }
-        debug_log!("Taking step in '{}'", heap[cur_frame.definition].identifier().value.as_str());
         debug_log!("Taking step in '{}'", heap[cur_frame.definition].identifier.value.as_str());
         // Execute all pending expressions
         while !cur_frame.expr_stack.is_empty() {

src/protocol/mod.rs

➞

Show inline comments

@@ @@ -54,6 +54,7 @@ impl ProtocolDescription { @@
         let mut parser = Parser::new();
         parser.feed(source).expect("failed to feed source");
         parser.write_ast_to = Some(String::from("hello.txt"));
         if let Err(err) = parser.parse() {
             println!("ERROR:\n{}", err);
             return Err(format!("{}", err))

src/runtime2/component/component_pdl.rs

➞

Show inline comments

@@ @@ -380,11 +380,13 @@ impl CompPDL { @@
             },
             EC::SelectStart(num_cases, _num_ports) => {
                 debug_assert_eq!(self.mode, Mode::Sync);
                 println!("DEBUG: AAAAAAAAAA");
                 self.select.handle_select_start(num_cases);
                 return Ok(CompScheduling::Requeue);
             },
             EC::SelectRegisterPort(case_index, port_index, port_id) => {
                 debug_assert_eq!(self.mode, Mode::Sync);
                 println!("DEBUG: BBBBBBBBBBB");
                 let port_id = port_id_from_eval(port_id);
                 if let Err(_err) = self.select.register_select_case_port(comp_ctx, case_index, port_index, port_id) {
                     todo!("handle registering a port multiple times");
@@ @@ -393,6 +395,7 @@ impl CompPDL { @@
             },
             EC::SelectWait => {
                 debug_assert_eq!(self.mode, Mode::Sync);
                 println!("DEBUG: CCCCCCCCCCC");
                 let select_decision = self.select.handle_select_waiting_point(&self.inbox_main, comp_ctx);
                 if let SelectDecision::Case(case_index) = select_decision {
                     // Reached a conclusion, so we can continue immediately

src/runtime2/tests/mod.rs

➞

Show inline comments

@@ @@ -133,3 +133,40 @@ fn test_simple_select() { @@
     let rt = Runtime::new(3, false, pd);
     create_component(&rt, "", "constructor", no_args());
+}
 #[test]
 fn test_empty_select() {
     let pd = ProtocolDescription::parse(b"
     primitive constructor() {
         u32 index = 0;
         while (index < 5) {
             sync select { auto v = () -> print(\"hello\"); }
             index += 1;
+        }
+    }
     ").expect("compilation");
     let rt = Runtime::new(3, false, pd);
     create_component(&rt, "", "constructor", no_args());
+}
 #[test]
 fn test_empty_select_should_not_work() {
     let pd = ProtocolDescription::parse(b"
     primitive constructor() {
         u32 index = 0;
         print(\"before while\");
         while (index < 5) {
             print(\"before sync\");
             sync {
                 print(\"before select\");
                 select { }
                 print(\"after select\");
+            }
             print(\"after sync\");
+        }
         print(\"after while\");
+    }
     ").expect("compilation");
     let rt = Runtime::new(3, false, pd);
     create_component(&rt, "", "constructor", no_args());
+}
@@ \ No newline at end of file @@

0 comments (0 inline, 0 general)