Changeset 3170

Timestamp:

12/08/08 10:06:33 (12 months ago)

Author:

sukyoungryu

Message:

[ast refactoring] Restructured the UnitExpr? hierarchy.

Location:

trunk/ProjectFortress

Files:

• astgen/Fortress.ast (modified) (1 diff)
• src/com/sun/fortress/nodes_util/ErrorMsgMaker.java (modified) (1 diff)
• src/com/sun/fortress/nodes_util/NodeFactory.java (modified) (1 diff)
• src/com/sun/fortress/parser/MayNewlineHeader.rats (modified) (3 diffs)
• src/com/sun/fortress/tools/FortressAstToConcrete.java (modified) (1 diff)

trunk/ProjectFortress/astgen/Fortress.ast

@@ -1347 +1347 @@
                     /**
                      * unit expression with an operator
-                     */
-                    abstract UnitOpExpr(UnitExpr left, UnitExpr right);
-                        /**
-                         * unit multiplication
-                         * UnitExpr ::= UnitExpr UnitExpr
-                         *            | UnitExpr DOT UnitExpr
-                         * e.g.) m DOT n
-                         */
-                        ProductUnit();
-                        /* unit division
-                         * UnitExpr ::= UnitExpr / UnitExpr
-                         *            | UnitExpr per UnitExpr
-                         * e.g.) meter / second
-                         */
-                        QuotientUnit();
-                        /**
-                         * unit exponentiation
-                         * UnitExpr ::= UnitExpr caret UnitExpr
-                         * e.g.) meter^2
-                         */
-                        ExponentUnit();
+                     *
+                     * unit multiplication
+                     * UnitExpr ::= UnitExpr UnitExpr
+                     *            | UnitExpr DOT UnitExpr
+                     * e.g.) m DOT n
+                     *
+                     * unit division
+                     * UnitExpr ::= UnitExpr / UnitExpr
+                     *            | UnitExpr per UnitExpr
+                     * e.g.) meter / second
+                     *
+                     * unit exponentiation
+                     * UnitExpr ::= UnitExpr caret UnitExpr
+                     * e.g.) meter^2
+                     */
+                    UnitBinaryOp(UnitExpr left, UnitExpr right, Op op);
             /**
              * where clause used in trait, object, and functional declarations

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

@@ -196 +196 @@
     }
 
-    private String forUnitOpExpr(UnitOpExpr node, String op) {
-        return "(" + node.getLeft().accept(this) + op + node.getRight().accept(this) + ")";
-    }
-
-    public String forProductUnit(ProductUnit node) {
-        return forUnitOpExpr(node, " ");
-    }
-
-    public String forQuotientUnit(QuotientUnit node) {
-        return forUnitOpExpr(node, "/");
-    }
-
-    public String forExponentUnit(ExponentUnit node) {
-        return forUnitOpExpr(node, "^");
+    public String forUnitBinaryOp(UnitBinaryOp node) {
+        return "(" + node.getLeft().accept(this) +
+                     node.getOp().accept(this) +
+                     node.getRight().accept(this) + ")";
     }
 

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

@@ -1205 +1205 @@
                 return new UnitRef(b.getSpan(), true, b.getName());
             }
-            public UnitExpr forProductUnit(ProductUnit i) {
-                return new ProductUnit(i.getSpan(), true, i.getLeft(),
-                        i.getRight());
-            }
-            public UnitExpr forQuotientUnit(QuotientUnit t) {
-                return new QuotientUnit(t.getSpan(), true, t.getLeft(),
-                        t.getRight());
-            }
-            public UnitExpr forExponentUnit(ExponentUnit i) {
-                return new ExponentUnit(i.getSpan(), true, i.getLeft(),
-                        i.getRight());
+            public UnitExpr forUnitBinaryOp(UnitBinaryOp i) {
+                return new UnitBinaryOp(i.getSpan(), true, i.getLeft(),
+                                        i.getRight(), i.getOp());
             }
             public UnitExpr defaultCase(Node x) {

trunk/ProjectFortress/src/com/sun/fortress/parser/MayNewlineHeader.rats

@@ -399 +399 @@
      { yyValue = new Action<UnitExpr>() {
            public UnitExpr run(UnitExpr base) {
-               return new ProductUnit(createSpan(yyStart,yyCount),
-                                      (UnitExpr)base, a1);
+               Op product = NodeFactory.makeOpInfix(a1.getSpan(), " ");
+               return new UnitBinaryOp(createSpan(yyStart,yyCount),
+                                       (UnitExpr)base, a1, product);
            }};
      };
@@ -408 +409 @@
      { yyValue = new Action<UnitExpr>() {
            public UnitExpr run(UnitExpr base) {
-               return new QuotientUnit(createSpan(yyStart,yyCount),
-                                      (UnitExpr)base, a1);
+               Op quotient = NodeFactory.makeOpInfix(a1.getSpan(), "/");
+               return new UnitBinaryOp(createSpan(yyStart,yyCount),
+                                       (UnitExpr)base, a1, quotient);
            }};
      };
@@ -417 +419 @@
      { yyValue = new Action<UnitExpr>() {
            public UnitExpr run(UnitExpr base) {
-               return new ExponentUnit(createSpan(yyStart,yyCount),
-                                      (UnitExpr)base, a1);
+               Op exponent = NodeFactory.makeOpInfix(a1.getSpan(), "^");
+               return new UnitBinaryOp(createSpan(yyStart,yyCount),
+                                       (UnitExpr)base, a1, exponent);
            }};
      };

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

@@ -2300 +2300 @@
     }
 
-    @Override public String forProductUnitOnly(ProductUnit that,
-                                               String left_result,
-                                               String right_result) {
-        return handleParen( left_result + " " + right_result,
-                            that.isParenthesized() );
-    }
-
-    @Override public String forQuotientUnitOnly(QuotientUnit that,
+    @Override public String forUnitBinaryOpOnly(UnitBinaryOp that,
                                                 String left_result,
-                                                String right_result) {
-        return handleParen( left_result + "/" + right_result,
-                            that.isParenthesized() );
-    }
-
-    @Override public String forExponentUnitOnly(ExponentUnit that,
-                                                String left_result,
-                                                String right_result) {
-        return handleParen( left_result + "^" + right_result,
+                                                String right_result,
+                                                String op_result) {
+        return handleParen( left_result + op_result + right_result,
                             that.isParenthesized() );
     }