Changeset 3572

Timestamp:

Mar 25, 2008, 7:06:31 PM (13 years ago)

Author:

yura

Message:

• Simplification: sentence cann't be empty.

Location:

devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast

Files:

• AstAlt.java (modified) (1 diff)
• AstConstBinding.java (modified) (1 diff)
• AstError.java (modified) (1 diff)
• AstFormat.java (modified) (1 diff)
• AstFuncDecl.java (modified) (1 diff)
• AstFuncDef.java (modified) (1 diff)
• AstIter.java (modified) (1 diff)
• AstName.java (modified) (1 diff)
• AstNative.java (modified) (1 diff)
• AstNot.java (modified) (1 diff)
• AstObjDecl.java (modified) (1 diff)
• AstSentence.java (modified) (1 diff)
• AstTrap.java (modified) (1 diff)

devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstAlt.java

@@ -36 +36 @@
         StringBuffer strBuf = new StringBuffer();
         strBuf.append(failMode.select("\\{", "{") + (sentenceList.length == 0 ? "" : " "));
-        for (AstSentence sentence : sentenceList) {
-            String str = sentence.toString();
-            strBuf.append((str.length() == 0 ? "" : str + " ") + "; ");
-        }
+        for (AstSentence sentence : sentenceList)
+            strBuf.append(sentence + " ; ");
         strBuf.append("}");
         return strBuf.toString();

devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstConstBinding.java

@@ -31 +31 @@
     @Override
     public String toString () {
-        return (isPublic ? "$public " : "") + "$const " + name + " = " + expr + ";";
+        return (isPublic ? "$public " : "") + "$const " + AstName.toString(name) + " = " + expr + ";";
     }
 }

devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstError.java

@@ -24 +24 @@
     @Override
     public String toString () {
-        String str = sentence.toString();
-        return "$error" + (str.length() == 0 ? "" : " " + str);
+        return "$error " + sentence;
     }
 }

devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstFormat.java

@@ -24 +24 @@
     @Override
     public String toString () {
-        String str = expr.toString();
-        return "::" + (str.length() == 0 ? "" : " " + str);
+        return (":: " + expr).trim();
     }
 }

devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstFuncDecl.java

@@ -48 +48 @@
     @Override
     public String toString () {
-        return (isPublic ? "$public " : "") + retMode.select("$func? ", "$func ") + name + " " + inFormat + " = " + outFormat + ";";
+        return (isPublic ? "$public " : "") + retMode.select("$func? ", "$func ") + AstName.toString(name) + " " + inFormat + " = " + outFormat + ";";
     }
 }

devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstFuncDef.java

@@ -34 +34 @@
     @Override
     public String toString () {
-        String str = body.toString();
-        return name + (str.length() == 0 ? "" : " " + str + " ") + ";";
+        return name + " " + body + " ;";
     }
 }

devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstIter.java

@@ -26 +26 @@
     @Override
     public String toString () {
-        String str1 = sentence.toString();
-        String str2 = target.toString();
-        return "$iter" + (str1.length() == 0 ? "" : " " + str1) + " ::" + (str2.length() == 0 ? "" : " " + str2);
+        return ("$iter " + sentence + " :: " + target).trim();
     }
 }

devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstName.java

@@ -30 +30 @@
         return isIdenifier() ? identifier : "\"" + identifier + "\"";
     }
+    
+    public static String toString (AstName astName) {
+        return astName == null ? "$NONAME$" : astName.toString();
+    }
 }

devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstNative.java

@@ -30 +30 @@
     @Override
     public String toString () {
-        return "$native " + left + " = " + right + ";";
+        return "$native " + left + " = " + AstName.toString(right) + ";";
     }
 }

devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstNot.java

@@ -24 +24 @@
     @Override
     public String toString () {
-        return ("# " + sentence).trim();
+        return "# " + sentence;
     }
 }

devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstObjDecl.java

@@ -35 +35 @@
     @Override
     public String toString () {
-        return (isPublic ? "$public " : "") + "$" + kind.name().toLowerCase() + " " + name + ";";
+        return (isPublic ? "$public " : "") + "$" + kind.name().toLowerCase() + " " + AstName.toString(name) + ";";
     }
 }

devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstSentence.java

@@ -30 +30 @@
             flag = true;
         }
-        return strBuf.toString().trim();
+        return strBuf.toString();
     }
 }

devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstTrap.java

@@ -26 +26 @@
     @Override
     public String toString () {
-        return (("$trap " + trySentence).trim() + " $with " + catchSentence).trim();
+        return "$trap " + trySentence + " $with " + catchSentence;
     }
 }