Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-06-02 23:46:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch

Browse Source 
'GP-1251_emteere_PR-3350_tchebb_eliminate-static-parser-state_patch'
into patch (Closes #1421, Closes #3350)
This commit is contained in:
Ryan Kurtz
2021-08-26 09:23:26 -04:00
parent 00157dfd59 410155810f
commit adba376aca
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/main/javacc/ghidra/app/util/cparser/C/C.jj
+1 -1
View File
@@ -718,7 +718,7 @@ PARSER_END(CParser)
TOKEN_MGR_DECLS : TOKEN_MGR_DECLS :
{ {
static int parenNesting = 0; int parenNesting = 0;
} }
SKIP : SKIP :
Ghidra/Features/Base/src/main/javacc/ghidra/app/util/cparser/CPP/CPP.jj
+3 -2
View File
@@ -437,7 +437,7 @@ public class PreProcessor {
private HashMap<String, Integer> alreadyDone; private HashMap<String, Integer> alreadyDone;
// Toggle printing // Toggle printing
private static int verboseLevel = 0; private int verboseLevel = 0;
public int verboseLevel() { public int verboseLevel() {
int vl = verboseLevel; int vl = verboseLevel;
@@ -1125,6 +1125,7 @@ public class PreProcessor {
this.pathList = parent.pathList; this.pathList = parent.pathList;
this.shift = parent.shift; this.shift = parent.shift;
this.alreadyDone = parent.alreadyDone; this.alreadyDone = parent.alreadyDone;
this.verboseLevel = parent.verboseLevel;
} }
public PreProcessor(String[] args) throws ParseException { public PreProcessor(String[] args) throws ParseException {
@@ -2174,7 +2175,7 @@ PPToken ValueExpression() :
// LEXICAL SCANNER SECTION // LEXICAL SCANNER SECTION
TOKEN_MGR_DECLS : TOKEN_MGR_DECLS :
{ {
static int parenNesting = 0; int parenNesting = 0;
} }
<DEFAULT> <DEFAULT>