Coding Style

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

diff --git a/Tools/Java/Source/MigrationTools/org/tianocore/migration/Macro.java b/Tools/Java/Source/MigrationTools/org/tianocore/migration/Macro.java
index bd10b5a251b80129730d89c06d4bef2966f422f0..91c878a1c8daed17ea8f0a9ab4cb61a2ef615a87 100644 (file)
--- a/Tools/Java/Source/MigrationTools/org/tianocore/migration/Macro.java
+++ b/Tools/Java/Source/MigrationTools/org/tianocore/migration/Macro.java
@@ -12,36 +12,43 @@
  **/\r
 package org.tianocore.migration;\r
 \r
-import java.util.regex.*;\r
+import java.util.regex.Matcher;\r
+import java.util.regex.Pattern;\r
 \r
 public class Macro {\r
-    Macro(String r8, String r9) {\r
-        r8name = r8;\r
-        r9name = r9;\r
-    }\r
-    Macro(String[] linecontext) {\r
-        r8name = linecontext[0];\r
-        r9name = linecontext[1];\r
-    }\r
-    \r
-    public String r8name;\r
-    public String r9name;\r
-\r
-    public static Pattern ptntmacro = Pattern.compile("\\b[A-Z_]+\\s*?\\(?\\b",Pattern.MULTILINE);\r
-\r
-    private static String unmacro = "VOID UINTN BOOLEAN ASSERT OPTIONAL STATIC NULL TRUE IN OUT FALSE";\r
-\r
-    public static String register(Matcher mtr, ModuleInfo mi, Database db) {\r
-        String temp = null;\r
-        \r
-        temp = mtr.group();\r
-        mi.hashmacro.add(temp);\r
-        if (MigrationTool.db.hasMacro(temp)) {                    // only changed macros registered, because the database of macro has only changed ones\r
-            if (!unmacro.contains(temp)) {\r
-                mi.hashnonlocalmacro.add(temp);\r
-            }\r
-            return temp;\r
-        }\r
-        return null;\r
-    }\r
+       Macro(String r8, String r9) {\r
+               r8name = r8;\r
+               r9name = r9;\r
+       }\r
+\r
+       Macro(String[] linecontext) {\r
+               r8name = linecontext[0];\r
+               r9name = linecontext[1];\r
+       }\r
+\r
+       public String r8name;\r
+\r
+       public String r9name;\r
+\r
+       public static Pattern ptntmacro = Pattern.compile("\\b\\w(\\w|\\d)*",\r
+                       Pattern.MULTILINE);\r
+\r
+       private static String unmacro = "VOID UINTN BOOLEAN ASSERT OPTIONAL STATIC NULL TRUE IN OUT FALSE";\r
+\r
+       public static String register(Matcher mtr, ModuleInfo mi, Database db) {\r
+               String temp = null;\r
+\r
+               temp = mtr.group();\r
+               mi.hashmacro.add(temp);\r
+               if (MigrationTool.db.hasMacro(temp)) { // only changed macros\r
+                                                                                               // registered, because the\r
+                                                                                               // database of macro has only\r
+                                                                                               // changed ones\r
+                       if (!unmacro.contains(temp)) {\r
+                               mi.hashnonlocalmacro.add(temp);\r
+                       }\r
+                       return temp;\r
+               }\r
+               return null;\r
+       }\r
 }
\ No newline at end of file