Repository: flex-falcon Updated Branches: refs/heads/feature/flexmojos-tests 7ee797340 -> 142af1891
Update and add various VF2JS pathway files In order to work on VF2JS specific code generation, we need to make a clean cut from the FlexJS code generation pathways. Signed-off-by: Erik de Bruin <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/b1980b93 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/b1980b93 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/b1980b93 Branch: refs/heads/feature/flexmojos-tests Commit: b1980b93e859a0fb3542cc480bcc359959b9c631 Parents: 26117b1 Author: Erik de Bruin <[email protected]> Authored: Thu Oct 23 19:41:42 2014 +0200 Committer: Erik de Bruin <[email protected]> Committed: Thu Oct 23 19:42:52 2014 +0200 ---------------------------------------------------------------------- .../codegen/mxml/vf2js/MXMLVF2JSEmitter.java | 3 +- .../internal/driver/js/vf2js/VF2JSBackend.java | 55 ++++++++++++++++++++ .../driver/mxml/vf2js/MXMLVF2JSBackend.java | 8 +-- 3 files changed, 61 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b1980b93/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java ---------------------------------------------------------------------- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java index a8ad471..b0dcc61 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java @@ -46,6 +46,7 @@ import org.apache.flex.compiler.internal.codegen.js.JSEmitterTokens; import org.apache.flex.compiler.internal.codegen.js.flexjs.JSFlexJSEmitter; import org.apache.flex.compiler.internal.codegen.js.flexjs.JSFlexJSEmitterTokens; import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitterTokens; +import org.apache.flex.compiler.internal.codegen.js.vf2js.JSVF2JSEmitter; import org.apache.flex.compiler.internal.codegen.mxml.MXMLEmitter; import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLEventSpecifier; import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLFlexJSBlockWalker; @@ -146,7 +147,7 @@ public class MXMLVF2JSEmitter extends MXMLEmitter implements IClassDefinition cdef = node.getClassDefinition(); IASEmitter asEmitter = ((IMXMLBlockWalker) getMXMLWalker()) .getASEmitter(); - ((JSFlexJSEmitter) asEmitter).thisClass = cdef; + ((JSVF2JSEmitter) asEmitter).thisClass = cdef; // visit tags final int len = node.getChildCount(); http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b1980b93/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/vf2js/VF2JSBackend.java ---------------------------------------------------------------------- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/vf2js/VF2JSBackend.java b/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/vf2js/VF2JSBackend.java new file mode 100644 index 0000000..d0030fe --- /dev/null +++ b/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/vf2js/VF2JSBackend.java @@ -0,0 +1,55 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.apache.flex.compiler.internal.driver.js.vf2js; + +import java.io.FilterWriter; + +import org.apache.flex.compiler.codegen.js.IJSEmitter; +import org.apache.flex.compiler.internal.codegen.js.vf2js.JSVF2JSEmitter; +import org.apache.flex.compiler.internal.driver.js.goog.GoogBackend; +import org.apache.flex.compiler.internal.targets.FlexJSTarget; +import org.apache.flex.compiler.internal.targets.JSTarget; +import org.apache.flex.compiler.projects.IASProject; +import org.apache.flex.compiler.targets.ITargetProgressMonitor; +import org.apache.flex.compiler.targets.ITargetSettings; + +/** + * @author Erik de Bruin + */ +public class VF2JSBackend extends GoogBackend +{ + + @Override + public IJSEmitter createEmitter(FilterWriter out) + { + IJSEmitter emitter = new JSVF2JSEmitter(out); + emitter.setDocEmitter(createDocEmitter(emitter)); + return emitter; + } + + @Override + public JSTarget createTarget(IASProject project, ITargetSettings settings, + ITargetProgressMonitor monitor) + { + return new FlexJSTarget(project, settings, monitor); + } + + +} http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b1980b93/compiler.jx/src/org/apache/flex/compiler/internal/driver/mxml/vf2js/MXMLVF2JSBackend.java ---------------------------------------------------------------------- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/driver/mxml/vf2js/MXMLVF2JSBackend.java b/compiler.jx/src/org/apache/flex/compiler/internal/driver/mxml/vf2js/MXMLVF2JSBackend.java index 3f164d9..397d977 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/driver/mxml/vf2js/MXMLVF2JSBackend.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/driver/mxml/vf2js/MXMLVF2JSBackend.java @@ -29,8 +29,8 @@ import org.apache.flex.compiler.codegen.js.IJSWriter; import org.apache.flex.compiler.codegen.mxml.IMXMLEmitter; import org.apache.flex.compiler.config.Configurator; import org.apache.flex.compiler.driver.IBackend; -import org.apache.flex.compiler.internal.codegen.js.flexjs.JSFlexJSEmitter; -import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogDocEmitter; +import org.apache.flex.compiler.internal.codegen.js.vf2js.JSVF2JSDocEmitter; +import org.apache.flex.compiler.internal.codegen.js.vf2js.JSVF2JSEmitter; import org.apache.flex.compiler.internal.codegen.mxml.MXMLBlockWalker; import org.apache.flex.compiler.internal.codegen.mxml.MXMLWriter; import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLFlexJSBlockWalker; @@ -93,13 +93,13 @@ public class MXMLVF2JSBackend extends MXMLBackend @Override public IDocEmitter createDocEmitter(IASEmitter emitter) { - return new JSGoogDocEmitter((IJSEmitter) emitter); + return new JSVF2JSDocEmitter((IJSEmitter) emitter); } @Override public IJSEmitter createEmitter(FilterWriter out) { - IJSEmitter emitter = new JSFlexJSEmitter(out); + IJSEmitter emitter = new JSVF2JSEmitter(out); emitter.setDocEmitter(createDocEmitter(emitter)); return emitter; }
