enable language namespace in semantic uast

Signed-off-by: Denys Smirnov <denys@sourced.tech>
bblfsh · Nov 2, 2018 · 6739710 · 6739710
1 parent 4b6dbe9
commit 6739710
Show file tree

Hide file tree

Showing 108 changed files with 1,230 additions and 1,229 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -3,7 +3,7 @@
 
 [[constraint]]
   name = "gopkg.in/bblfsh/sdk.v2"
-  version = "v2.5.x"
+  version = "v2.6.x"
 
 [prune]
   go-tests = true

diff --git a/driver/normalizer/transforms.go b/driver/normalizer/transforms.go
@@ -3,6 +3,7 @@ package normalizer
 import "gopkg.in/bblfsh/sdk.v2/driver"
 
 var Transforms = driver.Transforms{
+	Namespace:   "javascript",
 	Preprocess:  Preprocess,
 	Normalize:   Normalize,
 	Annotations: Native,

diff --git a/fixtures/_integration.js.sem.uast b/fixtures/_integration.js.sem.uast
@@ -1,4 +1,4 @@
-{ '@type': "File",
+{ '@type': "javascript:File",
    '@role': [File],
    '@pos': { '@type': "uast:Positions",
       start: { '@type': "uast:Position",
@@ -13,7 +13,7 @@
       },
    },
    comments: [],
-   program: { '@type': "Program",
+   program: { '@type': "javascript:Program",
       '@role': [Module],
       '@pos': { '@type': "uast:Positions",
          start: { '@type': "uast:Position",
@@ -28,7 +28,7 @@
          },
       },
       body: [
-         { '@type': "VariableDeclaration",
+         { '@type': "javascript:VariableDeclaration",
             '@role': [Declaration, Statement, Variable],
             '@pos': { '@type': "uast:Positions",
                start: { '@type': "uast:Position",
@@ -43,7 +43,7 @@
                },
             },
             declarations: [
-               { '@type': "VariableDeclarator",
+               { '@type': "javascript:VariableDeclarator",
                   '@role': [Declaration, Variable],
                   '@pos': { '@type': "uast:Positions",
                      start: { '@type': "uast:Position",
@@ -72,7 +72,7 @@
                      },
                      Name: "x",
                   },
-                  init: { '@type': "ObjectExpression",
+                  init: { '@type': "javascript:ObjectExpression",
                      '@role': [Expression, Initialization, Literal, Map],
                      '@pos': { '@type': "uast:Positions",
                         start: { '@type': "uast:Position",
@@ -87,7 +87,7 @@
                         },
                      },
                      properties: [
-                        { '@type': "ObjectProperty",
+                        { '@type': "javascript:ObjectProperty",
                            '@role': [Map],
                            '@pos': { '@type': "uast:Positions",
                               start: { '@type': "uast:Position",
@@ -120,7 +120,7 @@
                            },
                            method: false,
                            shorthand: false,
-                           value: { '@type': "NumericLiteral",
+                           value: { '@type': "javascript:NumericLiteral",
                               '@token': 0,
                               '@role': [Expression, Literal, Map, Number, Value],
                               '@pos': { '@type': "uast:Positions",

diff --git a/fixtures/array-expression.js.sem.uast b/fixtures/array-expression.js.sem.uast
@@ -1,4 +1,4 @@
-{ '@type': "File",
+{ '@type': "javascript:File",
    '@role': [File],
    '@pos': { '@type': "uast:Positions",
       start: { '@type': "uast:Position",
@@ -13,7 +13,7 @@
       },
    },
    comments: [],
-   program: { '@type': "Program",
+   program: { '@type': "javascript:Program",
       '@role': [Module],
       '@pos': { '@type': "uast:Positions",
          start: { '@type': "uast:Position",
@@ -28,7 +28,7 @@
          },
       },
       body: [
-         { '@type': "ExpressionStatement",
+         { '@type': "javascript:ExpressionStatement",
             '@role': [Statement],
             '@pos': { '@type': "uast:Positions",
                start: { '@type': "uast:Position",
@@ -42,7 +42,7 @@
                   col: 7,
                },
             },
-            expression: { '@type': "ArrayExpression",
+            expression: { '@type': "javascript:ArrayExpression",
                '@role': [Expression, Initialization, List, Literal],
                '@pos': { '@type': "uast:Positions",
                   start: { '@type': "uast:Position",
@@ -57,7 +57,7 @@
                   },
                },
                elements: [
-                  { '@type': "NumericLiteral",
+                  { '@type': "javascript:NumericLiteral",
                      '@token': 1,
                      '@role': [Expression, Literal, Number],
                      '@pos': { '@type': "uast:Positions",
@@ -73,7 +73,7 @@
                         },
                      },
                   },
-                  { '@type': "NumericLiteral",
+                  { '@type': "javascript:NumericLiteral",
                      '@token': 2,
                      '@role': [Expression, Literal, Number],
                      '@pos': { '@type': "uast:Positions",

diff --git a/fixtures/array-pattern.js.sem.uast b/fixtures/array-pattern.js.sem.uast
@@ -1,4 +1,4 @@
-{ '@type': "File",
+{ '@type': "javascript:File",
    '@role': [File],
    '@pos': { '@type': "uast:Positions",
       start: { '@type': "uast:Position",
@@ -13,7 +13,7 @@
       },
    },
    comments: [],
-   program: { '@type': "Program",
+   program: { '@type': "javascript:Program",
       '@role': [Module],
       '@pos': { '@type': "uast:Positions",
          start: { '@type': "uast:Position",
@@ -28,7 +28,7 @@
          },
       },
       body: [
-         { '@type': "ExpressionStatement",
+         { '@type': "javascript:ExpressionStatement",
             '@role': [Statement],
             '@pos': { '@type': "uast:Positions",
                start: { '@type': "uast:Position",
@@ -42,7 +42,7 @@
                   col: 16,
                },
             },
-            expression: { '@type': "AssignmentExpression",
+            expression: { '@type': "javascript:AssignmentExpression",
                '@role': [Assignment, Binary, Expression, Operator],
                '@pos': { '@type': "uast:Positions",
                   start: { '@type': "uast:Position",
@@ -56,7 +56,7 @@
                      col: 16,
                   },
                },
-               left: { '@type': "ArrayPattern",
+               left: { '@type': "javascript:ArrayPattern",
                   '@role': [Assignment, Binary, Incomplete, Left, List],
                   '@pos': { '@type': "uast:Positions",
                      start: { '@type': "uast:Position",
@@ -107,7 +107,7 @@
                   '@token': "=",
                   '@role': [Assignment, Binary, Expression, Operator],
                },
-               right: { '@type': "ArrayExpression",
+               right: { '@type': "javascript:ArrayExpression",
                   '@role': [Assignment, Binary, Expression, Initialization, List, Literal, Right],
                   '@pos': { '@type': "uast:Positions",
                      start: { '@type': "uast:Position",
@@ -122,7 +122,7 @@
                      },
                   },
                   elements: [
-                     { '@type': "NumericLiteral",
+                     { '@type': "javascript:NumericLiteral",
                         '@token': 3,
                         '@role': [Expression, Literal, Number],
                         '@pos': { '@type': "uast:Positions",
@@ -138,7 +138,7 @@
                            },
                         },
                      },
-                     { '@type': "NumericLiteral",
+                     { '@type': "javascript:NumericLiteral",
                         '@token': 4,
                         '@role': [Expression, Literal, Number],
                         '@pos': { '@type': "uast:Positions",