Added some utility methods for native handling (#500 and #1286)

ceylon · May 5, 2015 · 2cb9009 · 2cb9009
1 parent 3d90418
commit 2cb9009
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/com/redhat/ceylon/compiler/typechecker/model/Util.java b/src/com/redhat/ceylon/compiler/typechecker/model/Util.java
@@ -2147,6 +2147,14 @@ public static boolean hasNativeImplementation(Declaration decl) {
         return false;
     }
 
+    public static boolean isInNativeContainer(Declaration decl) {
+        Scope container = decl.getContainer();
+        if (container instanceof Declaration) {
+            return ((Declaration) container).isNative();
+        }
+        return false;
+    }
+
     public static Declaration getNativeAbstraction(Declaration decl) {
         Declaration abstraction = null;
         Overloadable f = (Overloadable)decl;

diff --git a/src/com/redhat/ceylon/compiler/typechecker/tree/Util.java b/src/com/redhat/ceylon/compiler/typechecker/tree/Util.java
@@ -73,16 +73,24 @@ public static boolean isForBackend(Tree.AnnotationList al, Backend forBackend, U
     }
 
     public static boolean isForBackend(Tree.AnnotationList al, BackendSupport backendSupport, Unit unit) {
-        Annotation a = getAnnotation(al, "native", unit);
-        if (a != null) {
-            Backend backend = Backend.fromAnnotation(getAnnotationArgument(a, ""));
+        String be = getNativeBackend(al, unit);
+        if (be != null) {
+            Backend backend = Backend.fromAnnotation(be);
             if (backend == null || !backendSupport.supportsBackend(backend)) {
                 return false;
             }
         }
         return true;
     }
 
+    public static String getNativeBackend(Tree.AnnotationList al, Unit unit) {
+        Annotation a = getAnnotation(al, "native", unit);
+        if (a != null) {
+            return getAnnotationArgument(a, "");
+        }
+        return null;
+    }
+
     public static boolean hasUncheckedNulls(Tree.Term term) {
         return hasUncheckedNulls(term, false);
     }