# HG changeset patch # User Christian Humer # Date 1422972423 -3600 # Node ID 259a416388d71da8c923906239a8a21c8b7a1c42 # Parent b339d723a06b2bea94a05f664249c1c0d109d792 Truffle-DSL: rename @ImportGuards to @ImportStatic diff -r b339d723a06b -r 259a416388d7 graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ImportGuardsTest.java --- a/graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ImportGuardsTest.java Thu Jan 29 19:07:58 2015 +0100 +++ b/graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ImportGuardsTest.java Tue Feb 03 15:07:03 2015 +0100 @@ -32,7 +32,7 @@ public class ImportGuardsTest { - @ImportGuards(Imports0.class) + @ImportStatic(Imports0.class) @NodeChild("a") static class ImportGuards0 extends ValueNode { @@ -43,7 +43,7 @@ } @NodeChild("a") - @ImportGuards(Imports0.class) + @ImportStatic(Imports0.class) static class ImportGuards1 extends ValueNode { @ExpectError("Error parsing expression 'nonStaticGuard(a)': The method nonStaticGuard is undefined for the enclosing scope.") @@ -97,7 +97,7 @@ @ExpectError("The specified import guard class 'com.oracle.truffle.api.dsl.test.ImportGuardsTest.Imports1' must be public.") @NodeChild("a") - @ImportGuards(Imports1.class) + @ImportStatic(Imports1.class) static class ImportGuards2 extends ValueNode { int do1(int a) { @@ -111,7 +111,7 @@ @ExpectError("The specified import guard class 'com.oracle.truffle.api.dsl.test.ImportGuardsTest.Imports2' must be public.") @NodeChild("a") - @ImportGuards(Imports2.class) + @ImportStatic(Imports2.class) static class ImportGuards3 extends ValueNode { int do1(int a) { @@ -121,7 +121,7 @@ @ExpectError("The specified import guard class 'boolean' is not a declared type.") @NodeChild("a") - @ImportGuards(boolean.class) + @ImportStatic(boolean.class) static class ImportGuards4 extends ValueNode { int do1(int a) { @@ -135,7 +135,7 @@ @ExpectError("At least import guard classes must be specified.") @NodeChild("a") - @ImportGuards({}) + @ImportStatic({}) static class ImportGuards5 extends ValueNode { int do1(int a) { @@ -151,7 +151,7 @@ array(1, 1)); } - @ImportGuards(Imports0.class) + @ImportStatic(Imports0.class) @NodeChild("a") static class ImportGuards6 extends ValueNode { diff -r b339d723a06b -r 259a416388d7 graal/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/ImportGuards.java --- a/graal/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/ImportGuards.java Thu Jan 29 19:07:58 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2012, 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package com.oracle.truffle.api.dsl; - -import java.lang.annotation.*; - -/** - * Imports all public static methods usable as guards for {@link Specialization} annotations to the - * current class. Using this annotation common guards can be shared across nodes. Imported guards - * are derived from super classes. Guards declared in the node type hierarchy are always preferred - * to imported guards. Imported guards for a more concrete type are preferred to guards imported in - * the base class. - */ -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.TYPE}) -public @interface ImportGuards { - - Class[] value(); - -} diff -r b339d723a06b -r 259a416388d7 graal/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/ImportStatic.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/ImportStatic.java Tue Feb 03 15:07:03 2015 +0100 @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2012, 2012, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package com.oracle.truffle.api.dsl; + +import java.lang.annotation.*; + +/** + * Imports all public and static methods and fields of the provided + * classes for the use in DSL expressions of the annotated class or its subclasses. + * + * @see Specialization#guards() + * @see Specialization#assumptions() + * @see Specialization#limit() + * @see Cached + */ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.TYPE}) +public @interface ImportStatic { + + Class[] value(); + +} diff -r b339d723a06b -r 259a416388d7 graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/NodeParser.java --- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/NodeParser.java Thu Jan 29 19:07:58 2015 +0100 +++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/NodeParser.java Tue Feb 03 15:07:03 2015 +0100 @@ -194,7 +194,7 @@ private void initializeImportGuards(NodeData node, List lookupTypes, List elements) { for (TypeElement lookupType : lookupTypes) { - AnnotationMirror importAnnotation = ElementUtils.findAnnotationMirror(processingEnv, lookupType, ImportGuards.class); + AnnotationMirror importAnnotation = ElementUtils.findAnnotationMirror(processingEnv, lookupType, ImportStatic.class); if (importAnnotation == null) { continue; }