update the fixture and remove empty noops

Signed-off-by: Denys Smirnov <[email protected]>
bblfsh · Apr 8, 2019 · 5698501 · 5698501
1 parent 52267bf
commit 5698501
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 0 deletions.
diff --git a/driver/normalizer/normalizer.go b/driver/normalizer/normalizer.go
@@ -245,6 +245,18 @@ var Normalizers = []Mapping{
 		CommentNode(false, "comm", nil),
 	)),
 
+	// remove empty noops
+	Map(Obj{
+		uast.KeyType: String("NoopSameLine"),
+		uast.KeyPos:  Any(),
+		"s":          String(""),
+	}, Is(nil)),
+	Map(Obj{
+		uast.KeyType: String("SameLineNoops"),
+		uast.KeyPos:  Any(),
+		"noop_lines": Check(All(Is(nil)), Any()),
+	}, Is(nil)),
+
 	// FIXME: no positions for keywords in the native AST
 	AnnotateType("keyword", MapObj(
 		Fields{

diff --git a/fixtures/unicode.py.native b/fixtures/unicode.py.native
@@ -12,6 +12,19 @@
                'end_col_offset': 4,
                'end_lineno': 1,
                lineno: 1,
+               'noops_sameline': {
+                  'ast_type': "SameLineNoops",
+                  'col_offset': 3,
+                  'end_col_offset': 4,
+                  'end_lineno': 1,
+                  lineno: 1,
+                  'noop_lines': [
+                     {
+                        'ast_type': "NoopSameLine",
+                        s: "",
+                     },
+                  ],
+               },
                s: "𝓏",
             },
          },

diff --git a/fixtures/unicode.py.sem.uast b/fixtures/unicode.py.sem.uast
@@ -30,6 +30,7 @@
                Format: "",
                Value: "𝓏",
             },
+            'noops_sameline': ~,
          },
       },
    ],

diff --git a/fixtures/unicode.py.uast b/fixtures/unicode.py.uast
@@ -27,6 +27,29 @@
                   col: 4,
                },
             },
+            'noops_sameline': { '@type': "SameLineNoops",
+               '@role': [Comment],
+               '@pos': { '@type': "uast:Positions",
+                  start: { '@type': "uast:Position",
+                     offset: 2,
+                     line: 1,
+                     col: 3,
+                  },
+                  end: { '@type': "uast:Position",
+                     offset: 3,
+                     line: 1,
+                     col: 4,
+                  },
+               },
+               'noop_lines': [
+                  { '@type': "NoopSameLine",
+                     '@token': "",
+                     '@role': [Comment, Noop],
+                     '@pos': { '@type': "uast:Positions",
+                     },
+                  },
+               ],
+            },
          },
       },
    ],
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,6 +30,7 @@ @@
                    Format: "",
                    Value: "𝓏",
                 },
+                'noops_sameline': ~,
              },
           },
        ],
@@ Expand Down @@