Changeset 4050

Timestamp:

Dec 17, 2008, 9:06:36 PM (12 years ago)

Author:

orlov

Message:

• Merged changes from r4047 to trunk.

File:

• to-imperative/trunk/java/java/org/refal/plus/Expr.java (modified) (5 diffs)

to-imperative/trunk/java/java/org/refal/plus/Expr.java

@@ -333 +333 @@
     }
 
+    private static boolean isIdentifierStartChar (char c) {
+        return ('A' <= c && c <= 'Z') || c == '_';
+    }
+
+    private static boolean isIdentifierInternalChar (char c) {
+        return isIdentifierStartChar(c) || ('a' <= c && c <= 'z') || ('0' <= c && c <= '9') || (c == '.');
+    }
+
+    private static boolean isIdentifier (String str) {
+        if (str.length() == 0)
+            return false;
+        if (!isIdentifierStartChar(str.charAt(0)))
+            return false;
+        for (int i = 1, l = str.length(); i < l; i++)
+            if (!isIdentifierInternalChar(str.charAt(i)))
+                return false;
+        return true;
+    }
+
+    private static void convertCharacter (StringBuffer strBuf, char c) {
+        switch (c) {
+            case '\t': strBuf.append("\\t"); break;
+            case '\r': strBuf.append("\\r"); break;
+            case '\n': strBuf.append("\\n"); break;
+            case '\\': strBuf.append("\\\\"); break;
+            case '\'': strBuf.append("\\\'"); break;
+            case '\"': strBuf.append("\\\""); break;
+            default: strBuf.append(c); break;
+        }
+    }
+
     public String toString () {
         StringBuffer strBuf = new StringBuffer();
@@ -340 +371 @@
 
     private void toString (StringBuffer strBuf) {
-        boolean chars = false;
-        boolean isNotFirst = false;
+        boolean chars = false, isNotFirst = false;
         for (Comparable<?> term : this) {
             if (term instanceof Character) {
@@ -351 +381 @@
                     isNotFirst = true;
                 }
-                switch (((Character) term).charValue()) {
-                    case '\t':
-                        strBuf.append("\\t");
-                        continue;
-                    case '\r':
-                        strBuf.append("\\r");
-                        continue;
-                    case '\n':
-                        strBuf.append("\\n");
-                        continue;
-                    case '\\':
-                        strBuf.append("\\\\");
-                        continue;
-                    case '\'':
-                        strBuf.append("\\\'");
-                        continue;
-                    case '\"':
-                        strBuf.append("\\\"");
-                        continue;
-                    default:
-                        strBuf.append(term);
-                        continue;
-                }
+                convertCharacter(strBuf, (Character) term);
+                continue;
             }
             if (chars) {
@@ -391 +400 @@
                 else {
                     strBuf.append('"');
-                    for (int i = 0; i < w.length(); i++) {
-                        char c = w.charAt(i);
-                        switch (c) {
-                            case '\t': strBuf.append("\\t"); continue;
-                            case '\r': strBuf.append("\\r"); continue;
-                            case '\n': strBuf.append("\\n"); continue;
-                            case '\\': strBuf.append("\\\\"); continue;
-                            case '\'': strBuf.append("\\\'"); continue;
-                            case '\"': strBuf.append("\\\""); continue;
-                            default: strBuf.append(c); continue;
-                        }
-                    }
+                    for (int i = 0; i < w.length(); i++)
+                        convertCharacter(strBuf, w.charAt(i));
                     strBuf.append('"');
                 }
@@ -425 +424 @@
                 ((Expr) term).toChars(strBuf);
                 strBuf.append(')');
-            } else if (term instanceof Reference && ((Reference) term).object instanceof org.refal.plus.objects.String)
-                ((org.refal.plus.objects.String) ((Reference) term).object).toExpr().toChars(strBuf);
+            } else if (Symbol.isObject(term) instanceof org.refal.plus.objects.String)
+                ((org.refal.plus.objects.String) Symbol.isObject(term)).toExpr().toChars(strBuf);
             else
                 strBuf.append(term.toString());
-    }
-
-    private static boolean isIdentifier (String str) {
-        if (str.length() == 0)
-            return false;
-        char c = str.charAt(0);
-        if (!Character.isUpperCase(c) && c != '_')
-            return false;
-        for (int i = 1; i < str.length(); i++) {
-            c = str.charAt(i);
-            if (!Character.isLetterOrDigit(c) && c != '_' && c != '.')
-                return false;
-        }
-        return true;
     }