Support emiting AST and Tokens

cburgdorf · cburgdorf · commit 7cd0b98a31d7 · 2020-10-12T20:36:32.000+02:00
diff --git a/compiler/src/evm/mod.rs b/compiler/src/evm/mod.rs
@@ -4,14 +4,17 @@ use crate::errors::CompileError;
 use crate::yul;
 
 pub struct CompilerOutput {
+    pub tokens: String,
+    pub ast: String,
     pub yul: String,
     pub bytecode: String,
 }
 
 /// Compiles Fe to bytecode. It uses Yul as an intermediate representation.
 pub fn compile(src: &str) -> Result<CompilerOutput, CompileError> {
     let solc_temp = include_str!("solc_temp.json");
-    let yul_src = yul::compile(src)?.replace("\"", "\\\"");
+    let yul_output = yul::compile(src)?;
+    let yul_src = yul_output.yul.replace("\"", "\\\"");
     let input = solc_temp.replace("{src}", &yul_src);
     let raw_output = solc::compile(&input);
     let output: serde_json::Value = serde_json::from_str(&raw_output)?;
@@ -24,8 +27,10 @@ pub fn compile(src: &str) -> Result<CompilerOutput, CompileError> {
     }
 
     Ok(CompilerOutput {
-        yul: yul_src,
+        ast: yul_output.ast,
         bytecode,
+        tokens: yul_output.tokens,
+        yul: yul_src,
     })
 }
 
diff --git a/compiler/src/yul/mod.rs b/compiler/src/yul/mod.rs
@@ -5,8 +5,14 @@ use crate::errors::CompileError;
 mod mappers;
 mod runtime;
 
+pub struct CompilerOutput {
+    pub tokens: String,
+    pub ast: String,
+    pub yul: String,
+}
+
 /// Compiles Fe to Yul.
-pub fn compile(src: &str) -> Result<String, CompileError> {
+pub fn compile(src: &str) -> Result<CompilerOutput, CompileError> {
     let tokens = fe_parser::get_parse_tokens(src)?;
     let fe_module = fe_parser::parsers::file_input(&tokens[..])?.1.node;
     let context = fe_semantics::analysis(&fe_module)?;
@@ -16,7 +22,11 @@ pub fn compile(src: &str) -> Result<String, CompileError> {
         .values()
         .next()
     {
-        return Ok(first_contract.to_string());
+        return Ok(CompilerOutput {
+            tokens: format!("{:?}", tokens),
+            ast: format!("{:?}", fe_module),
+            yul: first_contract.to_string(),
+        });
     }
 
     Err(CompileError::static_str("unable to parse tokens."))
diff --git a/src/main_full.rs b/src/main_full.rs
@@ -20,7 +20,9 @@ const VERSION: &str = env!("CARGO_PKG_VERSION");
 arg_enum! {
     #[derive(PartialEq, Debug)]
     pub enum CompilationTarget {
+        Ast,
         Bytecode,
+        Tokens,
         Yul,
     }
 }
@@ -92,10 +94,18 @@ fn compile(src_file: &str, output_dir: &str, targets: Vec<CompilationTarget>) ->
 
     for target in targets {
         match target {
+            CompilationTarget::Ast => {
+                let mut file_ast = fs::File::create(output_dir.join("out.ast"))?;
+                file_ast.write_all(output.ast.as_bytes())?;
+            }
             CompilationTarget::Bytecode => {
                 let mut file_bytecode = fs::File::create(output_dir.join("out.bin"))?;
                 file_bytecode.write_all(output.bytecode.as_bytes())?;
             }
+            CompilationTarget::Tokens => {
+                let mut file_tokens = fs::File::create(output_dir.join("out.tokens"))?;
+                file_tokens.write_all(output.tokens.as_bytes())?;
+            }
             CompilationTarget::Yul => {
                 let mut file_yul = fs::File::create(output_dir.join("out.yul"))?;
                 file_yul.write_all(output.yul.as_bytes())?;
