summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
35a9542)
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1312
6f19259b-4bc3-4df7-8a09-
765794883524
\r
public class Critic implements Common.ForDoAll {\r
private static Pattern ptnheadcomment = Pattern.compile("^\\/\\*\\+\\+(.*?)\\-\\-\\*\\/",Pattern.DOTALL);\r
\r
public class Critic implements Common.ForDoAll {\r
private static Pattern ptnheadcomment = Pattern.compile("^\\/\\*\\+\\+(.*?)\\-\\-\\*\\/",Pattern.DOTALL);\r
- private static Pattern ptnfunccomment = Pattern.compile("([\\w\\d]*\\s*[_\\w][_\\w\\d]*\\s*\\([^\\)\\(]*\\)\\s*)\\/\\*\\+\\+(.*?)\\-\\-\\*\\/(\\s*.*?)([\\{;])",Pattern.DOTALL);\r
+ private static Pattern ptnfunccomment = Pattern.compile("([\\};\\/]\\s*)([\\w\\s]*?[_\\w][_\\w\\d]*\\s*\\([^\\)\\(]*\\)\\s*)\\/\\*\\+\\+(.*?)\\-\\-\\*\\/(\\s*.*?)([\\{;])",Pattern.DOTALL);\r
//private static Pattern ptncommentstructure = Pattern.compile("\\/\\*\\+\\+\\s*Routine Description:\\s*(.*?)\\s*Arguments:\\s*(.*?)\\s*Returns:\\s*(.*?)\\s*\\-\\-\\*\\/",Pattern.DOTALL);\r
private static Pattern ptninfequation = Pattern.compile("([^\\s]*)\\s*-\\s*(.*)\\s*");\r
private static Matcher mtrinfequation;\r
//private static Pattern ptncommentstructure = Pattern.compile("\\/\\*\\+\\+\\s*Routine Description:\\s*(.*?)\\s*Arguments:\\s*(.*?)\\s*Returns:\\s*(.*?)\\s*\\-\\-\\*\\/",Pattern.DOTALL);\r
private static Pattern ptninfequation = Pattern.compile("([^\\s]*)\\s*-\\s*(.*)\\s*");\r
private static Matcher mtrinfequation;\r
boolean arguments = false;\r
boolean returns = false;\r
boolean inequation = false;\r
boolean arguments = false;\r
boolean returns = false;\r
boolean inequation = false;\r
System.out.println("Criticing " + filepath);\r
String wholeline = Common.file2string(filepath);\r
System.out.println("Criticing " + filepath);\r
String wholeline = Common.file2string(filepath);\r
+\r
+ wholeline = wholeline.replaceAll("\t", " ");\r
wholeline = Common.replaceAll(wholeline, ptnheadcomment, "/** @file$1**/");\r
wholeline = Common.replaceAll(wholeline, ptnheadcomment, "/** @file$1**/");\r
- wholeline = Common.replaceAll(wholeline, ptnfunccomment, "/**$2**/$3$1$4");\r
+ wholeline = Common.replaceAll(wholeline, ptnfunccomment, "$1/**$3**/$4$2$5");\r
//wholeline = Common.replaceAll(wholeline, ptncommentstructure, "/**\n#%\n$1\n%#\n#%%\n$2\n%%#\n#%%%\n$3\n%%%#\n**/");\r
\r
rd = new BufferedReader(new StringReader(wholeline));\r
//wholeline = Common.replaceAll(wholeline, ptncommentstructure, "/**\n#%\n$1\n%#\n#%%\n$2\n%%#\n#%%%\n$3\n%%%#\n**/");\r
\r
rd = new BufferedReader(new StringReader(wholeline));\r
mtrinfequation = ptninfequation.matcher(line);\r
if (mtrinfequation.find()) {\r
inequation = true;\r
mtrinfequation = ptninfequation.matcher(line);\r
if (mtrinfequation.find()) {\r
inequation = true;\r
- templine.append(" @param " + mtrinfequation.group(1) + " " + mtrinfequation.group(2) + "\n");\r
+ templine.append(" @param " + mtrinfequation.group(1) + " " + mtrinfequation.group(2) + "\n");\r
} else if (inequation && line.trim().length() == 0) {\r
inequation = false;\r
templine.append(line + "\n");\r
} else if (inequation && line.trim().length() == 0) {\r
inequation = false;\r
templine.append(line + "\n");\r
mtrinfequation = ptninfequation.matcher(line);\r
if (mtrinfequation.find()) {\r
inequation = true;\r
mtrinfequation = ptninfequation.matcher(line);\r
if (mtrinfequation.find()) {\r
inequation = true;\r
- templine.append(" @retval " + mtrinfequation.group(1) + " " + mtrinfequation.group(2) + "\n");\r
+ templine.append(" @retval " + mtrinfequation.group(1) + " " + mtrinfequation.group(2) + "\n");\r
} else if (inequation && line.trim().length() == 0) {\r
inequation = false;\r
templine.append(line + "\n");\r
} else if (inequation && line.trim().length() == 0) {\r
inequation = false;\r
templine.append(line + "\n");\r