enable language namespace in semantic uast

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

Hide file tree

Showing 104 changed files with 2,887 additions and 2,886 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:   "python",
 	Preprocess:  Preprocess,
 	Normalize:   Normalize,
 	Annotations: Native,

diff --git a/fixtures/_integration.py.sem.uast b/fixtures/_integration.py.sem.uast
@@ -1,9 +1,9 @@
-{ '@type': "Module",
+{ '@type': "python:Module",
    '@role': [File, Module],
    '@pos': { '@type': "uast:Positions",
    },
    body: [
-      { '@type': "ClassDef",
+      { '@type': "python:ClassDef",
          '@token': "testcls1",
          '@role': [Declaration, Identifier, Statement, Type],
          '@pos': { '@type': "uast:Positions",
@@ -18,14 +18,14 @@
                col: 15,
             },
          },
-         bases: { '@type': "ClassDef.bases",
+         bases: { '@type': "python:ClassDef.bases",
             '@role': [Base, Declaration, Type],
             bases: [],
          },
-         body: { '@type': "ClassDef.body",
+         body: { '@type': "python:ClassDef.body",
             '@role': [Body, Declaration, Type],
             'body_stmts': [
-               { '@type': "Pass",
+               { '@type': "python:Pass",
                   '@token': "pass",
                   '@role': [Noop, Statement],
                   '@pos': { '@type': "uast:Positions",
@@ -43,7 +43,7 @@
                },
             ],
          },
-         'decorator_list': { '@type': "ClassDef.decorator_list",
+         'decorator_list': { '@type': "python:ClassDef.decorator_list",
             '@role': [Call, Declaration, Incomplete, Type],
             decorators: [],
          },

diff --git a/fixtures/annotations.py.sem.uast b/fixtures/annotations.py.sem.uast
@@ -1,9 +1,9 @@
-{ '@type': "Module",
+{ '@type': "python:Module",
    '@role': [File, Module],
    '@pos': { '@type': "uast:Positions",
    },
    body: [
-      { '@type': "AnnAssign",
+      { '@type': "python:AnnAssign",
          '@role': [Assignment, Binary, Operator],
          '@pos': { '@type': "uast:Positions",
             start: { '@type': "uast:Position",
@@ -43,7 +43,7 @@
             },
             Name: "a",
          },
-         value: { '@type': "Num",
+         value: { '@type': "python:Num",
             '@token': 1,
             '@role': [Expression, Literal, Number, Primitive],
             '@pos': { '@type': "uast:Positions",
@@ -60,7 +60,7 @@
             },
          },
       },
-      { '@type': "AnnAssign",
+      { '@type': "python:AnnAssign",
          '@role': [Assignment, Binary, Operator],
          '@pos': { '@type': "uast:Positions",
             start: { '@type': "uast:Position",
@@ -126,7 +126,7 @@
                Node: { '@type': "uast:Function",
                   Body: { '@type': "uast:Block",
                      Statements: [
-                        { '@type': "Return",
+                        { '@type': "python:Return",
                            '@token': "return",
                            '@role': [Return, Statement],
                            '@pos': { '@type': "uast:Positions",
@@ -141,7 +141,7 @@
                                  col: 11,
                               },
                            },
-                           value: { '@type': "Num",
+                           value: { '@type': "python:Num",
                               '@token': 0,
                               '@role': [Expression, Literal, Number, Primitive],
                               '@pos': { '@type': "uast:Positions",