AleoHQ/leo
1
1
Fork 0
mirror of https://github.com/AleoHQ/leo.git synced 2024-12-22 00:51:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Refactored code to pull out JSON value serialization; preferring this option since it preserves test expectations

Browse Source
This commit is contained in:
Pranav Gaddamadugu 2021-09-20 20:48:16 -07:00
parent 074587f4d2
commit 798c3f0eb6
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ast/src/lib.rs
View File

@ -108,15 +108,6 @@ impl Ast {
Ok(serde_json::to_value(&self.ast).map_err(|e| AstError::failed_to_convert_ast_to_json_value(&e))?) Ok(serde_json::to_value(&self.ast).map_err(|e| AstError::failed_to_convert_ast_to_json_value(&e))?)
} }
/// Serializes the ast into a JSON file.
pub fn to_json_file(value: serde_json::Value, mut path: std::path::PathBuf, file_name: &str) -> Result<()> {
path.push(file_name);
let file = std::fs::File::create(&path).map_err(|e| AstError::failed_to_create_ast_json_file(&path, &e))?;
let writer = std::io::BufWriter::new(file);
Ok(serde_json::to_writer_pretty(writer, &value)
.map_err(|e| AstError::failed_to_write_ast_to_json_file(&path, &e))?)
}
/// Serializes the ast into a JSON file. /// Serializes the ast into a JSON file.
pub fn to_json_file_direct(&self, mut path: std::path::PathBuf, file_name: &str) -> Result<()> { pub fn to_json_file_direct(&self, mut path: std::path::PathBuf, file_name: &str) -> Result<()> {
path.push(file_name); path.push(file_name);

19
compiler/src/compiler.rs
View File

@ -22,7 +22,7 @@ use crate::{
pub use leo_asg::{new_context, AsgContext as Context, AsgContext}; pub use leo_asg::{new_context, AsgContext as Context, AsgContext};
use leo_asg::{Asg, AsgPass, Program as AsgProgram}; use leo_asg::{Asg, AsgPass, Program as AsgProgram};
use leo_ast::{AstPass, Input, MainInput, Program as AstProgram}; use leo_ast::{AstPass, Input, MainInput, Program as AstProgram};
use leo_errors::{CompilerError, Result}; use leo_errors::{AstError, CompilerError, Result};
use leo_imports::ImportParser; use leo_imports::ImportParser;
use leo_input::LeoInputParser; use leo_input::LeoInputParser;
use leo_package::inputs::InputPairs; use leo_package::inputs::InputPairs;
@ -249,7 +249,7 @@ impl<'a, F: PrimeField, G: GroupType<F>> Compiler<'a, F, G> {
if !self.ast_snapshot_options.spans_enabled { if !self.ast_snapshot_options.spans_enabled {
let mut value = ast.to_json_value()?; let mut value = ast.to_json_value()?;
remove_key_from_json(&mut value, "span"); remove_key_from_json(&mut value, "span");
leo_ast::Ast::to_json_file(value, self.output_directory.clone(), "initial_ast.json")?; write_value_to_json_file(value, self.output_directory.clone(), "initial_ast.json")?;
} else { } else {
ast.to_json_file_direct(self.output_directory.clone(), "initial_ast.json")?; ast.to_json_file_direct(self.output_directory.clone(), "initial_ast.json")?;
} }
@ -265,7 +265,7 @@ impl<'a, F: PrimeField, G: GroupType<F>> Compiler<'a, F, G> {
if !self.ast_snapshot_options.spans_enabled { if !self.ast_snapshot_options.spans_enabled {
let mut value = ast.to_json_value()?; let mut value = ast.to_json_value()?;
remove_key_from_json(&mut value, "span"); remove_key_from_json(&mut value, "span");
leo_ast::Ast::to_json_file(value, self.output_directory.clone(), "imports_resolved_ast.json")?; write_value_to_json_file(value, self.output_directory.clone(), "imports_resolved_ast.json")?;
} else { } else {
ast.to_json_file_direct(self.output_directory.clone(), "imports_resolved_ast.json")?; ast.to_json_file_direct(self.output_directory.clone(), "imports_resolved_ast.json")?;
} }
@ -278,7 +278,7 @@ impl<'a, F: PrimeField, G: GroupType<F>> Compiler<'a, F, G> {
if !self.ast_snapshot_options.spans_enabled { if !self.ast_snapshot_options.spans_enabled {
let mut value = ast.to_json_value()?; let mut value = ast.to_json_value()?;
remove_key_from_json(&mut value, "span"); remove_key_from_json(&mut value, "span");
leo_ast::Ast::to_json_file(value, self.output_directory.clone(), "canonicalization_ast.json")?; write_value_to_json_file(value, self.output_directory.clone(), "canonicalization_ast.json")?;
} else { } else {
ast.to_json_file_direct(self.output_directory.clone(), "canonicalization_ast.json")?; ast.to_json_file_direct(self.output_directory.clone(), "canonicalization_ast.json")?;
} }
@ -301,7 +301,7 @@ impl<'a, F: PrimeField, G: GroupType<F>> Compiler<'a, F, G> {
if !self.ast_snapshot_options.spans_enabled { if !self.ast_snapshot_options.spans_enabled {
let mut value = new_ast.to_json_value()?; let mut value = new_ast.to_json_value()?;
remove_key_from_json(&mut value, "span"); remove_key_from_json(&mut value, "span");
leo_ast::Ast::to_json_file(value, self.output_directory.clone(), "type_inferenced_ast.json")?; write_value_to_json_file(value, self.output_directory.clone(), "type_inferenced_ast.json")?;
} else { } else {
new_ast.to_json_file_direct(self.output_directory.clone(), "type_inferenced_ast.json")?; new_ast.to_json_file_direct(self.output_directory.clone(), "type_inferenced_ast.json")?;
} }
@ -432,3 +432,12 @@ fn remove_key_from_json(value: &mut serde_json::Value, key: &str) {
_ => (), _ => (),
} }
} }
/// Serializes a JSON value (of the AST) into a JSON file.
fn write_value_to_json_file(value: serde_json::Value, mut path: std::path::PathBuf, file_name: &str) -> Result<()> {
path.push(file_name);
let file = std::fs::File::create(&path).map_err(|e| AstError::failed_to_create_ast_json_file(&path, &e))?;
let writer = std::io::BufWriter::new(file);
Ok(serde_json::to_writer_pretty(writer, &value)
.map_err(|e| AstError::failed_to_write_ast_to_json_file(&path, &e))?)
}