Tiny changes.

dmc-lib/src/ast/call.rs

@@ -1,8 +1,8 @@
-use crate::ast::diagnostic_factories::class_has_no_constructor;
 use crate::ast::expression::Expression;
 use crate::ast::fqn_util::fqn_parts_to_string;
 use crate::ast::ir_builder::IrBuilder;
 use crate::diagnostic::Diagnostic;
+use crate::diagnostic_factories::class_has_no_constructor;
 use crate::ir::ir_call::IrCall;
 use crate::ir::ir_expression::IrExpression;
 use crate::source_range::SourceRange;

dmc-lib/src/ast/class.rs

@@ -16,12 +16,11 @@ use crate::source_range::SourceRange;
 use crate::symbol::Symbol;
 use crate::symbol::class_symbol::ClassSymbol;
 use crate::symbol::constructor_symbol::ConstructorSymbol;
-use crate::symbol::variable_symbol::VariableSymbol;
 use crate::symbol_table::SymbolTable;
 use crate::type_info::TypeInfo;
 use crate::types_table::TypesTable;
 use crate::{diagnostics_result, handle_diagnostics, ok_or_err_diagnostics};
-use std::collections::{HashMap, HashSet};
+use std::collections::HashSet;
 use std::rc::Rc;
 
 pub struct Class {
@@ -88,7 +87,7 @@ impl Class {
         symbol_table.pop_scope();
     }
 
-    pub fn make_symbols(&self, fqn_context: &mut FqnContext) -> Vec<Symbol> {
+    pub fn make_symbols(&self, fqn_context: &FqnContext) -> Vec<Symbol> {
         let mut all_symbols: Vec<Symbol> = Vec::new();
 
         let mut generic_parameter_symbols = Vec::new();
@@ -105,16 +104,17 @@ impl Class {
             field_symbols.push(symbol);
         }
 
-        fqn_context.push(self.declared_name.clone()); // namespace this class' members
+        let class_body_fqn_context = fqn_context.with_part(&self.declared_name);
 
         let constructor_symbol = if let Some(constructor) = &self.constructor {
-            let (constructor_symbol, mut symbols) = constructor.make_symbols(fqn_context);
+            let (constructor_symbol, mut symbols) =
+                constructor.make_symbols(&class_body_fqn_context);
             all_symbols.append(&mut symbols);
             constructor_symbol
         } else {
             Rc::new(ConstructorSymbol::new(
                 &self.declared_name_source_range,
-                resolve_ctor_name(fqn_context),
+                resolve_ctor_name(&class_body_fqn_context),
                 false,
                 true,
                 self.self_class_body_scope_id.unwrap(),
@@ -125,17 +125,16 @@ impl Class {
 
         let mut function_symbols = Vec::new();
         for function in &self.functions {
-            let (function_symbol, mut symbols) = function.make_symbols(fqn_context, true);
+            let (function_symbol, mut symbols) =
+                function.make_symbols(&class_body_fqn_context, true);
             all_symbols.append(&mut symbols);
             function_symbols.push(function_symbol);
         }
 
-        fqn_context.pop(); // un-namespace
-
         let class_symbol = Rc::new(ClassSymbol::new(
             &self.declared_name,
             Some(self.declared_name_source_range.clone()),
-            fqn_context.resolve(&self.declared_name),
+            fqn_context.resolve(&self.declared_name), // not class body!
             false,
             self.scope_id.unwrap(),
             generic_parameter_symbols,
@@ -148,7 +147,7 @@ impl Class {
         all_symbols
     }
 
-    pub fn check_names(&self, symbol_table: &mut SymbolTable) -> Vec<Diagnostic> {
+    pub fn check_names(&self, symbol_table: &SymbolTable) -> Vec<Diagnostic> {
         let mut diagnostics: Vec<Diagnostic> = Vec::new();
 
         for generic_parameter in &self.generic_parameters {

dmc-lib/src/ast/compilation_unit.rs

@@ -2,11 +2,13 @@ use crate::ast::class::Class;
 use crate::ast::extern_function::ExternFunction;
 use crate::ast::fqn_context::FqnContext;
 use crate::ast::function::Function;
-use crate::ast::helpers::{collect_diagnostics_into_mut, try_insert_symbols_into};
+use crate::ast::helpers::collect_diagnostics_into_mut;
 use crate::diagnostic::Diagnostic;
 use crate::ir::ir_class::IrClass;
 use crate::ir::ir_function::IrFunction;
+use crate::symbol::Symbol;
 use crate::symbol_table::SymbolTable;
+use crate::symbol_table::util::try_insert_symbols_into;
 use crate::types_table::TypesTable;
 use crate::{diagnostics_result, handle_diagnostics};
 
@@ -55,24 +57,46 @@ impl CompilationUnit {
         symbol_table.pop_scope();
     }
 
+    pub fn gather_unordered_symbols(&self) -> Vec<Symbol> {
+        let fqn_context = FqnContext::new();
+        [
+            self.classes
+                .iter()
+                .flat_map(|class| class.make_symbols(&fqn_context))
+                .collect::<Vec<_>>(),
+            self.extern_functions
+                .iter()
+                .flat_map(|function| function.make_symbols(&fqn_context).1)
+                .collect(),
+            self.functions
+                .iter()
+                .flat_map(|function| function.make_symbols(&fqn_context, false).1)
+                .collect(),
+        ]
+        .into_iter()
+        .flatten()
+        .collect()
+    }
+
+    #[deprecated]
     pub fn gather_symbols_into(
         &self,
         symbol_table: &mut SymbolTable,
     ) -> Result<(), Vec<Diagnostic>> {
         let mut diagnostics = vec![];
-        let mut fqn_context = FqnContext::new();
+        let fqn_context = FqnContext::new();
         for class in &self.classes {
             handle_diagnostics!(
-                try_insert_symbols_into(class.make_symbols(&mut fqn_context), symbol_table),
+                try_insert_symbols_into(class.make_symbols(&fqn_context), symbol_table),
                 diagnostics
             );
         }
         for function in &self.functions {
-            let (_, symbols) = function.make_symbols(&mut fqn_context, false);
+            let (_, symbols) = function.make_symbols(&fqn_context, false);
             handle_diagnostics!(try_insert_symbols_into(symbols, symbol_table), diagnostics);
         }
         for extern_function in &self.extern_functions {
-            let (_, symbols) = extern_function.make_symbols(&mut fqn_context);
+            let (_, symbols) = extern_function.make_symbols(&fqn_context);
             handle_diagnostics!(try_insert_symbols_into(symbols, symbol_table), diagnostics);
         }
         diagnostics_result!(diagnostics)

dmc-lib/src/ast/field.rs

@@ -1,7 +1,7 @@
-use crate::ast::diagnostic_factories::field_has_no_type_or_init;
 use crate::ast::expression::Expression;
 use crate::ast::type_use::TypeUse;
 use crate::diagnostic::Diagnostic;
+use crate::diagnostic_factories::field_has_no_type_or_init;
 use crate::source_range::SourceRange;
 use crate::symbol::class_symbol::ClassSymbol;
 use crate::symbol::field_symbol::FieldSymbol;

dmc-lib/src/ast/fqn_context.rs

@@ -9,12 +9,10 @@ impl FqnContext {
         Self { parts: vec![] }
     }
 
-    pub fn push(&mut self, part: Rc<str>) {
+    pub fn with_part(&self, part: &Rc<str>) -> Self {
-        self.parts.push(part);
+        let mut new_parts = self.parts.clone();
-    }
+        new_parts.push(part.clone());
-
+        Self { parts: new_parts }
-    pub fn pop(&mut self) {
-        self.parts.pop();
     }
 
     pub fn resolve(&self, name: &str) -> Vec<Rc<str>> {

dmc-lib/src/ast/helpers.rs

@@ -1,11 +1,9 @@
-use crate::ast::diagnostic_factories::symbol_already_declared;
 use crate::ast::fqn_context::FqnContext;
 use crate::ast::parameter::Parameter;
 use crate::diagnostic::Diagnostic;
 use crate::diagnostics_result;
 use crate::symbol::Symbol;
 use crate::symbol::parameter_symbol::ParameterSymbol;
-use crate::symbol_table::SymbolTable;
 use std::rc::Rc;
 
 /// Iterates through all `ts`, running the `f` function, and pushing returned `Diagnostic`s
@@ -95,31 +93,6 @@ pub fn resolve_ctor_name(fqn_context: &FqnContext) -> Vec<Rc<str>> {
     fqn_context.resolve("ctor") // ctor is a keyword at the language level, should not be callable via normal means
 }
 
-pub fn try_insert_symbol_into(
-    symbol: Symbol,
-    symbol_table: &mut SymbolTable,
-) -> Result<(), Diagnostic> {
-    let maybe_already_inserted = symbol_table.get_symbol(symbol.scope_id(), symbol.declared_name());
-    if let Some(already_inserted) = maybe_already_inserted {
-        Err(symbol_already_declared(&already_inserted, &symbol))
-    } else {
-        symbol_table.insert_symbol(symbol);
-        Ok(())
-    }
-}
-
-pub fn try_insert_symbols_into(
-    symbols: Vec<Symbol>,
-    symbol_table: &mut SymbolTable,
-) -> Result<(), Vec<Diagnostic>> {
-    let diagnostics: Vec<Diagnostic> = symbols
-        .into_iter()
-        .map(|symbol| try_insert_symbol_into(symbol, symbol_table))
-        .filter_map(Result::err)
-        .collect();
-    diagnostics_result!(diagnostics)
-}
-
 pub fn collect_parameter_symbols_into(
     parameters: &[Parameter],
     all_symbols: &mut Vec<Symbol>,

dmc-lib/src/ast/identifier.rs

@@ -1,10 +1,10 @@
-use crate::ast::diagnostic_factories::{
-    outer_class_field_usage, outer_class_method_usage, self_constructor_used_in_init,
-    self_field_used_in_init, self_method_used_in_init, symbol_not_found,
-};
 use crate::ast::ir_builder::IrBuilder;
 use crate::ast::ir_util::get_or_init_field_pointer_variable;
 use crate::diagnostic::Diagnostic;
+use crate::diagnostic_factories::{
+    outer_class_field_usage, outer_class_method_usage, self_constructor_used_in_init,
+    self_field_used_in_init, self_method_used_in_init, symbol_not_found,
+};
 use crate::ir::ir_assign::IrAssign;
 use crate::ir::ir_expression::IrExpression;
 use crate::ir::ir_operation::IrOperation;

dmc-lib/src/ast/let_statement.rs

@@ -1,5 +1,4 @@
 use crate::ast::expression::Expression;
-use crate::ast::helpers::try_insert_symbol_into;
 use crate::ast::ir_builder::IrBuilder;
 use crate::diagnostic::Diagnostic;
 use crate::ir::ir_assign::IrAssign;
@@ -10,6 +9,7 @@ use crate::symbol::Symbol;
 use crate::symbol::class_symbol::ClassSymbol;
 use crate::symbol::variable_symbol::VariableSymbol;
 use crate::symbol_table::SymbolTable;
+use crate::symbol_table::util::try_insert_symbol_into;
 use crate::type_info::TypeInfo;
 use crate::types_table::TypesTable;
 use std::cell::RefCell;

dmc-lib/src/ast/mod.rs

@@ -4,7 +4,6 @@ pub mod call;
 pub mod class;
 pub mod compilation_unit;
 pub mod constructor;
-mod diagnostic_factories;
 pub mod double_literal;
 pub mod expression;
 pub mod expression_statement;
@@ -26,4 +25,3 @@ pub mod parameter;
 pub mod statement;
 pub mod string_literal;
 pub mod type_use;
-mod util;

dmc-lib/src/ast/type_use.rs

@@ -1,5 +1,5 @@
-use crate::ast::diagnostic_factories::symbol_not_found;
 use crate::diagnostic::Diagnostic;
+use crate::diagnostic_factories::symbol_not_found;
 use crate::error_codes::INCORRECT_GENERIC_ARGUMENTS;
 use crate::source_range::SourceRange;
 use crate::symbol::type_symbol::TypeSymbol;

dmc-lib/src/compile_pipeline.rs

@@ -0,0 +1,51 @@
+use crate::ast::compilation_unit::CompilationUnit;
+use crate::diagnostic::Diagnostics;
+use crate::parser::parse_compilation_unit;
+use crate::symbol_table::SymbolTable;
+use crate::symbol_table::util::try_insert_symbols_into;
+use std::collections::HashMap;
+use std::rc::Rc;
+
+pub type Filename = Rc<str>;
+
+fn parse_compilation_units(
+    inputs: &HashMap<Filename, &str>,
+) -> Result<HashMap<Filename, CompilationUnit>, Diagnostics> {
+    let mut parse_diagnostics = Vec::new();
+    let mut compilation_units = HashMap::new();
+    for (file_name, source) in inputs {
+        match parse_compilation_unit(source) {
+            Ok(compilation_unit) => {
+                compilation_units.insert(file_name.clone(), compilation_unit);
+            }
+            Err(mut ds) => {
+                parse_diagnostics.append(&mut ds);
+            }
+        }
+    }
+    if parse_diagnostics.is_empty() {
+        Ok(compilation_units)
+    } else {
+        Err(parse_diagnostics)
+    }
+}
+
+pub fn compile_compilation_units(inputs: &HashMap<Filename, &str>) -> Result<(), Diagnostics> {
+    let mut compilation_units = parse_compilation_units(inputs)?;
+
+    let mut symbol_table = SymbolTable::new();
+
+    // init scopes
+    for compilation_unit in compilation_units.values_mut() {
+        compilation_unit.init_scopes(&mut symbol_table);
+    }
+
+    // gather unordered symbols
+    let all_symbols = compilation_units
+        .values()
+        .flat_map(|compilation_unit| compilation_unit.gather_unordered_symbols())
+        .collect::<Vec<_>>();
+    try_insert_symbols_into(all_symbols, &mut symbol_table)?;
+
+    Ok(())
+}

dmc-lib/src/lib.rs

@@ -1,6 +1,8 @@
 pub mod ast;
+pub mod compile_pipeline;
 pub mod constants_table;
 pub mod diagnostic;
+mod diagnostic_factories;
 pub mod error_codes;
 pub mod intrinsics;
 pub mod ir;
@@ -14,3 +16,4 @@ pub mod symbol_table;
 pub mod token;
 pub mod type_info;
 pub mod types_table;
+mod util;

dmc-lib/src/symbol_table/mod.rs

@@ -1,4 +1,5 @@
 mod helpers;
+pub mod util;
 
 use crate::scope::Scope;
 use crate::scope::block_scope::BlockScope;

dmc-lib/src/symbol_table/util.rs

@@ -0,0 +1,30 @@
+use crate::diagnostic::Diagnostic;
+use crate::diagnostic_factories::symbol_already_declared;
+use crate::diagnostics_result;
+use crate::symbol::Symbol;
+use crate::symbol_table::SymbolTable;
+
+pub fn try_insert_symbol_into(
+    symbol: Symbol,
+    symbol_table: &mut SymbolTable,
+) -> Result<(), Diagnostic> {
+    let maybe_already_inserted = symbol_table.get_symbol(symbol.scope_id(), symbol.declared_name());
+    if let Some(already_inserted) = maybe_already_inserted {
+        Err(symbol_already_declared(&already_inserted, &symbol))
+    } else {
+        symbol_table.insert_symbol(symbol);
+        Ok(())
+    }
+}
+
+pub fn try_insert_symbols_into(
+    symbols: Vec<Symbol>,
+    symbol_table: &mut SymbolTable,
+) -> Result<(), Vec<Diagnostic>> {
+    let diagnostics: Vec<Diagnostic> = symbols
+        .into_iter()
+        .map(|symbol| try_insert_symbol_into(symbol, symbol_table))
+        .filter_map(Result::err)
+        .collect();
+    diagnostics_result!(diagnostics)
+}