Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 66072200BEE for ; Sat, 17 Dec 2016 00:26:21 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 64AB0160B3A; Fri, 16 Dec 2016 23:26:21 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B5A28160B24 for ; Sat, 17 Dec 2016 00:26:20 +0100 (CET) Received: (qmail 11906 invoked by uid 500); 16 Dec 2016 23:26:19 -0000 Mailing-List: contact commits-help@flex.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flex.apache.org Delivered-To: mailing list commits@flex.apache.org Received: (qmail 11814 invoked by uid 99); 16 Dec 2016 23:26:19 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Dec 2016 23:26:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 91E12DFA00; Fri, 16 Dec 2016 23:26:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: joshtynjala@apache.org To: commits@flex.apache.org Date: Fri, 16 Dec 2016 23:26:23 -0000 Message-Id: <38811c39a15e4200bde2a38e8d82537f@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/6] git commit: [flex-falcon] [refs/heads/develop] - compiler-jx: externc converts an empty union type to * archived-at: Fri, 16 Dec 2016 23:26:21 -0000 compiler-jx: externc converts an empty union type to * Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/24c44fbc Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/24c44fbc Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/24c44fbc Branch: refs/heads/develop Commit: 24c44fbc1845a2833213569dd713e2af140a4ca4 Parents: 1c2570a Author: Josh Tynjala Authored: Fri Dec 16 13:02:58 2016 -0800 Committer: Josh Tynjala Committed: Fri Dec 16 15:25:39 2016 -0800 ---------------------------------------------------------------------- .../compiler/internal/codegen/externals/utils/JSTypeUtils.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/24c44fbc/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/utils/JSTypeUtils.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/utils/JSTypeUtils.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/utils/JSTypeUtils.java index 1e6feaa..966007e 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/utils/JSTypeUtils.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/utils/JSTypeUtils.java @@ -163,6 +163,10 @@ public class JSTypeUtils { return "Object /* " + type + " */"; } + else if (type.equals("None")) + { + return "* /* " + type + " */"; + } else { if (type.indexOf("Array<") == 0)