schala-lang/language/src/schala.rs

@@ -90,7 +90,7 @@ impl Schala {
     // Typechecking
     // TODO typechecking not working
     let _overall_type = self.type_context.typecheck(&ast)
-      .map_err(SchalaError::from_type_error);
+      .map_err(|err| SchalaError::from_type_error(err));
 
     // Reduce AST - TODO this doesn't produce an error yet, but probably should
     let symbol_table = self.symbol_table.borrow();

schala-lang/language/src/symbol_table/mod.rs

@@ -23,8 +23,8 @@ macro_rules! fqsn {
   };
 }
 
-mod tables;
+mod source_map;
-use tables::DeclLocations;
+use source_map::SourceMap;
 mod symbol_trie;
 use symbol_trie::SymbolTrie;
 mod test;
@@ -40,14 +40,14 @@ impl DuplicateNameTrackTable {
     DuplicateNameTrackTable { table: HashMap::new() }
   }
 
-  fn try_register(&mut self, name: &Rc<String>, id: &ItemId, decl_locations: &DeclLocations) -> Result<(), LineNumber> {
+  fn try_register(&mut self, name: &Rc<String>, id: &ItemId, source_map: &SourceMap) -> Result<(), LineNumber> {
     match self.table.entry(name.clone()) {
       Entry::Occupied(o) => {
         let line_number = o.get();
         Err(*line_number)
       },
       Entry::Vacant(v) => {
-        let line_number = if let Some(loc) = decl_locations.lookup(id) {
+        let line_number = if let Some(loc) = source_map.lookup(id) {
           loc.line_num
         } else {
           0
@@ -94,7 +94,7 @@ impl ScopeSegment {
 
 //cf. p. 150 or so of Language Implementation Patterns
 pub struct SymbolTable {
-  decl_locations: DeclLocations,
+  source_map: SourceMap,
   symbol_path_to_symbol: HashMap<FullyQualifiedSymbolName, Symbol>,
   id_to_fqsn: HashMap<ItemId, FullyQualifiedSymbolName>,
   symbol_trie: SymbolTrie,
@@ -103,7 +103,7 @@ pub struct SymbolTable {
 impl SymbolTable {
   pub fn new() -> SymbolTable {
     SymbolTable {
-      decl_locations: DeclLocations::new(),
+      source_map: SourceMap::new(),
       symbol_path_to_symbol: HashMap::new(),
       id_to_fqsn: HashMap::new(),
       symbol_trie: SymbolTrie::new()
@@ -139,7 +139,7 @@ impl SymbolTable {
 #[allow(dead_code)]
 #[derive(Debug)]
 pub struct Symbol {
-  pub local_name: Rc<String>,
+  pub local_name: Rc<String>, //TODO does this need to be pub?
   fully_qualified_name: FullyQualifiedSymbolName,
   pub spec: SymbolSpec,
 }
@@ -200,16 +200,16 @@ impl SymbolTable {
     for statement in statements.iter() {
       match statement {
         Statement { kind: StatementKind::Declaration(decl), id, location, } => {
-          self.decl_locations.add_location(id, *location);
+          self.source_map.add_location(id, *location);
 
           match decl {
             FuncSig(ref signature) => {
-              seen_identifiers.try_register(&signature.name, id, &self.decl_locations)
+              seen_identifiers.try_register(&signature.name, &id, &self.source_map)
                 .map_err(|line| format!("Duplicate function definition: {}. It's already defined at {}", signature.name, line))?;
               self.add_function_signature(signature, scope_name_stack)?
             }
             FuncDecl(ref signature, ref body) => {
-              seen_identifiers.try_register(&signature.name, id, &self.decl_locations)
+              seen_identifiers.try_register(&signature.name, &id, &self.source_map)
                 .map_err(|line| format!("Duplicate function definition: {}. It's already defined at {}", signature.name, line))?;
               self.add_function_signature(signature, scope_name_stack)?;
               scope_name_stack.push(ScopeSegment{
@@ -220,12 +220,12 @@ impl SymbolTable {
               output?
             },
             TypeDecl { name, body, mutable } => {
-              seen_identifiers.try_register(&name.name, &id, &self.decl_locations)
+              seen_identifiers.try_register(&name.name, &id, &self.source_map)
                 .map_err(|line| format!("Duplicate type definition: {}. It's already defined at {}", name.name, line))?;
               self.add_type_decl(name, body, mutable, scope_name_stack)?
             },
             Binding { name, .. } => {
-              seen_identifiers.try_register(&name, &id, &self.decl_locations)
+              seen_identifiers.try_register(&name, &id, &self.source_map)
                 .map_err(|line| format!("Duplicate variable definition: {}. It's already defined at {}", name, line))?;
               self.add_new_symbol(name, scope_name_stack, SymbolSpec::Binding);
             }
@@ -233,8 +233,8 @@ impl SymbolTable {
           }
         },
         Statement { kind: StatementKind::Module(ModuleSpecifier { name, contents}), id, location } => {
-          self.decl_locations.add_location(id, *location);
+          self.source_map.add_location(id, *location);
-          seen_modules.try_register(name, id, &self.decl_locations)
+          seen_modules.try_register(&name, &id, &self.source_map)
             .map_err(|line| format!("Duplicate module definition: {}. It's already defined at {}", name, line))?;
           scope_name_stack.push(ScopeSegment { name: name.clone() });
           let output = self.add_symbols_from_scope(contents, scope_name_stack);
@@ -248,7 +248,7 @@ impl SymbolTable {
   }
   #[allow(dead_code)]
   pub fn debug_symbol_table(&self) -> String {
-    let mut output = "Symbol table\n".to_string();
+    let mut output = format!("Symbol table\n");
     let mut sorted_symbols: Vec<(&FullyQualifiedSymbolName, &Symbol)> = self.symbol_path_to_symbol.iter().collect();
     sorted_symbols.sort_by(|(fqsn, _), (other_fqsn, _)| fqsn.cmp(other_fqsn));
     for (name, sym) in sorted_symbols.iter() {

schala-lang/language/src/symbol_table/source_map.rs

@@ -4,15 +4,14 @@ use crate::ast::ItemId;
 use crate::tokenizing::Location;
 
 
-/// Maps top-level declarations to Locations in source code, to detect
+//TODO rename this type to make its purpose clearer
-/// multiply-defined top level items.
+pub struct SourceMap {
-pub struct DeclLocations {
   map: HashMap<ItemId, Location>
 }
 
-impl DeclLocations {
+impl SourceMap {
-  pub fn new() -> Self {
+  pub fn new() -> SourceMap {
-    Self { map: HashMap::new() }
+    SourceMap { map: HashMap::new() }
   }
 
   pub(crate) fn add_location(&mut self, id: &ItemId, loc: Location) {