royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [royale-compiler] branch develop updated: handle excluding functions as well
Date Fri, 25 May 2018 17:49:58 GMT
This is an automated email from the ASF dual-hosted git repository.

aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git


The following commit(s) were added to refs/heads/develop by this push:
     new a45211a  handle excluding functions as well
a45211a is described below

commit a45211afeb891b88082cf31c0e44bf4ac54a8f29
Author: Alex Harui <aharui@apache.org>
AuthorDate: Fri May 25 10:49:49 2018 -0700

    handle excluding functions as well
---
 .../java/org/apache/royale/compiler/clients/ExternCConfiguration.java | 4 ++--
 .../compiler/internal/codegen/typedefs/emit/ReferenceEmitter.java     | 3 +++
 .../compiler/internal/codegen/typedefs/reference/ReferenceModel.java  | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/compiler-externc/src/main/java/org/apache/royale/compiler/clients/ExternCConfiguration.java
b/compiler-externc/src/main/java/org/apache/royale/compiler/clients/ExternCConfiguration.java
index 1a77c66..89e33ba 100644
--- a/compiler-externc/src/main/java/org/apache/royale/compiler/clients/ExternCConfiguration.java
+++ b/compiler-externc/src/main/java/org/apache/royale/compiler/clients/ExternCConfiguration.java
@@ -207,7 +207,7 @@ public class ExternCConfiguration extends Configuration
         return false;
     }
 
-    public ExcludedMember isExcludedClass(ClassReference classReference)
+    public ExcludedMember isExcludedClass(BaseReference classReference)
     {
         for (ExcludedMember memeber : excludesClass)
         {
@@ -389,7 +389,7 @@ public class ExternCConfiguration extends Configuration
             this.description = description;
         }
 
-        public boolean isExcluded(ClassReference classReference,
+        public boolean isExcluded(BaseReference classReference,
                                   MemberReference memberReference)
         {
             if (memberReference == null)
diff --git a/compiler-externc/src/main/java/org/apache/royale/compiler/internal/codegen/typedefs/emit/ReferenceEmitter.java
b/compiler-externc/src/main/java/org/apache/royale/compiler/internal/codegen/typedefs/emit/ReferenceEmitter.java
index 3fc1513..ed493f2 100644
--- a/compiler-externc/src/main/java/org/apache/royale/compiler/internal/codegen/typedefs/emit/ReferenceEmitter.java
+++ b/compiler-externc/src/main/java/org/apache/royale/compiler/internal/codegen/typedefs/emit/ReferenceEmitter.java
@@ -151,6 +151,9 @@ public class ReferenceEmitter
         final StringBuilder sb = new StringBuilder();
         for (FunctionReference reference : model.getFunctions())
         {
+            if (model.isExcludedClass(reference) != null)
+                continue;
+            
             if (model.getConfiguration().isExternalTypedef(reference))
                 continue;
             
diff --git a/compiler-externc/src/main/java/org/apache/royale/compiler/internal/codegen/typedefs/reference/ReferenceModel.java
b/compiler-externc/src/main/java/org/apache/royale/compiler/internal/codegen/typedefs/reference/ReferenceModel.java
index 037de61..9db9550 100644
--- a/compiler-externc/src/main/java/org/apache/royale/compiler/internal/codegen/typedefs/reference/ReferenceModel.java
+++ b/compiler-externc/src/main/java/org/apache/royale/compiler/internal/codegen/typedefs/reference/ReferenceModel.java
@@ -337,7 +337,7 @@ public class ReferenceModel
 
     //--------------------------------------------------------------------------
 
-    public ExcludedMember isExcludedClass(ClassReference classReference)
+    public ExcludedMember isExcludedClass(BaseReference classReference)
     {
         return getConfiguration().isExcludedClass(classReference);
     }

-- 
To stop receiving notification emails like this one, please contact
aharui@apache.org.

Mime
View raw message