azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Uast, Lint: Update and fix tests

Browse Source
This commit is contained in:
Yan Zhulanow
2016-04-06 19:53:11 +03:00
parent 21a2115501
commit c13c24becc
34 changed files with 1073 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/uast-java/testData/log/ControlStructures.txt
Vendored
+8 -6
View File
@@ -1,4 +1,4 @@
UFile (package = null)
UFile (package = )
UClass (_Dummy_, kind = class)
UClass (ControlStructures, kind = class)
UFunction (main, kind = function, paramCount = 1)
@@ -10,8 +10,8 @@ UFile (package = null)
USimpleReferenceExpression (length)
ULiteralExpression (0)
UBlockExpression
USpecialExpressionList (return)
UReturnExpression
<no element>
EmptyExpression
UDeclarationsExpression
UVariable (mode, kind = local)
@@ -23,7 +23,9 @@ UFile (package = null)
ULiteralExpression (1)
ULiteralExpression ("singleArg")
ULiteralExpression ("multiArgs")
UForEachExpression (arg)
UForEachExpression
UVariable (arg, kind = parameter)
<no initializer>
USimpleReferenceExpression (args)
UBlockExpression
UQualifiedExpression
@@ -79,7 +81,7 @@ UFile (package = null)
USimpleReferenceExpression (i)
UPostfixExpression (++)
USimpleReferenceExpression (i)
UAssignmentExpression (=)
UBinaryExpression (=)
USimpleReferenceExpression (i)
ULiteralExpression (0)
UDoWhileExpression
@@ -96,6 +98,6 @@ UFile (package = null)
UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1)
USimpleReferenceExpression (println)
USimpleReferenceExpression (i)
UAssignmentExpression (+=)
UBinaryExpression (+=)
USimpleReferenceExpression (i)
ULiteralExpression (1)
plugins/uast-java/testData/log/Lambda.txt
Vendored
+2 -2
View File
@@ -1,4 +1,4 @@
UFile (package = null)
UFile (package = )
UClass (_Dummy_, kind = class)
UClass (Lambda, kind = class)
UFunction (example, kind = function, paramCount = 0)
@@ -27,4 +27,4 @@ UFile (package = null)
USimpleReferenceExpression (arg)
UClass (Job, kind = interface)
UFunction (doJob, kind = function, paramCount = 1)
EmptyExpression
<no element>
plugins/uast-java/testData/log/NestedClasses.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
UFile (package = null)
UFile (package = )
UClass (_Dummy_, kind = class)
UClass (NestedClasses, kind = class)
UClass (Nested, kind = class)
plugins/uast-java/testData/log/Simple.txt
Vendored
+5 -5
View File
@@ -1,22 +1,22 @@
UFile (package = null)
UFile (package = )
UClass (_Dummy_, kind = class)
UClass (Simple, kind = class)
UVariable (name, kind = member)
EmptyExpression
UFunction (<init>, kind = CONSTRUCTOR, paramCount = 1)
UFunction (<init>, kind = constructor, paramCount = 1)
UBlockExpression
UAssignmentExpression (=)
UBinaryExpression (=)
UQualifiedExpression
UThisExpression
USimpleReferenceExpression (name)
USimpleReferenceExpression (name)
UFunction (getName, kind = function, paramCount = 0)
UBlockExpression
USpecialExpressionList (return)
UReturnExpression
USimpleReferenceExpression (name)
UFunction (setName, kind = function, paramCount = 1)
UBlockExpression
UAssignmentExpression (=)
UBinaryExpression (=)
UQualifiedExpression
UThisExpression
USimpleReferenceExpression (name)
plugins/uast-java/testData/log/SpecialExpressions.txt
Vendored
+27 -31
View File
@@ -1,28 +1,27 @@
UFile (package = null)
UFile (package = )
UClass (_Dummy_, kind = class)
UClass (SpecialExpressions, kind = class)
UFunction (test, kind = function, paramCount = 0)
UBlockExpression
USpecialExpressionList (assert)
UFunctionCallExpression (UastCallKind(name='assert'), argCount = 1)
<no element>
UBinaryExpression (>)
ULiteralExpression (5)
ULiteralExpression (3)
EmptyExpression
USpecialExpressionList (assert)
UFunctionCallExpression (UastCallKind(name='assert'), argCount = 2)
<no element>
UBinaryExpression (>)
ULiteralExpression (5)
ULiteralExpression (3)
ULiteralExpression ("Message")
USpecialExpressionList (synchronized)
UThisExpression
UBlockExpression
UBlockExpression
UQualifiedExpression
UQualifiedExpression
UQualifiedExpression
USimpleReferenceExpression (System)
USimpleReferenceExpression (out)
UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1)
USimpleReferenceExpression (println)
ULiteralExpression ("A")
USimpleReferenceExpression (System)
USimpleReferenceExpression (out)
UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1)
USimpleReferenceExpression (println)
ULiteralExpression ("A")
UDeclarationsExpression
UVariable (a, kind = local)
ULiteralExpression (5)
@@ -40,8 +39,7 @@ UFile (package = null)
USimpleReferenceExpression (a)
ULiteralExpression (3)
UBlockExpression
USpecialExpressionList (break)
UBreakExpression (<no label>)
EmptyExpression
UIfExpression
UBinaryExpression (===)
@@ -50,8 +48,7 @@ UFile (package = null)
ULiteralExpression (5)
ULiteralExpression (0)
UBlockExpression
USpecialExpressionList (continue)
UContinueExpression (<no label>)
EmptyExpression
UPostfixExpression (--)
USimpleReferenceExpression (a)
@@ -71,26 +68,25 @@ UFile (package = null)
USwitchExpression
USimpleReferenceExpression (a)
UBlockExpression
UExpressionSwitchClauseExpression
USwitchClauseExpression
ULiteralExpression (1)
UBlockExpression
UAssignmentExpression (=)
UBinaryExpression (=)
USimpleReferenceExpression (x)
ULiteralExpression ("1")
USpecialExpressionList (break)
UExpressionSwitchClauseExpression
UBreakExpression (<no label>)
USwitchClauseExpression
ULiteralExpression (3)
UAssignmentExpression (=)
UBinaryExpression (=)
USimpleReferenceExpression (x)
ULiteralExpression ("3")
UExpressionSwitchClauseExpression
USwitchClauseExpression
ULiteralExpression (4)
UAssignmentExpression (=)
UBinaryExpression (=)
USimpleReferenceExpression (x)
ULiteralExpression ("4")
UDefaultSwitchClause
UAssignmentExpression (=)
DefaultUSwitchClauseExpression
UBinaryExpression (=)
USimpleReferenceExpression (x)
ULiteralExpression ("")
UIfExpression
@@ -105,7 +101,7 @@ UFile (package = null)
USimpleReferenceExpression (equals)
ULiteralExpression ("1")
UBlockExpression
USpecialExpressionList (throw)
UThrowExpression
UFunctionCallExpression (UastCallKind(name='constructor_call'), argCount = 1)
<no element>
ULiteralExpression ("Err")
@@ -119,12 +115,12 @@ UFile (package = null)
ULiteralExpression (1000) UCatchClause
UBlockExpression
UBlockExpression
UAssignmentExpression (=)
UBinaryExpression (=)
USimpleReferenceExpression (a)
ULiteralExpression (3)
UBlockExpression
UAssignmentExpression (=)
UBinaryExpression (=)
USimpleReferenceExpression (a)
ULiteralExpression (5)
USpecialExpressionList (return)
UReturnExpression
ULiteralExpression (true)
plugins/uast-java/testData/render/ControlStructures.txt
Vendored
+6 -7
View File
@@ -1,20 +1,20 @@
default class _Dummy_ {
default class ControlStructures {
public fun main(args: String[]): void {
package_local class _Dummy_ {
package_local class ControlStructures {
public static fun main(args: String[]): void {
if (args.length === 0) {
return
}
var mode: String = (args.length === 1) ? ("singleArg") : ("multiArgs")
local var mode: String = (args.length === 1) ? ("singleArg") : ("multiArgs")
for (arg : args) {
System.out.println(arg)
}
for (var i: int = 0; i < args.length; ++i) {
for (local var i: int = 0; i < args.length; ++i) {
System.out.println(i + ": " + args[i])
}
var i: int = 0
local var i: int = 0
while (i < args.length) {
System.out.println("Index " + i)
i++
@@ -28,6 +28,5 @@ default class _Dummy_ {
while (i < args.length)
}
}
}
plugins/uast-java/testData/render/Lambda.txt
Vendored
+7 -7
View File
@@ -1,17 +1,17 @@
default class _Dummy_ {
default class Lambda {
default fun example(): void {
package_local class _Dummy_ {
package_local class Lambda {
package_local fun example(): void {
doJob({ arg: String ->
arg + arg
}, "Mary")
}
default fun doJob(job: Job, arg: String): void {
package_local fun doJob(job: Job, arg: String): void {
System.out.println(job.doJob(arg))
}
}
default abstract static interface Job {
public fun doJob(arg: String): String = EmptyExpression
package_local abstract static interface Job {
public abstract fun doJob(arg: String): String
}
}
plugins/uast-java/testData/render/NestedClasses.txt
Vendored
+6 -7
View File
@@ -1,14 +1,13 @@
default class _Dummy_ {
default class NestedClasses {
package_local class _Dummy_ {
package_local class NestedClasses {
public static class Nested {
default fun func1(): void {
package_local fun func1(): void {
}
}
public class Inner {
default fun func2(): void {
}
public class Inner {
package_local fun func2(): void {
}
}
}
}
plugins/uast-java/testData/render/Simple.txt
Vendored
+3 -4
View File
@@ -1,6 +1,6 @@
default class _Dummy_ {
default class Simple {
var name: String
package_local class _Dummy_ {
package_local class Simple {
private var name: String
public fun <init>(name: String) {
this.name = name
@@ -13,6 +13,5 @@ default class _Dummy_ {
public fun setName(name: String): void {
this.name = name
}
}
}
plugins/uast-java/testData/render/SpecialExpressions.txt
Vendored
+10 -14
View File
@@ -1,15 +1,15 @@
default class _Dummy_ {
default class SpecialExpressions {
default fun test(): boolean {
assert 5 > 3 : EmptyExpression
assert 5 > 3 : "Message"
synchronized this : {
package_local class _Dummy_ {
package_local class SpecialExpressions {
package_local fun test(): boolean {
<assert>(5 > 3)
<assert>(5 > 3, "Message")
{
System.out.println("A")
}
var a: int = 5
var b: int = 7
var c: int
local var a: int = 5
local var b: int = 7
local var c: int
while (a > 0) {
if (a === 3) {
break
@@ -24,7 +24,7 @@ default class _Dummy_ {
this.test()
super.hashCode()
var x: String
local var x: String
switch (a)
{
1 ->
@@ -49,20 +49,16 @@ default class _Dummy_ {
try {
Thread.sleep(1000)
}
catch (e) {
}
finally {
a = 3
}
{
a = 5
}
return true
}
}
}