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

Commit 9e3b934

Browse files
juanjuxjuanjux
authored
Merge pull request #21 from dennwc/update_any
Update SDK and switch to Any helper
2 parents 4034821 + b40d688 commit 9e3b934

File tree

3 files changed

+106
-106
lines changed

3 files changed

+106
-106
lines changed

‎Gopkg.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Gopkg.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# for detailed Gopkg.toml documentation.
33

44
[[constraint]]
5-
version = "2.12.x"
5+
version = "2.13.x"
66
name = "gopkg.in/bblfsh/sdk.v2"
77

88
[prune]

‎driver/normalizer/normalizer.go

Lines changed: 102 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ var Normalizers = []Mapping{
138138
}),
139139
Obj{
140140
"Path": UASTType(uast.String{}, Obj{
141-
"Value": Var("path"),
141+
"Value": Var("path"),
142142
"Format": String(""),
143143
}),
144144
"All": Bool(true),
@@ -224,22 +224,22 @@ var Normalizers = []Mapping{
224224
{Name: "Prop_AllSegments", Op: Each("qualParts", Cases("caseQualParts",
225225
Fields{
226226
{Name: uast.KeyType, Op: String("uast:Identifier")},
227-
{Name: uast.KeyPos, Op: AnyNode(nil)},
227+
{Name: uast.KeyPos, Op: Any()},
228228
{Name: "Name", Op: Var("name")},
229229
},
230230
Fields{
231231
{Name: uast.KeyType, Op: String("CPPASTTemplateId")},
232-
{Name: uast.KeyPos, Op: AnyNode(nil)},
232+
{Name: uast.KeyPos, Op: Any()},
233233
{Name: "Name", Op: Obj{
234234
uast.KeyType: String("uast:Identifier"),
235235
"Name": Var("name"),
236236
}},
237-
{Name: "Prop_TemplateArguments", Op: AnyNode(nil)},
238-
{Name: "Prop_TemplateName", Op: AnyNode(nil)},
237+
{Name: "Prop_TemplateArguments", Op: Any()},
238+
{Name: "Prop_TemplateName", Op: Any()},
239239
},
240240
Fields{
241241
{Name: uast.KeyType, Op: String("CPPASTConversionName")},
242-
{Name: uast.KeyPos, Op: AnyNode(nil)},
242+
{Name: uast.KeyPos, Op: Any()},
243243
{Name: "Name", Op: Obj{
244244
uast.KeyType: String("uast.Identifier"),
245245
"Name": Var("name"),
@@ -248,7 +248,7 @@ var Normalizers = []Mapping{
248248
Is(nil),
249249
))},
250250
// Ignored: already on AllSegments
251-
{Name: "Prop_Qualifier", Optional: "optPropQual", Op: AnyNode(nil)},
251+
{Name: "Prop_Qualifier", Optional: "optPropQual", Op: Any()},
252252
},
253253
Obj{
254254
"Names": Each("qualParts", Cases("caseQualParts",
@@ -268,162 +268,162 @@ var Normalizers = []Mapping{
268268

269269
MapSemantic("CPPASTFunctionDefinition", uast.FunctionGroup{}, MapObj(
270270
Fields{
271-
{Name: "IsDefaulted", Op: AnyNode(nil)},
272-
{Name: "IsDeleted", Op: AnyNode(nil)},
273-
{Name: "ExpandedFromMacro", Optional: "optMacro1", Op: AnyNode(nil)},
271+
{Name: "IsDefaulted", Op: Any()},
272+
{Name: "IsDeleted", Op: Any()},
273+
{Name: "ExpandedFromMacro", Optional: "optMacro1", Op: Any()},
274274
{Name: "Prop_Body", Optional: "optBody", Op: Var("body")},
275275

276276
{Name: "Prop_DeclSpecifier", Op: Cases("retTypeCase",
277277
// FIXME XXX: use an Or("void", "unspecified") or the equivalent
278278
// void
279279
Fields{
280280
{Name: uast.KeyType, Op: String("CPPASTSimpleDeclSpecifier")},
281-
{Name: uast.KeyPos, Op: AnyNode(nil)},
282-
{Name: "IsComplex", Op: AnyNode(nil)},
283-
{Name: "IsConst", Op: AnyNode(nil)},
284-
{Name: "IsConstExpr", Op: AnyNode(nil)},
285-
{Name: "IsExplicit", Op: AnyNode(nil)},
286-
{Name: "IsFriend", Op: AnyNode(nil)},
287-
{Name: "IsImaginary", Op: AnyNode(nil)},
288-
{Name: "IsInline", Op: AnyNode(nil)},
289-
{Name: "IsLong", Op: AnyNode(nil)},
290-
{Name: "IsLongLong", Op: AnyNode(nil)},
291-
{Name: "IsRestrict", Op: AnyNode(nil)},
292-
{Name: "IsShort", Op: AnyNode(nil)},
293-
{Name: "IsSigned", Op: AnyNode(nil)},
294-
{Name: "IsThreadLocal", Op: AnyNode(nil)},
295-
{Name: "IsUnsigned", Op: AnyNode(nil)},
296-
{Name: "IsVirtual", Op: AnyNode(nil)},
297-
{Name: "IsVolatile", Op: AnyNode(nil)},
298-
{Name: "StorageClass", Op: AnyNode(nil)},
299-
{Name: "ExpandedFromMacro", Optional: "optMacro2", Op: AnyNode(nil)},
281+
{Name: uast.KeyPos, Op: Any()},
282+
{Name: "IsComplex", Op: Any()},
283+
{Name: "IsConst", Op: Any()},
284+
{Name: "IsConstExpr", Op: Any()},
285+
{Name: "IsExplicit", Op: Any()},
286+
{Name: "IsFriend", Op: Any()},
287+
{Name: "IsImaginary", Op: Any()},
288+
{Name: "IsInline", Op: Any()},
289+
{Name: "IsLong", Op: Any()},
290+
{Name: "IsLongLong", Op: Any()},
291+
{Name: "IsRestrict", Op: Any()},
292+
{Name: "IsShort", Op: Any()},
293+
{Name: "IsSigned", Op: Any()},
294+
{Name: "IsThreadLocal", Op: Any()},
295+
{Name: "IsUnsigned", Op: Any()},
296+
{Name: "IsVirtual", Op: Any()},
297+
{Name: "IsVolatile", Op: Any()},
298+
{Name: "StorageClass", Op: Any()},
299+
{Name: "ExpandedFromMacro", Optional: "optMacro2", Op: Any()},
300300
{Name: "Type", Op: String("void")},
301301
},
302302
// unspecified (ie constructor/destructors)
303303
Fields{
304304
{Name: uast.KeyType, Op: String("CPPASTSimpleDeclSpecifier")},
305-
{Name: uast.KeyPos, Op: AnyNode(nil)},
306-
{Name: "IsComplex", Op: AnyNode(nil)},
307-
{Name: "IsConst", Op: AnyNode(nil)},
308-
{Name: "IsConstExpr", Op: AnyNode(nil)},
309-
{Name: "IsExplicit", Op: AnyNode(nil)},
310-
{Name: "IsFriend", Op: AnyNode(nil)},
311-
{Name: "IsImaginary", Op: AnyNode(nil)},
312-
{Name: "IsInline", Op: AnyNode(nil)},
313-
{Name: "IsLong", Op: AnyNode(nil)},
314-
{Name: "IsLongLong", Op: AnyNode(nil)},
315-
{Name: "IsRestrict", Op: AnyNode(nil)},
316-
{Name: "IsShort", Op: AnyNode(nil)},
317-
{Name: "IsSigned", Op: AnyNode(nil)},
318-
{Name: "IsThreadLocal", Op: AnyNode(nil)},
319-
{Name: "IsUnsigned", Op: AnyNode(nil)},
320-
{Name: "IsVirtual", Op: AnyNode(nil)},
321-
{Name: "IsVolatile", Op: AnyNode(nil)},
322-
{Name: "StorageClass", Op: AnyNode(nil)},
323-
{Name: "ExpandedFromMacro", Optional: "optMacro3", Op: AnyNode(nil)},
305+
{Name: uast.KeyPos, Op: Any()},
306+
{Name: "IsComplex", Op: Any()},
307+
{Name: "IsConst", Op: Any()},
308+
{Name: "IsConstExpr", Op: Any()},
309+
{Name: "IsExplicit", Op: Any()},
310+
{Name: "IsFriend", Op: Any()},
311+
{Name: "IsImaginary", Op: Any()},
312+
{Name: "IsInline", Op: Any()},
313+
{Name: "IsLong", Op: Any()},
314+
{Name: "IsLongLong", Op: Any()},
315+
{Name: "IsRestrict", Op: Any()},
316+
{Name: "IsShort", Op: Any()},
317+
{Name: "IsSigned", Op: Any()},
318+
{Name: "IsThreadLocal", Op: Any()},
319+
{Name: "IsUnsigned", Op: Any()},
320+
{Name: "IsVirtual", Op: Any()},
321+
{Name: "IsVolatile", Op: Any()},
322+
{Name: "StorageClass", Op: Any()},
323+
{Name: "ExpandedFromMacro", Optional: "optMacro3", Op: Any()},
324324
{Name: "Type", Op: String("unspecified")},
325325
},
326326
Fields{
327327
// simpledeclspecifier
328328
{Name: uast.KeyType, Op: String("CPPASTSimpleDeclSpecifier")},
329-
{Name: uast.KeyPos, Op: AnyNode(nil)},
330-
{Name: "IsComplex", Op: AnyNode(nil)},
331-
{Name: "IsConst", Op: AnyNode(nil)},
332-
{Name: "IsConstExpr", Op: AnyNode(nil)},
333-
{Name: "IsExplicit", Op: AnyNode(nil)},
334-
{Name: "IsFriend", Op: AnyNode(nil)},
335-
{Name: "IsImaginary", Op: AnyNode(nil)},
336-
{Name: "IsInline", Op: AnyNode(nil)},
337-
{Name: "IsLong", Op: AnyNode(nil)},
338-
{Name: "IsLongLong", Op: AnyNode(nil)},
339-
{Name: "IsRestrict", Op: AnyNode(nil)},
340-
{Name: "IsShort", Op: AnyNode(nil)},
341-
{Name: "IsSigned", Op: AnyNode(nil)},
342-
{Name: "IsThreadLocal", Op: AnyNode(nil)},
343-
{Name: "IsUnsigned", Op: AnyNode(nil)},
344-
{Name: "IsVirtual", Op: AnyNode(nil)},
345-
{Name: "IsVolatile", Op: AnyNode(nil)},
329+
{Name: uast.KeyPos, Op: Any()},
330+
{Name: "IsComplex", Op: Any()},
331+
{Name: "IsConst", Op: Any()},
332+
{Name: "IsConstExpr", Op: Any()},
333+
{Name: "IsExplicit", Op: Any()},
334+
{Name: "IsFriend", Op: Any()},
335+
{Name: "IsImaginary", Op: Any()},
336+
{Name: "IsInline", Op: Any()},
337+
{Name: "IsLong", Op: Any()},
338+
{Name: "IsLongLong", Op: Any()},
339+
{Name: "IsRestrict", Op: Any()},
340+
{Name: "IsShort", Op: Any()},
341+
{Name: "IsSigned", Op: Any()},
342+
{Name: "IsThreadLocal", Op: Any()},
343+
{Name: "IsUnsigned", Op: Any()},
344+
{Name: "IsVirtual", Op: Any()},
345+
{Name: "IsVolatile", Op: Any()},
346346
{Name: "StorageClass", Op: Var("StorageClass")},
347-
{Name: "ExpandedFromMacro", Optional: "optMacro4", Op: AnyNode(nil)},
347+
{Name: "ExpandedFromMacro", Optional: "optMacro4", Op: Any()},
348348
{Name: "Type", Op: Var("retType")},
349349
},
350350
Fields{
351351
// namedtypespecifier
352352
{Name: uast.KeyType, Op: String("CPPASTNamedTypeSpecifier")},
353-
{Name: uast.KeyPos, Op: AnyNode(nil)},
353+
{Name: uast.KeyPos, Op: Any()},
354354
{Name: "StorageClass", Op: Var("StorageClass")},
355-
{Name: "IsConst", Op: AnyNode(nil)},
356-
{Name: "IsConstExpr", Op: AnyNode(nil)},
357-
{Name: "IsExplicit", Op: AnyNode(nil)},
358-
{Name: "IsFriend", Op: AnyNode(nil)},
359-
{Name: "IsInline", Op: AnyNode(nil)},
360-
{Name: "IsRestrict", Op: AnyNode(nil)},
361-
{Name: "IsThreadLocal", Op: AnyNode(nil)},
362-
{Name: "IsTypeName", Op: AnyNode(nil)},
363-
{Name: "IsVirtual", Op: AnyNode(nil)},
364-
{Name: "IsVolatile", Op: AnyNode(nil)},
365-
{Name: "ExpandedFromMacro", Optional: "optMacro5", Op: AnyNode(nil)},
355+
{Name: "IsConst", Op: Any()},
356+
{Name: "IsConstExpr", Op: Any()},
357+
{Name: "IsExplicit", Op: Any()},
358+
{Name: "IsFriend", Op: Any()},
359+
{Name: "IsInline", Op: Any()},
360+
{Name: "IsRestrict", Op: Any()},
361+
{Name: "IsThreadLocal", Op: Any()},
362+
{Name: "IsTypeName", Op: Any()},
363+
{Name: "IsVirtual", Op: Any()},
364+
{Name: "IsVolatile", Op: Any()},
365+
{Name: "ExpandedFromMacro", Optional: "optMacro5", Op: Any()},
366366
{Name: "Prop_Name", Op: Var("retType")},
367367
},
368368
)},
369369

370370
{Name: "Prop_Declarator", Op: Fields{
371371
{Name: uast.KeyType, Op: String("CPPASTFunctionDeclarator")},
372372
{Name: uast.KeyPos, Op: Var("fdpos")},
373-
{Name: "IsConst", Op: AnyNode(nil)},
374-
{Name: "IsFinal", Op: AnyNode(nil)},
375-
{Name: "IsMutable", Op: AnyNode(nil)},
376-
{Name: "IsOverride", Op: AnyNode(nil)},
377-
{Name: "IsPureVirtual", Op: AnyNode(nil)},
378-
{Name: "IsVolatile", Op: AnyNode(nil)},
379-
{Name: "ExpandedFromMacro", Optional: "optMacro6", Op: AnyNode(nil)},
380-
{Name: "Prop_NoexceptExpression", Optional: "declNoExcept", Op: AnyNode(nil)},
381-
{Name: "Prop_VirtSpecifiers", Optional: "declVirtSpecs", Op: AnyNode(nil)},
373+
{Name: "IsConst", Op: Any()},
374+
{Name: "IsFinal", Op: Any()},
375+
{Name: "IsMutable", Op: Any()},
376+
{Name: "IsOverride", Op: Any()},
377+
{Name: "IsPureVirtual", Op: Any()},
378+
{Name: "IsVolatile", Op: Any()},
379+
{Name: "ExpandedFromMacro", Optional: "optMacro6", Op: Any()},
380+
{Name: "Prop_NoexceptExpression", Optional: "declNoExcept", Op: Any()},
381+
{Name: "Prop_VirtSpecifiers", Optional: "declVirtSpecs", Op: Any()},
382382

383383
{Name: "Prop_Name", Op: Cases("caseName",
384384
// Empty identifier
385385
Is(nil),
386386
// Normal identifier
387387
Fields{
388388
{Name: uast.KeyType, Op: String("uast:Identifier")},
389-
{Name: uast.KeyPos, Op: AnyNode(nil)},
389+
{Name: uast.KeyPos, Op: Any()},
390390
{Name: "Name", Op: Var("name")},
391391
},
392392
// Qualified identifier
393393
Fields{
394394
{Name: uast.KeyType, Op: String("uast:QualifiedIdentifier")},
395-
{Name: uast.KeyPos, Op: AnyNode(nil)},
395+
{Name: uast.KeyPos, Op: Any()},
396396
// FIXME: join the Names into a single string
397397
{Name: "Names", Op: Var("qualnames")},
398398
},
399399
)},
400400

401401
{Name: "TakesVarArgs", Op: Cases("takesVarArgs", Bool(false), Bool(true))},
402-
{Name: "Prop_ConstructorChain", Optional: "optConsChain", Op: AnyNode(nil)},
403-
{Name: "Prop_PointerOperators", Optional: "optPointerOps", Op: AnyNode(nil)},
402+
{Name: "Prop_ConstructorChain", Optional: "optConsChain", Op: Any()},
403+
{Name: "Prop_PointerOperators", Optional: "optPointerOps", Op: Any()},
404404

405405
{Name: "Prop_Parameters", Optional: "optArgs", Op: Each("args", Cases("caseParams",
406406
Fields{
407407
{Name: uast.KeyType, Op: String("CPPASTDeclarator")},
408408
{Name: uast.KeyPos, Op: Var("parampos")},
409409
{Name: "Prop_Name", Op: Var("aname")},
410410
{Name: "Prop_TypeNode", Op: Var("atype")},
411-
{Name: "DeclaresParameterPack", Op: AnyNode(nil)},
412-
{Name: "Prop_PointerOperators", Optional: "optPointerOps", Op: AnyNode(nil)},
411+
{Name: "DeclaresParameterPack", Op: Any()},
412+
{Name: "Prop_PointerOperators", Optional: "optPointerOps", Op: Any()},
413413
{Name: "Prop_Initializer", Optional: "optInitializer", Op: Var("ainit")},
414-
{Name: "ExpandedFromMacro", Optional: "optMacro7", Op: AnyNode(nil)},
415-
{Name: "Prop_PointerOperators", Optional: "optPointerOps", Op: AnyNode(nil)},
414+
{Name: "ExpandedFromMacro", Optional: "optMacro7", Op: Any()},
415+
{Name: "Prop_PointerOperators", Optional: "optPointerOps", Op: Any()},
416416
},
417417
Fields{
418418
{Name: uast.KeyType, Op: String("CPPASTArrayDeclarator")},
419419
{Name: uast.KeyPos, Op: Var("parampos")},
420420
{Name: "Prop_Name", Op: Var("aname")},
421421
{Name: "Prop_TypeNode", Op: Var("atype")},
422-
{Name: "DeclaresParameterPack", Op: AnyNode(nil)},
423-
{Name: "Prop_ArrayModifiers", Op: AnyNode(nil)},
422+
{Name: "DeclaresParameterPack", Op: Any()},
423+
{Name: "Prop_ArrayModifiers", Op: Any()},
424424
{Name: "Prop_Initializer", Optional: "optInitializer", Op: Var("ainit")},
425-
{Name: "ExpandedFromMacro", Optional: "optMacro8", Op: AnyNode(nil)},
426-
{Name: "Prop_PointerOperators", Optional: "optPointerOps", Op: AnyNode(nil)},
425+
{Name: "ExpandedFromMacro", Optional: "optMacro8", Op: Any()},
426+
{Name: "Prop_PointerOperators", Optional: "optPointerOps", Op: Any()},
427427
},
428428
))},
429429
}},
@@ -435,7 +435,7 @@ var Normalizers = []Mapping{
435435
Objs{
436436
// Empty identifier
437437
{
438-
"Name": AnyNode(nil),
438+
"Name": Any(),
439439
},
440440
// Normal Identifier
441441
{
@@ -454,8 +454,8 @@ var Normalizers = []Mapping{
454454
{Name: "Type", Op: UASTType(uast.FunctionType{}, Fields{
455455
{Name: "Returns", Op: Cases("retTypeCase",
456456
// void or unspecified
457-
AnyNode(nil),
458-
AnyNode(nil),
457+
Any(),
458+
Any(),
459459
// SimpleDeclSpecifier
460460
Arr(UASTType(uast.Argument{},
461461
Obj{

0 commit comments

Comments
 (0)