flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject git commit: [flex-falcon] [refs/heads/develop] - try to fix quote handling
Date Tue, 18 Jul 2017 04:01:56 GMT
Repository: flex-falcon
Updated Branches:
  refs/heads/develop ddf557d20 -> 90b35848c


try to fix quote handling


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/90b35848
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/90b35848
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/90b35848

Branch: refs/heads/develop
Commit: 90b35848ca89ddc7f0f90bd68ceac27dfe7a51c8
Parents: ddf557d
Author: Alex Harui <aharui@apache.org>
Authored: Mon Jul 17 20:56:30 2017 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Mon Jul 17 20:56:30 2017 -0700

----------------------------------------------------------------------
 .../flex/compiler/internal/codegen/js/jx/LiteralEmitter.java      | 2 +-
 .../internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/90b35848/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/LiteralEmitter.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/LiteralEmitter.java
b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/LiteralEmitter.java
index 75f5aee..5cd6a48 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/LiteralEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/LiteralEmitter.java
@@ -132,7 +132,7 @@ public class LiteralEmitter extends JSSubEmitter implements
                     if (c == '"')
                     {
                         s = s.substring(1, s.length() - 1);
-                        s = s.replace("\"", "\\\"");
+                        s = s.replace("\"", "__QUOTE_PLACEHOLDER__");
                         s = "\"" + s + "\"";
                     }
                     // use formatQualifiedName to get XML in the usedNames dependencies

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/90b35848/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java
b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java
index a5438f5..b372cd6 100644
--- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java
+++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java
@@ -400,7 +400,8 @@ public class TestFlexJSGlobalClasses extends TestGoogGlobalClasses
     {
         IVariableNode node = getVariable("var a:XML = <root title=\"That's Entertainment\"/>");
         asBlockWalker.visitVariable(node);
-        //assertOut("var /** @type {XML} */ a = new XML( \"<root title=\\\"That's Entertainment\\\"/>\")");
+        String s = "var /** @type {XML} */ a = new XML( \"<root title=\\\"That's Entertainment\\\"/>\")";
+        assertOut(s);
     }
     
     @Test


Mime
View raw message