Fix class variable naming checks to be 2.2-compatible

cheald · cheald · commit 08a9ee7c97fe · 2014-11-12T03:02:49.000-07:00
diff --git a/core/src/main/java/org/jruby/util/IdUtil.java b/core/src/main/java/org/jruby/util/IdUtil.java
@@ -109,18 +109,12 @@ public static boolean isValidInstanceVariableName(String id) {
         return false;
     }
     
-    // Pickaxe says @@ must be followed by a name character, but MRI
-    // does not require this.
     public static boolean isValidClassVariableName(String id) {
         int len;
-        if ((len = id.length()) > 1 && '@' == id.charAt(0) && '@' == id.charAt(1)) {
-            if (len > 2) {
-                if (isInitialCharacter(id.charAt(2))) {
-                    return isNameString(id, 3, len);
-                }
-                return false;
+        if ((len = id.length()) > 2 && '@' == id.charAt(0) && '@' == id.charAt(1)) {
+            if (isInitialCharacter(id.charAt(2))) {
+                return isNameString(id, 3, len);
             }
-            return true;
         }
         return false;
     }

Original file line number	Diff line number	Diff line change
`@@ -109,18 +109,12 @@ public static boolean isValidInstanceVariableName(String id) {`
`109`	`109`	`return false;`
`110`	`110`	`}`
`111`	`111`
`112`		`- // Pickaxe says @@ must be followed by a name character, but MRI`
`113`		`- // does not require this.`
`114`	`112`	`public static boolean isValidClassVariableName(String id) {`
`115`	`113`	`int len;`
`116`		`- if ((len = id.length()) > 1 && '@' == id.charAt(0) && '@' == id.charAt(1)) {`
`117`		`- if (len > 2) {`
`118`		`- if (isInitialCharacter(id.charAt(2))) {`
`119`		`- return isNameString(id, 3, len);`
`120`		`- }`
`121`		`- return false;`
	`114`	`+ if ((len = id.length()) > 2 && '@' == id.charAt(0) && '@' == id.charAt(1)) {`
	`115`	`+ if (isInitialCharacter(id.charAt(2))) {`
	`116`	`+ return isNameString(id, 3, len);`
`122`	`117`	`}`
`123`		`- return true;`
`124`	`118`	`}`
`125`	`119`	`return false;`
`126`	`120`	`}`