From fb87c4bacbb2d23ac6baa17142903fe692d5cd65 Mon Sep 17 00:00:00 2001 From: Juanjo Alvarez Date: Tue, 3 Oct 2017 12:03:04 +0200 Subject: [PATCH] Fix .uast files --- fixtures/annotations.py.uast | 1 + fixtures/aritmeticops.py.uast | 1 + fixtures/assert_constant.py.uast | 1 + fixtures/augassign.py.uast | 1 + fixtures/bitwise.py.uast | 1 + fixtures/classdef.py.uast | 35 +- fixtures/classdef_decorated.py.uast | 1 + fixtures/classdef_inheritance.py.uast | 1 + fixtures/classdef_metaclass_py2.py.uast | 1 + fixtures/classdef_metaclass_py3.py.uast | 1 + fixtures/comments.py.uast | 1 + fixtures/comparisonop.py.uast | 41 +- fixtures/complex.py.uast | 1 + fixtures/comprehension_dict.py.uast | 1 + fixtures/comprehension_list.py.uast | 1 + fixtures/comprehension_set.py.uast | 1 + fixtures/continue_break.py.uast | 1 + fixtures/declarations_annotated.py.uast | 1 + fixtures/ellipsis.py.uast | 1 + fixtures/empty.py.uast | 12 +- fixtures/except.py.uast | 35 +- fixtures/exec.py.uast | 11 +- fixtures/for.py.uast | 1 + fixtures/functioncalls.py.uast | 83 +- fixtures/functiondef_annotated.py.uast | 1 + fixtures/functiondef_decorated.py.uast | 39 +- fixtures/functiondef_defaultparams.py.uast | 1 + fixtures/functiondef_docstring.py.uast | 1 + fixtures/functiondef_kwarg.py.uast | 1 + fixtures/functiondef_simple.py.uast | 1 + fixtures/functiondef_vararg.py.uast | 1 + fixtures/hello.py.uast | 11 +- fixtures/if.py.uast | 19 +- fixtures/ifexpression.py.uast | 9 +- fixtures/import.py.uast | 1 + fixtures/issue102.py.uast | 5 +- fixtures/issue30.py.uast | 11 +- fixtures/issue51.py.uast | 1 + fixtures/issue58.py.uast | 1 + fixtures/issue62.py.uast | 1 + fixtures/issue62_b.py.uast | 71 +- fixtures/issue76.py.uast | 43 +- fixtures/issue97_assign.py.uast | 1 + fixtures/issue97_equal.py.uast | 1 + fixtures/issue97_lessThan.py.uast | 1 + fixtures/issue_server101.py.uast | 2481 +------------------- fixtures/lambda.py.uast | 1 + fixtures/line_comment.py.uast | 1 + fixtures/literals_assign.py.uast | 1 + fixtures/loop_if.py.uast | 11 +- fixtures/other_statements.py.uast | 1 + fixtures/pass.py.uast | 1 + fixtures/print.py.uast | 1 + fixtures/qualified.py.uast | 1 + fixtures/repr.py.uast | 11 +- fixtures/sameline.py.uast | 19 +- fixtures/sorting.py.uast | 1 + fixtures/string_fstring.py.uast | 17 +- fixtures/string_normal.py.uast | 1 + fixtures/string_triple.py.uast | 1 + fixtures/test.py.uast | 9 +- fixtures/unary.py.uast | 1 + fixtures/while.py.uast | 27 +- fixtures/with.py.uast | 1 + 64 files changed, 253 insertions(+), 2790 deletions(-) diff --git a/fixtures/annotations.py.uast b/fixtures/annotations.py.uast index ebf583ef..329ba682 100644 --- a/fixtures/annotations.py.uast +++ b/fixtures/annotations.py.uast @@ -287,3 +287,4 @@ Module { . } } + diff --git a/fixtures/aritmeticops.py.uast b/fixtures/aritmeticops.py.uast index 6dde2d4b..c29409b8 100644 --- a/fixtures/aritmeticops.py.uast +++ b/fixtures/aritmeticops.py.uast @@ -507,3 +507,4 @@ Module { . } } + diff --git a/fixtures/assert_constant.py.uast b/fixtures/assert_constant.py.uast index d503bb29..23ec49dd 100644 --- a/fixtures/assert_constant.py.uast +++ b/fixtures/assert_constant.py.uast @@ -137,3 +137,4 @@ Module { . } } + diff --git a/fixtures/augassign.py.uast b/fixtures/augassign.py.uast index 1ee256ee..9d34338c 100644 --- a/fixtures/augassign.py.uast +++ b/fixtures/augassign.py.uast @@ -236,3 +236,4 @@ Module { . } } + diff --git a/fixtures/bitwise.py.uast b/fixtures/bitwise.py.uast index f90ee6db..5626a52f 100644 --- a/fixtures/bitwise.py.uast +++ b/fixtures/bitwise.py.uast @@ -626,3 +626,4 @@ Module { . } } + diff --git a/fixtures/classdef.py.uast b/fixtures/classdef.py.uast index a95e3d90..f52e82f2 100644 --- a/fixtures/classdef.py.uast +++ b/fixtures/classdef.py.uast @@ -2,7 +2,7 @@ Status: ok Errors: UAST: Module { -. Roles: File +. Roles: File,Module . Children: { . . 0: ClassDef { . . . Roles: Type,Declaration,Identifier,Statement @@ -45,13 +45,7 @@ Module { . . . . . . . } . . . . . . . Children: { . . . . . . . . 0: arguments { -<<<<<<< HEAD -. . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . Properties: { . . . . . . . . . . internalRole: args . . . . . . . . . . kwarg: @@ -216,13 +210,7 @@ Module { . . . . . . . } . . . . . . . Children: { . . . . . . . . 0: arguments { -<<<<<<< HEAD -. . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . Properties: { . . . . . . . . . . internalRole: args . . . . . . . . . . kwarg: @@ -457,13 +445,7 @@ Module { . . . . . . . . . } . . . . . . . . } . . . . . . . . 2: arguments { -<<<<<<< HEAD -. . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . Properties: { . . . . . . . . . . internalRole: args . . . . . . . . . . kwarg: @@ -485,13 +467,7 @@ Module { . . . . . . . } . . . . . . . Children: { . . . . . . . . 0: arguments { -<<<<<<< HEAD -. . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . Properties: { . . . . . . . . . . internalRole: args . . . . . . . . . . kwarg: @@ -1030,13 +1006,7 @@ Module { . . . . . } . . . . . Children: { . . . . . . 0: Num { -<<<<<<< HEAD -. . . . . . . Roles: Literal,Number,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . Roles: Literal,Number,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . Roles: Literal,Number,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . Roles: Literal,Number,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . TOKEN "5" . . . . . . . StartPosition: { . . . . . . . . Offset: 269 @@ -1097,3 +1067,4 @@ Module { . } } + diff --git a/fixtures/classdef_decorated.py.uast b/fixtures/classdef_decorated.py.uast index 34af9047..9e99d2d9 100644 --- a/fixtures/classdef_decorated.py.uast +++ b/fixtures/classdef_decorated.py.uast @@ -68,3 +68,4 @@ Module { . } } + diff --git a/fixtures/classdef_inheritance.py.uast b/fixtures/classdef_inheritance.py.uast index 5062e85f..04305f83 100644 --- a/fixtures/classdef_inheritance.py.uast +++ b/fixtures/classdef_inheritance.py.uast @@ -220,3 +220,4 @@ Module { . } } + diff --git a/fixtures/classdef_metaclass_py2.py.uast b/fixtures/classdef_metaclass_py2.py.uast index 55d3217b..116a417c 100644 --- a/fixtures/classdef_metaclass_py2.py.uast +++ b/fixtures/classdef_metaclass_py2.py.uast @@ -105,3 +105,4 @@ Module { . } } + diff --git a/fixtures/classdef_metaclass_py3.py.uast b/fixtures/classdef_metaclass_py3.py.uast index bba0961a..a2a09dd4 100644 --- a/fixtures/classdef_metaclass_py3.py.uast +++ b/fixtures/classdef_metaclass_py3.py.uast @@ -211,3 +211,4 @@ Module { . } } + diff --git a/fixtures/comments.py.uast b/fixtures/comments.py.uast index e9eb72a5..2bb1bf7f 100644 --- a/fixtures/comments.py.uast +++ b/fixtures/comments.py.uast @@ -162,3 +162,4 @@ Module { . } } + diff --git a/fixtures/comparisonop.py.uast b/fixtures/comparisonop.py.uast index 9986c735..2ef3b827 100644 --- a/fixtures/comparisonop.py.uast +++ b/fixtures/comparisonop.py.uast @@ -49,13 +49,7 @@ Module { . . . . . . . } . . . . . . } . . . . . . 1: Num { -<<<<<<< HEAD -. . . . . . . Roles: Literal,Number,Expression,Primitive,Expression,Binary,Left -||||||| merged common ancestors -. . . . . . . Roles: Literal,Number,Expression,Expression,Binary,Left -======= -. . . . . . . Roles: Literal,Number,Expression,Expression,Left ->>>>>>> Misc annotation fixes +. . . . . . . Roles: Literal,Number,Expression,Primitive,Expression,Left . . . . . . . TOKEN "1" . . . . . . . StartPosition: { . . . . . . . . Offset: 0 @@ -132,13 +126,7 @@ Module { . . . . . . . } . . . . . . } . . . . . . 1: Num { -<<<<<<< HEAD -. . . . . . . Roles: Literal,Number,Expression,Primitive,Expression,Binary,Left -||||||| merged common ancestors -. . . . . . . Roles: Literal,Number,Expression,Expression,Binary,Left -======= -. . . . . . . Roles: Literal,Number,Expression,Expression,Left ->>>>>>> Misc annotation fixes +. . . . . . . Roles: Literal,Number,Expression,Primitive,Expression,Left . . . . . . . TOKEN "1" . . . . . . . StartPosition: { . . . . . . . . Offset: 7 @@ -279,13 +267,7 @@ Module { . . . . . . . } . . . . . . } . . . . . . 1: Num { -<<<<<<< HEAD -. . . . . . . Roles: Literal,Number,Expression,Primitive,Expression,Binary,Left -||||||| merged common ancestors -. . . . . . . Roles: Literal,Number,Expression,Expression,Binary,Left -======= -. . . . . . . Roles: Literal,Number,Expression,Expression,Left ->>>>>>> Misc annotation fixes +. . . . . . . Roles: Literal,Number,Expression,Primitive,Expression,Left . . . . . . . TOKEN "1" . . . . . . . StartPosition: { . . . . . . . . Offset: 20 @@ -380,13 +362,7 @@ Module { . . . . . . . } . . . . . . } . . . . . . 1: Num { -<<<<<<< HEAD -. . . . . . . Roles: Literal,Number,Expression,Primitive,Expression,Binary,Left -||||||| merged common ancestors -. . . . . . . Roles: Literal,Number,Expression,Expression,Binary,Left -======= -. . . . . . . Roles: Literal,Number,Expression,Expression,Left ->>>>>>> Misc annotation fixes +. . . . . . . Roles: Literal,Number,Expression,Primitive,Expression,Left . . . . . . . TOKEN "1" . . . . . . . StartPosition: { . . . . . . . . Offset: 32 @@ -481,13 +457,7 @@ Module { . . . . . . . } . . . . . . } . . . . . . 1: Num { -<<<<<<< HEAD -. . . . . . . Roles: Literal,Number,Expression,Primitive,Expression,Binary,Left -||||||| merged common ancestors -. . . . . . . Roles: Literal,Number,Expression,Expression,Binary,Left -======= -. . . . . . . Roles: Literal,Number,Expression,Expression,Left ->>>>>>> Misc annotation fixes +. . . . . . . Roles: Literal,Number,Expression,Primitive,Expression,Left . . . . . . . TOKEN "1" . . . . . . . StartPosition: { . . . . . . . . Offset: 42 @@ -526,3 +496,4 @@ Module { . } } + diff --git a/fixtures/complex.py.uast b/fixtures/complex.py.uast index 269de2e9..176dd0a7 100644 --- a/fixtures/complex.py.uast +++ b/fixtures/complex.py.uast @@ -100,3 +100,4 @@ Module { . } } + diff --git a/fixtures/comprehension_dict.py.uast b/fixtures/comprehension_dict.py.uast index 8435f9d5..31c24f9a 100644 --- a/fixtures/comprehension_dict.py.uast +++ b/fixtures/comprehension_dict.py.uast @@ -216,3 +216,4 @@ Module { . } } + diff --git a/fixtures/comprehension_list.py.uast b/fixtures/comprehension_list.py.uast index b592a6eb..4436d417 100644 --- a/fixtures/comprehension_list.py.uast +++ b/fixtures/comprehension_list.py.uast @@ -369,3 +369,4 @@ Module { . } } + diff --git a/fixtures/comprehension_set.py.uast b/fixtures/comprehension_set.py.uast index 483b796c..2e9c5cb6 100644 --- a/fixtures/comprehension_set.py.uast +++ b/fixtures/comprehension_set.py.uast @@ -198,3 +198,4 @@ Module { . } } + diff --git a/fixtures/continue_break.py.uast b/fixtures/continue_break.py.uast index a310519e..cb54507a 100644 --- a/fixtures/continue_break.py.uast +++ b/fixtures/continue_break.py.uast @@ -354,3 +354,4 @@ Module { . } } + diff --git a/fixtures/declarations_annotated.py.uast b/fixtures/declarations_annotated.py.uast index eb7adecd..28497345 100644 --- a/fixtures/declarations_annotated.py.uast +++ b/fixtures/declarations_annotated.py.uast @@ -141,3 +141,4 @@ Module { . } } + diff --git a/fixtures/ellipsis.py.uast b/fixtures/ellipsis.py.uast index bafc3efa..9f3a02d8 100644 --- a/fixtures/ellipsis.py.uast +++ b/fixtures/ellipsis.py.uast @@ -68,3 +68,4 @@ Module { . } } + diff --git a/fixtures/empty.py.uast b/fixtures/empty.py.uast index 33748003..71ea88f7 100644 --- a/fixtures/empty.py.uast +++ b/fixtures/empty.py.uast @@ -1,13 +1,5 @@ -Status: error +Status: ok Errors: - . column out of bounds: 1 [1, 0] UAST: -Module { -. Roles: File,Module -. StartPosition: { -. . Offset: 0 -. . Line: 1 -. . Col: 1 -. } -} + diff --git a/fixtures/except.py.uast b/fixtures/except.py.uast index b5d0736e..199dada8 100644 --- a/fixtures/except.py.uast +++ b/fixtures/except.py.uast @@ -2,7 +2,7 @@ Status: ok Errors: UAST: Module { -. Roles: File +. Roles: File,Module . Children: { . . 0: Try { . . . Roles: Try,Statement @@ -100,13 +100,7 @@ Module { . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Str { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . TOKEN "gogogo" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 35 @@ -172,13 +166,7 @@ Module { . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Str { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . TOKEN "here we are" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 153 @@ -258,13 +246,7 @@ Module { . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Str { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . TOKEN "someexception catched" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 82 @@ -365,13 +347,7 @@ Module { . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Str { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . TOKEN "ayyyy" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 125 @@ -416,3 +392,4 @@ Module { . } } + diff --git a/fixtures/exec.py.uast b/fixtures/exec.py.uast index 6a610c2c..3ad30256 100644 --- a/fixtures/exec.py.uast +++ b/fixtures/exec.py.uast @@ -2,7 +2,7 @@ Status: ok Errors: UAST: Module { -. Roles: File +. Roles: File,Module . Children: { . . 0: Expr { . . . Roles: Expression @@ -27,13 +27,7 @@ Module { . . . . . } . . . . . Children: { . . . . . . 0: Str { -<<<<<<< HEAD -. . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . TOKEN "print 1" . . . . . . . StartPosition: { . . . . . . . . Offset: 5 @@ -74,3 +68,4 @@ Module { . } } + diff --git a/fixtures/for.py.uast b/fixtures/for.py.uast index 029f4ad9..d30d072c 100644 --- a/fixtures/for.py.uast +++ b/fixtures/for.py.uast @@ -234,3 +234,4 @@ Module { . } } + diff --git a/fixtures/functioncalls.py.uast b/fixtures/functioncalls.py.uast index 4bb03b84..ebf35732 100644 --- a/fixtures/functioncalls.py.uast +++ b/fixtures/functioncalls.py.uast @@ -2,7 +2,7 @@ Status: ok Errors: UAST: Module { -. Roles: File +. Roles: File,Module . Children: { . . 0: Expr { . . . Roles: Expression @@ -27,13 +27,7 @@ Module { . . . . . } . . . . . Children: { . . . . . . 0: Str { -<<<<<<< HEAD -. . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . TOKEN "something1" . . . . . . . StartPosition: { . . . . . . . . Offset: 11 @@ -50,13 +44,7 @@ Module { . . . . . . . } . . . . . . } . . . . . . 1: Num { -<<<<<<< HEAD -. . . . . . . Roles: Literal,Number,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . Roles: Literal,Number,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . Roles: Literal,Number,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . Roles: Literal,Number,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . TOKEN "42" . . . . . . . StartPosition: { . . . . . . . . Offset: 25 @@ -73,13 +61,7 @@ Module { . . . . . . . } . . . . . . } . . . . . . 2: Name { -<<<<<<< HEAD -. . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . TOKEN "somesymbbol" . . . . . . . StartPosition: { . . . . . . . . Offset: 29 @@ -141,13 +123,7 @@ Module { . . . . . } . . . . . Children: { . . . . . . 0: Str { -<<<<<<< HEAD -. . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . TOKEN "something" . . . . . . . StartPosition: { . . . . . . . . Offset: 58 @@ -164,13 +140,7 @@ Module { . . . . . . . } . . . . . . } . . . . . . 1: Num { -<<<<<<< HEAD -. . . . . . . Roles: Literal,Number,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . Roles: Literal,Number,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . Roles: Literal,Number,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . Roles: Literal,Number,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . TOKEN "42" . . . . . . . StartPosition: { . . . . . . . . Offset: 71 @@ -187,13 +157,7 @@ Module { . . . . . . . } . . . . . . } . . . . . . 2: Name { -<<<<<<< HEAD -. . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . TOKEN "somesymbol" . . . . . . . StartPosition: { . . . . . . . . Offset: 75 @@ -275,13 +239,7 @@ Module { . . . . . } . . . . . Children: { . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . TOKEN "a" . . . . . . . StartPosition: { . . . . . . . . Offset: 95 @@ -317,14 +275,14 @@ Module { . . . . . . . } . . . . . . } . . . . . . 2: keyword { -. . . . . . . Roles: Call,Argument,Name +. . . . . . . Roles: Function,Call,Argument,Name . . . . . . . TOKEN "b" . . . . . . . Properties: { . . . . . . . . internalRole: keywords . . . . . . . } . . . . . . . Children: { . . . . . . . . 0: Num { -. . . . . . . . . Roles: Literal,Number,Expression,Primitive,Call,Argument,Value +. . . . . . . . . Roles: Literal,Number,Expression,Primitive,Argument,Value . . . . . . . . . TOKEN "1" . . . . . . . . . StartPosition: { . . . . . . . . . . Offset: 100 @@ -343,14 +301,14 @@ Module { . . . . . . . } . . . . . . } . . . . . . 3: keyword { -. . . . . . . Roles: Call,Argument,Name +. . . . . . . Roles: Function,Call,Argument,Name . . . . . . . TOKEN "c" . . . . . . . Properties: { . . . . . . . . internalRole: keywords . . . . . . . } . . . . . . . Children: { . . . . . . . . 0: Num { -. . . . . . . . . Roles: Literal,Number,Expression,Primitive,Call,Argument,Value +. . . . . . . . . Roles: Literal,Number,Expression,Primitive,Argument,Value . . . . . . . . . TOKEN "2" . . . . . . . . . StartPosition: { . . . . . . . . . . Offset: 105 @@ -395,13 +353,7 @@ Module { . . . . . } . . . . . Children: { . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . TOKEN "a" . . . . . . . StartPosition: { . . . . . . . . Offset: 123 @@ -419,13 +371,7 @@ Module { . . . . . . . } . . . . . . } . . . . . . 1: Starred { -<<<<<<< HEAD -. . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional -======= . . . . . . . Roles: Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . StartPosition: { . . . . . . . . Offset: 126 . . . . . . . . Line: 4 @@ -501,13 +447,7 @@ Module { . . . . . } . . . . . Children: { . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . TOKEN "a" . . . . . . . StartPosition: { . . . . . . . . Offset: 155 @@ -543,14 +483,14 @@ Module { . . . . . . . } . . . . . . } . . . . . . 2: keyword { -. . . . . . . Roles: Call,Argument,Name +. . . . . . . Roles: Function,Call,Argument,Name . . . . . . . TOKEN "" . . . . . . . Properties: { . . . . . . . . internalRole: keywords . . . . . . . } . . . . . . . Children: { . . . . . . . . 0: Name { -. . . . . . . . . Roles: Call,Argument,Value,Identifier,Expression +. . . . . . . . . Roles: Argument,Value,Identifier,Expression . . . . . . . . . TOKEN "expandedMap" . . . . . . . . . StartPosition: { . . . . . . . . . . Offset: 160 @@ -576,3 +516,4 @@ Module { . } } + diff --git a/fixtures/functiondef_annotated.py.uast b/fixtures/functiondef_annotated.py.uast index 9827dfbf..b106ab3f 100644 --- a/fixtures/functiondef_annotated.py.uast +++ b/fixtures/functiondef_annotated.py.uast @@ -187,3 +187,4 @@ Module { . } } + diff --git a/fixtures/functiondef_decorated.py.uast b/fixtures/functiondef_decorated.py.uast index c963fe09..7f42d830 100644 --- a/fixtures/functiondef_decorated.py.uast +++ b/fixtures/functiondef_decorated.py.uast @@ -2,7 +2,7 @@ Status: ok Errors: UAST: Module { -. Roles: File +. Roles: File,Module . Children: { . . 0: FunctionDef { . . . Roles: Function,Declaration,Name,Identifier @@ -68,13 +68,7 @@ Module { . . . . . } . . . . } . . . . 2: arguments { -<<<<<<< HEAD -. . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . Properties: { . . . . . . internalRole: args . . . . . . kwarg: @@ -169,13 +163,7 @@ Module { . . . . . . . } . . . . . . . Children: { . . . . . . . . 0: Num { -<<<<<<< HEAD -. . . . . . . . . Roles: Literal,Number,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . Roles: Literal,Number,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . Roles: Literal,Number,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . Roles: Literal,Number,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . TOKEN "1" . . . . . . . . . StartPosition: { . . . . . . . . . . Offset: 64 @@ -192,13 +180,7 @@ Module { . . . . . . . . . } . . . . . . . . } . . . . . . . . 1: Num { -<<<<<<< HEAD -. . . . . . . . . Roles: Literal,Number,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . Roles: Literal,Number,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . Roles: Literal,Number,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . Roles: Literal,Number,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . TOKEN "2" . . . . . . . . . StartPosition: { . . . . . . . . . . Offset: 67 @@ -215,13 +197,7 @@ Module { . . . . . . . . . } . . . . . . . . } . . . . . . . . 2: Num { -<<<<<<< HEAD -. . . . . . . . . Roles: Literal,Number,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . Roles: Literal,Number,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . Roles: Literal,Number,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . Roles: Literal,Number,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . TOKEN "3" . . . . . . . . . StartPosition: { . . . . . . . . . . Offset: 70 @@ -260,13 +236,7 @@ Module { . . . . . } . . . . } . . . . 2: arguments { -<<<<<<< HEAD -. . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . Properties: { . . . . . . internalRole: args . . . . . . kwarg: @@ -278,3 +248,4 @@ Module { . } } + diff --git a/fixtures/functiondef_defaultparams.py.uast b/fixtures/functiondef_defaultparams.py.uast index 992c351c..f65b37f9 100644 --- a/fixtures/functiondef_defaultparams.py.uast +++ b/fixtures/functiondef_defaultparams.py.uast @@ -306,3 +306,4 @@ Module { . } } + diff --git a/fixtures/functiondef_docstring.py.uast b/fixtures/functiondef_docstring.py.uast index 2c12c906..b6899bc7 100644 --- a/fixtures/functiondef_docstring.py.uast +++ b/fixtures/functiondef_docstring.py.uast @@ -103,3 +103,4 @@ Module { . } } + diff --git a/fixtures/functiondef_kwarg.py.uast b/fixtures/functiondef_kwarg.py.uast index 71614bfe..d46bc0b9 100644 --- a/fixtures/functiondef_kwarg.py.uast +++ b/fixtures/functiondef_kwarg.py.uast @@ -267,3 +267,4 @@ Module { . } } + diff --git a/fixtures/functiondef_simple.py.uast b/fixtures/functiondef_simple.py.uast index 25cd0113..6396c0fa 100644 --- a/fixtures/functiondef_simple.py.uast +++ b/fixtures/functiondef_simple.py.uast @@ -467,3 +467,4 @@ Module { . } } + diff --git a/fixtures/functiondef_vararg.py.uast b/fixtures/functiondef_vararg.py.uast index 86aaa88f..b656e6d9 100644 --- a/fixtures/functiondef_vararg.py.uast +++ b/fixtures/functiondef_vararg.py.uast @@ -129,3 +129,4 @@ Module { . } } + diff --git a/fixtures/hello.py.uast b/fixtures/hello.py.uast index 41cd5efb..f76a684f 100644 --- a/fixtures/hello.py.uast +++ b/fixtures/hello.py.uast @@ -2,7 +2,7 @@ Status: ok Errors: UAST: Module { -. Roles: File +. Roles: File,Module . Children: { . . 0: Expr { . . . Roles: Expression @@ -27,13 +27,7 @@ Module { . . . . . } . . . . . Children: { . . . . . . 0: Str { -<<<<<<< HEAD -. . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . TOKEN "hello world" . . . . . . . StartPosition: { . . . . . . . . Offset: 6 @@ -74,3 +68,4 @@ Module { . } } + diff --git a/fixtures/if.py.uast b/fixtures/if.py.uast index a019703c..28036add 100644 --- a/fixtures/if.py.uast +++ b/fixtures/if.py.uast @@ -2,7 +2,7 @@ Status: ok Errors: UAST: Module { -. Roles: File +. Roles: File,Module . Children: { . . 0: If { . . . Roles: If,Statement @@ -47,13 +47,7 @@ Module { . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: BoolLiteral { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Literal,Boolean,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . Roles: Literal,Boolean,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . Roles: Literal,Boolean,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . Roles: Literal,Boolean,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . TOKEN "true" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 19 @@ -157,13 +151,7 @@ Module { . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: BoolLiteral { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Literal,Boolean,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . Roles: Literal,Boolean,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . Roles: Literal,Boolean,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . Roles: Literal,Boolean,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . TOKEN "true" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 55 @@ -958,3 +946,4 @@ Module { . } } + diff --git a/fixtures/ifexpression.py.uast b/fixtures/ifexpression.py.uast index fdae69ea..cda99686 100644 --- a/fixtures/ifexpression.py.uast +++ b/fixtures/ifexpression.py.uast @@ -112,13 +112,7 @@ Module { . . . . . . . . . } . . . . . . . . } . . . . . . . . 1: Num { -<<<<<<< HEAD -. . . . . . . . . Roles: Literal,Number,Expression,Primitive,Expression,Binary,Left -||||||| merged common ancestors -. . . . . . . . . Roles: Literal,Number,Expression,Expression,Binary,Left -======= -. . . . . . . . . Roles: Literal,Number,Expression,Expression,Left ->>>>>>> Misc annotation fixes +. . . . . . . . . Roles: Literal,Number,Expression,Primitive,Expression,Left . . . . . . . . . TOKEN "3" . . . . . . . . . StartPosition: { . . . . . . . . . . Offset: 9 @@ -155,3 +149,4 @@ Module { . } } + diff --git a/fixtures/import.py.uast b/fixtures/import.py.uast index 193373e2..0b3e041e 100644 --- a/fixtures/import.py.uast +++ b/fixtures/import.py.uast @@ -130,3 +130,4 @@ Module { . } } + diff --git a/fixtures/issue102.py.uast b/fixtures/issue102.py.uast index 46ac2b92..093d2772 100644 --- a/fixtures/issue102.py.uast +++ b/fixtures/issue102.py.uast @@ -2,7 +2,7 @@ Status: ok Errors: UAST: Module { -. Roles: File +. Roles: File,Module . Children: { . . 0: Expr { . . . Roles: Expression @@ -16,7 +16,7 @@ Module { . . . } . . . Children: { . . . . 0: Str { -. . . . . Roles: Literal,String,Expression +. . . . . Roles: Literal,String,Expression,Primitive . . . . . TOKEN " select message.*, user.* from message, user where message.author_id = user.user_id and ( @@ -43,3 +43,4 @@ Module { . } } + diff --git a/fixtures/issue30.py.uast b/fixtures/issue30.py.uast index 89dceefa..65b49845 100644 --- a/fixtures/issue30.py.uast +++ b/fixtures/issue30.py.uast @@ -2,7 +2,7 @@ Status: ok Errors: UAST: Module { -. Roles: File +. Roles: File,Module . Children: { . . 0: Import { . . . Roles: Import,Declaration,Statement @@ -48,13 +48,7 @@ Module { . . . . . } . . . . . Children: { . . . . . . 0: Str { -<<<<<<< HEAD -. . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . TOKEN "Hello world! " . . . . . . . StartPosition: { @@ -136,3 +130,4 @@ Module { . } } + diff --git a/fixtures/issue51.py.uast b/fixtures/issue51.py.uast index a531fe5b..7ea65409 100644 --- a/fixtures/issue51.py.uast +++ b/fixtures/issue51.py.uast @@ -71,3 +71,4 @@ Module { . } } + diff --git a/fixtures/issue58.py.uast b/fixtures/issue58.py.uast index 560d5cfd..76007b62 100644 --- a/fixtures/issue58.py.uast +++ b/fixtures/issue58.py.uast @@ -119,3 +119,4 @@ Module { . } } + diff --git a/fixtures/issue62.py.uast b/fixtures/issue62.py.uast index ec88aed0..595bc82c 100644 --- a/fixtures/issue62.py.uast +++ b/fixtures/issue62.py.uast @@ -124,3 +124,4 @@ Module { . } } + diff --git a/fixtures/issue62_b.py.uast b/fixtures/issue62_b.py.uast index 0e41b722..61ca51a1 100644 --- a/fixtures/issue62_b.py.uast +++ b/fixtures/issue62_b.py.uast @@ -2,7 +2,7 @@ Status: ok Errors: UAST: Module { -. Roles: File +. Roles: File,Module . Children: { . . 0: ImportFrom { . . . Roles: Import,Declaration,Statement @@ -435,13 +435,7 @@ Module { . . . . . . . } . . . . . . . Children: { . . . . . . . . 0: arguments { -<<<<<<< HEAD -. . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . Properties: { . . . . . . . . . . internalRole: args . . . . . . . . . . kwarg: @@ -813,13 +807,7 @@ Module { . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . TOKEN "ch" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 513 @@ -837,13 +825,7 @@ Module { . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . TOKEN "id_cnt" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 517 @@ -984,13 +966,7 @@ Module { . . . . . . . } . . . . . . . Children: { . . . . . . . . 0: arguments { -<<<<<<< HEAD -. . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . Properties: { . . . . . . . . . . internalRole: args . . . . . . . . . . kwarg: @@ -1114,13 +1090,7 @@ Module { . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . 0: BinOp { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Expression,Binary,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Expression,Binary,Argument,Name,Identifier,Function,Call,Positional -======= . . . . . . . . . . . . . . . . . . . Roles: Expression,Binary,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 655 . . . . . . . . . . . . . . . . . . . . Line: 25 @@ -1233,13 +1203,7 @@ Module { . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . 0: Attribute { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Identifier,Expression,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Identifier,Expression,Function,Call,Positional -======= . . . . . . . . . . . . . . . . . . . . . . . Roles: Identifier,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . TOKEN "filepath" . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . Offset: 671 @@ -1406,13 +1370,7 @@ Module { . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . 0: Attribute { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Identifier,Expression,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Identifier,Expression,Function,Call,Positional -======= . . . . . . . . . . . . . . . . . . . Roles: Identifier,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . TOKEN "uast" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 764 @@ -1470,13 +1428,7 @@ Module { . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . TOKEN "id_cnt" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 770 @@ -1555,13 +1507,7 @@ Module { . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . TOKEN "id_cnt" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 796 @@ -1772,14 +1718,14 @@ Module { . . . . . . . . . . . } . . . . . . . . . . } . . . . . . . . . . 1: keyword { -. . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . TOKEN "linguist" . . . . . . . . . . . Properties: { . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . } . . . . . . . . . . . Children: { . . . . . . . . . . . . 0: Str { -. . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Call,Argument,Value +. . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Argument,Value . . . . . . . . . . . . . TOKEN "path/to/enry" . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 894 @@ -1798,14 +1744,14 @@ Module { . . . . . . . . . . . } . . . . . . . . . . } . . . . . . . . . . 2: keyword { -. . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . TOKEN "bblfsh_endpoint" . . . . . . . . . . . Properties: { . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . } . . . . . . . . . . . Children: { . . . . . . . . . . . . 0: Str { -. . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Call,Argument,Value +. . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Argument,Value . . . . . . . . . . . . . TOKEN "0.0.0.0:9432" . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 926 @@ -1847,13 +1793,7 @@ Module { . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "repo" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 969 @@ -2030,3 +1970,4 @@ Module { . } } + diff --git a/fixtures/issue76.py.uast b/fixtures/issue76.py.uast index 246a769d..d91c28e6 100644 --- a/fixtures/issue76.py.uast +++ b/fixtures/issue76.py.uast @@ -2,7 +2,7 @@ Status: ok Errors: UAST: Module { -. Roles: File +. Roles: File,Module . Children: { . . 0: With { . . . Roles: Block,Scope,Statement @@ -47,13 +47,7 @@ Module { . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Call { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Function,Call,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Function,Call,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Function,Call,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 81 . . . . . . . . . . . . Line: 2 @@ -64,13 +58,7 @@ Module { . . . . . . . . . . . } . . . . . . . . . . . Children: { . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . TOKEN "chosen_words" . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 91 @@ -192,13 +180,7 @@ Module { . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Call { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Function,Call,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Function,Call,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Function,Call,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 10 . . . . . . . . . . . . Line: 1 @@ -209,13 +191,7 @@ Module { . . . . . . . . . . . } . . . . . . . . . . . Children: { . . . . . . . . . . . . 0: Attribute { -<<<<<<< HEAD -. . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Identifier,Expression,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . Roles: Argument,Name,Identifier,Identifier,Expression,Function,Call,Positional -======= . . . . . . . . . . . . . Roles: Identifier,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . TOKEN "output" . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 28 @@ -253,13 +229,7 @@ Module { . . . . . . . . . . . . . } . . . . . . . . . . . . } . . . . . . . . . . . . 1: Str { -<<<<<<< HEAD -. . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . . . TOKEN "row_vocab.txt" . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 36 @@ -336,13 +306,7 @@ Module { . . . . . . . . . . . } . . . . . . . . . . } . . . . . . . . . . 1: Str { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . TOKEN "w" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 54 @@ -405,3 +369,4 @@ Module { . } } + diff --git a/fixtures/issue97_assign.py.uast b/fixtures/issue97_assign.py.uast index a3229158..d83ecc67 100644 --- a/fixtures/issue97_assign.py.uast +++ b/fixtures/issue97_assign.py.uast @@ -74,3 +74,4 @@ Module { . } } + diff --git a/fixtures/issue97_equal.py.uast b/fixtures/issue97_equal.py.uast index 81d62ede..67707c48 100644 --- a/fixtures/issue97_equal.py.uast +++ b/fixtures/issue97_equal.py.uast @@ -109,3 +109,4 @@ Module { . } } + diff --git a/fixtures/issue97_lessThan.py.uast b/fixtures/issue97_lessThan.py.uast index d0b34596..aca08e6b 100644 --- a/fixtures/issue97_lessThan.py.uast +++ b/fixtures/issue97_lessThan.py.uast @@ -109,3 +109,4 @@ Module { . } } + diff --git a/fixtures/issue_server101.py.uast b/fixtures/issue_server101.py.uast index 51614efa..76396620 100644 --- a/fixtures/issue_server101.py.uast +++ b/fixtures/issue_server101.py.uast @@ -2,7 +2,7 @@ Status: ok Errors: UAST: Module { -. Roles: File +. Roles: File,Module . Children: { . . 0: Expr { . . . Roles: Expression @@ -1258,13 +1258,7 @@ pyid to C{bool}." . . . . . } . . . . } . . . . 1: arguments { -<<<<<<< HEAD -. . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . Properties: { . . . . . . internalRole: args . . . . . . kwarg: @@ -1291,13 +1285,7 @@ pyid to C{bool}." . . . } . . . Children: { . . . . 0: arguments { -<<<<<<< HEAD -. . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . Properties: { . . . . . . internalRole: args . . . . . . kwarg: @@ -1725,13 +1713,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . 0: Call { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Function,Call,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Function,Call,Expression -======= . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Function,Call,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 3872 . . . . . . . . . . . . . . . . Line: 101 @@ -1744,13 +1726,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . TOKEN "name" . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 3883 @@ -1892,13 +1868,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . TOKEN "filename" . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . Offset: 4024 @@ -1985,13 +1955,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . TOKEN "filename" . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . Offset: 4092 @@ -2009,13 +1973,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . TOKEN "context" . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . Offset: 4102 @@ -2186,13 +2144,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . 0: Str { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . . . . . . . . . . . . . TOKEN "Expected exactly one of the following arguments: value, name, filename" . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . Offset: 4269 @@ -2911,13 +2863,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 4390 @@ -3096,13 +3042,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . 0: Call { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Function,Call,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Function,Call,Expression -======= . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Function,Call,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 4720 . . . . . . . . . . . . . . . . . . . . Line: 122 @@ -3115,13 +3055,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . 0: Call { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Function,Call,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Function,Call,Expression -======= . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Function,Call,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . Offset: 4738 . . . . . . . . . . . . . . . . . . . . . . Line: 122 @@ -3134,13 +3068,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . TOKEN "filename" . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . Offset: 4742 @@ -3652,13 +3580,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 4892 @@ -3869,13 +3791,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 5006 @@ -3936,13 +3852,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 5033 @@ -3960,13 +3870,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . } . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "val_doc" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 5040 @@ -4002,14 +3906,14 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . } . . . . . . . . . . 3: keyword { -. . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . TOKEN "module_name" . . . . . . . . . . . Properties: { . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . } . . . . . . . . . . . Children: { . . . . . . . . . . . . 0: Name { -. . . . . . . . . . . . . Roles: Call,Argument,Value,Identifier,Expression +. . . . . . . . . . . . . Roles: Argument,Value,Identifier,Expression . . . . . . . . . . . . . TOKEN "module_name" . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 5049 @@ -4112,13 +4016,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . TOKEN "name" . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 5224 @@ -4462,13 +4360,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . 0: Call { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Function,Call,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Function,Call,Expression -======= . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Function,Call,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 5371 . . . . . . . . . . . . . . . . Line: 139 @@ -4481,13 +4373,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . 0: Call { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Function,Call,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Function,Call,Expression -======= . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Function,Call,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 5389 . . . . . . . . . . . . . . . . . . Line: 139 @@ -4500,13 +4386,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . TOKEN "filename" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 5393 @@ -4800,13 +4680,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . 0: Attribute { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Identifier,Expression,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Identifier,Expression,Function,Call,Positional -======= . . . . . . . . . . . . . . . Roles: Identifier,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . TOKEN "__name__" . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 5522 @@ -4887,13 +4761,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . 0: BinOp { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Expression,Binary,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Expression,Binary,Argument,Name,Identifier,Function,Call,Positional -======= . . . . . . . . . . . . . . . Roles: Expression,Binary,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 5552 . . . . . . . . . . . . . . . . Line: 143 @@ -5044,13 +4912,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . 0: BinOp { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Expression,Binary,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Expression,Binary,Argument,Name,Identifier,Function,Call,Positional -======= . . . . . . . . . . . . . . . Roles: Expression,Binary,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 5694 . . . . . . . . . . . . . . . . Line: 145 @@ -5074,13 +4936,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . TOKEN "shadowed_name" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 5698 @@ -5466,13 +5322,7 @@ pyid to C{bool}." . . . } . . . Children: { . . . . 0: arguments { -<<<<<<< HEAD -. . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . Properties: { . . . . . . internalRole: args . . . . . . kwarg: @@ -5611,13 +5461,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 6088 @@ -5696,13 +5540,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "pyid" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 6129 @@ -5832,13 +5670,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 6208 @@ -5874,14 +5706,14 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . 2: keyword { -. . . . . . . . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . . . . . . . TOKEN "strict" . . . . . . . . . . . . . . . . . Properties: { . . . . . . . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . 0: Name { -. . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Value,Identifier,Expression +. . . . . . . . . . . . . . . . . . . Roles: Argument,Value,Identifier,Expression . . . . . . . . . . . . . . . . . . . TOKEN "True" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 6222 @@ -6065,14 +5897,14 @@ pyid to C{bool}." . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . } . . . . . . . . . . . . . . 1: keyword { -. . . . . . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . . . . . TOKEN "pyval" . . . . . . . . . . . . . . . Properties: { . . . . . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . 0: Name { -. . . . . . . . . . . . . . . . . Roles: Call,Argument,Value,Identifier,Expression +. . . . . . . . . . . . . . . . . Roles: Argument,Value,Identifier,Expression . . . . . . . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 6331 @@ -6092,14 +5924,14 @@ pyid to C{bool}." . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . } . . . . . . . . . . . . . . 2: keyword { -. . . . . . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . . . . . TOKEN "canonical_name" . . . . . . . . . . . . . . . Properties: { . . . . . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . 0: Name { -. . . . . . . . . . . . . . . . . Roles: Call,Argument,Value,Identifier,Expression +. . . . . . . . . . . . . . . . . Roles: Argument,Value,Identifier,Expression . . . . . . . . . . . . . . . . . TOKEN "canonical_name" . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 6338 @@ -6119,14 +5951,14 @@ pyid to C{bool}." . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . } . . . . . . . . . . . . . . 3: keyword { -. . . . . . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . . . . . TOKEN "docs_extracted_by" . . . . . . . . . . . . . . . Properties: { . . . . . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . 0: Str { -. . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Call,Argument,Value +. . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Argument,Value . . . . . . . . . . . . . . . . . TOKEN "introspecter" . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 6416 @@ -6276,13 +6108,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 6755 @@ -6300,13 +6126,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . TOKEN "val_doc" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 6762 @@ -6342,14 +6162,14 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . 3: keyword { -. . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . . . . . . . . . TOKEN "preliminary" . . . . . . . . . . . . . . . . . . . Properties: { . . . . . . . . . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . 0: Name { -. . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Value,Identifier,Expression +. . . . . . . . . . . . . . . . . . . . . Roles: Argument,Value,Identifier,Expression . . . . . . . . . . . . . . . . . . . . . TOKEN "True" . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . Offset: 6783 @@ -6486,13 +6306,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . 0: Call { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Function,Call,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Function,Call,Expression -======= . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Function,Call,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 6879 . . . . . . . . . . . . . . . . . . . . Line: 173 @@ -6505,13 +6319,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . Offset: 6901 @@ -6610,13 +6418,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . TOKEN "module_name" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 6946 @@ -6775,13 +6577,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . TOKEN "module" . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . Offset: 7079 @@ -6915,13 +6711,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . TOKEN "module" . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . Offset: 7014 @@ -7004,13 +6794,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 6717 @@ -7594,13 +7378,7 @@ pyid to C{bool}." . . . } . . . Children: { . . . . 0: arguments { -<<<<<<< HEAD -. . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . Properties: { . . . . . . internalRole: args . . . . . . kwarg: @@ -7814,13 +7592,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "ModuleDoc" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 7730 @@ -7959,13 +7731,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . 0: Attribute { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Identifier,Expression,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Identifier,Expression,Function,Call,Positional -======= . . . . . . . . . . . . . . . Roles: Identifier,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . TOKEN "__docformat__" . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 7865 @@ -8040,13 +7806,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "module" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 7793 @@ -8064,13 +7824,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . } . . . . . . . . . . 1: Str { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . TOKEN "__docformat__" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 7801 @@ -8245,13 +7999,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . 0: Attribute { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Identifier,Expression,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Identifier,Expression,Function,Call,Positional -======= . . . . . . . . . . . . . . . . . Roles: Identifier,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . TOKEN "__file__" . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 8036 @@ -8487,13 +8235,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . 0: Attribute { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Identifier,Expression,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Identifier,Expression,Function,Call,Positional -======= . . . . . . . . . . . . . . . . . . . . . Roles: Identifier,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . TOKEN "filename" . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . Offset: 8220 @@ -8711,13 +8453,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "module" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 7965 @@ -8735,13 +8471,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . } . . . . . . . . . . 1: Str { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . TOKEN "__file__" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 7973 @@ -9108,13 +8838,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . TOKEN "module" . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 8655 @@ -9169,13 +8893,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "module" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 8590 @@ -9193,13 +8911,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . } . . . . . . . . . . 1: Str { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . TOKEN "__doc__" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 8598 @@ -9451,13 +9163,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . TOKEN "p" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 8899 @@ -9738,13 +9444,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "module" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 8801 @@ -9762,13 +9462,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . } . . . . . . . . . . 1: Str { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . TOKEN "__path__" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 8809 @@ -10037,13 +9731,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . 0: Attribute { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Identifier,Expression,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Identifier,Expression,Function,Call,Positional -======= . . . . . . . . . . . . . . . Roles: Identifier,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . TOKEN "__name__" . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 9201 @@ -10214,13 +9902,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Call { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Function,Call,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Function,Call,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Function,Call,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 9248 . . . . . . . . . . . . Line: 235 @@ -10233,13 +9915,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . . Children: { . . . . . . . . . . . . 0: Str { -<<<<<<< HEAD -. . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . . . TOKEN "'" . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 9273 @@ -10256,13 +9932,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . } . . . . . . . . . . . . 1: Str { -<<<<<<< HEAD -. . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 9215 . . . . . . . . . . . . . . Line: 235 @@ -10309,13 +9979,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . TOKEN "dotted_name" . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 9252 @@ -10438,13 +10102,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . 0: Call { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Function,Call,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Function,Call,Expression -======= . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Function,Call,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 9405 . . . . . . . . . . . . . . . . Line: 239 @@ -10558,13 +10216,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . TOKEN "package_name" . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 9464 @@ -10723,13 +10375,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . TOKEN "package" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 9559 @@ -10963,13 +10609,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . . Children: { . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . TOKEN "dotted_name" . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 9360 @@ -11216,13 +10856,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . TOKEN "module_doc" . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 9843 @@ -11654,13 +11288,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . 0: ListComp { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,List,For,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,List,For,Expression -======= . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,List,For,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 10021 . . . . . . . . . . . . . . . . . . Line: 257 @@ -11684,13 +11312,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . TOKEN "name" . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . Offset: 10025 @@ -11917,13 +11539,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "module" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 9956 @@ -11941,13 +11557,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . } . . . . . . . . . . 1: Str { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . TOKEN "__all__" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 9964 @@ -12256,13 +11866,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . TOKEN "module" . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 10308 @@ -12280,13 +11884,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . } . . . . . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . TOKEN "child_name" . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 10316 @@ -12424,13 +12022,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . TOKEN "child" . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 10484 @@ -12562,13 +12154,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . TOKEN "child" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 10739 @@ -12604,14 +12190,14 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . 2: keyword { -. . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . . . . . . . . . TOKEN "context" . . . . . . . . . . . . . . . . . . . Properties: { . . . . . . . . . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . 0: Name { -. . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Value,Identifier,Expression +. . . . . . . . . . . . . . . . . . . . . Roles: Argument,Value,Identifier,Expression . . . . . . . . . . . . . . . . . . . . . TOKEN "module_doc" . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . Offset: 10754 @@ -12631,14 +12217,14 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . 3: keyword { -. . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . . . . . . . . . TOKEN "module_name" . . . . . . . . . . . . . . . . . . . Properties: { . . . . . . . . . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . 0: Name { -. . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Value,Identifier,Expression +. . . . . . . . . . . . . . . . . . . . . Roles: Argument,Value,Identifier,Expression . . . . . . . . . . . . . . . . . . . . . TOKEN "dotted_name" . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . Offset: 10822 @@ -12719,14 +12305,14 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . 1: keyword { -. . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . . . . . . . . . TOKEN "name" . . . . . . . . . . . . . . . . . . . Properties: { . . . . . . . . . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . 0: Name { -. . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Value,Identifier,Expression +. . . . . . . . . . . . . . . . . . . . . Roles: Argument,Value,Identifier,Expression . . . . . . . . . . . . . . . . . . . . . TOKEN "child_name" . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . Offset: 10880 @@ -12746,14 +12332,14 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . 2: keyword { -. . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . . . . . . . . . Properties: { . . . . . . . . . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . 0: Name { -. . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Value,Identifier,Expression +. . . . . . . . . . . . . . . . . . . . . Roles: Argument,Value,Identifier,Expression . . . . . . . . . . . . . . . . . . . . . TOKEN "child_val_doc" . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . Offset: 10938 @@ -12773,14 +12359,14 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . 3: keyword { -. . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . . . . . . . . . TOKEN "is_imported" . . . . . . . . . . . . . . . . . . . Properties: { . . . . . . . . . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . 0: Name { -. . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Value,Identifier,Expression +. . . . . . . . . . . . . . . . . . . . . Roles: Argument,Value,Identifier,Expression . . . . . . . . . . . . . . . . . . . . . TOKEN "False" . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . Offset: 11005 @@ -12800,14 +12386,14 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . 4: keyword { -. . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . . . . . . . . . TOKEN "container" . . . . . . . . . . . . . . . . . . . Properties: { . . . . . . . . . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . 0: Name { -. . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Value,Identifier,Expression +. . . . . . . . . . . . . . . . . . . . . Roles: Argument,Value,Identifier,Expression . . . . . . . . . . . . . . . . . . . . . TOKEN "module_doc" . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . Offset: 11062 @@ -12827,14 +12413,14 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . 5: keyword { -. . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . . . . . . . . . TOKEN "docs_extracted_by" . . . . . . . . . . . . . . . . . . . Properties: { . . . . . . . . . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . 0: Str { -. . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Call,Argument,Value +. . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Argument,Value . . . . . . . . . . . . . . . . . . . . . TOKEN "introspecter" . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . Offset: 11132 @@ -12929,13 +12515,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . TOKEN "child" . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . Offset: 11309 @@ -13106,13 +12686,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . TOKEN "child" . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . Offset: 11413 @@ -13148,14 +12722,14 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . 2: keyword { -. . . . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . . . . . . . . . . . . . TOKEN "context" . . . . . . . . . . . . . . . . . . . . . . . Properties: { . . . . . . . . . . . . . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . 0: Name { -. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Value,Identifier,Expression +. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Value,Identifier,Expression . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "module_doc" . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 11428 @@ -13236,14 +12810,14 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . 1: keyword { -. . . . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . . . . . . . . . . . . . TOKEN "name" . . . . . . . . . . . . . . . . . . . . . . . Properties: { . . . . . . . . . . . . . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . 0: Name { -. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Value,Identifier,Expression +. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Value,Identifier,Expression . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "child_name" . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 11485 @@ -13263,14 +12837,14 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . 2: keyword { -. . . . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . . . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . . . . . . . . . . . . . Properties: { . . . . . . . . . . . . . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . 0: Name { -. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Value,Identifier,Expression +. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Value,Identifier,Expression . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "child_val_doc" . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 11543 @@ -13290,14 +12864,14 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . 3: keyword { -. . . . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . . . . . . . . . . . . . TOKEN "container" . . . . . . . . . . . . . . . . . . . . . . . Properties: { . . . . . . . . . . . . . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . 0: Name { -. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Value,Identifier,Expression +. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Value,Identifier,Expression . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "module_doc" . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 11608 @@ -13317,14 +12891,14 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . 4: keyword { -. . . . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . . . . . . . . . . . . . TOKEN "docs_extracted_by" . . . . . . . . . . . . . . . . . . . . . . . Properties: { . . . . . . . . . . . . . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . 0: Str { -. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Call,Argument,Value +. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Argument,Value . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "introspecter" . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 11678 @@ -13427,13 +13001,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . TOKEN "child" . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . Offset: 11783 @@ -13530,14 +13098,14 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . 1: keyword { -. . . . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . . . . . . . . . . . . . TOKEN "name" . . . . . . . . . . . . . . . . . . . . . . . Properties: { . . . . . . . . . . . . . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . 0: Name { -. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Value,Identifier,Expression +. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Value,Identifier,Expression . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "child_name" . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 11835 @@ -13557,14 +13125,14 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . 2: keyword { -. . . . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . . . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . . . . . . . . . . . . . Properties: { . . . . . . . . . . . . . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . 0: Name { -. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Value,Identifier,Expression +. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Value,Identifier,Expression . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "child_val_doc" . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 11893 @@ -13584,14 +13152,14 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . 3: keyword { -. . . . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . . . . . . . . . . . . . TOKEN "is_imported" . . . . . . . . . . . . . . . . . . . . . . . Properties: { . . . . . . . . . . . . . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . 0: Name { -. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Value,Identifier,Expression +. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Value,Identifier,Expression . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "True" . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 11960 @@ -13611,14 +13179,14 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . 4: keyword { -. . . . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . . . . . . . . . . . . . TOKEN "container" . . . . . . . . . . . . . . . . . . . . . . . Properties: { . . . . . . . . . . . . . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . 0: Name { -. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Value,Identifier,Expression +. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Value,Identifier,Expression . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "module_doc" . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 12016 @@ -13638,14 +13206,14 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . 5: keyword { -. . . . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . . . . . . . . . . . . . TOKEN "docs_extracted_by" . . . . . . . . . . . . . . . . . . . . . . . Properties: { . . . . . . . . . . . . . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . 0: Str { -. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Call,Argument,Value +. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Argument,Value . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "introspecter" . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 12086 @@ -14398,13 +13966,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "child_var_doc" . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 12397 @@ -14422,13 +13984,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "ModuleDoc" . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 12412 @@ -14908,13 +14464,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "module" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 10215 @@ -15318,13 +14868,7 @@ pyid to C{bool}." . . . } . . . Children: { . . . . 0: arguments { -<<<<<<< HEAD -. . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . Properties: { . . . . . . internalRole: args . . . . . . kwarg: @@ -15503,13 +15047,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "ClassDoc" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 13167 @@ -15674,13 +15212,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "cls" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 13254 @@ -15882,13 +15414,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . 0: ListComp { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,List,For,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,List,For,Expression -======= . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,List,For,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 13420 . . . . . . . . . . . . . . . . . . Line: 340 @@ -15912,13 +15438,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . TOKEN "name" . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . Offset: 13424 @@ -16145,13 +15665,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "cls" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 13358 @@ -16169,13 +15683,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . } . . . . . . . . . . 1: Str { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . TOKEN "__all__" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 13363 @@ -16618,13 +16126,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . 0: Attribute { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Identifier,Expression,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Identifier,Expression,Function,Call,Positional -======= . . . . . . . . . . . . . . . . . Roles: Identifier,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . TOKEN "__bases__" . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 14550 @@ -16770,13 +16272,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . 0: BinOp { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Expression,Binary,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Expression,Binary,Argument,Name,Identifier,Function,Call,Positional -======= . . . . . . . . . . . . . . . . . . . Roles: Expression,Binary,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 14626 . . . . . . . . . . . . . . . . . . . . Line: 367 @@ -16812,13 +16308,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . TOKEN "cls" . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . Offset: 14776 @@ -16836,13 +16326,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . 1: Str { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . . . . . . . . . . . . . TOKEN "__name__" . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . Offset: 14781 @@ -16859,13 +16343,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . 2: Str { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . . . . . . . . . . . . . TOKEN "??" . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . Offset: 14793 @@ -17096,13 +16574,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . TOKEN "base" . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . Offset: 14936 @@ -17163,13 +16635,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . TOKEN "basedoc" . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . Offset: 14981 @@ -17270,13 +16736,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . TOKEN "class_doc" . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . Offset: 15032 @@ -17553,13 +17013,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . . . 0: Attribute { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Identifier,Expression,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Identifier,Expression,Function,Call,Positional -======= . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Identifier,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "__dict__" . . . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 15207 @@ -17654,13 +17108,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . TOKEN "base" . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . Offset: 15142 @@ -17678,13 +17126,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . 1: Str { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . . . . . . . . . . . . . TOKEN "__dict__" . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . Offset: 15148 @@ -17850,13 +17292,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "cls" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 14501 @@ -17874,13 +17310,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . } . . . . . . . . . . 1: Str { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . TOKEN "__bases__" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 14506 @@ -18546,13 +17976,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . TOKEN "cls" . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 15619 @@ -18570,13 +17994,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . 1: Str { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . . . . . . . TOKEN "__name__" . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 15624 @@ -18593,13 +18011,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . 2: Str { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . . . . . . . TOKEN "" . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 15636 @@ -18990,13 +18402,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "private_prefix" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 15926 @@ -19099,13 +18505,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . TOKEN "private_prefix" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 15865 @@ -19343,13 +18743,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . TOKEN "child" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 16047 @@ -19385,14 +18779,14 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . 2: keyword { -. . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . . . . . . . . . TOKEN "context" . . . . . . . . . . . . . . . . . . . Properties: { . . . . . . . . . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . 0: Name { -. . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Value,Identifier,Expression +. . . . . . . . . . . . . . . . . . . . . Roles: Argument,Value,Identifier,Expression . . . . . . . . . . . . . . . . . . . . . TOKEN "class_doc" . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . Offset: 16062 @@ -19412,14 +18806,14 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . 3: keyword { -. . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . . . . . . . . . TOKEN "module_name" . . . . . . . . . . . . . . . . . . . Properties: { . . . . . . . . . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . 0: Name { -. . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Value,Identifier,Expression +. . . . . . . . . . . . . . . . . . . . . Roles: Argument,Value,Identifier,Expression . . . . . . . . . . . . . . . . . . . . . TOKEN "module_name" . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . Offset: 16111 @@ -19500,14 +18894,14 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . 1: keyword { -. . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . . . . . . . . . TOKEN "name" . . . . . . . . . . . . . . . . . . . Properties: { . . . . . . . . . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . 0: Name { -. . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Value,Identifier,Expression +. . . . . . . . . . . . . . . . . . . . . Roles: Argument,Value,Identifier,Expression . . . . . . . . . . . . . . . . . . . . . TOKEN "child_name" . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . Offset: 16175 @@ -19527,14 +18921,14 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . 2: keyword { -. . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . . . . . . . . . Properties: { . . . . . . . . . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . 0: Name { -. . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Value,Identifier,Expression +. . . . . . . . . . . . . . . . . . . . . Roles: Argument,Value,Identifier,Expression . . . . . . . . . . . . . . . . . . . . . TOKEN "val_doc" . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . Offset: 16193 @@ -19554,14 +18948,14 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . 3: keyword { -. . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . . . . . . . . . TOKEN "container" . . . . . . . . . . . . . . . . . . . Properties: { . . . . . . . . . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . 0: Name { -. . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Value,Identifier,Expression +. . . . . . . . . . . . . . . . . . . . . Roles: Argument,Value,Identifier,Expression . . . . . . . . . . . . . . . . . . . . . TOKEN "class_doc" . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . Offset: 16246 @@ -19581,14 +18975,14 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . 4: keyword { -. . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . . . . . . . . . TOKEN "docs_extracted_by" . . . . . . . . . . . . . . . . . . . Properties: { . . . . . . . . . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . 0: Str { -. . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Call,Argument,Value +. . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Argument,Value . . . . . . . . . . . . . . . . . . . . . TOKEN "introspecter" . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . Offset: 16309 @@ -20067,13 +19461,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "cls" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 15558 @@ -20091,13 +19479,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . } . . . . . . . . . . 1: Str { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . TOKEN "__dict__" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 15563 @@ -20224,13 +19606,7 @@ pyid to C{bool}." . . . } . . . Children: { . . . . 0: arguments { -<<<<<<< HEAD -. . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . Properties: { . . . . . . internalRole: args . . . . . . kwarg: @@ -20459,13 +19835,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "RoutineDoc" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 16884 @@ -20673,13 +20043,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . 0: Num { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Literal,Number,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Literal,Number,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . . . . . . . . . Roles: Literal,Number,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . . . . . . . . . Roles: Literal,Number,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . . . . . . . . . TOKEN "0" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 17084 @@ -20818,13 +20182,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . 0: Num { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,Number,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,Number,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,Number,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,Number,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "0" . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 17161 @@ -20954,13 +20312,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . TOKEN "routine" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 17107 @@ -20978,13 +20330,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . TOKEN "classmethod" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 17116 @@ -21039,13 +20385,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . TOKEN "routine" . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 17029 @@ -21063,13 +20403,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . } . . . . . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . TOKEN "staticmethod" . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 17038 @@ -21124,13 +20458,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "routine" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 16956 @@ -21148,13 +20476,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . } . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "MethodType" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 16965 @@ -21345,13 +20667,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "func" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 17287 @@ -21518,13 +20834,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . TOKEN "func" . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 17433 @@ -21976,13 +21286,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . TOKEN "args" . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 17679 @@ -22101,13 +21405,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . TOKEN "args" . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . Offset: 17743 @@ -22158,13 +21456,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . TOKEN "defaults" . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . Offset: 17753 @@ -22272,13 +21564,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . 0: Subscript { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Expression,Incomplete -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Expression,Incomplete -======= . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Expression,Incomplete ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . Offset: 17852 . . . . . . . . . . . . . . . . . . . . . . . . Line: 446 @@ -22517,13 +21803,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . 0: Call { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Function,Call,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Function,Call,Expression -======= . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Function,Call,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 17790 . . . . . . . . . . . . . . . . . . . . Line: 445 @@ -22536,13 +21816,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . TOKEN "defaults" . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . Offset: 17794 @@ -22992,13 +22266,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . TOKEN "routine" . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 18025 @@ -23016,13 +22284,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . TOKEN "MethodType" . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 18034 @@ -23345,13 +22607,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . TOKEN "func" . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 18272 @@ -23369,13 +22625,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . } . . . . . . . . . . . . . . 1: Str { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . . . . . TOKEN "func_code" . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 18278 @@ -23859,13 +23109,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "func" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 17351 @@ -23883,13 +23127,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . } . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "FunctionType" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 17357 @@ -24016,13 +23254,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . TOKEN "StaticMethodDoc" . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 18840 @@ -24097,13 +23329,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "routine" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 18782 @@ -24121,13 +23347,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . } . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "staticmethod" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 18791 @@ -24254,13 +23474,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . TOKEN "ClassMethodDoc" . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 18932 @@ -24335,13 +23549,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "routine" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 18875 @@ -24359,13 +23567,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . } . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "classmethod" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 18884 @@ -24493,13 +23695,7 @@ pyid to C{bool}." . . . } . . . Children: { . . . . 0: arguments { -<<<<<<< HEAD -. . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . Properties: { . . . . . . internalRole: args . . . . . . kwarg: @@ -24728,13 +23924,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "PropertyDoc" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 19344 @@ -24899,13 +24089,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "prop" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 19436 @@ -24941,14 +24125,14 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . } . . . . . . . . . . 2: keyword { -. . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . TOKEN "module_name" . . . . . . . . . . . Properties: { . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . } . . . . . . . . . . . Children: { . . . . . . . . . . . . 0: Name { -. . . . . . . . . . . . . Roles: Call,Argument,Value,Identifier,Expression +. . . . . . . . . . . . . Roles: Argument,Value,Identifier,Expression . . . . . . . . . . . . . TOKEN "module_name" . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 19442 @@ -25051,13 +24235,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . 0: Attribute { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Identifier,Expression,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Identifier,Expression,Function,Call,Positional -======= . . . . . . . . . . . . . . . Roles: Identifier,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . TOKEN "fget" . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 19589 @@ -25176,13 +24354,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . 0: Attribute { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Identifier,Expression,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Identifier,Expression,Function,Call,Positional -======= . . . . . . . . . . . . . . . Roles: Identifier,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . TOKEN "fset" . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 19640 @@ -25301,13 +24473,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . 0: Attribute { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Identifier,Expression,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Identifier,Expression,Function,Call,Positional -======= . . . . . . . . . . . . . . . Roles: Identifier,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . TOKEN "fdel" . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 19691 @@ -25382,13 +24548,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "prop" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 19529 @@ -25406,13 +24566,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . } . . . . . . . . . . 1: Str { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . TOKEN "fget" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 19535 @@ -25585,13 +24739,7 @@ pyid to C{bool}." . . . } . . . Children: { . . . . 0: arguments { -<<<<<<< HEAD -. . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . Properties: { . . . . . . internalRole: args . . . . . . kwarg: @@ -25819,13 +24967,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "GenericValueDoc" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 20026 @@ -25940,13 +25082,7 @@ pyid to C{bool}." . . . } . . . Children: { . . . . 0: arguments { -<<<<<<< HEAD -. . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . Properties: { . . . . . . internalRole: args . . . . . . kwarg: @@ -26127,13 +25263,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "object" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 20704 @@ -26151,13 +25281,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . } . . . . . . . . . . 1: Call { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Function,Call,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Function,Call,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Function,Call,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 20712 . . . . . . . . . . . . Line: 519 @@ -26170,13 +25294,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . . Children: { . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . TOKEN "_CLASS_TYPES" . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 20718 @@ -26315,13 +25433,7 @@ pyid to C{bool}." . . . . . } . . . . . Children: { . . . . . . 0: List { -<<<<<<< HEAD -. . . . . . . Roles: Literal,List,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . Roles: Literal,List,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . Roles: Literal,List,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . Roles: Literal,List,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . StartPosition: { . . . . . . . . Offset: 20753 . . . . . . . . Line: 521 @@ -26440,13 +25552,7 @@ pyid to C{bool}." . . . } . . . Children: { . . . . 0: arguments { -<<<<<<< HEAD -. . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . Properties: { . . . . . . internalRole: args . . . . . . kwarg: @@ -26563,13 +25669,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "typ" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 21033 @@ -26732,13 +25832,7 @@ pyid to C{bool}." . . . } . . . Children: { . . . . 0: arguments { -<<<<<<< HEAD -. . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . Properties: { . . . . . . internalRole: args . . . . . . kwarg: @@ -26986,13 +26080,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . TOKEN "object" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 21451 @@ -27010,13 +26098,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . 1: Attribute { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Identifier,Expression,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Identifier,Expression,Function,Call,Positional -======= . . . . . . . . . . . . . . . . . . . Roles: Identifier,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . TOKEN "_Feature" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 21470 @@ -27232,13 +26314,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . TOKEN "object" . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 21615 @@ -27364,13 +26440,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . 0: Str { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . . . . . . . . . TOKEN "Troubles inspecting __future__. Python implementation may have been changed." . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 21704 @@ -27558,13 +26628,7 @@ pyid to C{bool}." . . . } . . . Children: { . . . . 0: arguments { -<<<<<<< HEAD -. . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . Properties: { . . . . . . internalRole: args . . . . . . kwarg: @@ -27744,13 +26808,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 22038 @@ -27768,13 +26826,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . } . . . . . . . . . . 1: Str { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . TOKEN "__doc__" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 22045 @@ -27791,13 +26843,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . } . . . . . . . . . . 2: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "None" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 22056 @@ -28009,13 +27055,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "docstring" . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 22239 @@ -28033,13 +27073,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . 1: Str { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "ascii" . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 22250 @@ -28152,13 +27186,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 22382 @@ -28343,13 +27371,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "module_name" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 22499 @@ -28431,13 +27453,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 0: Attribute { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Identifier,Expression,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Identifier,Expression,Function,Call,Positional -======= . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Identifier,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "__file__" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 22566 @@ -28539,13 +27555,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "filename" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 22644 @@ -28655,13 +27665,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "docstring" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 22689 @@ -28679,13 +27683,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "encoding" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 22700 @@ -29036,13 +28034,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 22892 @@ -29097,13 +28089,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 22820 @@ -29121,13 +28107,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . . 1: Str { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "__name__" . . . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 22827 @@ -29190,13 +28170,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . . . 0: BinOp { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Expression,Binary,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Expression,Binary,Argument,Name,Identifier,Function,Call,Positional -======= . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Expression,Binary,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 22923 . . . . . . . . . . . . . . . . . . . . . . . . . . . . Line: 581 @@ -29318,13 +28292,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "docstring" . . . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 23112 @@ -29342,13 +28310,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . . 1: Str { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "latin-1" . . . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 23123 @@ -29674,13 +28636,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 23363 @@ -29735,13 +28691,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 23295 @@ -29759,13 +28709,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . . 1: Str { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "__name__" . . . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 23302 @@ -29825,13 +28769,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . . . 0: BinOp { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Expression,Binary,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Expression,Binary,Argument,Name,Identifier,Function,Call,Positional -======= . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Expression,Binary,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 23390 . . . . . . . . . . . . . . . . . . . . . . . . . . . . Line: 592 @@ -30049,13 +28987,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . TOKEN "docstring" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 22194 @@ -30073,13 +29005,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . TOKEN "str" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 22205 @@ -30134,13 +29060,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . TOKEN "docstring" . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 22128 @@ -30158,13 +29078,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . } . . . . . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . TOKEN "unicode" . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 22139 @@ -30297,13 +29211,7 @@ pyid to C{bool}." . . . } . . . Children: { . . . . 0: arguments { -<<<<<<< HEAD -. . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . Properties: { . . . . . . internalRole: args . . . . . . kwarg: @@ -30528,13 +29436,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . . Children: { . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 23905 @@ -30552,13 +29454,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . } . . . . . . . . . . . . 1: Str { -<<<<<<< HEAD -. . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . . . TOKEN "__name__" . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 23912 @@ -30676,13 +29572,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . 0: Attribute { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Identifier,Expression,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Identifier,Expression,Function,Call,Positional -======= . . . . . . . . . . . . . . . . . Roles: Identifier,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . TOKEN "__name__" . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 24073 @@ -30738,14 +29628,14 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . 2: keyword { -. . . . . . . . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . . . . . . . TOKEN "strict" . . . . . . . . . . . . . . . . . Properties: { . . . . . . . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . 0: Name { -. . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Value,Identifier,Expression +. . . . . . . . . . . . . . . . . . . Roles: Argument,Value,Identifier,Expression . . . . . . . . . . . . . . . . . . . TOKEN "strict" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 24083 @@ -30813,13 +29703,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . 0: BinOp { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . Roles: Expression,Binary,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . Roles: Expression,Binary,Argument,Name,Identifier,Function,Call,Positional -======= . . . . . . . . . . . . . . . . . . . . . Roles: Expression,Binary,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . Offset: 24382 . . . . . . . . . . . . . . . . . . . . . . Line: 616 @@ -30938,13 +29822,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . 0: BinOp { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . Roles: Expression,Binary,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . Roles: Expression,Binary,Argument,Name,Identifier,Function,Call,Positional -======= . . . . . . . . . . . . . . . . . . . . . Roles: Expression,Binary,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . Offset: 24586 . . . . . . . . . . . . . . . . . . . . . . Line: 619 @@ -31125,13 +30003,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 24322 @@ -31149,13 +30021,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . TOKEN "dotted_name" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 24329 @@ -31445,13 +30311,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . 0: Call { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Function,Call,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Function,Call,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Function,Call,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . Offset: 24855 . . . . . . . . . . . . . . . . . . . . . . . . Line: 624 @@ -31464,13 +30324,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "filename" . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 24873 @@ -31545,13 +30399,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 24746 @@ -31569,13 +30417,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . 1: Str { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . . . . . . . . . TOKEN "__file__" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 24753 @@ -31771,13 +30613,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . 0: Attribute { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Identifier,Expression,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Identifier,Expression,Function,Call,Positional -======= . . . . . . . . . . . . . . . . . . . . . . . Roles: Identifier,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . TOKEN "__name__" . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . Offset: 25007 @@ -31833,14 +30669,14 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . 2: keyword { -. . . . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . . . . . . . . . . . . . TOKEN "strict" . . . . . . . . . . . . . . . . . . . . . . . Properties: { . . . . . . . . . . . . . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . 0: Name { -. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Value,Identifier,Expression +. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Value,Identifier,Expression . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "strict" . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 25017 @@ -31911,13 +30747,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . 0: Attribute { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Identifier,Expression,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Identifier,Expression,Function,Call,Positional -======= . . . . . . . . . . . . . . . . . . . . . . . Roles: Identifier,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . TOKEN "__module__" . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . Offset: 25089 @@ -31955,13 +30785,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . 1: Attribute { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Identifier,Expression,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Identifier,Expression,Function,Call,Positional -======= . . . . . . . . . . . . . . . . . . . . . . . Roles: Identifier,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . TOKEN "__name__" . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . Offset: 25107 @@ -32017,14 +30841,14 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . 3: keyword { -. . . . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . . . . . . . . . . . . . TOKEN "strict" . . . . . . . . . . . . . . . . . . . . . . . Properties: { . . . . . . . . . . . . . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . 0: Name { -. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Value,Identifier,Expression +. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Value,Identifier,Expression . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "strict" . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 25154 @@ -32199,13 +31023,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . 0: Attribute { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Identifier,Expression,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Identifier,Expression,Function,Call,Positional -======= . . . . . . . . . . . . . . . . . . . . . . . Roles: Identifier,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . TOKEN "im_self" . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . Offset: 25401 @@ -32430,13 +31248,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . TOKEN "class_name" . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . Offset: 25492 @@ -32454,13 +31266,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . 1: Attribute { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Identifier,Expression,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Identifier,Expression,Function,Call,Positional -======= . . . . . . . . . . . . . . . . . . . . . . . Roles: Identifier,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . TOKEN "__name__" . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . Offset: 25510 @@ -32516,14 +31322,14 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . 3: keyword { -. . . . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . . . . . . . . . . . . . TOKEN "strict" . . . . . . . . . . . . . . . . . . . . . . . Properties: { . . . . . . . . . . . . . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . 0: Name { -. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Value,Identifier,Expression +. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Value,Identifier,Expression . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "strict" . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 25520 @@ -32609,13 +31415,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . . . 0: Attribute { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Identifier,Expression,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Identifier,Expression,Function,Call,Positional -======= . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Identifier,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "im_class" . . . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 25666 @@ -32840,13 +31640,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "class_name" . . . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 25758 @@ -32864,13 +31658,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . . 1: Attribute { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Identifier,Expression,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Identifier,Expression,Function,Call,Positional -======= . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Identifier,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "__name__" . . . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 25776 @@ -32926,14 +31714,14 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . . 3: keyword { -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "strict" . . . . . . . . . . . . . . . . . . . . . . . . . . . Properties: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . 0: Name { -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Value,Identifier,Expression +. . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Value,Identifier,Expression . . . . . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "strict" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 25786 @@ -33019,13 +31807,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 25938 @@ -33230,13 +32012,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "module_name" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 26025 @@ -33254,13 +32030,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 1: Attribute { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Identifier,Expression,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Identifier,Expression,Function,Call,Positional -======= . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Identifier,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "__name__" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 26044 @@ -33316,14 +32086,14 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 3: keyword { -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "strict" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Properties: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . internalRole: keywords . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 0: Name { -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Call,Argument,Value,Identifier,Expression +. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Value,Identifier,Expression . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "strict" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 26054 @@ -33415,13 +32185,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 25822 @@ -33439,13 +32203,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "FunctionType" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 25829 @@ -33507,13 +32265,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 0: Str { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "<" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 25887 @@ -33635,13 +32387,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 25562 @@ -33723,13 +32469,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . . . 0: Str { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "<" . . . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 25613 @@ -33851,13 +32591,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . Offset: 25209 @@ -34148,13 +32882,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . 0: Str { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . . . . . . . . . . . . . TOKEN "<" . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . Offset: 25332 @@ -34284,13 +33012,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 24910 @@ -34378,13 +33100,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 23997 @@ -34402,13 +33118,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . } . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "ModuleType" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 24004 @@ -34521,13 +33231,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 26126 @@ -34545,13 +33249,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . } . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "dotted_name" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 26133 @@ -34645,13 +33343,7 @@ pyid to C{bool}." . . . } . . . Children: { . . . . 0: arguments { -<<<<<<< HEAD -. . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . Properties: { . . . . . . internalRole: args . . . . . . kwarg: @@ -35005,13 +33697,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . TOKEN "dotted_name" . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 26376 @@ -35076,13 +33762,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . . Children: { . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . TOKEN "__builtin__" . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 26406 @@ -35100,13 +33780,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . } . . . . . . . . . . . . 1: Subscript { -<<<<<<< HEAD -. . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Expression,Incomplete -||||||| merged common ancestors -. . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Expression,Incomplete -======= . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Expression,Incomplete ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 26419 . . . . . . . . . . . . . . Line: 660 @@ -35232,13 +33906,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Subscript { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Expression,Incomplete -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Expression,Incomplete -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Expression,Incomplete ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 26497 . . . . . . . . . . . . Line: 662 @@ -35553,13 +34221,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . TOKEN "named_value" . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 26630 @@ -35577,13 +34239,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . TOKEN "identifier" . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 26643 @@ -35947,13 +34603,7 @@ pyid to C{bool}." . . . } . . . Children: { . . . . 0: arguments { -<<<<<<< HEAD -. . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . Properties: { . . . . . . internalRole: args . . . . . . kwarg: @@ -36189,13 +34839,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . TOKEN "s" . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 26926 @@ -36250,13 +34894,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . . Children: { . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . TOKEN "s" . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 26872 @@ -36274,13 +34912,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . } . . . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . TOKEN "str" . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 26875 @@ -36432,13 +35064,7 @@ pyid to C{bool}." . . . } . . . Children: { . . . . 0: arguments { -<<<<<<< HEAD -. . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . Properties: { . . . . . . internalRole: args . . . . . . kwarg: @@ -36583,13 +35209,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . 0: Attribute { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Identifier,Expression,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Identifier,Expression,Function,Call,Positional -======= . . . . . . . . . . . . . . . Roles: Identifier,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . TOKEN "__name__" . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 27239 @@ -36699,13 +35319,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . 0: Attribute { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Identifier,Expression,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Identifier,Expression,Function,Call,Positional -======= . . . . . . . . . . . . . . . . . . . Roles: Identifier,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . TOKEN "__module__" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 27306 @@ -36815,13 +35429,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . 0: Attribute { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Identifier,Expression,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Identifier,Expression,Function,Call,Positional -======= . . . . . . . . . . . . . . . . . . . . . . . Roles: Identifier,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . TOKEN "__module__" . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . Offset: 27482 @@ -36951,13 +35559,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . . . 0: Attribute { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Identifier,Expression,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Identifier,Expression,Function,Call,Positional -======= . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Identifier,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "__module__" . . . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 27569 @@ -37099,13 +35701,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 27655 @@ -37298,13 +35894,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "module" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 27727 @@ -37401,13 +35991,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 27608 @@ -37482,13 +36066,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . Offset: 27520 @@ -37574,13 +36152,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . Offset: 27345 @@ -37858,13 +36430,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 27266 @@ -37919,13 +36485,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 27199 @@ -38006,13 +36566,7 @@ pyid to C{bool}." . . . } . . . Children: { . . . . 0: arguments { -<<<<<<< HEAD -. . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . Properties: { . . . . . . internalRole: args . . . . . . kwarg: @@ -38200,13 +36754,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "func" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 27997 @@ -38224,13 +36772,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . } . . . . . . . . . . 1: Str { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . TOKEN "__module__" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 28003 @@ -38319,13 +36861,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . . Children: { . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . TOKEN "func" . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 28093 @@ -38690,13 +37226,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . TOKEN "module" . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 28520 @@ -38714,13 +37244,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . 1: Str { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . . . . . . . TOKEN "__dict__" . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 28528 @@ -38770,13 +37294,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . TOKEN "func" . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 28564 @@ -38794,13 +37312,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . 1: Str { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . . . . . . . TOKEN "func_globals" . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 28570 @@ -39318,13 +37830,7 @@ pyid to C{bool}." . . . } . . . Children: { . . . . 0: arguments { -<<<<<<< HEAD -. . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . Properties: { . . . . . . internalRole: args . . . . . . kwarg: @@ -39480,13 +37986,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Tuple { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Literal,Tuple,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . Roles: Literal,Tuple,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . Roles: Literal,Tuple,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . Roles: Literal,Tuple,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 29849 . . . . . . . . . . . . Line: 753 @@ -39680,13 +38180,7 @@ pyid to C{bool}." . . . } . . . Children: { . . . . 0: arguments { -<<<<<<< HEAD -. . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . Properties: { . . . . . . internalRole: args . . . . . . kwarg: @@ -39842,13 +38336,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . TOKEN "value" . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 30110 @@ -40041,13 +38529,7 @@ pyid to C{bool}." . . . } . . . Children: { . . . . 0: arguments { -<<<<<<< HEAD -. . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . Properties: { . . . . . . internalRole: args . . . . . . kwarg: @@ -40154,13 +38636,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "v" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 30282 @@ -40178,13 +38654,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . } . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "classmethod" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 30285 @@ -40245,13 +38715,7 @@ pyid to C{bool}." . . . } . . . Children: { . . . . 0: arguments { -<<<<<<< HEAD -. . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . Properties: { . . . . . . internalRole: args . . . . . . kwarg: @@ -40312,13 +38776,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "v" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 30340 @@ -40336,13 +38794,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . } . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "staticmethod" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 30343 @@ -40403,13 +38855,7 @@ pyid to C{bool}." . . . } . . . Children: { . . . . 0: arguments { -<<<<<<< HEAD -. . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . Properties: { . . . . . . internalRole: args . . . . . . kwarg: @@ -40470,13 +38916,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "v" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 30395 @@ -40494,13 +38934,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . } . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "property" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 30398 @@ -40568,13 +39002,7 @@ pyid to C{bool}." . . . . . } . . . . . Children: { . . . . . . 0: Attribute { -<<<<<<< HEAD -. . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Identifier,Expression,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . Roles: Argument,Name,Identifier,Identifier,Expression,Function,Call,Positional -======= . . . . . . . Roles: Identifier,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . TOKEN "ismodule" . . . . . . . StartPosition: { . . . . . . . . Offset: 30438 @@ -40612,13 +39040,7 @@ pyid to C{bool}." . . . . . . . } . . . . . . } . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . TOKEN "introspect_module" . . . . . . . StartPosition: { . . . . . . . . Offset: 30448 @@ -40654,14 +39076,14 @@ pyid to C{bool}." . . . . . . . } . . . . . . } . . . . . . 3: keyword { -. . . . . . . Roles: Call,Argument,Name +. . . . . . . Roles: Function,Call,Argument,Name . . . . . . . TOKEN "priority" . . . . . . . Properties: { . . . . . . . . internalRole: keywords . . . . . . . } . . . . . . . Children: { . . . . . . . . 0: Num { -. . . . . . . . . Roles: Literal,Number,Expression,Primitive,Call,Argument,Value +. . . . . . . . . Roles: Literal,Number,Expression,Primitive,Argument,Value . . . . . . . . . TOKEN "20" . . . . . . . . . StartPosition: { . . . . . . . . . . Offset: 30476 @@ -40708,13 +39130,7 @@ pyid to C{bool}." . . . . . } . . . . . Children: { . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . TOKEN "isclass" . . . . . . . StartPosition: { . . . . . . . . Offset: 30502 @@ -40732,13 +39148,7 @@ pyid to C{bool}." . . . . . . . } . . . . . . } . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . TOKEN "introspect_class" . . . . . . . StartPosition: { . . . . . . . . Offset: 30511 @@ -40774,14 +39184,14 @@ pyid to C{bool}." . . . . . . . } . . . . . . } . . . . . . 3: keyword { -. . . . . . . Roles: Call,Argument,Name +. . . . . . . Roles: Function,Call,Argument,Name . . . . . . . TOKEN "priority" . . . . . . . Properties: { . . . . . . . . internalRole: keywords . . . . . . . } . . . . . . . Children: { . . . . . . . . 0: Num { -. . . . . . . . . Roles: Literal,Number,Expression,Primitive,Call,Argument,Value +. . . . . . . . . Roles: Literal,Number,Expression,Primitive,Argument,Value . . . . . . . . . TOKEN "24" . . . . . . . . . StartPosition: { . . . . . . . . . . Offset: 30538 @@ -40828,13 +39238,7 @@ pyid to C{bool}." . . . . . } . . . . . Children: { . . . . . . 0: Attribute { -<<<<<<< HEAD -. . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Identifier,Expression,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . Roles: Argument,Name,Identifier,Identifier,Expression,Function,Call,Positional -======= . . . . . . . Roles: Identifier,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . TOKEN "isroutine" . . . . . . . StartPosition: { . . . . . . . . Offset: 30572 @@ -40872,13 +39276,7 @@ pyid to C{bool}." . . . . . . . } . . . . . . } . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . TOKEN "introspect_routine" . . . . . . . StartPosition: { . . . . . . . . Offset: 30583 @@ -40914,14 +39312,14 @@ pyid to C{bool}." . . . . . . . } . . . . . . } . . . . . . 3: keyword { -. . . . . . . Roles: Call,Argument,Name +. . . . . . . Roles: Function,Call,Argument,Name . . . . . . . TOKEN "priority" . . . . . . . Properties: { . . . . . . . . internalRole: keywords . . . . . . . } . . . . . . . Children: { . . . . . . . . 0: Num { -. . . . . . . . . Roles: Literal,Number,Expression,Primitive,Call,Argument,Value +. . . . . . . . . Roles: Literal,Number,Expression,Primitive,Argument,Value . . . . . . . . . TOKEN "28" . . . . . . . . . StartPosition: { . . . . . . . . . . Offset: 30612 @@ -40968,13 +39366,7 @@ pyid to C{bool}." . . . . . } . . . . . Children: { . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . TOKEN "is_property" . . . . . . . StartPosition: { . . . . . . . . Offset: 30638 @@ -40992,13 +39384,7 @@ pyid to C{bool}." . . . . . . . } . . . . . . } . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . TOKEN "introspect_property" . . . . . . . StartPosition: { . . . . . . . . Offset: 30651 @@ -41034,14 +39420,14 @@ pyid to C{bool}." . . . . . . . } . . . . . . } . . . . . . 3: keyword { -. . . . . . . Roles: Call,Argument,Name +. . . . . . . Roles: Function,Call,Argument,Name . . . . . . . TOKEN "priority" . . . . . . . Properties: { . . . . . . . . internalRole: keywords . . . . . . . } . . . . . . . Children: { . . . . . . . . 0: Num { -. . . . . . . . . Roles: Literal,Number,Expression,Primitive,Call,Argument,Value +. . . . . . . . . Roles: Literal,Number,Expression,Primitive,Argument,Value . . . . . . . . . TOKEN "30" . . . . . . . . . StartPosition: { . . . . . . . . . . Offset: 30681 @@ -41182,13 +39568,7 @@ pyid to C{bool}." . . . . . . . } . . . . . . . Children: { . . . . . . . . 0: Attribute { -<<<<<<< HEAD -. . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Identifier,Expression,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . Roles: Argument,Name,Identifier,Identifier,Expression,Function,Call,Positional -======= . . . . . . . . . Roles: Identifier,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . TOKEN "typecode" . . . . . . . . . StartPosition: { . . . . . . . . . . Offset: 30786 @@ -41322,13 +39702,7 @@ pyid to C{bool}." . . . . . } . . . . . Children: { . . . . . . 0: arguments { -<<<<<<< HEAD -. . . . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . Properties: { . . . . . . . . internalRole: args . . . . . . . . kwarg: @@ -41389,13 +39763,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . . Children: { . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . TOKEN "v" . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 30850 @@ -41413,13 +39781,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . } . . . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . TOKEN "getset_type" . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 30853 @@ -41487,13 +39849,7 @@ pyid to C{bool}." . . . . . . . } . . . . . . . Children: { . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . TOKEN "is_getset" . . . . . . . . . StartPosition: { . . . . . . . . . . Offset: 30892 @@ -41511,13 +39867,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . } . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . TOKEN "introspect_property" . . . . . . . . . StartPosition: { . . . . . . . . . . Offset: 30903 @@ -41553,14 +39903,14 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . } . . . . . . . . 3: keyword { -. . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . TOKEN "priority" . . . . . . . . . Properties: { . . . . . . . . . . internalRole: keywords . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Num { -. . . . . . . . . . . Roles: Literal,Number,Expression,Primitive,Call,Argument,Value +. . . . . . . . . . . Roles: Literal,Number,Expression,Primitive,Argument,Value . . . . . . . . . . . TOKEN "32" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 30933 @@ -41735,13 +40085,7 @@ pyid to C{bool}." . . . . . . . } . . . . . . . Children: { . . . . . . . . 0: Attribute { -<<<<<<< HEAD -. . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Identifier,Expression,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . Roles: Argument,Name,Identifier,Identifier,Expression,Function,Call,Positional -======= . . . . . . . . . Roles: Identifier,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . TOKEN "days" . . . . . . . . . StartPosition: { . . . . . . . . . . Offset: 31065 @@ -41875,13 +40219,7 @@ pyid to C{bool}." . . . . . } . . . . . Children: { . . . . . . 0: arguments { -<<<<<<< HEAD -. . . . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . Properties: { . . . . . . . . internalRole: args . . . . . . . . kwarg: @@ -41942,13 +40280,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . . Children: { . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . TOKEN "v" . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 31128 @@ -41966,13 +40298,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . } . . . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . TOKEN "member_type" . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 31131 @@ -42040,13 +40366,7 @@ pyid to C{bool}." . . . . . . . } . . . . . . . Children: { . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . TOKEN "is_member" . . . . . . . . . StartPosition: { . . . . . . . . . . Offset: 31170 @@ -42064,13 +40384,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . } . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . TOKEN "introspect_property" . . . . . . . . . StartPosition: { . . . . . . . . . . Offset: 31181 @@ -42106,14 +40420,14 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . } . . . . . . . . 3: keyword { -. . . . . . . . . Roles: Call,Argument,Name +. . . . . . . . . Roles: Function,Call,Argument,Name . . . . . . . . . TOKEN "priority" . . . . . . . . . Properties: { . . . . . . . . . . internalRole: keywords . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Num { -. . . . . . . . . . . Roles: Literal,Number,Expression,Primitive,Call,Argument,Value +. . . . . . . . . . . Roles: Literal,Number,Expression,Primitive,Argument,Value . . . . . . . . . . . TOKEN "34" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 31211 @@ -42187,13 +40501,7 @@ pyid to C{bool}." . . . } . . . Children: { . . . . 0: arguments { -<<<<<<< HEAD -. . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . Properties: { . . . . . . internalRole: args . . . . . . kwarg: @@ -42427,13 +40735,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Call { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Function,Call,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Function,Call,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Function,Call,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 31490 . . . . . . . . . . . . Line: 799 @@ -42446,13 +40748,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . . Children: { . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . TOKEN "filename" . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 31506 @@ -42740,13 +41036,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . . Children: { . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . TOKEN "filename" . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 31719 @@ -42904,13 +41194,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . . Children: { . . . . . . . . . . . . 0: Subscript { -<<<<<<< HEAD -. . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Expression,Incomplete -||||||| merged common ancestors -. . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Expression,Incomplete -======= . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Expression,Incomplete ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 31760 . . . . . . . . . . . . . . Line: 805 @@ -42960,13 +41244,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . TOKEN "filename" . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 31774 @@ -43201,13 +41479,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . TOKEN "basedir" . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 31856 @@ -43395,13 +41667,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "name" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 31887 @@ -43552,13 +41818,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . TOKEN "basedir" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 32415 @@ -43677,13 +41937,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . TOKEN "pkg_name" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 32454 @@ -43701,13 +41955,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . TOKEN "name" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 32464 @@ -43762,13 +42010,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . TOKEN "basedir" . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 32359 @@ -44083,13 +42325,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . 0: Attribute { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Identifier,Expression,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Identifier,Expression,Function,Call,Positional -======= . . . . . . . . . . . . . . . Roles: Identifier,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . TOKEN "canonical_name" . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 32712 @@ -44127,13 +42363,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . } . . . . . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . TOKEN "name" . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 32728 @@ -44269,13 +42499,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . 0: Attribute { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Identifier,Expression,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Identifier,Expression,Function,Call,Positional -======= . . . . . . . . . . . . . . . . . . . . . Roles: Identifier,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . TOKEN "filename" . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . Offset: 32874 @@ -44453,13 +42677,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . TOKEN "pkg_dir" . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . Offset: 32923 @@ -45068,13 +43286,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . . Children: { . . . . . . . . . . . . 0: Num { -<<<<<<< HEAD -. . . . . . . . . . . . . Roles: Literal,Number,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . Roles: Literal,Number,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . . . Roles: Literal,Number,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . . . Roles: Literal,Number,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . . . TOKEN "0" . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 33243 @@ -45091,13 +43303,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . } . . . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . TOKEN "basedir" . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 33246 @@ -45201,13 +43407,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . . Children: { . . . . . . . . . . . . 0: Call { -<<<<<<< HEAD -. . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Function,Call,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Function,Call,Expression -======= . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Function,Call,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 33405 . . . . . . . . . . . . . . Line: 840 @@ -45220,13 +43420,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . TOKEN "name" . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 33409 @@ -45400,13 +43594,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . TOKEN "name" . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . Offset: 33488 @@ -45523,13 +43711,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . TOKEN "name" . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 33619 @@ -45673,13 +43855,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . TOKEN "name" . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 33431 @@ -45825,13 +44001,7 @@ pyid to C{bool}." . . . } . . . Children: { . . . . 0: arguments { -<<<<<<< HEAD -. . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . Properties: { . . . . . . internalRole: args . . . . . . kwarg: @@ -45937,13 +44107,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "filename" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 33741 @@ -46010,13 +44174,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "name" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 33770 @@ -46034,13 +44192,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . } . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "filename" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 33776 @@ -46101,13 +44253,7 @@ pyid to C{bool}." . . . } . . . Children: { . . . . 0: arguments { -<<<<<<< HEAD -. . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . Properties: { . . . . . . internalRole: args . . . . . . kwarg: @@ -46288,13 +44434,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "name" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 34061 @@ -46443,13 +44583,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . . Children: { . . . . . . . . . . . . 0: Subscript { -<<<<<<< HEAD -. . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Expression,Incomplete -||||||| merged common ancestors -. . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Expression,Incomplete -======= . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Expression,Incomplete ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 34216 . . . . . . . . . . . . . . Line: 865 @@ -46761,13 +44895,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . 0: Subscript { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Expression,Incomplete -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Expression,Incomplete -======= . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Expression,Incomplete ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . Offset: 34368 . . . . . . . . . . . . . . . . . . . . . . Line: 869 @@ -46864,13 +44992,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . 1: Subscript { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Expression,Incomplete -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Expression,Incomplete -======= . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Expression,Incomplete ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . Offset: 34384 . . . . . . . . . . . . . . . . . . . . . . Line: 869 @@ -47243,13 +45365,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . TOKEN "module" . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 34589 @@ -47267,13 +45383,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . 1: Subscript { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Expression,Incomplete -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Expression,Incomplete -======= . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Expression,Incomplete ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 34597 . . . . . . . . . . . . . . . . . . Line: 876 @@ -47445,13 +45555,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . 0: Call { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Function,Call,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Function,Call,Expression -======= . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Function,Call,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 34665 . . . . . . . . . . . . . . . . Line: 878 @@ -47464,13 +45568,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . 0: Subscript { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Expression,Incomplete -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Expression,Incomplete -======= . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Expression,Incomplete ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 34674 . . . . . . . . . . . . . . . . . . Line: 878 @@ -47667,13 +45765,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . TOKEN "module" . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 34712 @@ -47691,13 +45783,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . } . . . . . . . . . . . . . . 1: Subscript { -<<<<<<< HEAD -. . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Expression,Incomplete -||||||| merged common ancestors -. . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Expression,Incomplete -======= . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Expression,Incomplete ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . Offset: 34720 . . . . . . . . . . . . . . . . Line: 879 @@ -47847,13 +45933,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Num { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Literal,Number,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . Roles: Literal,Number,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . Roles: Literal,Number,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . Roles: Literal,Number,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . TOKEN "1" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 34546 @@ -47870,13 +45950,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . } . . . . . . . . . . 1: Call { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Function,Call,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Function,Call,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Function,Call,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 34549 . . . . . . . . . . . . Line: 875 @@ -47889,13 +45963,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . . Children: { . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . TOKEN "name" . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 34553 @@ -48074,13 +46142,7 @@ pyid to C{bool}." . . . } . . . Children: { . . . . 0: arguments { -<<<<<<< HEAD -. . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . Properties: { . . . . . . internalRole: args . . . . . . kwarg: @@ -48281,13 +46343,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . TOKEN "val" . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 34865 @@ -48305,13 +46361,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . TOKEN "identifier" . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 34870 @@ -48463,13 +46513,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . 0: Subscript { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Expression,Incomplete -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Expression,Incomplete -======= . . . . . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Expression,Incomplete ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . Offset: 35012 . . . . . . . . . . . . . . . . . . . . . . . . Line: 888 @@ -48650,13 +46694,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . TOKEN "exc_msg" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 35056 @@ -48733,13 +46771,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . TOKEN "name" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 34831 @@ -48884,13 +46916,7 @@ pyid to C{bool}." . . . } . . . Children: { . . . . 0: arguments { -<<<<<<< HEAD -. . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . Properties: { . . . . . . internalRole: args . . . . . . kwarg: @@ -49402,13 +47428,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Str { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 35896 . . . . . . . . . . . . Line: 909 @@ -50108,13 +48128,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . TOKEN "name" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 36273 @@ -50189,13 +48203,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . TOKEN "name" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 36377 @@ -50213,13 +48221,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . TOKEN "filename" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 36383 @@ -51248,13 +49250,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . TOKEN "estr" . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 36796 @@ -51441,13 +49437,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . . Children: { . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . TOKEN "old_builtins" . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 36942 @@ -51637,13 +49627,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . . Children: { . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . TOKEN "old_sys" . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 37013 @@ -51815,13 +49799,7 @@ pyid to C{bool}." . . . } . . . Children: { . . . . 0: arguments { -<<<<<<< HEAD -. . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . Properties: { . . . . . . internalRole: args . . . . . . kwarg: @@ -52188,13 +50166,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . 0: Attribute { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Identifier,Expression,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Identifier,Expression,Function,Call,Positional -======= . . . . . . . . . . . . . . . . . Roles: Identifier,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . TOKEN "pyval" . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 37570 @@ -52381,13 +50353,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . TOKEN "api_doc" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 37607 @@ -52405,13 +50371,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . TOKEN "ModuleDoc" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 37616 @@ -52760,13 +50720,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . . . . . . . . . 0: Str { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "#" . . . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 37732 @@ -52783,13 +50737,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . . . . . . . . . . 1: Num { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,Number,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,Number,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,Number,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . . . . . . . . . . . . . . . . . Roles: Literal,Number,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . . . . . . . . . . . . . . . . . TOKEN "1" . . . . . . . . . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . . . . . . . . . Offset: 37737 @@ -52909,13 +50857,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . TOKEN "lineno" . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 37672 @@ -52933,13 +50875,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . 1: Call { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Function,Call,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Function,Call,Expression -======= . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Function,Call,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . Offset: 37680 . . . . . . . . . . . . . . . . . . Line: 957 @@ -52952,13 +50888,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . TOKEN "lines" . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 37684 @@ -53170,13 +51100,7 @@ pyid to C{bool}." . . . . . . . . . . . . . . . . . } . . . . . . . . . . . . . . . . . Children: { . . . . . . . . . . . . . . . . . . 0: BinOp { -<<<<<<< HEAD -. . . . . . . . . . . . . . . . . . . Roles: Expression,Binary,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . . . . . . . Roles: Expression,Binary,Argument,Name,Identifier,Function,Call,Positional -======= . . . . . . . . . . . . . . . . . . . Roles: Expression,Binary,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . . . . . . . Offset: 37959 . . . . . . . . . . . . . . . . . . . . Line: 964 @@ -53341,13 +51265,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . . Children: { . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . TOKEN "api_doc" . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 37449 @@ -53365,13 +51283,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . } . . . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . TOKEN "ValueDoc" . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 37458 @@ -53647,13 +51559,7 @@ pyid to C{bool}." . . . . . . . } . . . . . . . Children: { . . . . . . . . 0: arguments { -<<<<<<< HEAD -. . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . Properties: { . . . . . . . . . . internalRole: args . . . . . . . . . . kwarg: @@ -53965,13 +51871,7 @@ pyid to C{bool}." . . . . . . . } . . . . . . . Children: { . . . . . . . . 0: arguments { -<<<<<<< HEAD -. . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . Properties: { . . . . . . . . . . internalRole: args . . . . . . . . . . kwarg: @@ -54037,13 +51937,7 @@ pyid to C{bool}." . . . . . . . } . . . . . . . Children: { . . . . . . . . 0: arguments { -<<<<<<< HEAD -. . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . Properties: { . . . . . . . . . . internalRole: args . . . . . . . . . . kwarg: @@ -54109,13 +52003,7 @@ pyid to C{bool}." . . . . . . . } . . . . . . . Children: { . . . . . . . . 0: arguments { -<<<<<<< HEAD -. . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . Properties: { . . . . . . . . . . internalRole: args . . . . . . . . . . kwarg: @@ -54239,13 +52127,7 @@ pyid to C{bool}." . . . . . . . } . . . . . . . Children: { . . . . . . . . 0: arguments { -<<<<<<< HEAD -. . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . Properties: { . . . . . . . . . . internalRole: args . . . . . . . . . . kwarg: @@ -54369,13 +52251,7 @@ pyid to C{bool}." . . . . . . . } . . . . . . . Children: { . . . . . . . . 0: arguments { -<<<<<<< HEAD -. . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . Properties: { . . . . . . . . . . internalRole: args . . . . . . . . . . kwarg: @@ -54495,13 +52371,7 @@ pyid to C{bool}." . . . . . . . } . . . . . . . Children: { . . . . . . . . 0: arguments { -<<<<<<< HEAD -. . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . Properties: { . . . . . . . . . . internalRole: args . . . . . . . . . . kwarg: @@ -54625,13 +52495,7 @@ pyid to C{bool}." . . . . . . . } . . . . . . . Children: { . . . . . . . . 0: arguments { -<<<<<<< HEAD -. . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . Properties: { . . . . . . . . . . internalRole: args . . . . . . . . . . kwarg: @@ -54716,13 +52580,7 @@ pyid to C{bool}." . . . . . . . } . . . . . . . Children: { . . . . . . . . 0: arguments { -<<<<<<< HEAD -. . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . Properties: { . . . . . . . . . . internalRole: args . . . . . . . . . . kwarg: @@ -54828,13 +52686,7 @@ pyid to C{bool}." . . . . . . . } . . . . . . . Children: { . . . . . . . . 0: arguments { -<<<<<<< HEAD -. . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . Properties: { . . . . . . . . . . internalRole: args . . . . . . . . . . kwarg: @@ -54918,13 +52770,7 @@ pyid to C{bool}." . . . . . . . } . . . . . . . Children: { . . . . . . . . 0: arguments { -<<<<<<< HEAD -. . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . Properties: { . . . . . . . . . . internalRole: args . . . . . . . . . . kwarg: @@ -55265,13 +53111,7 @@ pyid to C{bool}." . . . . . . . } . . . . . . . Children: { . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . TOKEN "_ZopeInterfaceClass" . . . . . . . . . StartPosition: { . . . . . . . . . . Offset: 39161 @@ -55538,13 +53378,7 @@ pyid to C{bool}." . . . . . . . } . . . . . . . Children: { . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . TOKEN "_ExtensionClass" . . . . . . . . . StartPosition: { . . . . . . . . . . Offset: 39511 @@ -55601,13 +53435,7 @@ pyid to C{bool}." . . . . . } . . . . . Children: { . . . . . . 0: arguments { -<<<<<<< HEAD -. . . . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . Properties: { . . . . . . . . internalRole: args . . . . . . . . kwarg: @@ -55668,13 +53496,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . . Children: { . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . TOKEN "val" . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 39582 @@ -55692,13 +53514,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . } . . . . . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . TOKEN "_ZopeType" . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 39587 @@ -55766,13 +53582,7 @@ pyid to C{bool}." . . . . . . . } . . . . . . . Children: { . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . TOKEN "_is_zope_type" . . . . . . . . . StartPosition: { . . . . . . . . . . Offset: 39624 @@ -55790,13 +53600,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . } . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . TOKEN "introspect_class" . . . . . . . . . StartPosition: { . . . . . . . . . . Offset: 39639 @@ -55985,13 +53789,7 @@ pyid to C{bool}." . . . . . } . . . . . Children: { . . . . . . 0: arguments { -<<<<<<< HEAD -. . . . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . Properties: { . . . . . . . . internalRole: args . . . . . . . . kwarg: @@ -56052,13 +53850,7 @@ pyid to C{bool}." . . . . . . . . . . . } . . . . . . . . . . . Children: { . . . . . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . . . . . TOKEN "val" . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 39894 @@ -56076,13 +53868,7 @@ pyid to C{bool}." . . . . . . . . . . . . . } . . . . . . . . . . . . } . . . . . . . . . . . . 1: Tuple { -<<<<<<< HEAD -. . . . . . . . . . . . . Roles: Literal,Tuple,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . . . Roles: Literal,Tuple,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . . . Roles: Literal,Tuple,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . . . Roles: Literal,Tuple,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . . . Offset: 39900 . . . . . . . . . . . . . . Line: 1019 @@ -56182,13 +53968,7 @@ pyid to C{bool}." . . . . . . . } . . . . . . . Children: { . . . . . . . . 0: Name { -<<<<<<< HEAD -. . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . TOKEN "_is_zope_method" . . . . . . . . . StartPosition: { . . . . . . . . . . Offset: 39962 @@ -56206,13 +53986,7 @@ pyid to C{bool}." . . . . . . . . . } . . . . . . . . } . . . . . . . . 1: Name { -<<<<<<< HEAD -. . . . . . . . . Roles: Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional,Identifier,Expression -||||||| merged common ancestors -. . . . . . . . . Roles: Argument,Name,Identifier,Function,Call,Positional,Identifier,Expression -======= . . . . . . . . . Roles: Function,Call,Positional,Argument,Name,Identifier,Expression ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . . . . . TOKEN "introspect_routine" . . . . . . . . . StartPosition: { . . . . . . . . . . Offset: 39979 @@ -56477,3 +54251,4 @@ class ZopeIntrospecter(Introspecter): . } } + diff --git a/fixtures/lambda.py.uast b/fixtures/lambda.py.uast index 70e425f6..fb34c79d 100644 --- a/fixtures/lambda.py.uast +++ b/fixtures/lambda.py.uast @@ -121,3 +121,4 @@ Module { . } } + diff --git a/fixtures/line_comment.py.uast b/fixtures/line_comment.py.uast index 42e90be0..28fc45b1 100644 --- a/fixtures/line_comment.py.uast +++ b/fixtures/line_comment.py.uast @@ -144,3 +144,4 @@ Module { . } } + diff --git a/fixtures/literals_assign.py.uast b/fixtures/literals_assign.py.uast index 2cebd0b9..db5ee186 100644 --- a/fixtures/literals_assign.py.uast +++ b/fixtures/literals_assign.py.uast @@ -926,3 +926,4 @@ Module { . } } + diff --git a/fixtures/loop_if.py.uast b/fixtures/loop_if.py.uast index f6f07251..4d79d6de 100644 --- a/fixtures/loop_if.py.uast +++ b/fixtures/loop_if.py.uast @@ -2,7 +2,7 @@ Status: ok Errors: UAST: Module { -. Roles: File +. Roles: File,Module . Children: { . . 0: For { . . . Roles: For,Iterator,Statement @@ -87,13 +87,7 @@ Module { . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Str { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . TOKEN "Python fors have elses" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 45 @@ -156,3 +150,4 @@ Module { . } } + diff --git a/fixtures/other_statements.py.uast b/fixtures/other_statements.py.uast index a0bba54f..7d503f5e 100644 --- a/fixtures/other_statements.py.uast +++ b/fixtures/other_statements.py.uast @@ -289,3 +289,4 @@ Module { . } } + diff --git a/fixtures/pass.py.uast b/fixtures/pass.py.uast index 7b5c5ad1..8bd8a37d 100644 --- a/fixtures/pass.py.uast +++ b/fixtures/pass.py.uast @@ -209,3 +209,4 @@ Module { . } } + diff --git a/fixtures/print.py.uast b/fixtures/print.py.uast index abe08df6..424692bf 100644 --- a/fixtures/print.py.uast +++ b/fixtures/print.py.uast @@ -83,3 +83,4 @@ Module { . } } + diff --git a/fixtures/qualified.py.uast b/fixtures/qualified.py.uast index a77b2a88..23d907ae 100644 --- a/fixtures/qualified.py.uast +++ b/fixtures/qualified.py.uast @@ -267,3 +267,4 @@ Module { . } } + diff --git a/fixtures/repr.py.uast b/fixtures/repr.py.uast index 90ff9db9..ab42f942 100644 --- a/fixtures/repr.py.uast +++ b/fixtures/repr.py.uast @@ -2,7 +2,7 @@ Status: ok Errors: UAST: Module { -. Roles: File +. Roles: File,Module . Children: { . . 0: Expr { . . . Roles: Expression @@ -27,13 +27,7 @@ Module { . . . . . } . . . . . Children: { . . . . . . 0: Num { -<<<<<<< HEAD -. . . . . . . Roles: Literal,Number,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . Roles: Literal,Number,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . Roles: Literal,Number,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . Roles: Literal,Number,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . TOKEN "1" . . . . . . . StartPosition: { . . . . . . . . Offset: 5 @@ -74,3 +68,4 @@ Module { . } } + diff --git a/fixtures/sameline.py.uast b/fixtures/sameline.py.uast index 11ffee7e..6310f359 100644 --- a/fixtures/sameline.py.uast +++ b/fixtures/sameline.py.uast @@ -2,7 +2,7 @@ Status: ok Errors: UAST: Module { -. Roles: File +. Roles: File,Module . Children: { . . 0: Expr { . . . Roles: Expression @@ -27,13 +27,7 @@ Module { . . . . . } . . . . . Children: { . . . . . . 0: Str { -<<<<<<< HEAD -. . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . TOKEN "same line test" . . . . . . . StartPosition: { . . . . . . . . Offset: 6 @@ -94,13 +88,7 @@ Module { . . . . . } . . . . . Children: { . . . . . . 0: Str { -<<<<<<< HEAD -. . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . TOKEN "another call" . . . . . . . StartPosition: { . . . . . . . . Offset: 31 @@ -141,3 +129,4 @@ Module { . } } + diff --git a/fixtures/sorting.py.uast b/fixtures/sorting.py.uast index e3dcb03c..1e4d05ff 100644 --- a/fixtures/sorting.py.uast +++ b/fixtures/sorting.py.uast @@ -155,3 +155,4 @@ Module { . } } + diff --git a/fixtures/string_fstring.py.uast b/fixtures/string_fstring.py.uast index 329a2718..4ab8ad20 100644 --- a/fixtures/string_fstring.py.uast +++ b/fixtures/string_fstring.py.uast @@ -3,7 +3,7 @@ Errors: . column out of bounds: 11 [1, 7] UAST: Module { -. Roles: File +. Roles: File,Module . Children: { . . 0: Assign { . . . Roles: Binary,Assignment,Expression @@ -643,13 +643,7 @@ Module { . . . } . . . Children: { . . . . 0: arguments { -<<<<<<< HEAD -. . . . . Roles: Function,Declaration,Argument,Name,Identifier -||||||| merged common ancestors -. . . . . Roles: Function,Declaration,Incomplete,Argument,Name,Identifier -======= . . . . . Roles: Function,Declaration,Incomplete,Argument ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups . . . . . Properties: { . . . . . . internalRole: args . . . . . . kwarg: @@ -854,13 +848,7 @@ Module { . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Num { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Literal,Number,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . Roles: Literal,Number,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . Roles: Literal,Number,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . Roles: Literal,Number,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . TOKEN "10" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 0 @@ -1058,3 +1046,4 @@ Module { . } } + diff --git a/fixtures/string_normal.py.uast b/fixtures/string_normal.py.uast index 7ffef3a6..80f2f937 100644 --- a/fixtures/string_normal.py.uast +++ b/fixtures/string_normal.py.uast @@ -67,3 +67,4 @@ Module { . } } + diff --git a/fixtures/string_triple.py.uast b/fixtures/string_triple.py.uast index 731a9d92..c082f5bf 100644 --- a/fixtures/string_triple.py.uast +++ b/fixtures/string_triple.py.uast @@ -73,3 +73,4 @@ Second line . } } + diff --git a/fixtures/test.py.uast b/fixtures/test.py.uast index d0090747..01b0e783 100644 --- a/fixtures/test.py.uast +++ b/fixtures/test.py.uast @@ -77,13 +77,7 @@ Module { . . . . . . . } . . . . . . } . . . . . . 1: Num { -<<<<<<< HEAD -. . . . . . . Roles: Literal,Number,Expression,Primitive,Expression,Binary,Left -||||||| merged common ancestors -. . . . . . . Roles: Literal,Number,Expression,Expression,Binary,Left -======= -. . . . . . . Roles: Literal,Number,Expression,Expression,Left ->>>>>>> Misc annotation fixes +. . . . . . . Roles: Literal,Number,Expression,Primitive,Expression,Left . . . . . . . TOKEN "1" . . . . . . . StartPosition: { . . . . . . . . Offset: 3 @@ -118,3 +112,4 @@ Module { . } } + diff --git a/fixtures/unary.py.uast b/fixtures/unary.py.uast index 7466c8dd..eec86c2e 100644 --- a/fixtures/unary.py.uast +++ b/fixtures/unary.py.uast @@ -159,3 +159,4 @@ Module { . } } + diff --git a/fixtures/while.py.uast b/fixtures/while.py.uast index 787a9c63..8a9585c5 100644 --- a/fixtures/while.py.uast +++ b/fixtures/while.py.uast @@ -2,7 +2,7 @@ Status: ok Errors: UAST: Module { -. Roles: File +. Roles: File,Module . Children: { . . 0: While { . . . Roles: While,Statement @@ -47,13 +47,7 @@ Module { . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Str { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . TOKEN "surely here" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 23 @@ -133,13 +127,7 @@ Module { . . . . . . . . . } . . . . . . . . . Children: { . . . . . . . . . . 0: Str { -<<<<<<< HEAD -. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional -||||||| merged common ancestors -. . . . . . . . . . . Roles: Literal,String,Expression,Argument,Name,Identifier,Function,Call,Positional -======= -. . . . . . . . . . . Roles: Literal,String,Expression,Function,Call,Positional,Argument,Name ->>>>>>> Remove Identifier from the arguments grouping node. Remove dups +. . . . . . . . . . . Roles: Literal,String,Expression,Primitive,Function,Call,Positional,Argument,Name . . . . . . . . . . . TOKEN "while's else" . . . . . . . . . . . StartPosition: { . . . . . . . . . . . . Offset: 64 @@ -213,13 +201,7 @@ Module { . . . . . . . } . . . . . . } . . . . . . 1: Num { -<<<<<<< HEAD -. . . . . . . Roles: Literal,Number,Expression,Primitive,Expression,Binary,Left -||||||| merged common ancestors -. . . . . . . Roles: Literal,Number,Expression,Expression,Binary,Left -======= -. . . . . . . Roles: Literal,Number,Expression,Expression,Left ->>>>>>> Misc annotation fixes +. . . . . . . Roles: Literal,Number,Expression,Primitive,Expression,Left . . . . . . . TOKEN "3" . . . . . . . StartPosition: { . . . . . . . . Offset: 6 @@ -254,3 +236,4 @@ Module { . } } + diff --git a/fixtures/with.py.uast b/fixtures/with.py.uast index 7bce1944..4b81dff7 100644 --- a/fixtures/with.py.uast +++ b/fixtures/with.py.uast @@ -129,3 +129,4 @@ Module { . } } +