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

Fix .uast files #117

Merged
merged 1 commit into from
Oct 3, 2017
Merged

Fix .uast files #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions fixtures/annotations.py.uast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,3 +287,4 @@ Module {
. }
}


1 change: 1 addition & 0 deletions fixtures/aritmeticops.py.uast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,3 +507,4 @@ Module {
. }
}


1 change: 1 addition & 0 deletions fixtures/assert_constant.py.uast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,3 +137,4 @@ Module {
. }
}


1 change: 1 addition & 0 deletions fixtures/augassign.py.uast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,3 +236,4 @@ Module {
. }
}


1 change: 1 addition & 0 deletions fixtures/bitwise.py.uast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,3 +626,4 @@ Module {
. }
}


35 changes: 3 additions & 32 deletions fixtures/classdef.py.uast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Status: ok
Errors:
UAST:
Module {
. Roles: File
. Roles: File,Module
. Children: {
. . 0: ClassDef {
. . . Roles: Type,Declaration,Identifier,Statement
Expand Down Expand Up @@ -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: <nil>
Expand Down Expand Up @@ -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: <nil>
Expand Down Expand Up @@ -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: <nil>
Expand All @@ -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: <nil>
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -1097,3 +1067,4 @@ Module {
. }
}


1 change: 1 addition & 0 deletions fixtures/classdef_decorated.py.uast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,4 @@ Module {
. }
}


1 change: 1 addition & 0 deletions fixtures/classdef_inheritance.py.uast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,3 +220,4 @@ Module {
. }
}


1 change: 1 addition & 0 deletions fixtures/classdef_metaclass_py2.py.uast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,4 @@ Module {
. }
}


1 change: 1 addition & 0 deletions fixtures/classdef_metaclass_py3.py.uast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,3 +211,4 @@ Module {
. }
}


1 change: 1 addition & 0 deletions fixtures/comments.py.uast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,3 +162,4 @@ Module {
. }
}


41 changes: 6 additions & 35 deletions fixtures/comparisonop.py.uast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -526,3 +496,4 @@ Module {
. }
}


1 change: 1 addition & 0 deletions fixtures/complex.py.uast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,4 @@ Module {
. }
}


1 change: 1 addition & 0 deletions fixtures/comprehension_dict.py.uast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,3 +216,4 @@ Module {
. }
}


1 change: 1 addition & 0 deletions fixtures/comprehension_list.py.uast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,3 +369,4 @@ Module {
. }
}


1 change: 1 addition & 0 deletions fixtures/comprehension_set.py.uast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,3 +198,4 @@ Module {
. }
}


1 change: 1 addition & 0 deletions fixtures/continue_break.py.uast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,3 +354,4 @@ Module {
. }
}


1 change: 1 addition & 0 deletions fixtures/declarations_annotated.py.uast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,3 +141,4 @@ Module {
. }
}


1 change: 1 addition & 0 deletions fixtures/ellipsis.py.uast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,4 @@ Module {
. }
}


12 changes: 2 additions & 10 deletions fixtures/empty.py.uast
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
. }
}


35 changes: 6 additions & 29 deletions fixtures/except.py.uast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Status: ok
Errors:
UAST:
Module {
. Roles: File
. Roles: File,Module
. Children: {
. . 0: Try {
. . . Roles: Try,Statement
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -416,3 +392,4 @@ Module {
. }
}


11 changes: 3 additions & 8 deletions fixtures/exec.py.uast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Status: ok
Errors:
UAST:
Module {
. Roles: File
. Roles: File,Module
. Children: {
. . 0: Expr {
. . . Roles: Expression
Expand All @@ -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
Expand Down Expand Up @@ -74,3 +68,4 @@ Module {
. }
}


1 change: 1 addition & 0 deletions fixtures/for.py.uast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,3 +234,4 @@ Module {
. }
}


Loading