Readding block and adapt Frontend to handle new grammar

Fraunhofer-AISEC · Dec 1, 2023 · f1b2c6e · f1b2c6e
1 parent 62c192a
commit f1b2c6e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/cpg-solidity/src/main/antlr/Solidity.g4 b/cpg-solidity/src/main/antlr/Solidity.g4
@@ -27,6 +27,7 @@ sourceUnit
   | usingForDeclaration
   // additional parts found in snippets
   | expressionStatement
+  | block
   | statement
   )* EOF ;
 

diff --git a/...solidity/src/main/kotlin/de/fraunhofer/aisec/cpg/frontends/solidity/DeclarationHandler.kt b/...solidity/src/main/kotlin/de/fraunhofer/aisec/cpg/frontends/solidity/DeclarationHandler.kt
@@ -170,7 +170,7 @@ class DeclarationHandler(lang: SolidityLanguageFrontend) : Handler<Declaration,
             declaration?.let { frontend.scopeManager.addDeclaration(declaration) }
         }
 
-        if(unit.block() != null || unit.statement() != null){
+        if(unit.block() != null && unit.block().isNotEmpty() || unit.statement() != null && unit.statement().isNotEmpty()){
             frontend.scopeManager.addDeclaration(handleMissingFunctionDefinition(filename, unit))
         }
 
@@ -348,9 +348,10 @@ class DeclarationHandler(lang: SolidityLanguageFrontend) : Handler<Declaration,
 
         method.receiver = receiver
 
-        if(unit.block()!= null){
-            method.body = frontend.statementHandler.handle(unit.block())
-        }else if(unit.statement() != null){
+        if(unit.block()!= null && unit.block().isNotEmpty()){
+            method.body = frontend.statementHandler.handle(unit.block()[0])
+        }else
+            if(unit.statement() != null && unit.statement().isNotEmpty()){
             method.body = frontend.statementHandler.handleMissingBlock(unit)
         }