You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by de...@apache.org on 2016/07/08 21:28:53 UTC

incubator-systemml git commit: [SYSTEMML-778] Handle escaped quotes in parser

Repository: incubator-systemml
Updated Branches:
  refs/heads/master 172bfcacc -> 33c6c4b90


[SYSTEMML-778] Handle escaped quotes in parser

Closes #189.


Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/33c6c4b9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/33c6c4b9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/33c6c4b9

Branch: refs/heads/master
Commit: 33c6c4b90d541670d48506acf78e58918f7576c4
Parents: 172bfca
Author: Deron Eriksson <de...@us.ibm.com>
Authored: Fri Jul 8 14:25:34 2016 -0700
Committer: Deron Eriksson <de...@us.ibm.com>
Committed: Fri Jul 8 14:25:34 2016 -0700

----------------------------------------------------------------------
 .../apache/sysml/parser/common/CommonSyntacticValidator.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/33c6c4b9/src/main/java/org/apache/sysml/parser/common/CommonSyntacticValidator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/common/CommonSyntacticValidator.java b/src/main/java/org/apache/sysml/parser/common/CommonSyntacticValidator.java
index 91ec37e..19e344e 100644
--- a/src/main/java/org/apache/sysml/parser/common/CommonSyntacticValidator.java
+++ b/src/main/java/org/apache/sysml/parser/common/CommonSyntacticValidator.java
@@ -332,7 +332,9 @@ public abstract class CommonSyntacticValidator {
 						.replaceAll("\\\\t","\t")
 						.replaceAll("\\\\n","\n")
 						.replaceAll("\\\\f","\f")
-						.replaceAll("\\\\r","\r");
+						.replaceAll("\\\\r","\r")
+						.replace("\\'","'")
+						.replace("\\\"","\"");
 				}
 				else if(text.equals("\"\"") || text.equals("\'\'")) {
 					val = "";
@@ -344,7 +346,9 @@ public abstract class CommonSyntacticValidator {
 					.replaceAll("\\\\t","\t")
 					.replaceAll("\\\\n","\n")
 					.replaceAll("\\\\f","\f")
-					.replaceAll("\\\\r","\r");
+					.replaceAll("\\\\r","\r")
+					.replace("\\'","'")
+					.replace("\\\"","\"");
 		}
 		return val;
 	}