public String r9libname;\r
\r
public static Pattern ptnbrace = Pattern.compile("\\{[^\\{\\}]*\\}",Pattern.MULTILINE);\r
- //public static Pattern ptnfuncc = Pattern.compile("([a-zA-Z_]\\w*)\\s*\\([^\\)\\(]*\\)",Pattern.MULTILINE);\r
- public static Pattern ptnfuncc = Pattern.compile("([a-zA-Z_]\\w*)\\s*\\(",Pattern.MULTILINE);\r
+ public static Pattern ptnfuncc = Pattern.compile("(?<!->)([a-zA-Z_]\\w*)\\s*\\(",Pattern.MULTILINE);\r
public static Pattern ptnfuncd = Pattern.compile("([a-zA-Z_]\\w*)\\s*\\([^\\)\\(]*\\)\\s*@",Pattern.MULTILINE);\r
public static Pattern ptnlowcase = Pattern.compile("[a-z]"); // must be removed\r
\r
while (mtrinfequation.find()) {\r
if (mtrinfequation.group(1).matches("IMAGE_ENTRY_POINT")) {\r
mi.entrypoint = mtrinfequation.group(2);\r
+ mi.hashrequiredr9libs.add("EntryPointLib");\r
}\r
if (mtrinfequation.group(1).matches("DPX_SOURCE")) {\r
if (!mi.localmodulesources.contains(mtrinfequation.group(2))) {\r
}\r
}\r
}\r
- if (mtrsection.group(1).matches("includes.common")) {\r
+ if (mtrsection.group(1).matches("includes.")) {\r
mtrfilename = ptnfilename.matcher(mtrsection.group(2));\r
while (mtrfilename.find()) {\r
mi.infincludes.add(mtrfilename.group());\r