Changeset 3364 for devel-tools/trunk

Timestamp:

Feb 4, 2008, 11:29:36 PM (13 years ago)

Author:

yura

Message:

• toString method instead of ImageBuilder?.

Location:

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/comp

Files:

• SrcPosition.java (modified) (1 diff)
• ast/AstCut.java (modified) (1 diff)
• ast/AstFence.java (modified) (1 diff)
• ast/AstName.java (modified) (1 diff)
• ast/AstVar.java (modified) (2 diffs)
• ast/AstWordSymbol.java (modified) (1 diff)
• ast/ImageBuilder.java (modified) (7 diffs)

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/comp/SrcPosition.java

@@ -52 +52 @@
         return charStart <= offset && offset <= charEnd;
     }
+    
+    public int length () {
+        return charEnd - charStart;
+    }
 
     @Override

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/comp/ast/AstCut.java

@@ -19 +19 @@
         v.visit(this, e);
     }
+
+    @Override
+    public String toString () {
+        return "\\!";
+    }
 }

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/comp/ast/AstFence.java

@@ -21 +21 @@
         v.visit(this, e);
     }
+
+    @Override
+    public String toString () {
+        return "\\?";
+    }
 }

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

@@ -10 +10 @@
         this.identifier = identifier;
     }
+
+    @Override
+    public String toString () {
+        return pos.length() > identifier.length() ? "\"" + identifier + "\"" : identifier;
+    }
 }

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/comp/ast/AstVar.java

@@ -36 +36 @@
     }
 
-    public String getTypeAsString () {
-        return type.name().toLowerCase();
-    }
-
     public boolean isHard () {
         return this.type == VarType.S || this.type == VarType.T;
@@ -53 +49 @@
         v.visit(this, e);
     }
+
+    @Override
+    public String toString () {
+        if (name != null)
+            return type.name().toLowerCase() + (pos.charStart + 1 < name.pos.charStart ? "." : "") + name.identifier;
+        else
+            return type.name().toLowerCase() + (pos.length() > 1 ? "." : "");
+    }
 }

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/comp/ast/AstWordSymbol.java

@@ -20 +20 @@
         v.visit(this, e);
     }
+
+    @Override
+    public String toString () {
+        return pos.length() > word.length() ? "\"" + word + "\"" : word;
+    }
 }

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/comp/ast/ImageBuilder.java

@@ -2 +2 @@
 
 public final class ImageBuilder implements ProgramVisitor, SentenceVisitor, ExpVisitor {
-    private static boolean isIdentifier (String word) {
-        if (word.length() == 0)
-            return false;
-
-        if (!isIdStartChar(word.charAt(0)))
-            return false;
-
-        for (int i = 1; i < word.length(); i++) {
-            if (!isIdTailChar(word.charAt(i)))
-                return false;
-        }
-        return true;
-    }
-
-    private static boolean isIdStartChar (int c) {
-        return ('A' <= c && c <= 'Z') || c == '_';
-    }
-
-    private static boolean isIdTailChar (int c) {
-        return ('A' <= c && c <= 'Z') || ('a' <= c && c <= 'z') || (c == '_') || ('0' <= c && c <= '9');
-    }
-    
     public static String getImage (AstInterf astInterf) {
         ImageBuilder imageBuilder = new ImageBuilder();
@@ -37 +15 @@
 
     private final StringBuilder sb = new StringBuilder();
-    
+
     private ImageBuilder () {}
 
@@ -47 +25 @@
         sb.append(astName != null ? astName.identifier + " " : "$NONAME$ ");
     }
-    
+
     // ProgramVisitor
-    
+
     public void visit (AstConstBinding astConstBinding) {
         if (astConstBinding.isPublic)
@@ -126 +104 @@
 
     // SentenceVisitor
-    
+
     public void visit (AstAlt astAlt) {
         append(astAlt.failMode.select("\\{ ", "{ "));
@@ -137 +115 @@
 
     public void visit (AstCut astCut) {
-        append("\\! ");
+        append(astCut + " ");
     }
 
@@ -154 +132 @@
 
     public void visit (AstFence astFence) {
-        append("\\? ");
+        append(astFence + " ");
     }
 
@@ -230 +208 @@
 
     public void visit (AstVar astVar) {
-        append(astVar.getTypeAsString());
-        if (astVar.name != null) {
-            append(".");
-            append(astVar.name);
-        } else
-            append(" ");
+        append(astVar + " ");
     }
 
     public void visit (AstWordSymbol astWordSymbol) {
-        if (isIdentifier(astWordSymbol.word))
-            append(astWordSymbol.word + " ");
-        else
-            append("\"" + astWordSymbol.word + "\" ");
+        append(astWordSymbol + " ");
     }
 }