Enhancements/make abstractions scalable (#253)

Cyfrin · Apr 1, 2024 · 03f9664 · 03f9664
1 parent 6cd7655
commit 03f9664
Show file tree

Hide file tree

Showing 27 changed files with 335 additions and 1,204 deletions.
diff --git a/aderyn_core/src/ast/blocks.rs b/aderyn_core/src/ast/blocks.rs
@@ -30,6 +30,11 @@ impl Node for Block {
         visitor.visit_immediate_children(self.id, children_ids)?;
         Ok(())
     }
+
+    fn accept_id(&self, visitor: &mut impl ASTConstVisitor) -> Result<()> {
+        visitor.visit_node_id(Some(self.id))?;
+        Ok(())
+    }
 }
 
 impl Display for Block {

diff --git a/aderyn_core/src/ast/contracts.rs b/aderyn_core/src/ast/contracts.rs
@@ -64,6 +64,11 @@ impl Node for ContractDefinitionNode {
             ) => user_defined_value_type_definition.accept(visitor),
         }
     }
+
+    fn accept_id(&self, visitor: &mut impl ASTConstVisitor) -> Result<()> {
+        visitor.visit_node_id(self.get_node_id())?;
+        Ok(())
+    }
 }
 
 impl ContractDefinitionNode {
@@ -154,6 +159,10 @@ impl Node for InheritanceSpecifier {
         visitor.visit_immediate_children(self.id, argument_ids)?;
         Ok(())
     }
+    fn accept_id(&self, visitor: &mut impl ASTConstVisitor) -> Result<()> {
+        visitor.visit_node_id(Some(self.id))?;
+        Ok(())
+    }
 }
 
 impl Display for InheritanceSpecifier {
@@ -231,6 +240,11 @@ impl Node for ContractDefinition {
         visitor.visit_immediate_children(self.id, node_ids)?;
         Ok(())
     }
+
+    fn accept_id(&self, visitor: &mut impl ASTConstVisitor) -> Result<()> {
+        visitor.visit_node_id(Some(self.id))?;
+        Ok(())
+    }
 }
 
 impl ContractDefinition {

diff --git a/aderyn_core/src/ast/enumerations.rs b/aderyn_core/src/ast/enumerations.rs
@@ -18,6 +18,10 @@ impl Node for EnumValue {
         visitor.visit_enum_value(self)?;
         visitor.end_visit_enum_value(self)
     }
+    fn accept_id(&self, visitor: &mut impl ASTConstVisitor) -> Result<()> {
+        visitor.visit_node_id(Some(self.id))?;
+        Ok(())
+    }
 }
 
 impl Display for EnumValue {
@@ -55,6 +59,10 @@ impl Node for EnumDefinition {
         visitor.visit_immediate_children(self.id, member_ids.clone())?;
         Ok(())
     }
+    fn accept_id(&self, visitor: &mut impl ASTConstVisitor) -> Result<()> {
+        visitor.visit_node_id(Some(self.id))?;
+        Ok(())
+    }
 }
 
 impl Display for EnumDefinition {

diff --git a/aderyn_core/src/ast/errors.rs b/aderyn_core/src/ast/errors.rs
@@ -28,6 +28,10 @@ impl Node for ErrorDefinition {
         // TODO: send documentation nodes to visitor
         visitor.visit_immediate_children(self.id, vec![self.parameters.id])
     }
+    fn accept_id(&self, visitor: &mut impl ASTConstVisitor) -> Result<()> {
+        visitor.visit_node_id(Some(self.id))?;
+        Ok(())
+    }
 }
 
 impl Display for ErrorDefinition {

diff --git a/aderyn_core/src/ast/events.rs b/aderyn_core/src/ast/events.rs
@@ -32,6 +32,10 @@ impl Node for EventDefinition {
         visitor.visit_immediate_children(self.id, vec![self.parameters.id])?;
         Ok(())
     }
+    fn accept_id(&self, visitor: &mut impl ASTConstVisitor) -> Result<()> {
+        visitor.visit_node_id(Some(self.id))?;
+        Ok(())
+    }
 }
 
 impl Display for EventDefinition {

diff --git a/aderyn_core/src/ast/expressions.rs b/aderyn_core/src/ast/expressions.rs
@@ -60,6 +60,11 @@ impl Node for Expression {
             }
         }
     }
+
+    fn accept_id(&self, visitor: &mut impl ASTConstVisitor) -> Result<()> {
+        visitor.visit_node_id(self.get_node_id())?;
+        Ok(())
+    }
 }
 
 impl Expression {
@@ -308,6 +313,10 @@ impl Node for UnaryOperation {
         }
         Ok(())
     }
+    fn accept_id(&self, visitor: &mut impl ASTConstVisitor) -> Result<()> {
+        visitor.visit_node_id(Some(self.id))?;
+        Ok(())
+    }
 }
 
 impl UnaryOperation {
@@ -361,6 +370,10 @@ impl Node for BinaryOperation {
         }
         Ok(())
     }
+    fn accept_id(&self, visitor: &mut impl ASTConstVisitor) -> Result<()> {
+        visitor.visit_node_id(Some(self.id))?;
+        Ok(())
+    }
 }
 
 impl BinaryOperation {
@@ -418,6 +431,10 @@ impl Node for Conditional {
         }
         Ok(())
     }
+    fn accept_id(&self, visitor: &mut impl ASTConstVisitor) -> Result<()> {
+        visitor.visit_node_id(Some(self.id))?;
+        Ok(())
+    }
 }
 
 impl Conditional {
@@ -471,6 +488,10 @@ impl Node for Assignment {
         }
         Ok(())
     }
+    fn accept_id(&self, visitor: &mut impl ASTConstVisitor) -> Result<()> {
+        visitor.visit_node_id(Some(self.id))?;
+        Ok(())
+    }
 }
 
 impl Assignment {
@@ -536,6 +557,10 @@ impl Node for FunctionCall {
         visitor.visit_immediate_children(self.id, argument_ids)?;
         Ok(())
     }
+    fn accept_id(&self, visitor: &mut impl ASTConstVisitor) -> Result<()> {
+        visitor.visit_node_id(Some(self.id))?;
+        Ok(())
+    }
 }
 
 impl FunctionCall {
@@ -610,6 +635,10 @@ impl Node for FunctionCallOptions {
         }
         Ok(())
     }
+    fn accept_id(&self, visitor: &mut impl ASTConstVisitor) -> Result<()> {
+        visitor.visit_node_id(Some(self.id))?;
+        Ok(())
+    }
 }
 
 impl FunctionCallOptions {
@@ -703,6 +732,10 @@ impl Node for IndexAccess {
         }
         Ok(())
     }
+    fn accept_id(&self, visitor: &mut impl ASTConstVisitor) -> Result<()> {
+        visitor.visit_node_id(Some(self.id))?;
+        Ok(())
+    }
 }
 
 impl IndexAccess {
@@ -762,6 +795,10 @@ impl Node for IndexRangeAccess {
         }
         Ok(())
     }
+    fn accept_id(&self, visitor: &mut impl ASTConstVisitor) -> Result<()> {
+        visitor.visit_node_id(Some(self.id))?;
+        Ok(())
+    }
 }
 
 impl IndexRangeAccess {
@@ -826,6 +863,10 @@ impl Node for MemberAccess {
         }
         Ok(())
     }
+    fn accept_id(&self, visitor: &mut impl ASTConstVisitor) -> Result<()> {
+        visitor.visit_node_id(Some(self.id))?;
+        Ok(())
+    }
 }
 
 impl MemberAccess {
@@ -859,6 +900,10 @@ impl Node for ElementaryTypeNameExpression {
         visitor.visit_elementary_type_name_expression(self)?;
         visitor.end_visit_elementary_type_name_expression(self)
     }
+    fn accept_id(&self, visitor: &mut impl ASTConstVisitor) -> Result<()> {
+        visitor.visit_node_id(Some(self.id))?;
+        Ok(())
+    }
 }
 
 impl Display for ElementaryTypeNameExpression {
@@ -904,6 +949,10 @@ impl Node for TupleExpression {
         visitor.visit_immediate_children(self.id, comp_ids)?;
         Ok(())
     }
+    fn accept_id(&self, visitor: &mut impl ASTConstVisitor) -> Result<()> {
+        visitor.visit_node_id(Some(self.id))?;
+        Ok(())
+    }
 }
 
 impl TupleExpression {
@@ -961,6 +1010,10 @@ impl Node for NewExpression {
         }
         visitor.end_visit_new_expression(self)
     }
+    fn accept_id(&self, visitor: &mut impl ASTConstVisitor) -> Result<()> {
+        visitor.visit_node_id(Some(self.id))?;
+        Ok(())
+    }
 }
 
 impl Display for NewExpression {

diff --git a/aderyn_core/src/ast/functions.rs b/aderyn_core/src/ast/functions.rs
@@ -40,6 +40,10 @@ impl Node for ParameterList {
         visitor.visit_immediate_children(self.id, parameters_ids.clone())?;
         Ok(())
     }
+    fn accept_id(&self, visitor: &mut impl ASTConstVisitor) -> Result<()> {
+        visitor.visit_node_id(Some(self.id))?;
+        Ok(())
+    }
 }
 
 impl Display for ParameterList {
@@ -79,6 +83,10 @@ impl Node for OverrideSpecifier {
         visitor.visit_immediate_children(self.id, overrides_ids.clone())?;
         Ok(())
     }
+    fn accept_id(&self, visitor: &mut impl ASTConstVisitor) -> Result<()> {
+        visitor.visit_node_id(Some(self.id))?;
+        Ok(())
+    }
 }
 
 impl Display for OverrideSpecifier {
@@ -160,6 +168,10 @@ impl Node for FunctionDefinition {
         }
         Ok(())
     }
+    fn accept_id(&self, visitor: &mut impl ASTConstVisitor) -> Result<()> {
+        visitor.visit_node_id(Some(self.id))?;
+        Ok(())
+    }
 }
 
 impl FunctionDefinition {

diff --git a/aderyn_core/src/ast/identifiers.rs b/aderyn_core/src/ast/identifiers.rs
@@ -26,6 +26,10 @@ impl Node for Identifier {
     fn accept_metadata(&self, _visitor: &mut impl ASTConstVisitor) -> Result<()> {
         Ok(())
     }
+    fn accept_id(&self, visitor: &mut impl ASTConstVisitor) -> Result<()> {
+        visitor.visit_node_id(Some(self.id))?;
+        Ok(())
+    }
 }
 
 impl PartialEq for Identifier {
@@ -78,6 +82,10 @@ impl Node for IdentifierPath {
     fn accept_metadata(&self, _visitor: &mut impl ASTConstVisitor) -> Result<()> {
         Ok(())
     }
+    fn accept_id(&self, visitor: &mut impl ASTConstVisitor) -> Result<()> {
+        visitor.visit_node_id(Some(self.id))?;
+        Ok(())
+    }
 }
 
 impl PartialEq for IdentifierPath {

diff --git a/aderyn_core/src/ast/import_directives.rs b/aderyn_core/src/ast/import_directives.rs
@@ -46,4 +46,8 @@ impl Node for ImportDirective {
         visitor.visit_immediate_children(self.id, symbol_alias_ids)?;
         Ok(())
     }
+    fn accept_id(&self, visitor: &mut impl ASTConstVisitor) -> Result<()> {
+        visitor.visit_node_id(Some(self.id))?;
+        Ok(())
+    }
 }
diff --git a/aderyn_core/src/ast/literals.rs b/aderyn_core/src/ast/literals.rs
@@ -36,6 +36,10 @@ impl Node for Literal {
         visitor.visit_literal(self)?;
         visitor.end_visit_literal(self)
     }
+    fn accept_id(&self, visitor: &mut impl ASTConstVisitor) -> Result<()> {
+        visitor.visit_node_id(Some(self.id))?;
+        Ok(())
+    }
 }
 
 impl Display for Literal {

diff --git a/aderyn_core/src/ast/modifiers.rs b/aderyn_core/src/ast/modifiers.rs
@@ -41,6 +41,10 @@ impl Node for ModifierDefinition {
         visitor.visit_immediate_children(self.id, vec![self.parameters.id])?;
         Ok(())
     }
+    fn accept_id(&self, visitor: &mut impl ASTConstVisitor) -> Result<()> {
+        visitor.visit_node_id(Some(self.id))?;
+        Ok(())
+    }
 }
 
 impl Display for ModifierDefinition {
@@ -110,6 +114,10 @@ impl Node for ModifierInvocation {
         }
         Ok(())
     }
+    fn accept_id(&self, visitor: &mut impl ASTConstVisitor) -> Result<()> {
+        visitor.visit_node_id(Some(self.id))?;
+        Ok(())
+    }
 }
 
 impl Display for ModifierInvocation {

diff --git a/aderyn_core/src/ast/pragma_directives.rs b/aderyn_core/src/ast/pragma_directives.rs
@@ -16,4 +16,8 @@ impl Node for PragmaDirective {
         visitor.visit_pragma_directive(self)?;
         visitor.end_visit_pragma_directive(self)
     }
+    fn accept_id(&self, visitor: &mut impl ASTConstVisitor) -> Result<()> {
+        visitor.visit_node_id(Some(self.id))?;
+        Ok(())
+    }
 }
diff --git a/aderyn_core/src/ast/source_units.rs b/aderyn_core/src/ast/source_units.rs
@@ -58,6 +58,10 @@ impl Node for SourceUnitNode {
             }
         }
     }
+    fn accept_id(&self, visitor: &mut impl ASTConstVisitor) -> Result<()> {
+        visitor.visit_node_id(self.get_node_id())?;
+        Ok(())
+    }
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq)]
@@ -90,6 +94,10 @@ impl Node for SourceUnit {
         visitor.visit_immediate_children(self.id, node_ids.clone())?;
         Ok(())
     }
+    fn accept_id(&self, visitor: &mut impl ASTConstVisitor) -> Result<()> {
+        visitor.visit_node_id(Some(self.id))?;
+        Ok(())
+    }
 }
 
 impl SourceUnit {