Thread: [X10-commits] SF.net SVN: x10:[14185] trunk (Page 15)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 14185
          http://x10.svn.sourceforge.net/x10/?rev=14185&view=rev
Author:   mtake
Date:     2010-05-18 06:34:19 +0000 (Tue, 18 May 2010)

Log Message:
-----------
Fix for XTENLANG-1348

Modified Paths:
--------------
    trunk/x10.compiler/src/x10/visit/Desugarer.java
    trunk/x10.compiler/src/x10c/visit/Desugarer.java

Added Paths:
-----------
    trunk/x10.runtime/src-java/x10/core/UnaryPost.java
    trunk/x10.runtime/src-x10/x10/compiler/UnaryPost.x10

Modified: trunk/x10.compiler/src/x10/visit/Desugarer.java
===================================================================

--- trunk/x10.compiler/src/x10/visit/Desugarer.java	2010-05-17 21:30:16 UTC (rev 14184)
+++ trunk/x10.compiler/src/x10/visit/Desugarer.java	2010-05-18 06:34:19 UTC (rev 14185)
@@ -624,7 +624,7 @@
      * node factory screws up.
      * @throws SemanticException
      */
-    private Assign assign(Position pos, Expr e, Assign.Operator asgn, Expr val) throws SemanticException {
+    protected Assign assign(Position pos, Expr e, Assign.Operator asgn, Expr val) throws SemanticException {
         Assign a = (Assign) xnf.Assign(pos, e, asgn, val).type(e.type());
         if (a instanceof FieldAssign) {
             assert (e instanceof Field);
@@ -659,7 +659,7 @@
     }
 
     // x++ -> ((t:Int)=>t-1)(x+=1) or x-- -> ((t:Int)=>t+1)(x-=1)
-    private Expr unaryPost(Position pos, X10Unary_c.Operator op, Expr e) throws SemanticException {
+    protected Expr unaryPost(Position pos, X10Unary_c.Operator op, Expr e) throws SemanticException {
         Type ret = e.type();
         CanonicalTypeNode retTN = xnf.CanonicalTypeNode(pos, ret);
         Expr one = xnf.X10Cast(pos, retTN,

Modified: trunk/x10.compiler/src/x10c/visit/Desugarer.java
===================================================================
--- trunk/x10.compiler/src/x10c/visit/Desugarer.java	2010-05-17 21:30:16 UTC (rev 14184)
+++ trunk/x10.compiler/src/x10c/visit/Desugarer.java	2010-05-18 06:34:19 UTC (rev 14185)
@@ -11,16 +11,29 @@
 
 package x10c.visit;
 
+import java.util.Collections;
+import java.util.List;
+
 import polyglot.ast.Assign;
+import polyglot.ast.CanonicalTypeNode;
 import polyglot.ast.Expr;
+import polyglot.ast.IntLit;
 import polyglot.ast.NodeFactory;
+import polyglot.ast.Unary.Operator;
 import polyglot.frontend.Job;
+import polyglot.types.Name;
+import polyglot.types.QName;
 import polyglot.types.SemanticException;
+import polyglot.types.Type;
 import polyglot.types.TypeSystem;
+import polyglot.util.Position;
 import x10.ast.SettableAssign_c;
 import x10.ast.X10Call;
 import x10.ast.X10NodeFactory;
+import x10.ast.X10Unary_c;
+import x10.types.X10MethodInstance;
 import x10.types.X10TypeSystem;
+import x10.types.checker.Converter;
 
 /**
  * Visitor to desugar the AST before code gen.
@@ -34,7 +47,30 @@
         this.xnf = (X10NodeFactory) nf;
     }
 
+    private static final QName UNARY_POST = QName.make("x10.compiler.UnaryPost");
+    private static final Name BEFORE_INCREMENT = Name.make("beforeIncrement");
+    private static final Name BEFORE_DECREMENT = Name.make("beforeDecrement");
+
     @Override
+    protected Expr unaryPost(Position pos, Operator op, Expr e) throws SemanticException {
+        Type ret = e.type();
+        if (ret.isNumeric()) {
+            CanonicalTypeNode retTN = xnf.CanonicalTypeNode(pos, ret);
+            Expr one = xnf.X10Cast(pos, retTN, (Expr) xnf.IntLit(pos, IntLit.INT, 1).typeCheck(this), Converter.ConversionType.PRIMITIVE).type(ret);
+            Assign.Operator asgn = (op == X10Unary_c.POST_INC) ? Assign.ADD_ASSIGN : Assign.SUB_ASSIGN;
+            Expr incr = assign(pos, e, asgn, one);
+            if (e instanceof X10Call) incr = visitSettableAssign((SettableAssign_c) incr);
+            List<Expr> args = Collections.singletonList(incr);
+            Type unaryPost = xts.typeForName(UNARY_POST);
+            Name beforeIncDec = (op == X10Unary_c.POST_INC) ? BEFORE_INCREMENT : BEFORE_DECREMENT;
+            List<Type> actualTypes = Collections.singletonList(ret);
+            X10MethodInstance mi = xts.findMethod(unaryPost, xts.MethodMatcher(unaryPost, beforeIncDec, Collections.EMPTY_LIST, actualTypes, context));
+            return xnf.X10Call(pos, xnf.CanonicalTypeNode(pos, unaryPost), xnf.Id(pos, beforeIncDec), Collections.EMPTY_LIST, args).methodInstance(mi).type(ret);
+        }
+        return super.unaryPost(pos, op, e);
+    }
+
+    @Override
     protected Expr visitSettableAssign(SettableAssign_c n) throws SemanticException {
         if (n.operator() != Assign.ASSIGN) {
             X10Call left = (X10Call) n.left(xnf, this);

Added: trunk/x10.runtime/src-java/x10/core/UnaryPost.java
===================================================================
--- trunk/x10.runtime/src-java/x10/core/UnaryPost.java	                        (rev 0)
+++ trunk/x10.runtime/src-java/x10/core/UnaryPost.java	2010-05-18 06:34:19 UTC (rev 14185)
@@ -0,0 +1,27 @@
+/*
+ *  This file is part of the X10 project (http://x10-lang.org).
+ *
+ *  This file is licensed to You under the Eclipse Public License (EPL);
+ *  You may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *      http://www.opensource.org/licenses/eclipse-1.0.php
+ *
+ *  (C) Copyright IBM Corporation 2006-2010.
+ */
+
+package x10.core;
+
+public class UnaryPost {
+    public static byte beforeIncrement(byte t) { return (byte)(t - 1); }
+    public static byte beforeDecrement(byte t) { return (byte)(t + 1); }
+    public static short beforeIncrement(short t) { return (short)(t - 1); }
+    public static short beforeDecrement(short t) { return (short)(t + 1); }
+    public static int beforeIncrement(int t) { return t - 1; }
+    public static int beforeDecrement(int t) { return t + 1; }
+    public static long beforeIncrement(long t) { return t - 1L; }
+    public static long beforeDecrement(long t) { return t + 1L; }
+    public static float beforeIncrement(float t) { return t - 1.0F; }
+    public static float beforeDecrement(float t) { return t + 1.0F; }
+    public static double beforeIncrement(double t) { return t - 1.0; }
+    public static double beforeDecrement(double t) { return t + 1.0; }
+}


Property changes on: trunk/x10.runtime/src-java/x10/core/UnaryPost.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Added: trunk/x10.runtime/src-x10/x10/compiler/UnaryPost.x10
===================================================================
--- trunk/x10.runtime/src-x10/x10/compiler/UnaryPost.x10	                        (rev 0)
+++ trunk/x10.runtime/src-x10/x10/compiler/UnaryPost.x10	2010-05-18 06:34:19 UTC (rev 14185)
@@ -0,0 +1,41 @@
+/*
+ *  This file is part of the X10 project (http://x10-lang.org).
+ *
+ *  This file is licensed to You under the Eclipse Public License (EPL);
+ *  You may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *      http://www.opensource.org/licenses/eclipse-1.0.php
+ *
+ *  (C) Copyright IBM Corporation 2006-2010.
+ */
+
+package x10.compiler;
+
+import x10.compiler.Native;
+
+public abstract class UnaryPost {
+    @Native("java", "x10.core.UnaryPost.beforeIncrement(#1)")
+    public static global safe def beforeIncrement(v:Byte): Byte = (v - 1) as Byte;
+    @Native("java", "x10.core.UnaryPost.beforeDecrement(#1)")
+    public static global safe def beforeDecrement(v:Byte): Byte = (v + 1) as Byte;
+    @Native("java", "x10.core.UnaryPost.beforeIncrement(#1)")
+    public static global safe def beforeIncrement(v:Short): Short = (v - 1) as Short;
+    @Native("java", "x10.core.UnaryPost.beforeDecrement(#1)")
+    public static global safe def beforeDecrement(v:Short): Short = (v + 1) as Short;
+    @Native("java", "x10.core.UnaryPost.beforeIncrement(#1)")
+    public static global safe def beforeIncrement(v:Int): Int = v - 1;
+    @Native("java", "x10.core.UnaryPost.beforeDecrement(#1)")
+    public static global safe def beforeDecrement(v:Int): Int = v + 1;
+    @Native("java", "x10.core.UnaryPost.beforeIncrement(#1)")
+    public static global safe def beforeIncrement(v:Long): Long = v - 1L;
+    @Native("java", "x10.core.UnaryPost.beforeDecrement(#1)")
+    public static global safe def beforeDecrement(v:Long): Long = v + 1L;
+    @Native("java", "x10.core.UnaryPost.beforeIncrement(#1)")
+    public static global safe def beforeIncrement(v:Float): Float = v - 1.0F;
+    @Native("java", "x10.core.UnaryPost.beforeDecrement(#1)")
+    public static global safe def beforeDecrement(v:Float): Float = v + 1.0F;
+    @Native("java", "x10.core.UnaryPost.beforeIncrement(#1)")
+    public static global safe def beforeIncrement(v:Double): Double = v - 1.0;
+    @Native("java", "x10.core.UnaryPost.beforeDecrement(#1)")
+    public static global safe def beforeDecrement(v:Double): Double = v + 1.0;
+}


Property changes on: trunk/x10.runtime/src-x10/x10/compiler/UnaryPost.x10
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [X10-commits] SF.net SVN: x10:[14185] trunk (Page 15)

Performance and Productivity at Scale

x10-commits