diff options
| -rw-r--r-- | lux-mode/lux-mode.el | 4 | ||||
| -rw-r--r-- | new-luxc/source/luxc/lang/host.jvm.lux | 2 | ||||
| -rw-r--r-- | stdlib/source/lux.lux | 6 | ||||
| -rw-r--r-- | stdlib/source/lux/concurrency/stm.lux | 2 | ||||
| -rw-r--r-- | stdlib/source/lux/math/constructive.lux | 2 | ||||
| -rw-r--r-- | stdlib/source/lux/type/abstract.lux | 4 | ||||
| -rw-r--r-- | stdlib/source/lux/type/unit.lux | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/lux-mode/lux-mode.el b/lux-mode/lux-mode.el index 91232201c..7dfcdecc8 100644 --- a/lux-mode/lux-mode.el +++ b/lux-mode/lux-mode.el @@ -224,14 +224,14 @@ Called by `imenu--generic-function'." "word:" "abstract:" "unit:" "scale:" - "function" "case" ":" ":!" ":!!" "undefined" "ident-for" "static" + ":" ":!" ":assume" "@abstraction" "@representation" "^@representation" + "function" "case" "undefined" "ident-for" "static" "and" "or" "char" "exec" "let" "if" "cond" "do" "be" "open:" "loop" "recur" "comment" "for" "list" "list&" "io" "sequence" "tree" "get@" "set@" "update@" "|>" "|>>" "<|" "<<|" "_$" "$_" "~" "~+" "~!" "~'" "::" ":::" "|" "&" "->" "All" "Ex" "Rec" "primitive" "$" "type" - "@abstraction" "@representation" "^@representation" "^" "^or" "^slots" "^multi" "^@" "^template" "^open" "^|>" "^code" "^stream&" "^regex" "bin" "oct" "hex" "pre" "post" diff --git a/new-luxc/source/luxc/lang/host.jvm.lux b/new-luxc/source/luxc/lang/host.jvm.lux index ba617aa42..9a959bb48 100644 --- a/new-luxc/source/luxc/lang/host.jvm.lux +++ b/new-luxc/source/luxc/lang/host.jvm.lux @@ -74,7 +74,7 @@ (#.Some bytecode) (case (define-class class-name bytecode (:! ClassLoader _jvm_this)) (#e.Success class) - (:!! class) + (:assume class) (#e.Error error) (error! (format "Class definition error: " class-name "\n" diff --git a/stdlib/source/lux.lux b/stdlib/source/lux.lux index 157208071..72e22a485 100644 --- a/stdlib/source/lux.lux +++ b/stdlib/source/lux.lux @@ -5945,9 +5945,9 @@ _ (fail "Wrong syntax for ^|>"))) -(macro: #export (:!! tokens) +(macro: #export (:assume tokens) {#.doc (doc "Coerces the given expression to the type of whatever is expected." - (: Dinosaur (:!! (list 1 2 3))))} + (: Dinosaur (:assume (list 1 2 3))))} (case tokens (^ (list expr)) (do Monad<Meta> @@ -5955,7 +5955,7 @@ (wrap (list (` ("lux coerce" (~ (type-to-code type)) (~ expr)))))) _ - (fail "Wrong syntax for :!!"))) + (fail "Wrong syntax for :assume"))) (macro: #export (undefined tokens) {#.doc (doc "Meant to be used as a stand-in for functions with undefined implementations." diff --git a/stdlib/source/lux/concurrency/stm.lux b/stdlib/source/lux/concurrency/stm.lux index a7c8b3cf3..791419444 100644 --- a/stdlib/source/lux/concurrency/stm.lux +++ b/stdlib/source/lux/concurrency/stm.lux @@ -80,7 +80,7 @@ (:! (Var Any) _var)))) (:: maybe.Monad<Maybe> map (function (_ [_var _original _current]) _current)) - (:!!) + (:assume) )) (def: #export (read var) diff --git a/stdlib/source/lux/math/constructive.lux b/stdlib/source/lux/math/constructive.lux index 8d375fad7..b154e9c20 100644 --- a/stdlib/source/lux/math/constructive.lux +++ b/stdlib/source/lux/math/constructive.lux @@ -149,7 +149,7 @@ (-> (~+ g!requisites) (~ meaning))))))) (syntax: #export (axiom {description (p.default "" s.text)}) - (wrap (.list (.` (.:!! []))))) + (wrap (.list (.` (.:assume []))))) (syntax: #export (theorem {type-vars type-vars} {[name inputs] theorem-declaration} diff --git a/stdlib/source/lux/type/abstract.lux b/stdlib/source/lux/type/abstract.lux index 2caaf62bb..1bb084cf5 100644 --- a/stdlib/source/lux/type/abstract.lux +++ b/stdlib/source/lux/type/abstract.lux @@ -73,7 +73,7 @@ (^ (list value)) (wrap (list (` ((: (All [(~+ type-varsC)] (-> (~ representation-declaration) (~ abstract-declaration))) - (|>> :!!)) + (|>> :assume)) (~ value))))) _ @@ -86,7 +86,7 @@ (^ (list value)) (wrap (list (` ((: (All [(~+ type-varsC)] (-> (~ abstract-declaration) (~ representation-declaration))) - (|>> :!!)) + (|>> :assume)) (~ value))))) _ diff --git a/stdlib/source/lux/type/unit.lux b/stdlib/source/lux/type/unit.lux index 0f81c6a08..88b56730b 100644 --- a/stdlib/source/lux/type/unit.lux +++ b/stdlib/source/lux/type/unit.lux @@ -70,7 +70,7 @@ (primitive (~ (code.text (unit-name name)))))) (` (def: (~+ (csw.export export)) (~ (code.local-symbol (format "@" name))) (~ (code.local-symbol name)) - (:!! []))) + (:assume []))) ))) (def: ratio^ |