From 18e1b3355e9bc7dfe3152416fe6ad4e3fe415af9 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Wed, 11 Jul 2018 19:54:39 -0400
Subject: - Re-named "type-of" to ":of".

---
 stdlib/source/lux.lux                  |  6 +++---
 stdlib/source/lux/math/logic/fuzzy.lux |  2 +-
 stdlib/test/test/lux/math/modular.lux  | 14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'stdlib')

diff --git a/stdlib/source/lux.lux b/stdlib/source/lux.lux
index 6e9604376..9dde82dc8 100644
--- a/stdlib/source/lux.lux
+++ b/stdlib/source/lux.lux
@@ -5850,10 +5850,10 @@
     _
     (fail "Wrong syntax for undefined")))
 
-(macro: #export (type-of tokens)
+(macro: #export (:of tokens)
   {#.doc (doc "Generates the type corresponding to a given definition or variable."
               (let [my-num (: Int 123)]
-                (type-of my-num))
+                (:of my-num))
               "=="
               Int)}
   (case tokens
@@ -5863,7 +5863,7 @@
       (wrap (list (type-to-code var-type))))
 
     _
-    (fail "Wrong syntax for type-of")))
+    (fail "Wrong syntax for :of")))
 
 (def: (parse-complex-declaration tokens)
   (-> (List Code) (Meta [[Text (List Text)] (List Code)]))
diff --git a/stdlib/source/lux/math/logic/fuzzy.lux b/stdlib/source/lux/math/logic/fuzzy.lux
index 4d0d7f860..4bb58ae1a 100644
--- a/stdlib/source/lux/math/logic/fuzzy.lux
+++ b/stdlib/source/lux/math/logic/fuzzy.lux
@@ -1,7 +1,7 @@
 (.module:
   [lux #*
    [control
-    [predicate #+ Predicate]]
+    [predicate (#+ Predicate)]]
    [data
     [collection
      [list]
diff --git a/stdlib/test/test/lux/math/modular.lux b/stdlib/test/test/lux/math/modular.lux
index 89e2e94a3..8bbaf1292 100644
--- a/stdlib/test/test/lux/math/modular.lux
+++ b/stdlib/test/test/lux/math/modular.lux
@@ -15,7 +15,7 @@
   lux/test)
 
 (def: %3 (/.modulus 3))
-(`` (type: Mod3 (~~ (type-of %3))))
+(`` (type: Mod3 (~~ (:of %3))))
 
 (def: modulusR
   (r.Random Int)
@@ -71,12 +71,12 @@
          #let [copyM (|> normalM /.to-int /.from-int e.assume)]]
         ($_ seq
             (test "Every modulus has a unique type, even if the numeric value is the same as another."
-                  (and (type/= (type-of normalM)
-                               (type-of normalM))
-                       (not (type/= (type-of normalM)
-                                    (type-of alternativeM)))
-                       (not (type/= (type-of normalM)
-                                    (type-of copyM)))))
+                  (and (type/= (:of normalM)
+                               (:of normalM))
+                       (not (type/= (:of normalM)
+                                    (:of alternativeM)))
+                       (not (type/= (:of normalM)
+                                    (:of copyM)))))
             
             (test "Can extract the original integer from the modulus."
                   (i/= _normalM
-- 
cgit v1.2.3