Changeset 2405 for trunk/ProjectFortress/src/com/sun/fortress/tools/FortressAstToConcrete.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/tools/FortressAstToConcrete.java (modified) (11 diffs)

trunk/ProjectFortress/src/com/sun/fortress/tools/FortressAstToConcrete.java

@@ -34 +34 @@
      */
 
+    /* indentation utilities *************************************************/
     private int indent = 0;
 
@@ -59 +60 @@
 
     /* utility methods ********************************************************/
+    /* returns number copies of s */
+    private String makeCopies(int number, String s) {
+        String result = s;
+        for (int index = 1; index < number; index++) {
+            result += s;
+        }
+        return result;
+    }
+
     /* returns a string beginning with 'kind' followed by a sequence of elements
        in 'list' separated by commas and  enclosed by '{' and '}'
@@ -362 +372 @@
                                               List<String> decls_result) {
         StringBuilder s = new StringBuilder();
-        
+
         increaseIndent();
 
@@ -386 +396 @@
         s.append( indent(join(decls_result,"\n")) );
         s.append( "\nend" ).append( "\n" );
-        
+
         decreaseIndent();
 
@@ -655 +665 @@
                                       List<String> fronts_result) {
         StringBuilder s = new StringBuilder();
-        s.append( indent(join(fronts_result, "\n")) );
+        s.append( indent(join(fronts_result, " also\n")) );
         s.append( "\nend" );
         return s.toString();
@@ -1030 +1040 @@
         StringBuilder s = new StringBuilder();
 
-        // s.append( op_result );
         s.append( join(args_result, " " + op_result + " ") );
 
@@ -1094 +1103 @@
 //    @Override public String forMathPrimaryOnly( that,
 
-    @Override public String forArrayElementOnly(ArrayElement that, List<String> staticArgs_result, String element_result) {
-        StringBuilder s = new StringBuilder();
-
-        s.append( element_result );
-        s.append( inOxfordBrackets(staticArgs_result));
-
-        return s.toString();
-    }
-
-    @Override public String forArrayElementsOnly(ArrayElements that, List<String> staticArgs_result, List<String> elements_result) {
-        StringBuilder s = new StringBuilder();
-
-        s.append( "[ " );
-        s.append( join(elements_result, ", ") );
-        s.append( inOxfordBrackets( staticArgs_result ) );
-        s.append( " ]" );
+    @Override public String forArrayElementOnly(ArrayElement that,
+                                                List<String> staticArgs_result,
+                                                String element_result) {
+        return element_result;
+    }
+
+    @Override public String forArrayElementsOnly(ArrayElements that,
+                                                 List<String> staticArgs_result,
+                                                 List<String> elements_result) {
+        StringBuilder s = new StringBuilder();
+
+        if ( that.isOutermost() ) {
+            s.append( "[" );
+            s.append( inOxfordBrackets( staticArgs_result ) );
+            s.append( " " );
+        }
+        String separator;
+        if ( that.getDimension() == 1 )
+            separator = " ";
+        else
+            separator = makeCopies(that.getDimension()-1, ";");
+        s.append( join(elements_result, separator) );
+        if ( that.isOutermost() )
+            s.append( " ]" );
 
         return s.toString();
@@ -1131 +1148 @@
 //    @Override public String for_RewriteGenericSingletonTypeOnly( that,
 
-    @Override public String forArrayTypeOnly(ArrayType that, String type_result, String indices_result) {
+    @Override public String forArrayTypeOnly(ArrayType that,
+                                             String type_result,
+                                             String indices_result) {
         StringBuilder s = new StringBuilder();
 
@@ -1711 +1730 @@
     @Override public String forAnonymousFnNameOnly(AnonymousFnName that,
                                                    Option<String> api_result) {
-        StringBuilder s = new StringBuilder();
-
-        return s.toString();
-        /*
-        return bug(that, "Anonymous function names are not supported " +
-                   "in Fortress concrete syntax.");
-                   */
+        return "";
     }
 
@@ -1812 +1825 @@
     }
 
-    @Override public String forExtentRangeOnly(ExtentRange that, Option<String> base_result, Option<String> size_result) {
-            StringBuilder s = new StringBuilder();
-
-            if ( base_result.isSome() ){
-                    s.append( base_result.unwrap() );
-            }
-            if ( size_result.isSome() ){
-                    s.append( size_result.unwrap() );
-            }
-
-            return s.toString();
+    /* Possible differences in the original Fortress program and
+       the unparsed program.
+       In the Fortress source program, either "#" or ":" may be used.
+       In AST, only "#" is used.
+       In the Fortress source program, either "#size" or "size" may be used.
+       In AST, only "#size" is used.
+     */
+    @Override public String forExtentRangeOnly(ExtentRange that,
+                                               Option<String> base_result,
+                                               Option<String> size_result) {
+        StringBuilder s = new StringBuilder();
+
+        if ( base_result.isSome() ){
+            s.append( base_result.unwrap() );
+        }
+        s.append( "#" );
+        if ( size_result.isSome() ){
+            s.append( size_result.unwrap() );
+        }
+
+        return s.toString();
     }
 
@@ -1856 +1879 @@
 //    @Override public String forTraitTypeWhereOnly( that,
 
-    @Override public String forIndicesOnly(Indices that, List<String> extents_result) {
+    @Override public String forIndicesOnly(Indices that,
+                                           List<String> extents_result) {
         StringBuilder s = new StringBuilder();