Merge pull request #115 from bzz/fix-string-literal-escapes

Fix string literal escapes

Author: bzz

driver/normalizer/normalizer.go

@@ -14,8 +14,9 @@ var Normalize = Transformers([][]Transformer{
 
 var Normalizers = []Mapping{
 	MapSemantic("StringLiteral", uast.String{}, MapObj(
-		Obj{
-			"escapedValue": Quote(Var("val")),
+		Fields{
+			{Name: "unescapedValue", Op: Var("val")},
+			{Name: "escapedValue", Drop: true, Op: Any()}, // only used in Annotated
 		},
 		Obj{
 			"Value":  Var("val"),

fixtures/hello_world.java.native

@@ -96,6 +96,7 @@
                                        },
                                     },
                                     escapedValue: "\"Hello world\"",
+                                    unescapedValue: "Hello world",
                                  },
                               ],
                               expression: { '@type': "QualifiedName",

fixtures/hello_world.java.uast

@@ -102,6 +102,7 @@
                                        col: 35,
                                     },
                                  },
+                                 unescapedValue: "Hello world",
                               },
                            ],
                            expression: { '@type': "QualifiedName",

fixtures/member_value_pair.java.native

@@ -252,6 +252,7 @@
                               },
                            },
                            escapedValue: "\"\"",
+                           unescapedValue: "",
                         },
                      },
                   ],

fixtures/member_value_pair.java.uast

@@ -267,6 +267,7 @@
                               col: 8,
                            },
                         },
+                        unescapedValue: "",
                      },
                   },
                ],

fixtures/string_literals.java

@@ -0,0 +1,6 @@
+class Code {
+    String bn = "b\nc";
+    String zero = "\0";
+    String doubleDigitOctalEscape = "\41";
+    String unicodeEscape = "\u1D306";
+}