Repository: flex-falcon Updated Branches: refs/heads/develop 70a6c2f0a -> 6a00ac83f
fix mxml output for includeIn Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/6a00ac83 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/6a00ac83 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/6a00ac83 Branch: refs/heads/develop Commit: 6a00ac83f1be07a276b70b1774279e67a6cfb1a0 Parents: 70a6c2f Author: Alex Harui <aha...@apache.org> Authored: Wed Oct 1 19:15:52 2014 -0700 Committer: Alex Harui <aha...@apache.org> Committed: Wed Oct 1 19:15:52 2014 -0700 ---------------------------------------------------------------------- .../internal/as/codegen/MXMLClassDirectiveProcessor.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6a00ac83/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 5514e47..8844133 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 @@ -3348,7 +3348,12 @@ public class MXMLClassDirectiveProcessor extends ClassDirectiveProcessor context.addInstruction(OP_findpropstrict, context.instanceClassName); context.addInstruction(OP_getproperty, context.instanceClassName); if (context.parentContext.isContentFactory) - context.parentContext.incrementCounter(IL.MXML_CONTENT_FACTORY, 1); + { + if (context.isStateDescriptor) + context.parentContext.incrementCounter(IL.MXML_STATES_ARRAY, 1); + else + context.parentContext.incrementCounter(IL.MXML_CONTENT_FACTORY, 1); + } else if (!context.parentContext.isContentFactory) numElements = 1; // if not in content factory, create the array now
