Changeset 3120

Timestamp:

11/29/08 06:56:10 (12 months ago)

Author:

sukyoungryu

Message:

[ast refactoring] Always provide a fixity for an Op.

Location:

trunk/ProjectFortress

Files:

• astgen/Fortress.ast (modified) (2 diffs)
• src/com/sun/fortress/nodes_util/ExprFactory.java (modified) (2 diffs)
• src/com/sun/fortress/nodes_util/NodeFactory.java (modified) (2 diffs)
• src/com/sun/fortress/nodes_util/OprUtil.java (modified) (4 diffs)
• src/com/sun/fortress/tools/FortressAstToConcrete.java (modified) (3 diffs)

trunk/ProjectFortress/astgen/Fortress.ast

@@ -1896 +1896 @@
                              * e.g.) ===
                              */
-                            Op(String text,
-                               Option<Fixity> fixity = Option.<Fixity>none());
+                            Op(String text, Fixity fixity);
                             /**
                              * pair of enclosing operators
@@ -2101 +2100 @@
                  */
                 BigFixity();
+                /**
+                 * Fixity is not yet known
+                 * This should not appear after parsing.
+                 */
+                UnknownFixity();
             /*
              * A Link in a ChainExpr is a pair of OpRef and the next Expr in the chain.

trunk/ProjectFortress/src/com/sun/fortress/nodes_util/ExprFactory.java

@@ -660 +660 @@
 
     public static _RewriteObjectExpr make_RewriteObjectExpr(ObjectExpr expr,
-            BATree<String, StaticParam> implicit_type_parameters) {
+                                                            BATree<String, StaticParam> implicit_type_parameters) {
         List<StaticArg> staticArgs =
             new ArrayList<StaticArg>(implicit_type_parameters.size());
@@ -675 +675 @@
         }
         return new _RewriteObjectExpr(expr.getSpan(), false,
-                expr.getExtendsClause(), expr.getDecls(),
-                implicit_type_parameters, WellKnownNames.objectExprName(expr),
-                stParams, staticArgs,
-                Option.some(Collections.<Param>emptyList()));
+                                      expr.getExtendsClause(), expr.getDecls(),
+                                      implicit_type_parameters, WellKnownNames.objectExprName(expr),
+                                      stParams, staticArgs,
+                                      Option.some(Collections.<Param>emptyList()));
     }
 

trunk/ProjectFortress/src/com/sun/fortress/nodes_util/NodeFactory.java

@@ -845 +845 @@
 
     // All of these should go away, except for the gross overhead of allocating separate items.
-    private static Option<Fixity> infix = Option.<Fixity>some(new InFixity(makeSpan("singleton")));
-    private static Option<Fixity> prefix = Option.<Fixity>some(new PreFixity(makeSpan("singleton")));
-    private static Option<Fixity> postfix = Option.<Fixity>some(new PostFixity(makeSpan("singleton")));
-    private static Option<Fixity> nofix = Option.<Fixity>some(new NoFixity(makeSpan("singleton")));
-    private static Option<Fixity> multifix = Option.<Fixity>some(new MultiFixity(makeSpan("singleton")));
-    private static Option<Fixity> enclosing = Option.<Fixity>some(new EnclosingFixity(makeSpan("singleton")));
-    private static Option<Fixity> big = Option.<Fixity>some(new BigFixity(makeSpan("singleton")));
-    private static Option<Fixity> unknownFix = Option.<Fixity>none();
+    private static Fixity infix = new InFixity(makeSpan("singleton"));
+    private static Fixity prefix = new PreFixity(makeSpan("singleton"));
+    private static Fixity postfix = new PostFixity(makeSpan("singleton"));
+    private static Fixity nofix = new NoFixity(makeSpan("singleton"));
+    private static Fixity multifix = new MultiFixity(makeSpan("singleton"));
+    private static Fixity enclosing = new EnclosingFixity(makeSpan("singleton"));
+    private static Fixity big = new BigFixity(makeSpan("singleton"));
+    private static Fixity unknownFix = new UnknownFixity(makeSpan("singleton"));
 
     public static Op makeOp(String name) {
@@ -862 +862 @@
     }
 
-    public static Op makeOp(Span span, String name, Option<Fixity> fixity) {
+    public static Op makeOp(Span span, String name, Fixity fixity) {
         return new Op(span, PrecedenceMap.ONLY.canon(name), fixity);
     }

trunk/ProjectFortress/src/com/sun/fortress/nodes_util/OprUtil.java

@@ -24 +24 @@
 import com.sun.fortress.nodes.Op;
 import com.sun.fortress.nodes.OpName;
+import com.sun.fortress.nodes.UnknownFixity;
 import com.sun.fortress.nodes.PostFixity;
 import com.sun.fortress.nodes.PreFixity;
@@ -38 +39 @@
 
     public static boolean isUnknownFixity(Op name) {
-        return name.getFixity().isNone();
+        return name.getFixity() instanceof UnknownFixity;
     }
 
@@ -48 +49 @@
 
     private static boolean isPostfix(Op name) {
-        return name.getFixity().unwrap(null) instanceof PostFixity;
+        return name.getFixity() instanceof PostFixity;
     }
 
@@ -132 +133 @@
     }
 
-    public static String fixityDecorator(final Option<Fixity> of, final String s) {
-        if (of.isNone()) {
-            return s;
-        }
-        return of.unwrap().accept(new NodeAbstractVisitor<String>() {
+    public static String fixityDecorator(final Fixity of, final String s) {
+        return of.accept(new NodeAbstractVisitor<String>() {
 //            @Override public String forInFixity(InFixity that) {
 //                return "infix "+s;

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

@@ -631 +631 @@
             @Override public String forOp(final Op opThat) {
                 final String oper = opThat.getText();
-                /* fixity shouldnt be null */
-                assert(opThat.getFixity().isSome());
-                return opThat.getFixity().unwrap().accept( new NodeDepthFirstVisitor<String>(){
+                return opThat.getFixity().accept( new NodeDepthFirstVisitor<String>(){
                     @Override public String forPreFixityOnly(PreFixity that) {
                         return "opr " + oper + sparams + inParentheses(vparams);
@@ -1816 +1814 @@
             @Override public String forOp(final Op opThat) {
                 final String oper = canonicalOp( opThat.getText() );
-                /* fixity shouldnt be null */
-                assert(opThat.getFixity().isSome());
-                return opThat.getFixity().unwrap().accept( new NodeDepthFirstVisitor<String>(){
+                return opThat.getFixity().accept( new NodeDepthFirstVisitor<String>(){
                     @Override public String forPreFixityOnly(PreFixity that) {
                         assert( args_result.size() == 1 );
@@ -2746 +2742 @@
     @Override public String forOpOnly(Op that,
                                       Option<String> api_result,
-                                      Option<String> fixity_result) {
+                                      String fixity_result) {
         return canonicalOp( that.getText() );
     }