Merge pull request #18 from Kodowa/feature/runtime-block-removal

Add support for block removal at the runtime level

Author: joshuafcole

examples/db-explorer.eve

@@ -78,7 +78,7 @@ Add tag completions to queries with no existing filters.
 ~~~ eve
 search
   query = [#db-explorer/query]
-  // not(string/contains[text: query.value substring: " "]) // @TODO: This filter goes back on once dynamic completion is ready
+  not(string/contains[text: query.value substring: " "])
   [tag]
 bind
   query.completion += [text: "#{{tag}}" value: tag]
@@ -89,7 +89,7 @@ Add attribute completions to queries with no existing filters.
 ~~~ eve
 search
   query = [#db-explorer/query]
-  // not(string/contains[text: query.value substring: " "]) // @TODO: This filter goes back on once dynamic completion is ready
+  not(string/contains[text: query.value substring: " "])
   lookup[attribute]
 bind
   query.completion += [text: attribute value: attribute]
@@ -137,18 +137,17 @@ end
 
 Find records that match the current completer pattern.
 When the completion pattern has at least one attribute, create a completer block.
-@TODO: Gotta implement block removal as a result of CodeTransaction's or this'll panic on changes.
 ~~~ eve
-// search
-//   [#db-explorer/query completion-pattern]
-//   completion-pattern.attribute
-// bind
-//   output-var = [#eve/compiler/variable name: "completion" completion-pattern]
-//   record-var = [#eve/compiler/variable name: "record" completion-pattern]
-//   [#eve/compiler/block #db-explorer/completer type: "bind" | record-var constraint:
-//     [#eve/compiler/output entity: output-var attribute: "tag" value: "db-explorer/completion-record"]
-//     [#eve/compiler/output entity: output-var attribute: "record" value: record-var]]
-// end
+search
+  [#db-explorer/query completion-pattern]
+  completion-pattern.attribute
+bind
+  output-var = [#eve/compiler/variable name: "completion" completion-pattern]
+  record-var = [#eve/compiler/variable name: "record" completion-pattern]
+  [#eve/compiler/block #db-explorer/completer type: "bind" | record-var constraint:
+    [#eve/compiler/output entity: output-var attribute: "tag" value: "db-explorer/completion-record"]
+    [#eve/compiler/output entity: output-var attribute: "record" value: record-var]]
+end
 ~~~
 
 Fully formed AVs translate into eAV scans.

src/ops.rs

@@ -837,7 +837,7 @@ impl Frame {
 // Instruction
 //-------------------------------------------------------------------------
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub enum Instruction {
     StartBlock { block: usize },
     GetIterator {iterator: usize, bail: i32, constraint: usize},
@@ -2847,8 +2847,21 @@ impl Program {
     }
 
     pub fn unregister_block(&mut self, name:String) {
-        println!("Unregister: {}", name);
-        unimplemented!();
+        if let Some(block_ix) = self.block_info.block_names.remove(&name) {
+            let block = self.block_info.blocks.remove(block_ix);
+            for (pipe_ix, pipe) in block.pipes.iter().enumerate() {
+                for shape in block.shapes[pipe_ix].iter() {
+                    match shape {
+                        &PipeShape::Scan(e, a, v) => {
+                            self.block_info.pipe_lookup.get_mut(&(e, a, v)).unwrap().remove_item(pipe);
+                        },
+                        &PipeShape::Intermediate(id) => {
+                            self.block_info.intermediate_pipe_lookup.get_mut(&id).unwrap().remove_item(pipe);
+                        }
+                    }
+                }
+            }
+        }
     }
 
     pub fn insert_block(&mut self, name:&str, code:&str) {
@@ -3119,13 +3132,6 @@ impl CodeTransaction {
         let ref mut frame = self.frame;
         let ref mut iter_pool = self.iter_pool;
 
-        for add in to_add {
-            frame.reset();
-            frame.input = Some(Change { e:0,a:0,v:0,n: 0, transaction:0, round:0, count:1 });
-            program.register_block(add);
-            interpret(&mut program.state, &program.block_info, iter_pool, frame, &program.block_info.blocks.last().unwrap().pipes[0]);
-        }
-
         for name in to_remove {
             {
                 let block_ix = match program.block_info.block_names.get(&name) {
@@ -3141,6 +3147,13 @@ impl CodeTransaction {
             program.unregister_block(name);
         }
 
+        for add in to_add {
+            frame.reset();
+            frame.input = Some(Change { e:0,a:0,v:0,n: 0, transaction:0, round:0, count:1 });
+            program.register_block(add);
+            interpret(&mut program.state, &program.block_info, iter_pool, frame, &program.block_info.blocks.last().unwrap().pipes[0]);
+        }
+
         let mut max_round = 0;
         intermediate_flow(frame, &mut program.state, &program.block_info, iter_pool, 0, &mut max_round);