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 ED47C200C4D for ; Wed, 22 Mar 2017 00:10:43 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id EC5E0160B97; Tue, 21 Mar 2017 23:10:43 +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 E3B27160B90 for ; Wed, 22 Mar 2017 00:10:42 +0100 (CET) Received: (qmail 10484 invoked by uid 500); 21 Mar 2017 23:10:40 -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 8263 invoked by uid 99); 21 Mar 2017 23:10:39 -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; Tue, 21 Mar 2017 23:10:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 31157DFB0E; Tue, 21 Mar 2017 23:10:39 +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: Tue, 21 Mar 2017 23:11:15 -0000 Message-Id: In-Reply-To: <132b70eb1b464b6891c60ec846f00390@git.apache.org> References: <132b70eb1b464b6891c60ec846f00390@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [38/50] git commit: [flex-falcon] [refs/heads/master] - handle some tricky RegExp literals archived-at: Tue, 21 Mar 2017 23:10:44 -0000 handle some tricky RegExp literals Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/628d3ca6 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/628d3ca6 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/628d3ca6 Branch: refs/heads/master Commit: 628d3ca65391645c52d76098c6e9a2155b5c77b2 Parents: dad773a Author: Alex Harui Authored: Thu Mar 9 11:28:48 2017 -0800 Committer: Alex Harui Committed: Thu Mar 9 11:28:48 2017 -0800 ---------------------------------------------------------------------- .../internal/codegen/js/jx/LiteralEmitter.java | 9 +++++ .../js/flexjs/TestFlexJSGlobalClasses.java | 41 ++++++++++++++++++++ 2 files changed, 50 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/628d3ca6/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 84e883a..22129d4 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 @@ -172,6 +172,15 @@ public class LiteralEmitter extends JSSubEmitter implements } } + else + { + s = s.replaceAll("\n", "\\\\u000a"); + s = s.replaceAll("\r", "\\\\u000d"); + s = s.replaceAll("\t", "\\\\u0009"); + s = s.replaceAll(" ", "\\\\u0020"); + s = s.replace("\u2028", "\\u2028"); + s = s.replace("\u2029", "\\u2029"); + } if (!isWritten) { http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/628d3ca6/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 74b9d1e..05b318b 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 @@ -915,4 +915,45 @@ public class TestFlexJSGlobalClasses extends TestGoogGlobalClasses assertOut("var foreachiter0_target = a;\nfor (var foreachiter0 in foreachiter0_target.propertyNames()) \n{\nvar p = foreachiter0_target.getProperty(foreachiter0);\n\n var /** @type {number} */ i = p.length;}\n"); } + @Test + public void testRegExp_LiteralUnicode() + { + IVariableNode node = getVariable("var a:RegExp = /[\\u0065\\u0066\\u0067]/g;"); + asBlockWalker.visitVariable(node); + assertOut("var /** @type {RegExp} */ a = /[efg]/g"); + } + + @Test + public void testRegExp_LiteralComplex1() + { + IVariableNode node = getVariable("var a:RegExp = /[\\u0009\\u000a\\u000d]/g;"); + asBlockWalker.visitVariable(node); + assertOut("var /** @type {RegExp} */ a = /[\\u0009\\u000a\\u000d]/g"); + } + + @Test + public void testRegExp_LiteralComplex2() + { + IVariableNode node = getVariable("var a:RegExp = /\\u2028/;"); + asBlockWalker.visitVariable(node); + assertOut("var /** @type {RegExp} */ a = /\\u2028/"); + } + + @Test + public void testRegExp_LiteralComplex3() + { + IVariableNode node = getVariable("var a:RegExp = /\\u000A|\\u000D\\u000A?/g;"); + asBlockWalker.visitVariable(node); + assertOut("var /** @type {RegExp} */ a = /\\u000a|\\u000d\\u000a?/g"); + } + + @Test + public void testRegExp_LiteralComplex4() + { + IVariableNode node = getVariable("var a:RegExp = /[^\\u0009\\u000a\\u000d\\u0020]/g;"); + asBlockWalker.visitVariable(node); + assertOut("var /** @type {RegExp} */ a = /[^\\u0009\\u000a\\u000d\\u0020]/g"); + } + + }