greg/schala
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Symbol table addition should be separate stage

Browse Source
This commit is contained in:
greg 2017-10-08 16:24:44 -07:00
parent b4054d7581
commit c4f0331d1a
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/schala_lang/mod.rs
View File

@ -62,6 +62,8 @@ impl ProgrammingLanguageInterface for Schala {
} }
}; };
self.type_context.add_symbols(&ast);
if options.debug_symbol_table { if options.debug_symbol_table {
let text = self.type_context.debug_symbol_table(); let text = self.type_context.debug_symbol_table();
output.add_artifact(TraceArtifact::new("symbol_table", text)); output.add_artifact(TraceArtifact::new("symbol_table", text));

5
src/schala_lang/type_check.rs
View File

@ -55,6 +55,9 @@ impl TypeContext {
pub fn new() -> TypeContext { pub fn new() -> TypeContext {
TypeContext { symbol_table: SymbolTable::new() } TypeContext { symbol_table: SymbolTable::new() }
} }
pub fn add_symbols(&mut self, ast: &AST) {
self.symbol_table.add_symbols(ast)
}
pub fn debug_symbol_table(&self) -> String { pub fn debug_symbol_table(&self) -> String {
format!("Symbol table:\n {:?}", self.symbol_table.map) format!("Symbol table:\n {:?}", self.symbol_table.map)
} }
@ -81,8 +84,6 @@ impl TypeContext {
pub fn type_check(&mut self, ast: &AST) -> TypeCheckResult { pub fn type_check(&mut self, ast: &AST) -> TypeCheckResult {
use self::ExpressionType::*; use self::ExpressionType::*;
self.symbol_table.add_symbols(ast);
for statement in ast.0.iter() { for statement in ast.0.iter() {
match statement { match statement {
&Statement::Declaration(ref _decl) => { &Statement::Declaration(ref _decl) => {