Return-Path: X-Original-To: apmail-flex-commits-archive@www.apache.org Delivered-To: apmail-flex-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D0D8210973 for ; Tue, 30 Apr 2013 18:27:30 +0000 (UTC) Received: (qmail 19789 invoked by uid 500); 30 Apr 2013 18:27:30 -0000 Delivered-To: apmail-flex-commits-archive@flex.apache.org Received: (qmail 19757 invoked by uid 500); 30 Apr 2013 18:27:30 -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 19751 invoked by uid 99); 30 Apr 2013 18:27:30 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Apr 2013 18:27:30 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 752F9884543; Tue, 30 Apr 2013 18:27:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aharui@apache.org To: commits@flex.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: [flex-falcon] - Fix multiple beads on a strand Date: Tue, 30 Apr 2013 18:27:30 +0000 (UTC) Updated Branches: refs/heads/develop c4babfdcb -> 444371793 Fix multiple beads on a strand Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/44437179 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/44437179 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/44437179 Branch: refs/heads/develop Commit: 444371793c6599decb0a0629e0e5913e4d332a7d Parents: c4babfd Author: Alex Harui Authored: Tue Apr 30 11:27:14 2013 -0700 Committer: Alex Harui Committed: Tue Apr 30 11:27:14 2013 -0700 ---------------------------------------------------------------------- .../as/codegen/MXMLClassDirectiveProcessor.java | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/44437179/compiler/src/org/apache/flex/compiler/internal/as/codegen/MXMLClassDirectiveProcessor.java ---------------------------------------------------------------------- diff --git a/compiler/src/org/apache/flex/compiler/internal/as/codegen/MXMLClassDirectiveProcessor.java b/compiler/src/org/apache/flex/compiler/internal/as/codegen/MXMLClassDirectiveProcessor.java index 293fdb2..bebf953 100644 --- a/compiler/src/org/apache/flex/compiler/internal/as/codegen/MXMLClassDirectiveProcessor.java +++ b/compiler/src/org/apache/flex/compiler/internal/as/codegen/MXMLClassDirectiveProcessor.java @@ -2831,6 +2831,7 @@ public class MXMLClassDirectiveProcessor extends ClassDirectiveProcessor } else if (context.makingArrayValues) { + context.addInstruction(OP_newarray, context.numArrayValues); return; } } @@ -3065,7 +3066,12 @@ public class MXMLClassDirectiveProcessor extends ClassDirectiveProcessor if (context.parentContext.isContentFactory) context.parentContext.incrementCounter(IL.MXML_CONTENT_FACTORY, numElements); else if (!context.parentContext.isContentFactory) - context.addInstruction(OP_newarray, numElements); // if not in content factory, create the array now + { + if (context.parentContext.makingArrayValues) + context.parentContext.numArrayValues += numElements; + else + context.addInstruction(OP_newarray, numElements); // if not in content factory, create the array now + } } } @@ -4819,6 +4825,11 @@ public class MXMLClassDirectiveProcessor extends ClassDirectiveProcessor * in an array (other than contextFactory) */ boolean makingArrayValues; + + /** + * number of elements in array when makingArrayValues + */ + int numArrayValues = 0; /** * This flag used in instance contexts to keep track