From e76add6e6f904677f5c09bb2a66dce283f1b848a Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Wed, 1 Sep 2021 01:49:59 -0400 Subject: De-taggification | part 1 --- stdlib/source/test/lux/ffi.jvm.lux | 96 +++++++++++++++++++------------------- stdlib/source/test/lux/ffi.old.lux | 34 +++++++------- stdlib/source/test/lux/macro.lux | 2 +- 3 files changed, 66 insertions(+), 66 deletions(-) (limited to 'stdlib/source/test') diff --git a/stdlib/source/test/lux/ffi.jvm.lux b/stdlib/source/test/lux/ffi.jvm.lux index 97ecdb7a4..7557f7f9f 100644 --- a/stdlib/source/test/lux/ffi.jvm.lux +++ b/stdlib/source/test/lux/ffi.jvm.lux @@ -231,7 +231,7 @@ (actual0 [] java/lang/Long)]) (/.interface: test/TestInterface1 - ([] actual1 [java/lang/Boolean] java/lang/Long #throws [java/lang/Throwable])) + ([] actual1 [java/lang/Boolean] java/lang/Long "throws" [java/lang/Throwable])) (/.import: test/TestInterface1 ["#::." @@ -280,7 +280,7 @@ (test/TestInterface1 [] (actual1 self {throw? java/lang/Boolean}) java/lang/Long - #throws [java/lang/Throwable] + "throws" [java/lang/Throwable] (if (:as Bit throw?) (panic! "YOLO") (:as java/lang/Long @@ -340,12 +340,12 @@ example/3! example/4!)))) -(/.class: #final test/TestClass0 [test/TestInterface0] +(/.class: "final" test/TestClass0 [test/TestInterface0] ... Fields - (#private value java/lang/Long) + ("private" value java/lang/Long) ... Constructors - (#public [] (new self {value java/lang/Long}) [] - (:= ::value value)) + ("public" [] (new self {value java/lang/Long}) [] + (:= ::value value)) ... Methods (test/TestInterface0 [] (actual0 self) java/lang/Long ::value)) @@ -354,14 +354,14 @@ ["#::." (new [java/lang/Long])]) -(/.class: #final test/TestClass1 [test/TestInterface1] +(/.class: "final" test/TestClass1 [test/TestInterface1] ... Fields - (#private value java/lang/Long) + ("private" value java/lang/Long) ... Constructors - (#public [] (new self {value java/lang/Long}) [] - (:= ::value value)) + ("public" [] (new self {value java/lang/Long}) [] + (:= ::value value)) ... Methods - (test/TestInterface1 [] (actual1 self {throw? java/lang/Boolean}) java/lang/Long #throws [java/lang/Throwable] + (test/TestInterface1 [] (actual1 self {throw? java/lang/Boolean}) java/lang/Long "throws" [java/lang/Throwable] (if (:as Bit throw?) (panic! "YOLO") ::value))) @@ -370,10 +370,10 @@ ["#::." (new [java/lang/Long])]) -(/.class: #final test/TestClass2 [test/TestInterface2] +(/.class: "final" test/TestClass2 [test/TestInterface2] ... Constructors - (#public [] (new self) [] - []) + ("public" [] (new self) [] + []) ... Methods (test/TestInterface2 [a] (actual2 self {input a}) @@ -384,12 +384,12 @@ ["#::." (new [])]) -(/.class: #final (test/TestClass3 a) [(test/TestInterface3 a)] +(/.class: "final" (test/TestClass3 a) [(test/TestInterface3 a)] ... Fields - (#private value a) + ("private" value a) ... Constructors - (#public [] (new self {value a}) [] - (:= ::value value)) + ("public" [] (new self {value a}) [] + (:= ::value value)) ... Methods ((test/TestInterface3 a) [] (actual3 self) @@ -400,48 +400,48 @@ ["#::." (new [a])]) -(/.class: #final test/TestClass4 [] +(/.class: "final" test/TestClass4 [] ... Constructors - (#public [] (new self) [] - []) + ("public" [] (new self) [] + []) ... Methods - (#public (actual4 self {value java/lang/Long}) java/lang/Long - value)) + ("public" (actual4 self {value java/lang/Long}) java/lang/Long + value)) (/.import: test/TestClass4 ["#::." (new []) (actual4 [java/lang/Long] java/lang/Long)]) -(/.class: #final test/TestClass5 [] +(/.class: "final" test/TestClass5 [] ... Constructors - (#public [] (new self) [] - []) + ("public" [] (new self) [] + []) ... Methods - (#public "static" (actual5 {value java/lang/Long}) - java/lang/Long - value)) + ("public" "static" (actual5 {value java/lang/Long}) + java/lang/Long + value)) (/.import: test/TestClass5 ["#::." ("static" actual5 [java/lang/Long] java/lang/Long)]) -(/.class: #abstract test/TestClass6 [] +(/.class: "abstract" test/TestClass6 [] ... Constructors - (#public [] (new self) [] - []) + ("public" [] (new self) [] + []) ... Methods - (#public #abstract (actual6 {value java/lang/Long}) - java/lang/Long)) + ("public" "abstract" (actual6 {value java/lang/Long}) + java/lang/Long)) (/.import: test/TestClass6 ["#::." (actual6 [java/lang/Long] java/lang/Long)]) -(/.class: #final test/TestClass7 test/TestClass6 [] +(/.class: "final" test/TestClass7 test/TestClass6 [] ... Constructors - (#public [] (new self) [] - []) + ("public" [] (new self) [] + []) ... Methods (test/TestClass6 [] (actual6 self {input java/lang/Long}) @@ -452,10 +452,10 @@ ["#::." (new [])]) -(/.class: #final test/TestClass8 [test/TestInterface4] +(/.class: "final" test/TestClass8 [test/TestInterface4] ... Constructors - (#public [] (new self) [] - []) + ("public" [] (new self) [] + []) ... Methods (test/TestInterface4 [] (actual4 self {actual_left long} {actual_right long} {_ long}) @@ -468,17 +468,17 @@ ["#::." (new [])]) -(/.class: #final (test/TestClass9 a) [] +(/.class: "final" (test/TestClass9 a) [] ... Fields - (#private value9 a) + ("private" value9 a) ... Constructors - (#public [] (new self {value a}) [] - (:= ::value9 value)) + ("public" [] (new self {value a}) [] + (:= ::value9 value)) ... Methods - (#public (set_actual9 self {value a}) void - (:= ::value9 value)) - (#public (get_actual9 self) a - ::value9)) + ("public" (set_actual9 self {value a}) void + (:= ::value9 value)) + ("public" (get_actual9 self) a + ::value9)) (/.import: (test/TestClass9 a) ["#::." diff --git a/stdlib/source/test/lux/ffi.old.lux b/stdlib/source/test/lux/ffi.old.lux index 22c0a636a..1fcb84652 100644 --- a/stdlib/source/test/lux/ffi.old.lux +++ b/stdlib/source/test/lux/ffi.old.lux @@ -33,22 +33,22 @@ ["#::." (getName [] java/lang/String)]) -(/.class: #final (TestClass A) [] +(/.class: "final" (TestClass A) [] ... Fields - (#private increase java/lang/Long) - (#private counter java/lang/Long) + ("private" increase java/lang/Long) + ("private" counter java/lang/Long) ... Methods - (#public [] (new {increase java/lang/Long} {counter java/lang/Long}) [] - (exec - (:= ::increase increase) - (:= ::counter counter) - [])) - (#public (currentC self) java/lang/Long - ::counter) - (#public (upC self) void - (:= ::counter (i.+ ::increase ::counter))) - (#public (downC self) void - (:= ::counter (i.- ::increase ::counter)))) + ("public" [] (new {increase java/lang/Long} {counter java/lang/Long}) [] + (exec + (:= ::increase increase) + (:= ::counter counter) + [])) + ("public" (currentC self) java/lang/Long + ::counter) + ("public" (upC self) void + (:= ::counter (i.+ ::increase ::counter))) + ("public" (downC self) void + (:= ::counter (i.- ::increase ::counter)))) (/.import: (test/lux/ffi/TestClass a) ["#::." @@ -58,9 +58,9 @@ (downC [] void)]) (/.interface: TestInterface - ([] current [] java/lang/Long #throws [java/lang/Exception]) - ([] up [] test/lux/ffi/TestInterface #throws [java/lang/Exception]) - ([] down [] test/lux/ffi/TestInterface #throws [java/lang/Exception])) + ([] current [] java/lang/Long "throws" [java/lang/Exception]) + ([] up [] test/lux/ffi/TestInterface "throws" [java/lang/Exception]) + ([] down [] test/lux/ffi/TestInterface "throws" [java/lang/Exception])) (/.import: test/lux/ffi/TestInterface ["#::." diff --git a/stdlib/source/test/lux/macro.lux b/stdlib/source/test/lux/macro.lux index fa117e96b..ec8b70644 100644 --- a/stdlib/source/test/lux/macro.lux +++ b/stdlib/source/test/lux/macro.lux @@ -125,7 +125,7 @@ (try.else false))) (_.cover [] - (and (|> (/.single_expansion (` ( (~' #omit) (..pow/4 (~ pow/1))))) + (and (|> (/.single_expansion (` ( "omit" (..pow/4 (~ pow/1))))) (meta.result lux) (try\each (\ (list.equivalence code.equivalence) = (list))) (try.else false)) -- cgit v1.2.3