ProvableHQ/leo
1
1
Fork 0
mirror of https://github.com/ProvableHQ/leo.git synced 2024-11-24 16:08:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant function in compiler

Browse Source
This commit is contained in:
d0cd 2023-02-21 13:47:22 -08:00
parent 2b5c24ada6
commit 1ea7dad842
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
compiler/compiler/src/compiler.rs
View File

@ -226,6 +226,16 @@ impl<'a> Compiler<'a> {
Ok(())
}
/// Runs the code generation pass.
pub fn code_generation_pass(
&mut self,
symbol_table: &SymbolTable,
struct_graph: &StructGraph,
call_graph: &CallGraph,
) -> Result<String> {
CodeGenerator::do_pass((&self.ast, symbol_table, struct_graph, call_graph))
}
/// Runs the compiler stages.
pub fn compiler_stages(&mut self) -> Result<(SymbolTable, StructGraph, CallGraph)> {
let st = self.symbol_table_pass()?;
@ -246,21 +256,15 @@ impl<'a> Compiler<'a> {
Ok((st, struct_graph, call_graph))
}
/// Returns a compiled Leo program and prints the resulting bytecode.
// TODO: Remove when code generation is ready to be integrated into the compiler.
pub fn compile_and_generate_instructions(&mut self) -> Result<(SymbolTable, String)> {
self.parse_program()?;
let (symbol_table, struct_graph, call_graph) = self.compiler_stages()?;
let bytecode = CodeGenerator::do_pass((&self.ast, &symbol_table, &struct_graph, &call_graph))?;
Ok((symbol_table, bytecode))
}
/// Returns a compiled Leo program.
pub fn compile(&mut self) -> Result<SymbolTable> {
pub fn compile(&mut self) -> Result<(SymbolTable, String)> {
// Parse the program.
self.parse_program()?;
self.compiler_stages().map(|(st, _, _)| st)
// Run the intermediate compiler stages.
let (symbol_table, struct_graph, call_graph) = self.compiler_stages()?;
// Run code generation.
let bytecode = self.code_generation_pass(&symbol_table, &struct_graph, &call_graph)?;
Ok((symbol_table, bytecode))
}
/// Writes the AST to a JSON file.

2
leo/commands/build.rs
View File

@ -256,7 +256,7 @@ fn compile_leo_file(
);
// Compile the Leo program into Aleo instructions.
let (symbol_table, instructions) = compiler.compile_and_generate_instructions()?;
let (symbol_table, instructions) = compiler.compile()?;
// Write the instructions.
std::fs::File::create(&aleo_file_path)