MsaOwner usable

[mirror_edk2.git] / Tools / Source / MigrationTools / org / tianocore / migration / Func.java

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/Func.java b/Tools/Source/MigrationTools/org/tianocore/migration/Func.java
index f00eac4e2aed9c89f34f7fb71d9b3e8bdb5fe2aa..0154fc83dd126ed814c5942e81b46aa7ecfee3a6 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/Func.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/Func.java
@@ -23,8 +23,11 @@ public class Func {
     }\r
     Func(String[] linecontext) {\r
         r8funcname = linecontext[1];\r
-        r8libname = linecontext[0];\r
+        r8libname  = linecontext[0];\r
         r9funcname = linecontext[2];\r
+        if (r9funcname.contains("n/a")) {\r
+            r9funcname = "#error Unknown or missing library function in EDKII: " + r8funcname;\r
+        }\r
         r9libname = linecontext[3];\r
     }\r
     public String r8funcname;\r
@@ -33,8 +36,7 @@ public class Func {
     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