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

Start adding symbol_table to scope resolution

Browse Source
This commit is contained in:
greg 2019-09-09 17:45:34 -07:00
parent 5572e0eebb
commit 418d77770f
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
schala-lang/language/src/schala.rs
View File

@ -144,8 +144,9 @@ fn symbol_table(input: ast::AST, handle: &mut Schala, comp: Option<&mut PassDebu
Ok(input) Ok(input)
} }
fn scope_resolution(mut input: ast::AST, _handle: &mut Schala, _com: Option<&mut PassDebugArtifact>) -> Result<ast::AST, String> { fn scope_resolution(mut input: ast::AST, handle: &mut Schala, _com: Option<&mut PassDebugArtifact>) -> Result<ast::AST, String> {
let mut resolver = crate::scope_resolution::ScopeResolver::new(); let symbol_table = handle.symbol_table.borrow();
let mut resolver = crate::scope_resolution::ScopeResolver::new(&symbol_table);
let () = resolver.resolve(&mut input)?; let () = resolver.resolve(&mut input)?;
Ok(input) Ok(input)
} }

11
schala-lang/language/src/scope_resolution.rs
View File

@ -1,12 +1,13 @@
use crate::symbol_table::{ScopeSegment, ScopeSegmentKind, FullyQualifiedSymbolName}; use crate::symbol_table::{SymbolTable, ScopeSegment, ScopeSegmentKind, FullyQualifiedSymbolName};
use crate::ast::*; use crate::ast::*;
pub struct ScopeResolver { pub struct ScopeResolver<'a> {
symbol_table: &'a SymbolTable
} }
impl ScopeResolver { impl<'a> ScopeResolver<'a> {
pub fn new() -> ScopeResolver { pub fn new(symbol_table: &'a SymbolTable) -> ScopeResolver {
ScopeResolver { } ScopeResolver { symbol_table }
} }
pub fn resolve(&mut self, ast: &mut AST) -> Result<(), String> { pub fn resolve(&mut self, ast: &mut AST) -> Result<(), String> {
for statement in ast.0.iter_mut() { for statement in ast.0.iter_mut() {