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

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

Revision: 12767
          http://x10.svn.sourceforge.net/x10/?rev=12767&view=rev
Author:   tardieu
Date:     2010-01-28 21:46:06 +0000 (Thu, 28 Jan 2010)

Log Message:
-----------
added mutable annotation for structs

Modified Paths:
--------------
    trunk/x10.compiler/src/x10/ast/X10FieldDecl_c.java
    trunk/x10.runtime/src-x10/x10/compiler/ByRef.x10

Added Paths:
-----------
    trunk/x10.runtime/src-x10/x10/compiler/Mutable.x10

Modified: trunk/x10.compiler/src/x10/ast/X10FieldDecl_c.java
===================================================================

--- trunk/x10.compiler/src/x10/ast/X10FieldDecl_c.java	2010-01-28 21:43:55 UTC (rev 12766)
+++ trunk/x10.compiler/src/x10/ast/X10FieldDecl_c.java	2010-01-28 21:46:06 UTC (rev 12767)
@@ -28,6 +28,7 @@
 import polyglot.types.InitializerDef;
 import polyglot.types.LazyRef;
 import polyglot.types.Name;
+import polyglot.types.QName;
 import polyglot.types.Ref;
 import polyglot.types.SemanticException;
 import polyglot.types.StructType;
@@ -49,6 +50,7 @@
 import x10.types.X10ClassDef;
 import x10.types.X10ClassType;
 import x10.types.X10Context;
+import x10.types.X10Def;
 import x10.types.X10FieldDef;
 import x10.types.X10Flags;
 import x10.types.X10InitializerDef;
@@ -102,8 +104,7 @@
             throw new SemanticException("Cannot declare a non-final field in a value class.", position());
         }
 */
-      
-        	if (X10TypeMixin.isX10Struct(ref)) {
+        	if (X10TypeMixin.isX10Struct(ref) && !isMutable(xts, ref)) {
         		X10Flags x10flags = X10Flags.toX10Flags(fi.flags());
         		if (! x10flags.isFinal()) 
         			throw new SemanticException("Illegal " + fi
@@ -117,6 +118,17 @@
         return result;
     }
     
+    protected boolean isMutable(X10TypeSystem xts, Type t) {
+        if (!(t instanceof X10ClassType)) return false;
+        X10ClassType ct = (X10ClassType) t;
+        try {
+            Type m = (Type) xts.systemResolver().find(QName.make("x10.compiler.Mutable"));
+            return ct.annotations().contains(m);
+        } catch (SemanticException e) {
+            return false;
+        }
+    }
+    
     protected void checkVariance(ContextVisitor tc) throws SemanticException {
 	X10Context c = (X10Context) tc.context();
 	X10ClassDef cd;
@@ -273,13 +285,15 @@
 	                		+ this.type().type() + " (a proto type).", position());
 	            	
 	            }
-	            if (X10TypeMixin.isX10Struct(fieldDef().container().get()) &&
+                X10TypeSystem ts = (X10TypeSystem) tc.typeSystem();
+
+                if (X10TypeMixin.isX10Struct(fieldDef().container().get()) &&
+	                    !isMutable(ts, fieldDef().container().get()) &&
 	            		! X10Flags.toX10Flags(fieldDef().flags()).isFinal()) {
 	                throw new SemanticException("A struct may not have var fields.",
 	                		position());
 	            }
 	            	
-	            X10TypeSystem ts = (X10TypeSystem) tc.typeSystem();
 	            X10NodeFactory nf = (X10NodeFactory) tc.nodeFactory();
 	            X10Context context = (X10Context) tc.context();
 	            

Modified: trunk/x10.runtime/src-x10/x10/compiler/ByRef.x10
===================================================================
--- trunk/x10.runtime/src-x10/x10/compiler/ByRef.x10	2010-01-28 21:43:55 UTC (rev 12766)
+++ trunk/x10.runtime/src-x10/x10/compiler/ByRef.x10	2010-01-28 21:46:06 UTC (rev 12767)
@@ -8,8 +8,10 @@
 
 package x10.compiler;
 
+import x10.lang.annotations.ClassAnnotation;
+
 /** An annotation on a struct that instructs the C++ backend to pass instances
  * of this struct by reference and not value.
  * @author Dave Cunningham
  */
-public interface ByRef { }
+public interface ByRef extends ClassAnnotation { }

Added: trunk/x10.runtime/src-x10/x10/compiler/Mutable.x10
===================================================================
--- trunk/x10.runtime/src-x10/x10/compiler/Mutable.x10	                        (rev 0)
+++ trunk/x10.runtime/src-x10/x10/compiler/Mutable.x10	2010-01-28 21:46:06 UTC (rev 12767)
@@ -0,0 +1,17 @@
+/*
+ *
+ * (C) Copyright IBM Corporation 2006-2008.
+ *
+ *  This file is part of X10 Language.
+ *
+ */
+
+package x10.compiler;
+
+import x10.lang.annotations.ClassAnnotation;
+
+/** An annotation on a struct that enables mutable fields
+ * EXPERIMENTAL
+ * @author Olivier Tardieu
+ */
+public interface Mutable extends ClassAnnotation { }


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:[12767] trunk (Page 12)

Performance and Productivity at Scale

x10-commits