Better syntax for calling virtual methods when defining JVM classes.

14 files changed, 45 insertions, 33 deletions

diff --git a/stdlib/source/test/lux/abstract.lux b/stdlib/source/test/lux/abstract.lux
index eac73fa40..9a4c8d3ce 100644
--- a/stdlib/source/test/lux/abstract.lux
+++ b/stdlib/source/test/lux/abstract.lux
@@ -17,8 +17,7 @@
   ["[1][0]" monad (.only)
    ["[1]/[0]" free]]
   ["[1][0]" monoid]
-  ["[1][0]" order]
-  ["[1][0]" predicate]])
+  ["[1][0]" order]])
 
 (def functor
   Test
@@ -53,7 +52,6 @@
        /interval.test
        /monoid.test
        /order.test
-       /predicate.test
        ..functor
        ..monad
        ..comonad
diff --git a/stdlib/source/test/lux/control/function.lux b/stdlib/source/test/lux/control/function.lux
index bb688959f..a3e9c5440 100644
--- a/stdlib/source/test/lux/control/function.lux
+++ b/stdlib/source/test/lux/control/function.lux
@@ -18,7 +18,8 @@
   ["[1][0]" memo]
   ["[1][0]" mixin]
   ["[1][0]" mutual]
-  ["[1][0]" inline]])
+  ["[1][0]" inline]
+  ["[1][0]" predicate]])
 
 (def .public test
   Test
@@ -64,4 +65,5 @@
              /mixin.test
              /mutual.test
              /inline.test
+             /predicate.test
              ))))
diff --git a/stdlib/source/test/lux/control/function/mixin.lux b/stdlib/source/test/lux/control/function/mixin.lux
index e84f4293a..3ed034a69 100644
--- a/stdlib/source/test/lux/control/function/mixin.lux
+++ b/stdlib/source/test/lux/control/function/mixin.lux
@@ -4,12 +4,13 @@
    ["_" test (.only Test)]
    [abstract
     [equivalence (.only Equivalence)]
-    [predicate (.only Predicate)]
     [monad (.only do)]
     [\\specification
      ["$[0]" monoid]]]
    [control
-    ["[0]" state (.only State)]]
+    ["[0]" state (.only State)]
+    [function
+     [predicate (.only Predicate)]]]
    [data
     ["[0]" product]
     [collection
diff --git a/stdlib/source/test/lux/abstract/predicate.lux b/stdlib/source/test/lux/control/function/predicate.lux
index 28d0eed16..28d0eed16 100644
--- a/stdlib/source/test/lux/abstract/predicate.lux
+++ b/stdlib/source/test/lux/control/function/predicate.lux
diff --git a/stdlib/source/test/lux/data/binary.lux b/stdlib/source/test/lux/data/binary.lux
index 1389e4620..52fa6519a 100644
--- a/stdlib/source/test/lux/data/binary.lux
+++ b/stdlib/source/test/lux/data/binary.lux
@@ -6,7 +6,6 @@
    ["[0]" type]
    [abstract
     [equivalence (.only Equivalence)]
-    [predicate (.only Predicate)]
     ["[0]" monad (.only do)]
     ["[0]" enum]
     [\\specification
@@ -17,7 +16,9 @@
     ["[0]" pipe]
     ["[0]" maybe]
     ["[0]" try (.only Try)]
-    ["[0]" exception (.only Exception)]]
+    ["[0]" exception (.only Exception)]
+    [function
+     [predicate (.only Predicate)]]]
    [data
     ["[0]" sum]
     ["[0]" bit]
diff --git a/stdlib/source/test/lux/data/collection/bits.lux b/stdlib/source/test/lux/data/collection/bits.lux
index a96aff9cc..98d288dc5 100644
--- a/stdlib/source/test/lux/data/collection/bits.lux
+++ b/stdlib/source/test/lux/data/collection/bits.lux
@@ -4,9 +4,11 @@
    ["_" test (.only Test)]
    [abstract
     [monad (.only do)]
-    ["[0]" predicate]
     [\\specification
      ["$[0]" equivalence]]]
+   [control
+    [function
+     ["[0]" predicate]]]
    [math
     ["[0]" random (.only Random)]
     [number
diff --git a/stdlib/source/test/lux/data/collection/set/multi.lux b/stdlib/source/test/lux/data/collection/set/multi.lux
index 1b48f0fd0..a0dd01e06 100644
--- a/stdlib/source/test/lux/data/collection/set/multi.lux
+++ b/stdlib/source/test/lux/data/collection/set/multi.lux
@@ -5,10 +5,12 @@
    [abstract
     [hash (.only Hash)]
     [monad (.only do)]
-    ["[0]" predicate]
     [\\specification
      ["$[0]" equivalence]
      ["$[0]" hash]]]
+   [control
+    [function
+     ["[0]" predicate]]]
    [data
     ["[0]" bit (.use "[1]#[0]" equivalence)]
     [collection
diff --git a/stdlib/source/test/lux/ffi.jvm.lux b/stdlib/source/test/lux/ffi.jvm.lux
index 6edf7e3ac..581d89f2d 100644
--- a/stdlib/source/test/lux/ffi.jvm.lux
+++ b/stdlib/source/test/lux/ffi.jvm.lux
@@ -381,11 +381,11 @@
   ("private" value java/lang/Long)
   ... Constructors
   ("public" [] (new self [value java/lang/Long]) []
-   (/.set value value))
+   (/.set value value self))
   ... Methods
   (test/TestInterface0 [] (actual0 self [])
                        java/lang/Long
-                       (/.get value)))
+                       (/.get value self)))
 
 (/.import test/TestClass0
   "[1]::[0]"
@@ -396,13 +396,13 @@
   ("private" value java/lang/Long)
   ... Constructors
   ("public" [] (new self [value java/lang/Long]) []
-   (/.set value value))
+   (/.set value value self))
   ... Methods
   (test/TestInterface1 [] (actual1 self [throw? java/lang/Boolean])
                        java/lang/Long
                        "throws" [java/lang/Throwable]
                        (if (not (/.of_boolean throw?))
-                         (/.get value)
+                         (/.get value self)
                          (panic! "YOLO"))))
 
 (/.import test/TestClass1
@@ -428,12 +428,12 @@
   ("private" value a)
   ... Constructors
   ("public" [] (new self [value a]) []
-   (/.set value value))
+   (/.set value value self))
   ... Methods
   ((test/TestInterface3 a)
    [] (actual3 self [])
    a
-   (/.get value)))
+   (/.get value self)))
 
 (/.import (test/TestClass3 a)
   "[1]::[0]"
@@ -513,12 +513,12 @@
   ("private" value9 a)
   ... Constructors
   ("public" [] (new self [value a]) []
-   (/.set value9 value))
+   (/.set value9 value self))
   ... Methods
   ("public" (set_actual9 self [value a]) void
-   (/.set value9 value))
+   (/.set value9 value self))
   ("public" (get_actual9 self []) a
-   (/.get value9)))
+   (/.get value9 self)))
 
 (/.import (test/TestClass9 a)
   "[1]::[0]"
@@ -531,7 +531,7 @@
   ("public" value10 a)
   ... Constructors
   ("public" [] (new self [init a]) []
-   (/.set value10 init)))
+   (/.set value10 init self)))
 
 (/.import (test/TestClass10 a)
   "[1]::[0]"
@@ -543,7 +543,7 @@
   ("public" value11 a)
   ... Constructors
   ("public" [] (new self [init a]) []
-   (/.set value11 init)))
+   (/.set value11 init self)))
 
 (/.import (test/TestClass11 a)
   "[1]::[0]"
diff --git a/stdlib/source/test/lux/math/modular.lux b/stdlib/source/test/lux/math/modular.lux
index b3a516885..c3a1b8f53 100644
--- a/stdlib/source/test/lux/math/modular.lux
+++ b/stdlib/source/test/lux/math/modular.lux
@@ -5,7 +5,6 @@
    ["[0]" type (.use "[1]#[0]" equivalence)]
    [abstract
     [monad (.only do)]
-    ["[0]" predicate]
     [\\specification
      ["$[0]" equivalence]
      ["$[0]" order]
@@ -13,7 +12,9 @@
      ["$[0]" codec]]]
    [control
     ["[0]" try]
-    ["[0]" exception]]
+    ["[0]" exception]
+    [function
+     ["[0]" predicate]]]
    [data
     ["[0]" product]
     ["[0]" bit (.use "[1]#[0]" equivalence)]]
diff --git a/stdlib/source/test/lux/time/day.lux b/stdlib/source/test/lux/time/day.lux
index 53271cc96..eecc8a0fb 100644
--- a/stdlib/source/test/lux/time/day.lux
+++ b/stdlib/source/test/lux/time/day.lux
@@ -4,7 +4,6 @@
    ["_" test (.only Test)]
    [abstract
     [monad (.only do)]
-    ["[0]" predicate]
     [\\specification
      ["$[0]" equivalence]
      ["$[0]" hash]
@@ -13,7 +12,9 @@
      ["$[0]" codec]]]
    [control
     ["[0]" try (.use "[1]#[0]" functor)]
-    ["[0]" exception]]
+    ["[0]" exception]
+    [function
+     ["[0]" predicate]]]
    [data
     [collection
      ["[0]" list]
diff --git a/stdlib/source/test/lux/time/month.lux b/stdlib/source/test/lux/time/month.lux
index 751d0f3f7..c87a956cd 100644
--- a/stdlib/source/test/lux/time/month.lux
+++ b/stdlib/source/test/lux/time/month.lux
@@ -4,7 +4,6 @@
    ["_" test (.only Test)]
    [abstract
     [monad (.only do)]
-    ["[0]" predicate]
     [\\specification
      ["$[0]" equivalence]
      ["$[0]" hash]
@@ -13,7 +12,9 @@
      ["$[0]" codec]]]
    [control
     ["[0]" try (.use "[1]#[0]" functor)]
-    ["[0]" exception]]
+    ["[0]" exception]
+    [function
+     ["[0]" predicate]]]
    [data
     [collection
      ["[0]" set]
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/coverage.lux b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/coverage.lux
index 9f3d0b5ac..e6eb4333c 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/coverage.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/coverage.lux
@@ -4,13 +4,14 @@
    ["_" test (.only Test)]
    [abstract
     ["[0]" monad (.only do)]
-    ["[0]" predicate]
     [\\specification
      ["$[0]" equivalence]]]
    [control
     ["[0]" pipe]
     ["[0]" try (.only Try) (.use "[1]#[0]" functor)]
-    ["[0]" exception (.only Exception)]]
+    ["[0]" exception (.only Exception)]
+    [function
+     ["[0]" predicate]]]
    [data
     ["[0]" product]
     ["[0]" bit (.use "[1]#[0]" equivalence)]
diff --git a/stdlib/source/test/lux/type/refinement.lux b/stdlib/source/test/lux/type/refinement.lux
index ce23ba709..711d0401f 100644
--- a/stdlib/source/test/lux/type/refinement.lux
+++ b/stdlib/source/test/lux/type/refinement.lux
@@ -3,10 +3,11 @@
   [lux (.except)
    ["_" test (.only Test)]
    [abstract
-    [predicate (.only Predicate)]
     [monad (.only do)]]
    [control
-    ["[0]" maybe (.use "[1]#[0]" monad)]]
+    ["[0]" maybe (.use "[1]#[0]" monad)]
+    [function
+     [predicate (.only Predicate)]]]
    [data
     [collection
      ["[0]" list (.use "[1]#[0]" functor)]]]
diff --git a/stdlib/source/test/lux/world/file/watch.lux b/stdlib/source/test/lux/world/file/watch.lux
index 21e653751..36f1f444b 100644
--- a/stdlib/source/test/lux/world/file/watch.lux
+++ b/stdlib/source/test/lux/world/file/watch.lux
@@ -3,13 +3,14 @@
   [lux (.except)
    ["_" test (.only Test)]
    [abstract
-    [predicate (.only Predicate)]
     [monad (.only do)]]
    [control
     ["[0]" try (.only Try)]
     ["[0]" exception]
     [concurrency
-     ["[0]" async (.only Async)]]]
+     ["[0]" async (.only Async)]]
+    [function
+     [predicate (.only Predicate)]]]
    [data
     ["[0]" binary (.only Binary) (.use "[1]#[0]" equivalence)]
     ["[0]" text (.use "[1]#[0]" equivalence)