Yul Support & Multiple Foundry Compiler Support (#92)

.github/workflows/cargo.yml

@@ -62,7 +62,9 @@ jobs:
           args: -- -o report2.md ./tests/contract-playground/
 
       - name: Check report.md vs report2.md
-        run: diff report.md report2.md
+        run: |
+          cat report2.md
+          diff report.md report2.md
 
       - name: Generate report2.json
         uses: actions-rs/cargo@v1
@@ -71,7 +73,9 @@ jobs:
           args: -- -o report2.json ./tests/contract-playground/
 
       - name: Check report.json vs report2.json
-        run: diff report.json report2.json
+        run: |
+          cat report2.json
+          diff report.json report2.json
 
   lints:
     name: Lints

README.md

@@ -146,12 +146,15 @@ If it is a Solidity file path, then Aderyn will create a temporary Foundry proje
 * [x] Support Foundry/Hardhat/Truffle/Solc output formats for ingesting AST
   * [x] Foundry
   * [x] Hardhat
-* [ ] Complexity score (with Percentage YUL code & nsloc)
+* [x] Markdown and JSON output
+* [x] Yul Support
+* [ ] Complexity metrics
 * [ ] More complex static analysis detectors
 * [ ] auto-fixes
 * [ ] installer that doesn't require Rust (aderynup)
-* [ ] VSCode Extension
 * [ ] Python bindings
+* [ ] JS/TS bindings
+* [ ] VSCode Extension
 
 **Long-term goals - Product**
 

aderyn_core/src/ast/mod.rs

@@ -20,10 +20,11 @@ mod types;
 mod user_defined_value_types;
 mod using_for_directives;
 mod variables;
+mod yul;
 
 pub use self::{
     blocks::*, contracts::*, documentation::*, enumerations::*, errors::*, events::*,
     expressions::*, functions::*, identifiers::*, import_directives::*, literals::*, magic::*,
     modifiers::*, node::*, pragma_directives::*, source_units::*, statements::*, structures::*,
-    types::*, user_defined_value_types::*, using_for_directives::*, variables::*,
+    types::*, user_defined_value_types::*, using_for_directives::*, variables::*, yul::*,
 };

aderyn_core/src/ast/statements.rs

@@ -74,7 +74,7 @@ impl Display for Statement {
             Statement::UncheckedBlock(stmt) => stmt.fmt(f),
             Statement::Return(stmt) => stmt.fmt(f),
             Statement::ExpressionStatement(stmt) => stmt.fmt(f),
-            Statement::InlineAssembly(_) => {
+            Statement::InlineAssembly(..) => {
                 f.write_str("assembly { /* WARNING: not implemented */ }")
             }
             Statement::UnhandledStatement { node_type, .. } => match node_type {
@@ -464,20 +464,20 @@ impl Display for Return {
 #[derive(Clone, Debug, Deserialize, Eq, Serialize, PartialEq, Hash)]
 #[serde(rename_all = "camelCase")]
 pub struct InlineAssembly {
-    // FIXME
     #[serde(rename = "AST")]
-    pub ast: Option<()>,
+    pub ast: Option<YulBlock>,
     pub evm_version: Option<String>,
-    // FIXME
-    pub external_references: Vec<()>,
+    pub external_references: Vec<ExternalReference>,
     pub operations: Option<String>,
     pub src: String,
     pub id: NodeID,
 }
 
 impl Node for InlineAssembly {
     fn accept(&self, visitor: &mut impl ASTConstVisitor) -> Result<()> {
-        visitor.visit_inline_assembly(self)?;
+        if visitor.visit_inline_assembly(self)? && self.ast.is_some() {
+            self.ast.as_ref().unwrap().accept(visitor)?;
+        }
         visitor.end_visit_inline_assembly(self)
     }
 }