Render whitespace in elements without newlines and tabs

This commit is contained in:
Andrey Breslav
2013-12-03 18:35:34 +04:00
parent 81003ba298
commit 6c519bb515
11 changed files with 117 additions and 213 deletions
@@ -55,29 +55,19 @@ fun test1() {
}
---------------------
L0:
<START> NEXT:[v(val a = object { val x : I..)] PREV:[]
v(val a = object {
val x : Int
{
$x = 1
}
}) NEXT:[v(val x : Int)] PREV:[<START>]
v(val x : Int) NEXT:[r(1)] PREV:[v(val a = object { val x : I..)]
r(1) NEXT:[w($x)] PREV:[v(val x : Int)]
w($x) NEXT:[r(object { val x : Int { $x ..)] PREV:[r(1)]
r(object {
val x : Int
{
$x = 1
}
}) NEXT:[w(a)] PREV:[w($x)]
w(a) NEXT:[<END>] PREV:[r(object { val x : Int { $x ..)]
<START> NEXT:[v(val a = object { val x : Int { $x = 1 } })] PREV:[]
v(val a = object { val x : Int { $x = 1 } }) NEXT:[v(val x : Int)] PREV:[<START>]
v(val x : Int) NEXT:[r(1)] PREV:[v(val a = object { val x : Int { $x = 1 } })]
r(1) NEXT:[w($x)] PREV:[v(val x : Int)]
w($x) NEXT:[r(object { val x : Int { $x = 1 } })] PREV:[r(1)]
r(object { val x : Int { $x = 1 } }) NEXT:[w(a)] PREV:[w($x)]
w(a) NEXT:[<END>] PREV:[r(object { val x : Int { $x = 1 } })]
L1:
<END> NEXT:[<SINK>] PREV:[w(a)]
<END> NEXT:[<SINK>] PREV:[w(a)]
error:
<ERROR> NEXT:[<SINK>] PREV:[]
<ERROR> NEXT:[<SINK>] PREV:[]
sink:
<SINK> NEXT:[] PREV:[<ERROR>, <END>]
<SINK> NEXT:[] PREV:[<ERROR>, <END>]
=====================
== O ==
object O {
@@ -108,26 +98,22 @@ fun test2() {
}
---------------------
L0:
<START> NEXT:[v(val b = 1)] PREV:[]
v(val b = 1) NEXT:[r(1)] PREV:[<START>]
r(1) NEXT:[w(b)] PREV:[v(val b = 1)]
w(b) NEXT:[v(val a = object { val x = b..)] PREV:[r(1)]
v(val a = object {
val x = b
}) NEXT:[v(val x = b)] PREV:[w(b)]
v(val x = b) NEXT:[r(b)] PREV:[v(val a = object { val x = b..)]
r(b) NEXT:[w(x)] PREV:[v(val x = b)]
w(x) NEXT:[r(object { val x = b }) ] PREV:[r(b)]
r(object {
val x = b
}) NEXT:[w(a)] PREV:[w(x)]
w(a) NEXT:[<END>] PREV:[r(object { val x = b }) ]
<START> NEXT:[v(val b = 1)] PREV:[]
v(val b = 1) NEXT:[r(1)] PREV:[<START>]
r(1) NEXT:[w(b)] PREV:[v(val b = 1)]
w(b) NEXT:[v(val a = object { val x = b })] PREV:[r(1)]
v(val a = object { val x = b }) NEXT:[v(val x = b)] PREV:[w(b)]
v(val x = b) NEXT:[r(b)] PREV:[v(val a = object { val x = b })]
r(b) NEXT:[w(x)] PREV:[v(val x = b)]
w(x) NEXT:[r(object { val x = b })] PREV:[r(b)]
r(object { val x = b }) NEXT:[w(a)] PREV:[w(x)]
w(a) NEXT:[<END>] PREV:[r(object { val x = b })]
L1:
<END> NEXT:[<SINK>] PREV:[w(a)]
<END> NEXT:[<SINK>] PREV:[w(a)]
error:
<ERROR> NEXT:[<SINK>] PREV:[]
<ERROR> NEXT:[<SINK>] PREV:[]
sink:
<SINK> NEXT:[] PREV:[<ERROR>, <END>]
<SINK> NEXT:[] PREV:[<ERROR>, <END>]
=====================
== test3 ==
fun test3() {
@@ -140,32 +126,20 @@ fun test3() {
}
---------------------
L0:
<START> NEXT:[v(val a = object { val y : I..)] PREV:[]
v(val a = object {
val y : Int
fun inner_bar() {
y = 10
}
}) NEXT:[v(val y : Int)] PREV:[<START>]
v(val y : Int) NEXT:[jmp?(L2)] PREV:[v(val a = object { val y : I..)]
jmp?(L2) NEXT:[r(object { val y : Int fun i..), d(fun inner_bar() { y = 10 }) ] PREV:[v(val y : Int)]
d(fun inner_bar() {
y = 10
}) NEXT:[<SINK>] PREV:[jmp?(L2)]
<START> NEXT:[v(val a = object { val y : Int fun inner_bar() { y = 10 } })] PREV:[]
v(val a = object { val y : Int fun inner_bar() { y = 10 } }) NEXT:[v(val y : Int)] PREV:[<START>]
v(val y : Int) NEXT:[jmp?(L2)] PREV:[v(val a = object { val y : Int fun inner_bar() { y = 10 } })]
jmp?(L2) NEXT:[r(object { val y : Int fun inner_bar() { y = 10 } }), d(fun inner_bar() { y = 10 })] PREV:[v(val y : Int)]
d(fun inner_bar() { y = 10 }) NEXT:[<SINK>] PREV:[jmp?(L2)]
L2:
r(object {
val y : Int
fun inner_bar() {
y = 10
}
}) NEXT:[w(a)] PREV:[jmp?(L2)]
w(a) NEXT:[<END>] PREV:[r(object { val y : Int fun i..)]
r(object { val y : Int fun inner_bar() { y = 10 } }) NEXT:[w(a)] PREV:[jmp?(L2)]
w(a) NEXT:[<END>] PREV:[r(object { val y : Int fun inner_bar() { y = 10 } })]
L1:
<END> NEXT:[<SINK>] PREV:[w(a)]
<END> NEXT:[<SINK>] PREV:[w(a)]
error:
<ERROR> NEXT:[<SINK>] PREV:[]
<ERROR> NEXT:[<SINK>] PREV:[]
sink:
<SINK> NEXT:[] PREV:[<ERROR>, <END>, d(fun inner_bar() { y = 10 }) ]
<SINK> NEXT:[] PREV:[<ERROR>, <END>, d(fun inner_bar() { y = 10 })]
L3:
<START> NEXT:[r(10)] PREV:[]
r(10) NEXT:[w(y)] PREV:[<START>]
@@ -208,43 +182,23 @@ fun test4() {
}
---------------------
L0:
<START> NEXT:[v(val a = object { val x : I..)] PREV:[]
v(val a = object {
val x : Int
val y : Int
{
$x = 1
}
fun ggg() {
y = 10
}
}) NEXT:[v(val x : Int)] PREV:[<START>]
v(val x : Int) NEXT:[v(val y : Int)] PREV:[v(val a = object { val x : I..)]
v(val y : Int) NEXT:[r(1)] PREV:[v(val x : Int)]
r(1) NEXT:[w($x)] PREV:[v(val y : Int)]
w($x) NEXT:[jmp?(L2)] PREV:[r(1)]
jmp?(L2) NEXT:[r(object { val x : Int val y..), d(fun ggg() { y = 10 }) ] PREV:[w($x)]
d(fun ggg() {
y = 10
}) NEXT:[<SINK>] PREV:[jmp?(L2)]
<START> NEXT:[v(val a = object { val x : Int val y : Int { $x = 1 } fun ggg() { y = 10 } })] PREV:[]
v(val a = object { val x : Int val y : Int { $x = 1 } fun ggg() { y = 10 } }) NEXT:[v(val x : Int)] PREV:[<START>]
v(val x : Int) NEXT:[v(val y : Int)] PREV:[v(val a = object { val x : Int val y : Int { $x = 1 } fun ggg() { y = 10 } })]
v(val y : Int) NEXT:[r(1)] PREV:[v(val x : Int)]
r(1) NEXT:[w($x)] PREV:[v(val y : Int)]
w($x) NEXT:[jmp?(L2)] PREV:[r(1)]
jmp?(L2) NEXT:[r(object { val x : Int val y : Int { $x = 1 } fun ggg() { y = 10 } }), d(fun ggg() { y = 10 })] PREV:[w($x)]
d(fun ggg() { y = 10 }) NEXT:[<SINK>] PREV:[jmp?(L2)]
L2:
r(object {
val x : Int
val y : Int
{
$x = 1
}
fun ggg() {
y = 10
}
}) NEXT:[w(a)] PREV:[jmp?(L2)]
w(a) NEXT:[<END>] PREV:[r(object { val x : Int val y..)]
r(object { val x : Int val y : Int { $x = 1 } fun ggg() { y = 10 } }) NEXT:[w(a)] PREV:[jmp?(L2)]
w(a) NEXT:[<END>] PREV:[r(object { val x : Int val y : Int { $x = 1 } fun ggg() { y = 10 } })]
L1:
<END> NEXT:[<SINK>] PREV:[w(a)]
<END> NEXT:[<SINK>] PREV:[w(a)]
error:
<ERROR> NEXT:[<SINK>] PREV:[]
<ERROR> NEXT:[<SINK>] PREV:[]
sink:
<SINK> NEXT:[] PREV:[<ERROR>, <END>, d(fun ggg() { y = 10 }) ]
<SINK> NEXT:[] PREV:[<ERROR>, <END>, d(fun ggg() { y = 10 })]
L3:
<START> NEXT:[r(10)] PREV:[]
r(10) NEXT:[w(y)] PREV:[<START>]
@@ -289,53 +243,27 @@ fun test5() {
}
---------------------
L0:
<START> NEXT:[v(val a = object { var x = 1..)] PREV:[]
v(val a = object {
var x = 1
{
$x = 2
}
fun foo() {
x = 3
}
fun bar() {
x = 4
}
}) NEXT:[v(var x = 1)] PREV:[<START>]
v(var x = 1) NEXT:[r(1)] PREV:[v(val a = object { var x = 1..)]
r(1) NEXT:[w(x)] PREV:[v(var x = 1)]
w(x) NEXT:[r(2)] PREV:[r(1)]
r(2) NEXT:[w($x)] PREV:[w(x)]
w($x) NEXT:[jmp?(L2)] PREV:[r(2)]
jmp?(L2) NEXT:[jmp?(L5), d(fun foo() { x = 3 }) ] PREV:[w($x)]
d(fun foo() {
x = 3
}) NEXT:[<SINK>] PREV:[jmp?(L2)]
<START> NEXT:[v(val a = object { var x = 1 { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } })] PREV:[]
v(val a = object { var x = 1 { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } }) NEXT:[v(var x = 1)] PREV:[<START>]
v(var x = 1) NEXT:[r(1)] PREV:[v(val a = object { var x = 1 { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } })]
r(1) NEXT:[w(x)] PREV:[v(var x = 1)]
w(x) NEXT:[r(2)] PREV:[r(1)]
r(2) NEXT:[w($x)] PREV:[w(x)]
w($x) NEXT:[jmp?(L2)] PREV:[r(2)]
jmp?(L2) NEXT:[jmp?(L5), d(fun foo() { x = 3 })] PREV:[w($x)]
d(fun foo() { x = 3 }) NEXT:[<SINK>] PREV:[jmp?(L2)]
L2:
jmp?(L5) NEXT:[r(object { var x = 1 { $x = ..), d(fun bar() { x = 4 }) ] PREV:[jmp?(L2)]
d(fun bar() {
x = 4
}) NEXT:[<SINK>] PREV:[jmp?(L5)]
jmp?(L5) NEXT:[r(object { var x = 1 { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } }), d(fun bar() { x = 4 })] PREV:[jmp?(L2)]
d(fun bar() { x = 4 }) NEXT:[<SINK>] PREV:[jmp?(L5)]
L5:
r(object {
var x = 1
{
$x = 2
}
fun foo() {
x = 3
}
fun bar() {
x = 4
}
}) NEXT:[w(a)] PREV:[jmp?(L5)]
w(a) NEXT:[<END>] PREV:[r(object { var x = 1 { $x = ..)]
r(object { var x = 1 { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } }) NEXT:[w(a)] PREV:[jmp?(L5)]
w(a) NEXT:[<END>] PREV:[r(object { var x = 1 { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } })]
L1:
<END> NEXT:[<SINK>] PREV:[w(a)]
<END> NEXT:[<SINK>] PREV:[w(a)]
error:
<ERROR> NEXT:[<SINK>] PREV:[]
<ERROR> NEXT:[<SINK>] PREV:[]
sink:
<SINK> NEXT:[] PREV:[<ERROR>, <END>, d(fun foo() { x = 3 }) , d(fun bar() { x = 4 }) ]
<SINK> NEXT:[] PREV:[<ERROR>, <END>, d(fun foo() { x = 3 }), d(fun bar() { x = 4 })]
L3:
<START> NEXT:[r(3)] PREV:[]
r(3) NEXT:[w(x)] PREV:[<START>]