1 files changed, 57 insertions, 61 deletions
diff --git a/stdlib/source/library/lux/target/jvm/constant.lux b/stdlib/source/library/lux/target/jvm/constant.lux
index 742c1101e..ef1076787 100644
--- a/stdlib/source/library/lux/target/jvm/constant.lux
+++ b/stdlib/source/library/lux/target/jvm/constant.lux
@@ -42,27 +42,25 @@
   binaryF.utf8/16)
 
 (abstract: .public Class
-  {}
-  
   (Index UTF8)
 
-  (def: .public index
-    (-> Class (Index UTF8))
-    (|>> :representation))
-  
-  (def: .public class
-    (-> (Index UTF8) Class)
-    (|>> :abstraction))
-
-  (def: .public class_equivalence
-    (Equivalence Class)
-    (\ equivalence.functor each
-       ..index
-       //index.equivalence))
-
-  (def: class_writer
-    (Writer Class)
-    (|>> :representation //index.writer))
+  [(def: .public index
+     (-> Class (Index UTF8))
+     (|>> :representation))
+   
+   (def: .public class
+     (-> (Index UTF8) Class)
+     (|>> :abstraction))
+
+   (def: .public class_equivalence
+     (Equivalence Class)
+     (\ equivalence.functor each
+        ..index
+        //index.equivalence))
+
+   (def: class_writer
+     (Writer Class)
+     (|>> :representation //index.writer))]
   )
 
 (import: java/lang/Float
@@ -86,50 +84,48 @@
    ("static" doubleToRawLongBits [double] long)])
 
 (abstract: .public (Value kind)
-  {}
-  
   kind
 
-  (def: .public value
-    (All (_ kind) (-> (Value kind) kind))
-    (|>> :representation))
-
-  (def: .public (value_equivalence Equivalence<kind>)
-    (All (_ kind)
-      (-> (Equivalence kind)
-          (Equivalence (Value kind))))
-    (\ equivalence.functor each
-       (|>> :representation)
-       Equivalence<kind>))
-
-  (template [<constructor> <type> <marker>]
-    [(type: .public <type>
-       (Value <marker>))
-
-     (def: .public <constructor>
-       (-> <marker> <type>)
-       (|>> :abstraction))]
-
-    [integer Integer I32]
-    [float   Float   java/lang/Float]
-    [long    Long    .Int]
-    [double  Double  Frac]
-    [string  String  (Index UTF8)]
-    )
-
-  (template [<writer_name> <type> <write> <writer>]
-    [(def: <writer_name>
-       (Writer <type>)
-       (`` (|>> :representation
-                (~~ (template.spliced <write>))
-                (~~ (template.spliced <writer>)))))]
-
-    [integer_writer Integer [] [binaryF.bits/32]]
-    [float_writer Float [java/lang/Float::floatToRawIntBits ffi.int_to_long (:as I64)] [i32.i32 binaryF.bits/32]]
-    [long_writer Long [] [binaryF.bits/64]]
-    [double_writer Double [java/lang/Double::doubleToRawLongBits] [binaryF.bits/64]]
-    [string_writer String [] [//index.writer]]
-    )
+  [(def: .public value
+     (All (_ kind) (-> (Value kind) kind))
+     (|>> :representation))
+
+   (def: .public (value_equivalence Equivalence<kind>)
+     (All (_ kind)
+       (-> (Equivalence kind)
+           (Equivalence (Value kind))))
+     (\ equivalence.functor each
+        (|>> :representation)
+        Equivalence<kind>))
+
+   (template [<constructor> <type> <marker>]
+     [(type: .public <type>
+        (Value <marker>))
+
+      (def: .public <constructor>
+        (-> <marker> <type>)
+        (|>> :abstraction))]
+
+     [integer Integer I32]
+     [float   Float   java/lang/Float]
+     [long    Long    .Int]
+     [double  Double  Frac]
+     [string  String  (Index UTF8)]
+     )
+
+   (template [<writer_name> <type> <write> <writer>]
+     [(def: <writer_name>
+        (Writer <type>)
+        (`` (|>> :representation
+                 (~~ (template.spliced <write>))
+                 (~~ (template.spliced <writer>)))))]
+
+     [integer_writer Integer [] [binaryF.bits/32]]
+     [float_writer Float [java/lang/Float::floatToRawIntBits ffi.int_to_long (:as I64)] [i32.i32 binaryF.bits/32]]
+     [long_writer Long [] [binaryF.bits/64]]
+     [double_writer Double [java/lang/Double::doubleToRawLongBits] [binaryF.bits/64]]
+     [string_writer String [] [//index.writer]]
+     )]
   )
 
 (type: .public (Name_And_Type of)