1 files changed, 3 insertions, 119 deletions
diff --git a/src/lux/analyser/record.clj b/src/lux/analyser/record.clj
index 2b4b7e095..96c988544 100644
--- a/src/lux/analyser/record.clj
+++ b/src/lux/analyser/record.clj
@@ -13,122 +13,6 @@
             (lux.analyser [base :as &&]
                           [module :as &&module])))
 
-;; [Tags]
-(deftags ""
-  "bool"
-  "int"
-  "real"
-  "char"
-  "text"
-  "variant"
-  "tuple"
-  "apply"
-  "case"
-  "lambda"
-  "ann"
-  "def"
-  "declare-macro"
-  "var"
-  "captured"
-
-  "jvm-getstatic"
-  "jvm-getfield"
-  "jvm-putstatic"
-  "jvm-putfield"
-  "jvm-invokestatic"
-  "jvm-instanceof"
-  "jvm-invokevirtual"
-  "jvm-invokeinterface"
-  "jvm-invokespecial"
-  "jvm-null?"
-  "jvm-null"
-  "jvm-new"
-  "jvm-new-array"
-  "jvm-aastore"
-  "jvm-aaload"
-  "jvm-class"
-  "jvm-interface"
-  "jvm-try"
-  "jvm-throw"
-  "jvm-monitorenter"
-  "jvm-monitorexit"
-  "jvm-program"
-
-  "jvm-iadd"
-  "jvm-isub"
-  "jvm-imul"
-  "jvm-idiv"
-  "jvm-irem"
-  "jvm-ieq"
-  "jvm-ilt"
-  "jvm-igt"
-
-  "jvm-ceq"
-  "jvm-clt"
-  "jvm-cgt"
-
-  "jvm-ladd"
-  "jvm-lsub"
-  "jvm-lmul"
-  "jvm-ldiv"
-  "jvm-lrem"
-  "jvm-leq"
-  "jvm-llt"
-  "jvm-lgt"
-
-  "jvm-fadd"
-  "jvm-fsub"
-  "jvm-fmul"
-  "jvm-fdiv"
-  "jvm-frem"
-  "jvm-feq"
-  "jvm-flt"
-  "jvm-fgt"
-
-  "jvm-dadd"
-  "jvm-dsub"
-  "jvm-dmul"
-  "jvm-ddiv"
-  "jvm-drem"
-  "jvm-deq"
-  "jvm-dlt"
-  "jvm-dgt"
-
-  "jvm-d2f"
-  "jvm-d2i"
-  "jvm-d2l"
-
-  "jvm-f2d"
-  "jvm-f2i"
-  "jvm-f2l"
-
-  "jvm-i2b"
-  "jvm-i2c"
-  "jvm-i2d"
-  "jvm-i2f"
-  "jvm-i2l"
-  "jvm-i2s"
-
-  "jvm-l2d"
-  "jvm-l2f"
-  "jvm-l2i"
-
-  "jvm-iand"
-  "jvm-ior"
-  "jvm-ixor"
-  "jvm-ishl"
-  "jvm-ishr"
-  "jvm-iushr"
-
-  "jvm-land"
-  "jvm-lor"
-  "jvm-lxor"
-  "jvm-lshl"
-  "jvm-lshr"
-  "jvm-lushr"
-  
-  )
-
 ;; [Exports]
 (defn order-record [pairs]
   "(-> (List (, Syntax Syntax)) (Lux (List Syntax)))"
@@ -136,7 +20,7 @@
                     (&/$Nil)
                     (return (&/|list))
                     
-                    (&/$Cons [(&/$Meta _ (&/$TagS tag1)) _] _)
+                    (&/$Cons [[_ (&/$TagS tag1)] _] _)
                     (|do [[module name] (&&/resolved-ident tag1)]
                       (&&module/tag-group module name))
 
@@ -144,9 +28,9 @@
                     (fail "[Analyser Error] Wrong syntax for records. Odd elements must be tags."))
         =pairs (&/map% (fn [kv]
                          (|case kv
-                           [(&/$Meta _ (&/$TagS k)) v]
+                           [[_ (&/$TagS k)] v]
                            (|do [=k (&&/resolved-ident k)]
-                             (return (&/T (&/ident->text =k) v)))
+                             (return (&/P (&/ident->text =k) v)))
 
                            _
                            (fail "[Analyser Error] Wrong syntax for records. Odd elements must be tags.")))