CSY/reowolf Changeset - 52ae67e7183e · Centrum Wiskunde & Informatica (CWI)

Changeset - 52ae67e7183e

Parent rev.

Child rev.

[Not reviewed]

0 4 0

MH - 4 years ago 2021-12-03 15:40:08
contact@maxhenger.nl

Remove stale code in testing suite

4 files changed with 34 insertions and 18 deletions:

src/protocol/ast.rs

src/protocol/tests/utils.rs

src/runtime/tests/data_transmission.rs

src/runtime/tests/mod.rs

0 comments (0 inline, 0 general)

src/protocol/ast.rs

➞

Show inline comments

 define_aliased_ast_id!(StatementId, Id<Statement>, index(Statement, statements));
 define_new_ast_id!(BlockStatementId, StatementId, index(BlockStatement, Statement::Block, statements), alloc(alloc_block_statement));
 define_new_ast_id!(EndBlockStatementId, StatementId, index(EndBlockStatement, Statement::EndBlock, statements), alloc(alloc_end_block_statement));
-define_new_ast_id!(LocalStatementId, StatementId, index(LocalStatement, Statement::Local, statements), alloc(alloc_local_statement));
 define_new_ast_id!(LocalStatementId, StatementId, index(LocalStatement, Statement::Local, statements));
 define_new_ast_id!(MemoryStatementId, LocalStatementId);
 define_new_ast_id!(ChannelStatementId, LocalStatementId);
 define_new_ast_id!(LabeledStatementId, StatementId, index(LabeledStatement, Statement::Labeled, statements), alloc(alloc_labeled_statement));

src/protocol/tests/utils.rs

➞

Show inline comments

 use crate::collections::StringPool;
 use crate::protocol::{
     Module,
     ast::*,
     input_source::*,
     parser::{
         Parser,
         type_table::*,
         symbol_table::SymbolTable,
         token_parsing::*,
     },
     eval::*,
 };
 use crate::protocol::{Module, ast::*, input_source::*, parser::{
     Parser,
     type_table::*,
     symbol_table::SymbolTable,
     token_parsing::*,
 }, eval::*, RunContext};
 // Carries information about the test into utility structures for builder-like
 // assertions
@@ @@ -691,7 +685,7 @@ impl<'a> FunctionTester<'a> { @@
         use crate::protocol::*;
         let mut prompt = Prompt::new(&self.ctx.types, &self.ctx.heap, self.def.this.upcast(), 0, ValueGroup::new_stack(Vec::new()));
-        let mut call_context = EvalContext::None;
+        let mut call_context = FakeRunContext{};
         loop {
             let result = prompt.step(&self.ctx.types, &self.ctx.heap, &self.ctx.modules, &mut call_context);
             match result {
         },
         _ => None
+    }
+}
 struct FakeRunContext{}
 impl RunContext for FakeRunContext {
     fn performed_put(&mut self, _port: PortId) -> bool {
         unreachable!("'put' called in compiler testing code")
+    }
     fn performed_get(&mut self, _port: PortId) -> Option<ValueGroup> {
         unreachable!("'get' called in compiler testing code")
+    }
     fn fires(&mut self, _port: PortId) -> Option<Value> {
         unreachable!("'fires' called in compiler testing code")
+    }
     fn performed_fork(&mut self) -> Option<bool> {
         unreachable!("'fork' called in compiler testing code")
+    }
     fn created_channel(&mut self) -> Option<(Value, Value)> {
         unreachable!("channel created in compiler testing code")
+    }
+}
@@ \ No newline at end of file @@

src/runtime/tests/data_transmission.rs

➞

Show inline comments

@@ @@ -55,12 +55,12 @@ fn test_single_put_and_get() { @@
         let channel = api.create_channel().unwrap();
         api.create_connector("", "putter", ValueGroup::new_stack(vec![
-            Value::Output(PortId(Id{ connector_id: 0, u32_suffix: channel.putter_id.index })),
+            Value::Output(PortId::new(channel.putter_id.index)),
             Value::UInt32(NUM_LOOPS)
         ])).expect("create putter");
         api.create_connector("", "getter", ValueGroup::new_stack(vec![
-            Value::Input(PortId(Id{ connector_id: 0, u32_suffix: channel.getter_id.index })),
+            Value::Input(PortId::new(channel.getter_id.index)),
             Value::UInt32(NUM_LOOPS)
         ])).expect("create getter");
     });

src/runtime/tests/mod.rs

➞

Show inline comments

@@ @@ -5,8 +5,7 @@ mod data_transmission; @@
 mod sync_failure;
 use super::*;
 use crate::{PortId, ProtocolDescription};
 use crate::common::Id;
 use crate::ProtocolDescription;
 use crate::protocol::eval::*;
 use crate::runtime::native::{ApplicationSyncAction};

0 comments (0 inline, 0 general)