[X10-commits] SF.net SVN: x10:[8041] trunk

[<ipe...@us...>]

Revision: 8041
          http://x10.svn.sourceforge.net/x10/?rev=8041&view=rev
Author:   ipeshansky
Date:     2009-03-22 05:07:26 +0000 (Sun, 22 Mar 2009)

Log Message:
-----------
Fix XTENLANG-358.
Remove references to package-private classes from Dummy.x10

Modified Paths:
--------------
    trunk/x10.compiler.p3/src/polyglot/ext/x10/ast/X10CanonicalTypeNode_c.java
    trunk/x10.runtime.17/src-x10/Dummy.x10

Modified: trunk/x10.compiler.p3/src/polyglot/ext/x10/ast/X10CanonicalTypeNode_c.java
===================================================================
--- trunk/x10.compiler.p3/src/polyglot/ext/x10/ast/X10CanonicalTypeNode_c.java	2009-03-22 03:59:27 UTC (rev 8040)
+++ trunk/x10.compiler.p3/src/polyglot/ext/x10/ast/X10CanonicalTypeNode_c.java	2009-03-22 05:07:26 UTC (rev 8041)
@@ -82,25 +82,25 @@
 	checkType(t);
 
 	List<AnnotationNode> as = ((X10Del) this.del()).annotations();
-	if (as == null || as.isEmpty())
-	    return this;
+	if (as != null && !as.isEmpty()) {
 
-	// Eh.  Why not?
-//	if (c.inAnnotation()) {
-//	    throw new SemanticException("Annotations not permitted within annotations.", position());
-//	}
+	    // Eh.  Why not?
+//	    if (c.inAnnotation()) {
+//		throw new SemanticException("Annotations not permitted within annotations.", position());
+//	    }
 	
-	List<Type> annotationTypes = new ArrayList<Type>();
-	for (AnnotationNode an : as) {
+	    List<Type> annotationTypes = new ArrayList<Type>();
+	    for (AnnotationNode an : as) {
 	    Type at = an.annotationInterface();
-	    annotationTypes.add(at);
+		annotationTypes.add(at);
+	    }
+	
+	    Type newType = ts.AnnotatedType(position(), t, annotationTypes);
+	    Ref<Type> tref = (Ref<Type>) type;
+	    tref.update(newType);
 	}
-	
-	Type newType = ts.AnnotatedType(position(), t, annotationTypes);
-	Ref<Type> tref = (Ref<Type>) type;
-	tref.update(newType);
-	
-	return this;
+
+	return super.typeCheck(tc);
     }
     
     @Override

Modified: trunk/x10.runtime.17/src-x10/Dummy.x10
===================================================================
--- trunk/x10.runtime.17/src-x10/Dummy.x10	2009-03-22 03:59:27 UTC (rev 8040)
+++ trunk/x10.runtime.17/src-x10/Dummy.x10	2009-03-22 05:07:26 UTC (rev 8041)
@@ -7,26 +7,15 @@
     var f0 : x10.array.BaseArray[Dummy];
     var f1 : x10.array.BaseDist;
     var f2 : x10.array.BaseRegion;
-    var f3 : x10.array.DistArray[Dummy];
-    var f4 : x10.array.EmptyRegion;
-    var f5 : x10.array.FullRegion;
-    var f9 : x10.array.Layout;
-    var f10 : x10.array.LocalArray[Dummy];
     var f11 : x10.array.NoSuchElementException;
-    var f12 : x10.array.PlaceLocal[Dummy];
     var f13 : x10.array.PolyRegion;
-    var f14 : x10.array.PolyRegionListBuilder;
     var f15 : x10.array.PolyScanner;
-    var f16 : x10.array.RectLayout;
-    var f17 : x10.array.RectRegion;
     var f18 : x10.array.U;
     var f19 : x10.array.UnboundedRegionException;
-    var f20 : x10.array.UnionRegion;
     var f21 : x10.compiler.ArithmeticOps[Dummy];
     var f22 : x10.compiler.ComparisonOps[Dummy];
     var f23 : x10.compiler.Native;
     var f24 : x10.compiler.NativeRep;
-    var f25 : x10.compiler.Ops[Dummy,Dummy];
     var f26 : x10.compiler.SetOps[Dummy];
     var f27 : x10.io.ByteRailWriter;
     var f28 : x10.io.ByteValRailWriter;
@@ -40,7 +29,6 @@
     var f36 : x10.io.FileWriter;
     var f37 : x10.io.FilterReader;
     var f38 : x10.io.FilterWriter;
-    var f39 : x10.io.InputStreamReader;
     var f40 : x10.io.IOException;
     var f41 : x10.io.IORuntimeException;
     var f42 : x10.io.Marshal[Dummy];
@@ -111,22 +99,13 @@
     var f107 : x10.lang.ValRail[Dummy];
     var f108 : x10.lang.Value;
     var f109 : x10.lang._;
-    var f110 : x10.runtime.Activity;
-    var f111 : x10.runtime.ClockPhases;
-    var f112 : x10.runtime.ClockState;
     var f113 : x10.runtime.Clock_c;
-    var f114 : x10.runtime.FinishState;
     var f115 : x10.runtime.Future_c[Dummy];
     var f117 : x10.runtime.InterruptedException;
     var f118 : x10.runtime.Lock;
-    var f119 : x10.runtime.ModCountDownLatch;
-    var f120 : x10.runtime.Monitor;
     var f121 : x10.runtime.NativeRuntime;
-    var f122 : x10.runtime.Pool;
     var f123 : x10.runtime.Runtime;
     var f128 : x10.runtime.Thread;
-    var f129 : x10.tuningfork.Logger;
-    var f130 : x10.tuningfork.LoggerFactory;
     var f135 : x10.util.AbstractCollection[Dummy];
     var f136 : x10.util.AbstractContainer[Dummy];
     var f137 : x10.util.ArrayList[Dummy];


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