Changeset 2405 for trunk/ProjectFortress/src/com/sun/fortress/parser_util/FortressUtil.java

Timestamp:

07/28/08 20:20:58 (16 months ago)

Author:

sukyoungryu

Message:

[tool] Fixed arrays and also do.

Files:

• trunk/ProjectFortress/src/com/sun/fortress/parser_util/FortressUtil.java (modified) (2 diffs)

trunk/ProjectFortress/src/com/sun/fortress/parser_util/FortressUtil.java

@@ -668 +668 @@
         }
     }
-    public static ArrayExpr multiDimCons(Expr init,
+    public static ArrayElements multiDimCons(Expr init,
                                         List<Pair<Integer,Expr>> rest) {
         ArrayExpr _init = multiDimElement(init);
@@ -691 +691 @@
     }
 
-    public static ArrayExpr addStaticArgsToArrayExpr(List<StaticArg> sargs,
-                                              ArrayExpr a) {
-        if (a instanceof ArrayElement) {
-            ArrayElement arrayE = (ArrayElement)a;
-            return new ArrayElement(arrayE.getSpan(), arrayE.isParenthesized(),
-                                    sargs, arrayE.getElement());
-        } else { // a instanceof ArrayElements
-            ArrayElements arrayE = (ArrayElements)a;
-            return new ArrayElements(arrayE.getSpan(), arrayE.isParenthesized(),
-                                     sargs, arrayE.getDimension(),
-                                     arrayE.getElements());
-        }
+    public static ArrayElements finalizeArrayExpr(ArrayElements a) {
+        return new ArrayElements(a.getSpan(), a.isParenthesized(),
+                                 a.getStaticArgs(), a.getDimension(),
+                                 a.getElements(), true);
+    }
+
+    public static ArrayElements addStaticArgsToArrayExpr(List<StaticArg> sargs,
+                                                         ArrayElements a) {
+        return new ArrayElements(a.getSpan(), a.isParenthesized(),
+                                 sargs, a.getDimension(),
+                                 a.getElements(), true);
     }