Skip to content
This repository was archived by the owner on Mar 8, 2020. It is now read-only.

Commit d0506e3

Browse files
Denys Smirnovdennwc
Denys Smirnov
authored and
dennwc
committedJan 22, 2019
update sdk and regenerate fixtures
Signed-off-by: Denys Smirnov <[email protected]>
·
v2.10.2v2.6.0
1 parent bd5a772 commit d0506e3

19 files changed

+1956
-2007
lines changed
 

‎Gopkg.lock

+17-104
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Gopkg.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
[[constraint]]
55
name = "gopkg.in/bblfsh/sdk.v2"
6-
version = "2.9.x"
6+
version = "2.13.x"
77

88
[prune]
99
go-tests = true

‎driver/normalizer/annotation.go

+6-7
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,14 @@ var Native = Transformers([][]Transformer{
2020
},
2121
}...)
2222

23-
// Code is a special block of transformations that are applied at the end
24-
// and can access original source code file. It can be used to improve or
25-
// fix positional information.
26-
//
27-
// https://godoc.org/gopkg.in/bblfsh/sdk.v2/uast/transformer/positioner
28-
var Code = []CodeTransformer{
29-
positioner.NewFillLineColFromOffset(),
23+
// PreprocessCode is a preprocessor stage that can use the source code to
24+
// fix tokens and positional information.
25+
var PreprocessCode = []CodeTransformer{
26+
positioner.FromOffset(),
3027
}
3128

29+
var Code []CodeTransformer // TODO(dennwc): deprecated
30+
3231
var (
3332
unaryRoles = StringToRolesMap(map[string][]role.Role{
3433
// Unary operators

‎driver/normalizer/transforms.go

+6-5
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ package normalizer
33
import "gopkg.in/bblfsh/sdk.v2/driver"
44

55
var Transforms = driver.Transforms{
6-
Namespace: "javascript",
7-
Preprocess: Preprocess,
8-
Normalize: Normalize,
9-
Annotations: Native,
10-
Code: Code,
6+
Namespace: "javascript",
7+
Preprocess: Preprocess,
8+
PreprocessCode: PreprocessCode,
9+
Normalize: Normalize,
10+
Annotations: Native,
11+
Code: Code,
1112
}

‎fixtures/bench_Pangram.js.sem.uast

+3-2
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@
287287
},
288288
arguments: [
289289
{ '@type': "javascript:RegExpLiteral",
290-
'@token': "[^a-z]",
290+
'@token': "/[^a-z]/g",
291291
'@role': [Argument, Call, Expression, Literal, Regexp],
292292
'@pos': { '@type': "uast:Positions",
293293
start: { '@type': "uast:Position",
@@ -302,6 +302,7 @@
302302
},
303303
},
304304
flags: "g",
305+
pattern: "[^a-z]",
305306
},
306307
{ '@type': "uast:String",
307308
'@role': [Argument, Call],
@@ -317,7 +318,7 @@
317318
col: 45,
318319
},
319320
},
320-
Format: "",
321+
Format: "single",
321322
Value: "",
322323
},
323324
],

‎fixtures/bench_Pangram.js.uast

+6-5
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153
},
154154
},
155155
init: { '@type': "StringLiteral",
156-
'@token': "zqxjkvbpygfwmucldrhsnioate",
156+
'@token': "\"zqxjkvbpygfwmucldrhsnioate\"",
157157
'@role': [Expression, Initialization, Literal, String],
158158
'@pos': { '@type': "uast:Positions",
159159
start: { '@type': "uast:Position",
@@ -259,7 +259,7 @@
259259
},
260260
arguments: [
261261
{ '@type': "RegExpLiteral",
262-
'@token': "[^a-z]",
262+
'@token': "/[^a-z]/g",
263263
'@role': [Argument, Call, Expression, Literal, Regexp],
264264
'@pos': { '@type': "uast:Positions",
265265
start: { '@type': "uast:Position",
@@ -274,9 +274,10 @@
274274
},
275275
},
276276
flags: "g",
277+
pattern: "[^a-z]",
277278
},
278279
{ '@type': "StringLiteral",
279-
'@token': "",
280+
'@token': "''",
280281
'@role': [Argument, Call, Expression, Literal, String],
281282
'@pos': { '@type': "uast:Positions",
282283
start: { '@type': "uast:Position",
@@ -886,7 +887,7 @@
886887
},
887888
arguments: [
888889
{ '@type': "StringLiteral",
889-
'@token': "is this a pangram",
890+
'@token': "\"is this a pangram\"",
890891
'@role': [Argument, Call, Expression, Literal, String],
891892
'@pos': { '@type': "uast:Positions",
892893
start: { '@type': "uast:Position",
@@ -1034,7 +1035,7 @@
10341035
},
10351036
arguments: [
10361037
{ '@type': "StringLiteral",
1037-
'@token': "The quick brown fox jumps over the lazy dog",
1038+
'@token': "\"The quick brown fox jumps over the lazy dog\"",
10381039
'@role': [Argument, Call, Expression, Literal, String],
10391040
'@pos': { '@type': "uast:Positions",
10401041
start: { '@type': "uast:Position",

‎fixtures/bench_fizzbuzz.js.sem.uast

+3-3
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@
292292
col: 16,
293293
},
294294
},
295-
Format: "",
295+
Format: "single",
296296
Value: "",
297297
},
298298
},
@@ -389,7 +389,7 @@
389389
col: 37,
390390
},
391391
},
392-
Format: "",
392+
Format: "single",
393393
Value: "Fizz",
394394
},
395395
},
@@ -560,7 +560,7 @@
560560
col: 37,
561561
},
562562
},
563-
Format: "",
563+
Format: "single",
564564
Value: "Buzz",
565565
},
566566
},

‎fixtures/bench_fizzbuzz.js.uast

+3-3
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@
280280
'@role': [Assignment, Binary, Expression, Operator],
281281
},
282282
right: { '@type': "StringLiteral",
283-
'@token': "",
283+
'@token': "''",
284284
'@role': [Assignment, Binary, Expression, Literal, Right, String],
285285
'@pos': { '@type': "uast:Positions",
286286
start: { '@type': "uast:Position",
@@ -376,7 +376,7 @@
376376
'@role': [Add, Arithmetic, Assignment, Binary, Expression, Operator],
377377
},
378378
right: { '@type': "StringLiteral",
379-
'@token': "Fizz",
379+
'@token': "'Fizz'",
380380
'@role': [Assignment, Binary, Expression, Literal, Right, String],
381381
'@pos': { '@type': "uast:Positions",
382382
start: { '@type': "uast:Position",
@@ -547,7 +547,7 @@
547547
'@role': [Add, Arithmetic, Assignment, Binary, Expression, Operator],
548548
},
549549
right: { '@type': "StringLiteral",
550-
'@token': "Buzz",
550+
'@token': "'Buzz'",
551551
'@role': [Assignment, Binary, Expression, Literal, Right, String],
552552
'@pos': { '@type': "uast:Positions",
553553
start: { '@type': "uast:Position",

‎fixtures/bench_happy_numbers.js.uast

+1-1
Original file line numberDiff line numberDiff line change
@@ -1506,7 +1506,7 @@
15061506
'@role': [Add, Arithmetic, Binary, Expression, Operator],
15071507
},
15081508
right: { '@type': "StringLiteral",
1509-
'@token': " ",
1509+
'@token': "\" \"",
15101510
'@role': [Binary, Expression, Literal, Right, String],
15111511
'@pos': { '@type': "uast:Positions",
15121512
start: { '@type': "uast:Position",

‎fixtures/bench_hundred_doors.js.uast

+1-1
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@
277277
},
278278
arguments: [
279279
{ '@type': "StringLiteral",
280-
'@token': "Door %d is open",
280+
'@token': "\"Door %d is open\"",
281281
'@role': [Argument, Call, Expression, Literal, String],
282282
'@pos': { '@type': "uast:Positions",
283283
start: { '@type': "uast:Position",

0 commit comments

Comments
 (0)