-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
7c30825
commit bc5a886
Showing
9 changed files
with
209 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| use crate::parser; | ||
| mod variable_resolution_pass; | ||
|
|
||
| pub struct Analysis { | ||
| pub ast: parser::nodes::Program, | ||
| } | ||
|
|
||
| impl Analysis { | ||
| pub fn new(ast: parser::nodes::Program) -> Self { | ||
| Self { | ||
| ast, | ||
| } | ||
| } | ||
|
|
||
| pub fn run(&mut self) -> parser::nodes::Program { | ||
| let mut first_pass = variable_resolution_pass::Pass::new(&self.ast); | ||
|
|
||
| let program = first_pass.run(); | ||
|
|
||
| program | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| use crate::parser::nodes; | ||
|
|
||
| pub struct Pass { | ||
| pub program: nodes::Program, | ||
| pub error_func: Option<fn(String, String, String, usize, usize, usize, Option<i32>)>, | ||
| context: Context, | ||
| } | ||
|
|
||
| pub struct Context { | ||
| pub var_map: std::collections::HashMap<String, String>, | ||
| pub tmp_n: i32, | ||
| } | ||
|
|
||
| impl Context { | ||
| fn new() -> Context { | ||
| Context { var_map: std::collections::HashMap::new(), tmp_n: -1 } | ||
| } | ||
|
|
||
| } | ||
|
|
||
| impl Pass { | ||
| pub fn new(program: &nodes::Program) -> Pass { | ||
| Pass { program: program.clone(), error_func: None, context: Context::new() } | ||
| } | ||
|
|
||
| pub fn run(&mut self) -> nodes::Program { | ||
| let mut program = nodes::Program { | ||
| function_definitions: Vec::new(), | ||
| }; | ||
|
|
||
| for function in self.program.function_definitions.clone() { | ||
| let body = match *function.body { | ||
| nodes::Statement::Compound(compound) => compound, | ||
| _ => panic!() | ||
| }; | ||
|
|
||
| let mut statements: Vec<Box<nodes::Statement>> = Vec::new(); | ||
|
|
||
| for statement in body.statements { | ||
| statements.push(self.resolve_statement(statement)); | ||
| } | ||
|
|
||
| let new_function = nodes::FunctionDeclaration { | ||
| function_name: function.function_name.clone(), | ||
| body: Box::new(nodes::Statement::Compound(nodes::CompoundStatement { | ||
| statements, | ||
| })), | ||
| return_type: function.return_type.clone(), | ||
| params: function.params.clone(), // todo: run resolve vars on params | ||
| }; | ||
|
|
||
| program.function_definitions.push(new_function); | ||
| } | ||
|
|
||
| program | ||
| } | ||
|
|
||
| fn make_temporary(&mut self) -> String { | ||
| self.context.tmp_n += 1; | ||
| format!(".localvar{}", self.context.tmp_n) | ||
| } | ||
|
|
||
| fn resolve_statement(&mut self, statement: Box<nodes::Statement>) -> Box<nodes::Statement> { | ||
| match *statement { | ||
| nodes::Statement::VariableDeclaration(decl) => { | ||
| if self.context.var_map.contains_key(&decl.ident.value) { | ||
| panic!("Variable {} already declared in scope", decl.ident.value) | ||
| } | ||
|
|
||
| let new_ident = self.make_temporary(); | ||
|
|
||
| self.context.var_map.insert(decl.ident.value.clone(), new_ident.clone()); | ||
|
|
||
| let new_decl = nodes::VariableDeclaration { | ||
| kind: decl.kind.clone(), | ||
| ident: nodes::Identifier { value: new_ident }, | ||
| expr: if decl.expr.is_some() { Some(self.resolve_expression(decl.expr.unwrap())) } else { None }, | ||
| }; | ||
|
|
||
| Box::new(nodes::Statement::VariableDeclaration(new_decl)) | ||
| }, | ||
| nodes::Statement::ExpressionStatement(expr) => { | ||
| Box::new(nodes::Statement::ExpressionStatement(nodes::ExpressionStatement { | ||
| expression: self.resolve_expression(expr.expression) | ||
| })) | ||
| }, | ||
| nodes::Statement::ReturnStatement(ret) => { | ||
| Box::new(nodes::Statement::ReturnStatement(nodes::ReturnStatement { | ||
| return_value: self.resolve_expression(ret.return_value) | ||
| })) | ||
| }, | ||
|
|
||
| _ => statement, | ||
| } | ||
| } | ||
|
|
||
| fn resolve_expression(&mut self, expr: Box<nodes::Expression>) -> Box<nodes::Expression> { | ||
| match *expr { | ||
| nodes::Expression::Var(ref ident) => { | ||
| if self.context.var_map.contains_key(&ident.value) { | ||
| Box::new(nodes::Expression::Var(nodes::Identifier { value: self.context.var_map.get(&ident.value).unwrap().clone() })) | ||
| } else { | ||
| panic!("Variable {} not found in scope", ident.value) | ||
| } | ||
| }, | ||
| nodes::Expression::Assignment(ref ident, ref expr) => { | ||
| if self.context.var_map.contains_key(&ident.value) { | ||
| Box::new(nodes::Expression::Assignment(nodes::Identifier { value: self.context.var_map.get(&ident.value).unwrap().clone() }, self.resolve_expression(expr.clone()))) | ||
| } else { | ||
| expr.clone() | ||
| } | ||
| }, | ||
| nodes::Expression::BinOp(ref left, ref op, ref right) => { | ||
| Box::new(nodes::Expression::BinOp(self.resolve_expression(left.clone()), op.clone(), self.resolve_expression(right.clone()))) | ||
| }, | ||
| nodes::Expression::UnaryOp(ref op, ref expr) => { | ||
| Box::new(nodes::Expression::UnaryOp(op.clone(), self.resolve_expression(expr.clone()))) | ||
| }, | ||
| _ => expr, | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| fn main(argc: int) -> int { | ||
| return 1 >= 1; | ||
| let a: int = 5; | ||
| return a; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters