MONDRIAN: Integrate changes to checkFile from 3.2 branch to main.

[git-p4: depot-paths = "//open/mondrian/": change = 14001]
ljq354004063 · Dec 19, 2010 · 900b0ea · 900b0ea
1 parent fa3ca97
commit 900b0ea
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/bin/checkFile.awk b/bin/checkFile.awk
@@ -81,6 +81,9 @@ FNR == 1 {
         # mask out /* */ comments
         gsub(/\/\*.*\*\//, "/* comment */", s);
     }
+    if (s ~ /\/\/\$NON-NLS/) {
+        error(fname, FNR, "NON-NLS not allowed");
+    }
     # mask out // comments
     gsub(/\/\/.*$/, "// comment", s);
     # line starts with string or plus?

diff --git a/bin/checkFile.sh b/bin/checkFile.sh
@@ -60,7 +60,13 @@ doCheck() {
     */mondrian/rolap/aggmatcher/DefaultDef.java| \
     */mondrian/resource/MondrianResource*.java| \
     */mondrian/olap/Parser.java| \
-    */mondrian/olap/ParserSym.java)
+    */mondrian/olap/ParserSym.java| \
+    */mondrian/parser/ParseException.java| \
+    */mondrian/parser/Token.java| \
+    */mondrian/parser/TokenMgrError.java| \
+    */mondrian/parser/SimpleCharStream.java| \
+    */mondrian/parser/MdxParserImplTokenManager.java| \
+    */mondrian/parser/MdxParserImpl.java)
         # mondrian.util.Base64 is checked in as is, so don't check it
         # Other files above are generated.
         return
@@ -123,7 +129,7 @@ doCheck() {
         fi
         ;;
 
-    # Only validate .java and .cup files at present.
+    # Only validate .java and parser files at present.
     *.java|*.cup|*.h|*.cpp)
         ;;