Mercurial > hg > truffle

changeset 7506:40133ce026c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Project dependency fixes.
author Christian Humer <christian.humer@gmail.com>
date Fri, 18 Jan 2013 14:38:43 +0100
parents 1b00e067eafe
children 265fd65e0c0d
files graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/TruffleProcessor.java graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/node/NodeParser.java graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/typesystem/TypeSystemParser.java mx/projects
diffstat 4 files changed, 13 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/TruffleProcessor.java	Fri Jan 18 13:41:46 2013 +0100
+++ b/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/TruffleProcessor.java	Fri Jan 18 14:38:43 2013 +0100
@@ -113,13 +113,11 @@
     @Override
     public Set<String> getSupportedAnnotationTypes() {
         Set<String> annotations = new HashSet<>();
-        for (AnnotationProcessor< ? > generator : getGenerators()) {
-            for (Class<? extends Annotation> annotationClass : generator.getParser().getAllAnnotationTypes()) {
-                if (annotationClass == null) {
-                    throw new NullPointerException("class is null");
-                }
-                annotations.add(annotationClass.getCanonicalName());
-            }
+        List<Class<? extends Annotation>> annotationsTypes = new ArrayList<>();
+        annotationsTypes.addAll(NodeParser.ANNOTATIONS);
+        annotationsTypes.addAll(TypeSystemParser.ANNOTATIONS);
+        for (Class< ? extends Annotation > type : annotationsTypes) {
+            annotations.add(type.getCanonicalName());
         }
         return annotations;
     }
--- a/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/node/NodeParser.java	Fri Jan 18 13:41:46 2013 +0100
+++ b/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/node/NodeParser.java	Fri Jan 18 14:38:43 2013 +0100
@@ -41,7 +41,7 @@
 
 public class NodeParser extends TemplateParser<NodeData>{
 
-    private static final List<Class<? extends Annotation>> annotations = Arrays.asList(
+    public static final List<Class<? extends Annotation>> ANNOTATIONS = Arrays.asList(
                     Generic.class, GuardCheck.class, TypeSystemReference.class, ShortCircuit.class, Specialization.class,
                     SpecializationGuard.class, SpecializationListener.class, SpecializationThrows.class);
 
@@ -775,7 +775,7 @@
 
     @Override
     public List<Class< ? extends Annotation>> getTypeDelegatedAnnotationTypes() {
-        return annotations;
+        return ANNOTATIONS;
     }
 
 }
--- a/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/typesystem/TypeSystemParser.java	Fri Jan 18 13:41:46 2013 +0100
+++ b/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/typesystem/TypeSystemParser.java	Fri Jan 18 14:38:43 2013 +0100
@@ -37,6 +37,8 @@
 
 public class TypeSystemParser extends TemplateParser<TypeSystemData> {
 
+    public static final List<Class<TypeSystem>> ANNOTATIONS = Arrays.asList(TypeSystem.class);
+
     public TypeSystemParser(ProcessorContext c) {
         super(c);
     }
--- a/mx/projects	Fri Jan 18 13:41:46 2013 +0100
+++ b/mx/projects	Fri Jan 18 14:38:43 2013 +0100
@@ -279,21 +279,21 @@
 # truffle.api.codegen
 project@com.oracle.truffle.api.codegen@subDir=graal
 project@com.oracle.truffle.api.codegen@sourceDirs=src
-project@com.oracle.truffle.api.codegen@dependencies=com.oracle.truffle.api
+project@com.oracle.truffle.api.codegen@dependencies=
 project@com.oracle.truffle.api.codegen@checkstyle=com.oracle.graal.graph
 project@com.oracle.truffle.api.codegen@javaCompliance=1.7
 
 # truffle.codegen.processor
 project@com.oracle.truffle.codegen.processor@subDir=graal
 project@com.oracle.truffle.codegen.processor@sourceDirs=src
-project@com.oracle.truffle.codegen.processor@dependencies=com.oracle.truffle.api.codegen
-project@com.oracle.truffle.codegen.processor@checkstyle=com.oracle.graal.graph
+project@com.oracle.truffle.codegen.processor@dependencies=com.oracle.truffle.api.codegen,com.oracle.truffle.api
+project@com.oracle.truffle.codegen.processor@checkstyle=com.oracle.graal.graph 
 project@com.oracle.truffle.codegen.processor@javaCompliance=1.7
 
 # truffle.sl
 project@com.oracle.truffle.sl@subDir=graal
 project@com.oracle.truffle.sl@sourceDirs=src
-project@com.oracle.truffle.sl@dependencies=com.oracle.truffle.api.codegen
+project@com.oracle.truffle.sl@dependencies=com.oracle.truffle.api.codegen,com.oracle.truffle.api
 project@com.oracle.truffle.sl@checkstyle=com.oracle.graal.graph
 project@com.oracle.truffle.sl@javaCompliance=1.7
 project@com.oracle.truffle.sl@annotationProcessors=com.oracle.truffle.codegen.processor