Changeset 3422 for devel-tools

Timestamp:

Feb 22, 2008, 8:06:21 PM (13 years ago)

Author:

yura

Message:

• Suppress warnings: using Comparable<?> instead of Comparable.

File:

• devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/core/builder/RefalASGenerator.java (modified) (16 diffs)

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/core/builder/RefalASGenerator.java

@@ -100 +100 @@
         items.toRight(makeName(modName + "." + astConstBinding.name.identifier));
         astConstBinding.exp.accept(this, items);
-        e.toRight((Comparable<Expr>) items.yield());
+        e.toRight((Comparable<?>) items.yield());
     }
 
@@ -118 +118 @@
         Expr.Concatenator inFormat = Expr.getConcatenator();
         astFuncDecl.inFormat.accept(this, inFormat);
-        items.toRight((Comparable<Expr>) inFormat.yield());
+        items.toRight((Comparable<?>) inFormat.yield());
         Expr.Concatenator outFormat = Expr.getConcatenator();
         astFuncDecl.outFormat.accept(this, outFormat);
-        items.toRight((Comparable<Expr>) outFormat.yield());
+        items.toRight((Comparable<?>) outFormat.yield());
         if (astFuncDecl.funcDef instanceof AstNative)
             items.toRight(((AstNative) astFuncDecl.funcDef).right.identifier);
@@ -128 +128 @@
             body.toRight(BRANCH);
             ((AstFuncDef) astFuncDecl.funcDef).body.accept(this, body);
-            items.toRight((Comparable<Expr>) body.yield());
+            items.toRight((Comparable<?>) body.yield());
         }
-        e.toRight((Comparable<Expr>) items.yield());
+        e.toRight((Comparable<?>) items.yield());
     }
 
@@ -160 +160 @@
         Expr.Concatenator inFormat = Expr.getConcatenator();
         astFuncDecl.inFormat.accept(this, inFormat);
-        items.toRight((Comparable<Expr>) inFormat.yield());
+        items.toRight((Comparable<?>) inFormat.yield());
         Expr.Concatenator outFormat = Expr.getConcatenator();
         astFuncDecl.outFormat.accept(this, outFormat);
-        items.toRight((Comparable<Expr>) outFormat.yield());
+        items.toRight((Comparable<?>) outFormat.yield());
         items.toRight(astNative.left.identifier);
-        e.toRight((Comparable<Expr>) items.yield());
+        e.toRight((Comparable<?>) items.yield());
     }
 
@@ -179 +179 @@
         String modName = astObjDecl.module != null ? astObjDecl.module : moduleName;
         items.toRight(makeName(modName + "." + astObjDecl.name.identifier));
-        e.toRight((Comparable<Expr>) items.yield());
+        e.toRight((Comparable<?>) items.yield());
     }
 
@@ -198 +198 @@
             sentence.toRight(BRANCH);
             astSentence.accept(this, sentence);
-            items.toRight((Comparable<Expr>) sentence.yield());
+            items.toRight((Comparable<?>) sentence.yield());
         }
-        e.toRight((Comparable<Expr>) items.yield());
+        e.toRight((Comparable<?>) items.yield());
     }
 
     public void visit (AstCut astCut, Expr.Concatenator e) {
-        e.toRight((Comparable<Expr>) new Expr(CUT));
+        e.toRight((Comparable<?>) new Expr(CUT));
     }
 
     public void visit (AstCutAll astCutAll, Expr.Concatenator e) {
-        e.toRight((Comparable<Expr>) new Expr(CUTALL));
+        e.toRight((Comparable<?>) new Expr(CUTALL));
     }
 
@@ -215 +215 @@
         error.toRight(ERROR);
         astError.sentence.accept(this, error);
-        e.toRight((Comparable<Expr>) error.yield());
+        e.toRight((Comparable<?>) error.yield());
     }
 
     public void visit (AstFail astFail, Expr.Concatenator e) {
-        e.toRight((Comparable<Expr>) new Expr(FAIL));
+        e.toRight((Comparable<?>) new Expr(FAIL));
     }
 
     public void visit (AstFence astFence, Expr.Concatenator e) {
-        e.toRight((Comparable<Expr>) new Expr(FENCE));
+        e.toRight((Comparable<?>) new Expr(FENCE));
     }
 
@@ -230 +230 @@
         format.toRight(FORMAT);
         astFormat.exp.accept(this, format);
-        e.toRight((Comparable<Expr>) format.yield());
+        e.toRight((Comparable<?>) format.yield());
     }
 
@@ -239 +239 @@
         source.toRight(BRANCH);
         astIter.sentence.accept(this, source);
-        iter.toRight((Comparable<Expr>) source.yield());
+        iter.toRight((Comparable<?>) source.yield());
         Expr.Concatenator format = Expr.getConcatenator();
         format.toRight(FORMAT);
         astIter.target.accept(this, format);
-        iter.toRight((Comparable<Expr>) format.yield());
-        e.toRight((Comparable<Expr>) iter.yield());
+        iter.toRight((Comparable<?>) format.yield());
+        e.toRight((Comparable<?>) iter.yield());
     }
 
@@ -251 +251 @@
         source.toRight(BRANCH);
         astNot.sentence.accept(this, source);
-        e.toRight((Comparable<Expr>) Expr.concat(NOT, (Comparable<Expr>) source.yield()));
+        e.toRight((Comparable<?>) Expr.concat(NOT, (Comparable<?>) source.yield()));
     }
 
@@ -258 +258 @@
         items.toRight(astPattern.dir.select(LEFT, RIGHT));
         astPattern.exp.accept(this, items);
-        e.toRight((Comparable<Expr>) items.yield());
+        e.toRight((Comparable<?>) items.yield());
     }
 
@@ -265 +265 @@
         items.toRight(RESULT);
         astResult.exp.accept(this, items);
-        e.toRight((Comparable<Expr>) items.yield());
+        e.toRight((Comparable<?>) items.yield());
     }
 
@@ -279 +279 @@
         trap.toRight(BRANCH);
         astTrap.trySentence.accept(this, trap);
-        items.toRight((Comparable<Expr>) trap.yield());
+        items.toRight((Comparable<?>) trap.yield());
         Expr.Concatenator with = Expr.getConcatenator();
         with.toRight(BRANCH);
         astTrap.catchSentence.accept(this, with);
-        items.toRight((Comparable<Expr>) with.yield());
-        e.toRight((Comparable<Expr>) items.yield());
+        items.toRight((Comparable<?>) with.yield());
+        e.toRight((Comparable<?>) items.yield());
     }
 
@@ -297 +297 @@
         items.toRight(makeName(modName + "." + astCall.funcDecl.name.identifier));
         astCall.arg.accept(this, items);
-        e.toRight((Comparable<Expr>) items.yield());
+        e.toRight((Comparable<?>) items.yield());
     }
 
@@ -317 +317 @@
         items.toRight(PAREN);
         astParen.exp.accept(this, items);
-        e.toRight((Comparable<Expr>) items.yield());
+        e.toRight((Comparable<?>) items.yield());
     }
 
@@ -327 +327 @@
             modName = moduleName;
         items.toRight(makeName(modName + "." + astRef.decl.name.identifier));
-        e.toRight((Comparable<Expr>) items.yield());
+        e.toRight((Comparable<?>) items.yield());
     }
 
     public void visit (AstVar astVar, Expr.Concatenator e) {
         String varType = astVar.type.name().toUpperCase() + "VAR"; // FIXME
-        Comparable<Expr> varName;
+        Comparable<?> varName;
         if (astVar.name != null && astVar.name.identifier.length() > 0)
             varName = new Expr(astVar.name.identifier); // FIXME
         else
             varName = new Expr("$tmp-" + astVar.pos.charStart); // FIXME
-        e.toRight((Comparable<Expr>) Expr.concat(varType, varName));
+        e.toRight((Comparable<?>) Expr.concat(varType, varName));
     }