Changeset 4047

Timestamp:

Dec 17, 2008, 6:11:39 PM (12 years ago)

Author:

yura

Message:

• Indentifier - only latin letters.
• RefalException? returns just text (not formatted representation)

Location:

to-imperative

Files:

• branches/java_expr_without_holes/Expr.java (modified) (11 diffs)
• trunk/java/java/org/refal/plus/RefalException.java (modified) (1 diff)

to-imperative/branches/java_expr_without_holes/Expr.java

@@ -296 +296 @@
     }
 
+    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();
@@ -302 +333 @@
     }
 
-    private void toString (StringBuffer strBuf) { 
-        boolean chars = false;
-        boolean isNotFirst = false;
+    private void toString (StringBuffer strBuf) {
+        boolean chars = false, isNotFirst = false;
         for (Comparable<?> term : this) {
             if (term instanceof Character) {
@@ -310 +340 @@
                     if (isNotFirst)
                         strBuf.append(' ');
-                    strBuf.append('\''); 
+                    strBuf.append('\'');
                     chars = true;
                     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) {
@@ -340 +363 @@
                 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('"');
                 }
@@ -374 +387 @@
                 ((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;
     }
 
@@ -484 +483 @@
         }
     }
-    
+
     public static Concatenator getConcatenator () {
         return new ListConcatenator();
@@ -492 +491 @@
         return new InplaceConcatenator(initialCapacity);
     }
-    
+
     public interface Concatenator {
         public Concatenator toRight (Comparable<?> obj);
@@ -512 +511 @@
             }
         }
-        
+
         public ListConcatenator () {
             list = new ArrayList<Object>(16);
@@ -525 +524 @@
         public ListConcatenator toRight (Expr expr) {
             if (expr.length == 0)
-                return this; 
+                return this;
             list.add(expr);
             length += expr.length;
@@ -550 +549 @@
         private Comparable<?>[] terms;
         private int length;
-        
+
         public InplaceConcatenator (int initialCapacity) {
             assert initialCapacity >= 0;
@@ -571 +570 @@
             assert expr != null;
             if (expr.length == 0)
-                return this; 
+                return this;
             int newLength = length + expr.length;
             if (terms.length < newLength) {

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

@@ -23 +23 @@
     @Override
     public String toString () {
-        return expr.toString();
+        return expr.toChars();
     }
 }