Merge pull request #140 from vlad902/function-pointer-parsing

Parse function pointers
octopus-platform · Dec 1, 2016 · de0cd6a · de0cd6a
2 parents c2358ff + 5705342
commit de0cd6a
Show file tree

Hide file tree

Showing 17 changed files with 10,345 additions and 20,554 deletions.
diff --git a/projects/extensions/joern-fuzzyc/genParsers.sh b/projects/extensions/joern-fuzzyc/genParsers.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-antlr4='java -jar ./antlr4-4.5.1-SNAPSHOT-complete.jar'
+antlr4='java -jar ./antlr4-4.5.4-SNAPSHOT-complete.jar'
 
 $antlr4 src/main/java/antlr/Module.g4
 $antlr4 src/main/java/antlr/Function.g4
diff --git a/projects/extensions/joern-fuzzyc/src/main/java/antlr/CoarseSimpleDecl.g4 b/projects/extensions/joern-fuzzyc/src/main/java/antlr/CoarseSimpleDecl.g4
@@ -1,12 +1,14 @@
+// Encompasses declarations in the module scope, e.g. variable declarations in C++ classes
+
 grammar CoarseSimpleDecl;
 
 import SimpleDecl;
 
 // The following two contain 'water'-rules for expressions
 
 init_declarator : declarator (('(' expr? ')') | ('=' assign_expr_w_))?;
-declarator: ptrs? identifier type_suffix?;
-
+declarator: ptrs? identifier type_suffix? |
+            ptrs? '(' func_ptrs identifier ')' type_suffix;
 
 type_suffix : ('[' constant_expr_w_ ']') | param_type_list;
 

diff --git a/projects/extensions/joern-fuzzyc/src/main/java/antlr/FineSimpleDecl.g4 b/projects/extensions/joern-fuzzyc/src/main/java/antlr/FineSimpleDecl.g4
@@ -1,3 +1,5 @@
+// Encompasses declarations in the function scope, e.g. local variable declarations
+
 grammar FineSimpleDecl;
 
 import SimpleDecl;
@@ -7,7 +9,8 @@ init_declarator: declarator '(' expr? ')' #initDeclWithCall
                | declarator #initDeclSimple
                ;
 
-declarator: ptrs? identifier type_suffix?;
+declarator: ptrs? identifier type_suffix? |
+            ptrs? '(' func_ptrs identifier ')' type_suffix;
 
 type_suffix : ('[' conditional_expression? ']') | param_type_list;
 
diff --git a/projects/extensions/joern-fuzzyc/src/main/java/antlr/Function.g4 b/projects/extensions/joern-fuzzyc/src/main/java/antlr/Function.g4
@@ -2,7 +2,7 @@ grammar Function;
 import ModuleLex, Common, Expressions, FineSimpleDecl;
 
 @header{
-	package antlr.C;
+	package antlr;
 }
 
 statements: (pre_opener