put pipeline into compiler

Author: WindSoilder

src/compiler.rs

@@ -1,5 +1,5 @@
 use crate::errors::SourceError;
-use crate::parser::{AstNode, Block, NodeId};
+use crate::parser::{AstNode, Block, NodeId, Pipeline};
 use crate::protocol::Command;
 use crate::resolver::{DeclId, Frame, NameBindings, ScopeId, VarId, Variable};
 use crate::typechecker::{TypeId, Types};
@@ -44,7 +44,8 @@ pub struct Compiler {
     pub ast_nodes: Vec<AstNode>,
     pub node_types: Vec<TypeId>,
     // node_lifetimes: Vec<AllocationLifetime>,
-    pub blocks: Vec<Block>, // Blocks, indexed by BlockId
+    pub blocks: Vec<Block>,       // Blocks, indexed by BlockId
+    pub pipelines: Vec<Pipeline>, // Pipelines, indexed by PipelineId
     pub source: Vec<u8>,
     pub file_offsets: Vec<(String, usize, usize)>, // fname, start, end
 
@@ -87,6 +88,7 @@ impl Compiler {
             ast_nodes: vec![],
             node_types: vec![],
             blocks: vec![],
+            pipelines: vec![],
             source: vec![],
             file_offsets: vec![],
 

src/parser.rs

@@ -15,6 +15,9 @@ pub struct NodeId(pub usize);
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct BlockId(pub usize);
 
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct PipelineId(pub usize);
+
 #[derive(Debug, Clone)]
 pub struct Block {
     pub nodes: Vec<NodeId>,
@@ -234,7 +237,7 @@ pub enum AstNode {
         field: NodeId,
     },
     Block(BlockId),
-    Pipeline(Pipeline),
+    Pipeline(PipelineId),
     If {
         condition: NodeId,
         then_block: NodeId,
@@ -315,9 +318,10 @@ impl Parser {
             }
             expressions.push(self.expression());
         }
+        self.compiler.pipelines.push(Pipeline::new(expressions));
         let span_end = self.position();
         self.create_node(
-            AstNode::Pipeline(Pipeline::new(expressions)),
+            AstNode::Pipeline(PipelineId(self.compiler.pipelines.len() - 1)),
             span_start,
             span_end,
         )

src/resolver.rs

@@ -2,7 +2,7 @@ use crate::protocol::{Command, Declaration};
 use crate::{
     compiler::Compiler,
     errors::{Severity, SourceError},
-    parser::{AstNode, BlockId, NodeId},
+    parser::{AstNode, BlockId, NodeId, PipelineId},
 };
 use std::collections::HashMap;
 
@@ -338,11 +338,7 @@ impl<'a> Resolver<'a> {
                 }
             }
             AstNode::Statement(node) => self.resolve_node(node),
-            AstNode::Pipeline(ref pipeline) => {
-                for exp in pipeline.get_expressions() {
-                    self.resolve_node(*exp)
-                }
-            }
+            AstNode::Pipeline(pipeline_id) => self.resolve_pipeline(pipeline_id),
             AstNode::Param { .. } => (/* seems unused for now */),
             AstNode::Type { .. } => ( /* probably doesn't make sense to resolve? */ ),
             AstNode::NamedValue { .. } => (/* seems unused for now */),
@@ -351,6 +347,14 @@ impl<'a> Resolver<'a> {
         }
     }
 
+    pub fn resolve_pipeline(&mut self, pipeline_id: PipelineId) {
+        let pipeline = &self.compiler.pipelines[pipeline_id.0];
+
+        for exp in pipeline.get_expressions() {
+            self.resolve_node(*exp)
+        }
+    }
+
     pub fn resolve_variable(&mut self, unbound_node_id: NodeId) {
         let var_name = trim_var_name(self.compiler.get_span_contents(unbound_node_id));
 

src/snapshots/new_nu_parser__test__node_output@let_.nu.snap

@@ -12,7 +12,7 @@ snapshot_kind: text
 4: Variable (21 to 22) "x"
 5: Int (25 to 28) "123"
 6: Int (31 to 34) "456"
-7: Pipeline(Pipeline { nodes: [NodeId(5), NodeId(6)] }) (25 to 34)
+7: Pipeline(PipelineId(0)) (25 to 34)
 8: Let { variable_name: NodeId(4), ty: None, initializer: NodeId(7), is_mutable: false } (17 to 34)
 9: Variable (36 to 38) "$x"
 10: Block(BlockId(0)) (0 to 39)
@@ -36,3 +36,4 @@ register_count: 0
 file_count: 0
 ==== IR ERRORS ====
 Error (NodeId 2): node Let { variable_name: NodeId(0), ty: None, initializer: NodeId(1), is_mutable: false } not suported yet
+

src/snapshots/new_nu_parser__test__node_output@mut_.nu.snap

@@ -22,7 +22,7 @@ snapshot_kind: text
 14: Type { name: NodeId(13), args: None, optional: false } (39 to 42)
 15: Int (45 to 48) "123"
 16: Int (51 to 54) "344"
-17: Pipeline(Pipeline { nodes: [NodeId(15), NodeId(16)] }) (45 to 54)
+17: Pipeline(PipelineId(0)) (45 to 54)
 18: Let { variable_name: NodeId(12), ty: Some(NodeId(14)), initializer: NodeId(17), is_mutable: true } (32 to 54)
 19: Variable (56 to 58) "$y"
 20: Assignment (59 to 60)
@@ -68,3 +68,4 @@ register_count: 0
 file_count: 0
 ==== IR ERRORS ====
 Error (NodeId 4): node Let { variable_name: NodeId(0), ty: Some(NodeId(2)), initializer: NodeId(3), is_mutable: true } not suported yet
+

src/snapshots/new_nu_parser__test__node_output@pipeline.nu.snap

@@ -8,11 +8,11 @@ snapshot_kind: text
 0: Int (0 to 1) "1"
 1: Int (4 to 5) "3"
 2: Int (8 to 9) "5"
-3: Pipeline(Pipeline { nodes: [NodeId(0), NodeId(1), NodeId(2)] }) (0 to 9)
+3: Pipeline(PipelineId(0)) (0 to 9)
 4: Int (42 to 43) "1"
 5: Int (46 to 47) "2"
 6: Int (50 to 51) "3"
-7: Pipeline(Pipeline { nodes: [NodeId(4), NodeId(5), NodeId(6)] }) (42 to 51)
+7: Pipeline(PipelineId(1)) (42 to 51)
 8: Block(BlockId(0)) (0 to 52)
 ==== SCOPE ====
 0: Frame Scope, node_id: NodeId(8) (empty)
@@ -30,4 +30,5 @@ snapshot_kind: text
 register_count: 0
 file_count: 0
 ==== IR ERRORS ====
-Error (NodeId 3): node Pipeline(Pipeline { nodes: [NodeId(0), NodeId(1), NodeId(2)] }) not suported yet
+Error (NodeId 3): node Pipeline(PipelineId(0)) not suported yet
+

src/typechecker.rs

@@ -338,7 +338,8 @@ impl<'a> Typechecker<'a> {
 
                 self.set_node_type_id(node_id, block_type);
             }
-            AstNode::Pipeline(ref pipeline) => {
+            AstNode::Pipeline(pipeline_id) => {
+                let pipeline = &self.compiler.pipelines[pipeline_id.0];
                 let expressions = pipeline.get_expressions();
                 for inner in expressions {
                     self.typecheck_node(*inner)