Allow inclusion of multiple source files as dependencies for a single contract/script/etc.

core_lang/Cargo.toml

@@ -8,8 +8,9 @@ rust = "1.50"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-pest = "2.0"
+#pest = "2.0"
 pest_derive = "2.0"
+pest = { git = "https://github.com/sezna/pest.git" , rev = "8aa58791f759daf4caee26e8560e862df5a6afb7" }
 thiserror = "1.0"
 either = "1.6"
 Inflector = "0.11"

core_lang/src/asm_generation/expression/enum_instantiation.rs

@@ -8,11 +8,11 @@ use crate::asm_lang::{
     },
     Op,
 };
-use crate::error::*;
-use crate::semantic_analysis::ast_node::TypedEnumDeclaration;
-use crate::semantic_analysis::TypedExpression;
-use crate::Literal;
-use crate::{CompileResult, Ident};
+use crate::{
+    error::*,
+    semantic_analysis::{ast_node::TypedEnumDeclaration, TypedExpression},
+    CompileResult, Ident, Literal,
+};
 
 pub(crate) fn convert_enum_instantiation_to_asm<'sc>(
     decl: &TypedEnumDeclaration<'sc>,

core_lang/src/build_config.rs

@@ -0,0 +1,17 @@
+use std::path::PathBuf;
+
+/// Configuration for the overall build and compilation process.
+#[derive(Clone)]
+pub struct BuildConfig {
+    pub(crate) dir_of_code: PathBuf,
+}
+
+impl BuildConfig {
+    // note this is intentionally not the trait Default
+    // since we need at least a manifest path to work with
+    pub fn root_from_manifest_path(canonicalized_manifest_path: PathBuf) -> Self {
+        let mut path = canonicalized_manifest_path.clone();
+        path.push("src");
+        Self { dir_of_code: path }
+    }
+}

core_lang/src/constants.rs

@@ -0,0 +1 @@
+pub const DEFAULT_FILE_EXTENSION: &str = "sw";

core_lang/src/control_flow_analysis/dead_code_analysis.rs

@@ -99,22 +99,19 @@ impl<'sc> ControlFlowGraph<'sc> {
             })
             .collect()
     }
-    /// Constructs a graph that is designed to identify unused declarations and sections of code.
-    pub(crate) fn construct_dead_code_graph(
+
+    pub(crate) fn append_to_dead_code_graph(
         ast: &TypedParseTree<'sc>,
         tree_type: TreeType,
-    ) -> Result<Self, CompileError<'sc>> {
-        let mut graph = ControlFlowGraph {
-            graph: Graph::new(),
-            entry_points: vec![],
-            namespace: Default::default(),
-        };
+        graph: &mut ControlFlowGraph<'sc>,
+        // the `Result` return is just to handle `Unimplemented` errors
+    ) -> Result<(), CompileError<'sc>> {
         // do a depth first traversal and cover individual inner ast nodes
         let mut leaves = vec![];
         let exit_node = Some(graph.add_node(("Program exit".to_string()).into()));
         for ast_entrypoint in ast.all_nodes().iter() {
             let (l_leaves, _new_exit_node) =
-                connect_node(ast_entrypoint, &mut graph, &leaves, exit_node, tree_type)?;
+                connect_node(ast_entrypoint, graph, &leaves, exit_node, tree_type)?;
 
             leaves = l_leaves;
         }
@@ -168,6 +165,16 @@ impl<'sc> ControlFlowGraph<'sc> {
                             )),
                         ..
                     }) => true,
+                    ControlFlowGraphNode::ProgramNode(TypedAstNode {
+                        content:
+                            TypedAstNodeContent::Declaration(TypedDeclaration::StructDeclaration(
+                                TypedStructDeclaration {
+                                    visibility: Visibility::Public,
+                                    ..
+                                },
+                            )),
+                        ..
+                    }) => true,
                     ControlFlowGraphNode::ProgramNode(TypedAstNode {
                         content:
                             TypedAstNodeContent::Declaration(TypedDeclaration::ImplTrait { .. }),
@@ -177,7 +184,7 @@ impl<'sc> ControlFlowGraph<'sc> {
                 })
                 .collect(),
         };
-        Ok(graph)
+        Ok(())
     }
 }
 fn connect_node<'sc>(

core_lang/src/error.rs

@@ -627,6 +627,16 @@ pub enum CompileError<'sc> {
     UnknownType { span: Span<'sc> },
     #[error("Bytecode can only support programs with up to 2^12 words worth of opcodes. Try refactoring into contract calls? This is a temporary error and will be implemented in the future.")]
     TooManyInstructions { span: Span<'sc> },
+    #[error("No valid Sway file (.sw) was found at {file_path}")]
+    FileNotFound { span: Span<'sc>, file_path: String },
+    #[error("The file {file_path} could not be read: {stringified_error}")]
+    FileCouldNotBeRead {
+        span: Span<'sc>,
+        file_path: String,
+        stringified_error: String,
+    },
+    #[error("This imported file must be a library. It must start with \"library <name>\", where \"name\" is the name of the library/module this file contains.")]
+    ImportMustBeLibrary { span: Span<'sc> },
 }
 
 impl<'sc> std::convert::From<TypeError<'sc>> for CompileError<'sc> {
@@ -780,6 +790,9 @@ impl<'sc> CompileError<'sc> {
             UnknownType { span, .. } => span,
             InvalidStrType { span, .. } => span,
             TooManyInstructions { span, .. } => span,
+            FileNotFound { span, .. } => span,
+            FileCouldNotBeRead { span, .. } => span,
+            ImportMustBeLibrary { span, .. } => span,
         }
     }
 

core_lang/src/hll.pest

@@ -17,16 +17,21 @@ block_comment_open  =  {"/*"}
 block_comment_close =  {"*/"}
 fn_returns          =  {"->"}
 path_separator      =  {"::"}
+include_keyword     =  { "dep" }
 
 // top level
 program =  {SOI ~ (library|contract|script|predicate)?  ~ EOI}
 
-library      =  {"library" ~ library_name ~ ";" ~ (control_flow|declaration|use_statement)* }
+library      =  {"library" ~ library_name ~ ";" ~ (control_flow|declaration|use_statement|include_statement)* }
 library_name =  {ident}
-contract     =  {"contract" ~ ";" ~ (control_flow|declaration|use_statement)*}
-script       =  {"script" ~ ";" ~ (control_flow|declaration|use_statement)*}
-predicate    =  {"predicate" ~ ";" ~ (control_flow|declaration|use_statement)*}
-
+contract     =  {"contract" ~ ";" ~ (control_flow|declaration|use_statement|include_statement)*}
+script       =  {"script" ~ ";" ~ (control_flow|declaration|use_statement|include_statement)*}
+predicate    =  {"predicate" ~ ";" ~ (control_flow|declaration|use_statement|include_statement)*}
+
+// including other files
+file_path         = { ident ~ ("/" ~ ident)* }
+include_statement = { include_keyword ~ file_path ~ alias? ~ ";"}
+alias             = { "as" ~ ident }
 // expressions
 expr_inner               = _{literal_value|if_exp|parenthesized_expression|asm_expression|code_block|func_app|struct_expression|delineated_path|method_exp|subfield_exp|var_exp|array_exp|match_expression|unit}
 parenthesized_expression =  {"(" ~ expr ~ ")"}
@@ -131,9 +136,11 @@ impl_trait    =  {impl_keyword ~ trait_name ~ type_params? ~ "for" ~ type_name ~
 
 // imports
 
-use_statement =  {use_keyword ~ import_path ~ ";"}
-import_path   =  {ident ~ (path_separator ~ (ident|star))*}
-star          =  {"*"}
+use_statement           =  {relative_use_statement | absolute_use_statement}
+relative_use_statement  =  {use_keyword ~ import_path ~ ";"}
+absolute_use_statement  =  {use_keyword ~ path_separator ~ import_path ~ ";"}
+import_path             =  {ident ~ (path_separator ~ (ident|star))*}
+star                    =  {"*"}
 
 // loops
 while_loop =  {while_keyword ~ expr ~ code_block}