preserve raw regexp literals in the native ast; fixes #22

Signed-off-by: Denys Smirnov <denys@sourced.tech>
bblfsh · Jan 22, 2019 · ecdce1f · ecdce1f
1 parent 2ac100c
commit ecdce1f
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/driver/normalizer/annotation.go b/driver/normalizer/annotation.go
@@ -144,7 +144,7 @@ var Annotations = []Mapping{
 	// Literals
 	AnnotateType("RegExpLiteral",
 		FieldRoles{
-			"pattern": {Rename: uast.KeyToken},
+			"raw": {Rename: uast.KeyToken},
 		},
 		role.Expression, role.Literal, role.Regexp,
 	),

diff --git a/driver/normalizer/normalizer.go b/driver/normalizer/normalizer.go
@@ -32,7 +32,7 @@ var Preprocessors = []Mapping{
 		Part("_", Obj{"loc": AnyNode(nil)}),
 		Part("_", Obj{}),
 	),
-	// preserve raw string literal
+	// preserve raw string and regexp literals
 	Map(
 		Part("_", Obj{
 			uast.KeyType: String("StringLiteral"),
@@ -47,6 +47,18 @@ var Preprocessors = []Mapping{
 			"value":      Var("raw"),
 		}),
 	),
+	Map(
+		Part("_", Obj{
+			uast.KeyType: String("RegExpLiteral"),
+			"extra": Obj{
+				"raw": Var("raw"),
+			},
+		}),
+		Part("_", Obj{
+			uast.KeyType: String("RegExpLiteral"),
+			"raw":        Var("raw"),
+		}),
+	),
 	// drop extra info for other nodes (it duplicates other node fields)
 	Map(
 		Part("_", Obj{"extra": AnyNode(nil)}),
@@ -306,7 +318,6 @@ func (op singleQuote) Construct(st *State, n nodes.Node) (nodes.Node, error) {
 	if !ok {
 		return nil, ErrUnexpectedType.New(nodes.String(""), n)
 	}
-	s := string(sn)
-	s = quoteSingle(s)
+	s := quoteSingle(string(sn))
 	return nodes.String(s), nil
 }
diff --git a/fixtures/regexp-literal.js.sem.uast b/fixtures/regexp-literal.js.sem.uast
@@ -43,7 +43,7 @@
                },
             },
             expression: { '@type': "javascript:RegExpLiteral",
-               '@token': "a",
+               '@token': "/a/",
                '@role': [Expression, Literal, Regexp],
                '@pos': { '@type': "uast:Positions",
                   start: { '@type': "uast:Position",
@@ -58,6 +58,7 @@
                   },
                },
                flags: "",
+               pattern: "a",
             },
          },
          { '@type': "javascript:ExpressionStatement",
@@ -90,7 +91,7 @@
                },
                arguments: [
                   { '@type': "javascript:RegExpLiteral",
-                     '@token': "a",
+                     '@token': "/a/g",
                      '@role': [Argument, Call, Expression, Literal, Regexp],
                      '@pos': { '@type': "uast:Positions",
                         start: { '@type': "uast:Position",
@@ -105,6 +106,7 @@
                         },
                      },
                      flags: "g",
+                     pattern: "a",
                   },
                   { '@type': "uast:String",
                      '@role': [Argument, Call],

diff --git a/fixtures/regexp-literal.js.uast b/fixtures/regexp-literal.js.uast
@@ -43,7 +43,7 @@
                },
             },
             expression: { '@type': "RegExpLiteral",
-               '@token': "a",
+               '@token': "/a/",
                '@role': [Expression, Literal, Regexp],
                '@pos': { '@type': "uast:Positions",
                   start: { '@type': "uast:Position",
@@ -58,6 +58,7 @@
                   },
                },
                flags: "",
+               pattern: "a",
             },
          },
          { '@type': "ExpressionStatement",
@@ -90,7 +91,7 @@
                },
                arguments: [
                   { '@type': "RegExpLiteral",
-                     '@token': "a",
+                     '@token': "/a/g",
                      '@role': [Argument, Call, Expression, Literal, Regexp],
                      '@pos': { '@type': "uast:Positions",
                         start: { '@type': "uast:Position",
@@ -105,6 +106,7 @@
                         },
                      },
                      flags: "g",
+                     pattern: "a",
                   },
                   { '@type': "StringLiteral",
                      '@token': "'x'",