From d12f340ba1b20d4db11c4aae6d4d04a2acf0e05a Mon Sep 17 00:00:00 2001 From: Jean Privat Date: Wed, 25 Jun 2014 22:13:50 -0400 Subject: [PATCH] tests: remove remaining old-style accessors Signed-off-by: Jean Privat --- tests/base_attr_isset.nit | 8 +++---- tests/base_attr_nullable.nit | 8 +++---- tests/base_attr_nullable_int.nit | 4 ++-- tests/sav/base_attr_isset_alt3.res | 2 +- tests/sav/base_attr_isset_alt4.res | 2 +- tests/sav/base_attr_nullable_alt2.res | 2 +- tests/sav/niti/base_attr_isset_alt3.res | 27 --------------------- tests/sav/niti/base_attr_isset_alt4.res | 36 ---------------------------- tests/sav/niti/base_attr_nullable_alt2.res | 2 -- 9 files changed, 13 insertions(+), 78 deletions(-) delete mode 100644 tests/sav/niti/base_attr_isset_alt3.res delete mode 100644 tests/sav/niti/base_attr_isset_alt4.res delete mode 100644 tests/sav/niti/base_attr_nullable_alt2.res diff --git a/tests/base_attr_isset.nit b/tests/base_attr_isset.nit index 5120c9b..f3a1178 100644 --- a/tests/base_attr_isset.nit +++ b/tests/base_attr_isset.nit @@ -29,18 +29,18 @@ enum Bool end class Integer - readable writable var _val: Int + var _val: Int init(val: Int) do _val = val fun output do _val.output end class Foo var _a1: Integer - readable var _a2: Integer + var _a2: Integer fun run do _a1.output - a2.output + _a2.output end fun show(i: Int) @@ -55,7 +55,7 @@ class Foo show(1) _a1 = new Integer(1) show(2) - _a2 = new Integer(_a1.val + 1) #alt3# #alt4# + _a2 = new Integer(_a1._val + 1) #alt3# #alt4# show(3) end #alt3# diff --git a/tests/base_attr_nullable.nit b/tests/base_attr_nullable.nit index 3e2c6f0..08ad503 100644 --- a/tests/base_attr_nullable.nit +++ b/tests/base_attr_nullable.nit @@ -25,18 +25,18 @@ enum Int end class Integer - readable writable var _val: Int + var _val: Int init(val: Int) do _val = val fun output do _val.output end class Foo var _a1: Integer - readable var _a2: Integer + var _a2: Integer fun run do _a1.output - a2.output + _a2.output end fun run_other(o: Foo) @@ -50,7 +50,7 @@ class Foo #alt1#run _a1 = new Integer(1) #alt2#run - _a2 = new Integer(_a1.val + 1) + _a2 = new Integer(_a1._val + 1) end init nop do end diff --git a/tests/base_attr_nullable_int.nit b/tests/base_attr_nullable_int.nit index 8e10a92..063dd14 100644 --- a/tests/base_attr_nullable_int.nit +++ b/tests/base_attr_nullable_int.nit @@ -26,11 +26,11 @@ end class Foo var _a1: Int - readable var _a2: Int + var _a2: Int fun run do _a1.output - a2.output + _a2.output end fun run_other(o: Foo) diff --git a/tests/sav/base_attr_isset_alt3.res b/tests/sav/base_attr_isset_alt3.res index 4444c33..650801b 100644 --- a/tests/sav/base_attr_isset_alt3.res +++ b/tests/sav/base_attr_isset_alt3.res @@ -1,4 +1,4 @@ -Runtime error: Uninitialized attribute _a2 (alt/base_attr_isset_alt3.nit:39) +Runtime error: Uninitialized attribute _a2 (alt/base_attr_isset_alt3.nit:43) 1 false false diff --git a/tests/sav/base_attr_isset_alt4.res b/tests/sav/base_attr_isset_alt4.res index 9bf0682..f569857 100644 --- a/tests/sav/base_attr_isset_alt4.res +++ b/tests/sav/base_attr_isset_alt4.res @@ -1,4 +1,4 @@ -Runtime error: Uninitialized attribute _a2 (alt/base_attr_isset_alt4.nit:39) +Runtime error: Uninitialized attribute _a2 (alt/base_attr_isset_alt4.nit:43) 1 false false diff --git a/tests/sav/base_attr_nullable_alt2.res b/tests/sav/base_attr_nullable_alt2.res index bd9cbf0..d238261 100644 --- a/tests/sav/base_attr_nullable_alt2.res +++ b/tests/sav/base_attr_nullable_alt2.res @@ -1,2 +1,2 @@ -Runtime error: Uninitialized attribute _a2 (alt/base_attr_nullable_alt2.nit:35) +Runtime error: Uninitialized attribute _a2 (alt/base_attr_nullable_alt2.nit:39) 1 diff --git a/tests/sav/niti/base_attr_isset_alt3.res b/tests/sav/niti/base_attr_isset_alt3.res deleted file mode 100644 index 650801b..0000000 --- a/tests/sav/niti/base_attr_isset_alt3.res +++ /dev/null @@ -1,27 +0,0 @@ -Runtime error: Uninitialized attribute _a2 (alt/base_attr_isset_alt3.nit:43) -1 -false -false -2 -true -false -3 -true -false -4 -false -false -false -5 -true -false -false -6 -true -true -false -7 -true -true -true -1 diff --git a/tests/sav/niti/base_attr_isset_alt4.res b/tests/sav/niti/base_attr_isset_alt4.res deleted file mode 100644 index f569857..0000000 --- a/tests/sav/niti/base_attr_isset_alt4.res +++ /dev/null @@ -1,36 +0,0 @@ -Runtime error: Uninitialized attribute _a2 (alt/base_attr_isset_alt4.nit:43) -1 -false -false -2 -true -false -3 -true -false -1 -false -false -2 -true -false -3 -true -false -4 -false -false -false -5 -true -false -false -6 -true -true -false -7 -true -true -true -1 diff --git a/tests/sav/niti/base_attr_nullable_alt2.res b/tests/sav/niti/base_attr_nullable_alt2.res deleted file mode 100644 index d238261..0000000 --- a/tests/sav/niti/base_attr_nullable_alt2.res +++ /dev/null @@ -1,2 +0,0 @@ -Runtime error: Uninitialized attribute _a2 (alt/base_attr_nullable_alt2.nit:39) -1 -- 1.7.9.5