Relocated maybe and lazy from data to control.

2 files changed, 13 insertions, 13 deletions

diff --git a/lux-r/source/program.lux b/lux-r/source/program.lux
index 19b417b4d..245883eb4 100644
--- a/lux-r/source/program.lux
+++ b/lux-r/source/program.lux
@@ -7,13 +7,13 @@
     ["." monad (#+ do)]]
    [control
     [pipe (#+ exec> case> new>)]
+    ["." maybe]
     ["." try (#+ Try)]
     ["." exception (#+ exception:)]
     ["." io (#+ IO io)]
     [concurrency
      ["." promise (#+ Promise)]]]
    [data
-    ["." maybe]
     ["." text ("#\." hash)
      ["%" format (#+ format)]
      [encoding
@@ -261,8 +261,8 @@
                    <output>
                    ... (exec
                    ...   ... ("lux io log" (..%%code <call>))
-                   ...   (error! (..%%code <call>)))
-                   (error! (..%%code <call>)))]
+                   ...   (panic! (..%%code <call>)))
+                   (panic! (..%%code <call>)))]
 
                  ... org/renjin/sexp/ListVector
                  [(accept self {_ org/renjin/sexp/SexpVisitor}) void]
@@ -463,7 +463,7 @@
                       (#try.Failure error)
                       (exec
                         ("lux io log" error)
-                        (error! error))))
+                        (panic! error))))
         _ ("lux io log" "@call_macro 1")
         r_macro (org/renjin/sexp/FunctionCall::new macro r_inputs)
         _ ("lux io log" "@call_macro 2")
diff --git a/lux-ruby/source/program.lux b/lux-ruby/source/program.lux
index 33a7ff9cb..2a07dc220 100644
--- a/lux-ruby/source/program.lux
+++ b/lux-ruby/source/program.lux
@@ -9,6 +9,7 @@
      ["." monad (#+ do)]]
     [control
      [pipe (#+ new>)]
+     ["." maybe]
      ["." try (#+ Try)]
      ["." exception (#+ exception:)]
      ["." io (#+ IO io)]
@@ -18,7 +19,6 @@
      ["<>" parser
       ["<.>" code]]]
     [data
-     ["." maybe]
      ["." text ("#\." hash)
       ["%" format (#+ format)]
       [encoding
@@ -140,7 +140,7 @@
   (monad.map meta.monad
              (function (_ class)
                (do meta.monad
-                 [var (macro.gensym "input")]
+                 [var (macro.identifier "input")]
                  (wrap (code.record (list [var class])))))
              input_classes))
 
@@ -388,7 +388,7 @@
                (wrapped_lux_value lux_structure value)
 
                #.None
-               (error! (exception.construct ..invalid_tuple_access [(org/jruby/RubyFixnum::getLongValue member)])))
+               (panic! (exception.construct ..invalid_tuple_access [(org/jruby/RubyFixnum::getLongValue member)])))
 
              #.None)
            (case (ffi.check org/jruby/RubyString member)
@@ -416,10 +416,10 @@
                  (wrapped_lux_value lux_structure value)
 
                  #.None
-                 (error! (exception.construct ..nil_has_no_lux_representation [])))
+                 (panic! (exception.construct ..nil_has_no_lux_representation [])))
 
                field
-               (error! (exception.construct ..invalid_variant_access [field])))
+               (panic! (exception.construct ..invalid_variant_access [field])))
              
              #.None)
            (case (ffi.check org/jruby/RubyRange member)
@@ -432,10 +432,10 @@
                  (lux_structure (java/util/Arrays::copyOfRange value first (i.+ first size))))
 
                _
-               (error! (exception.construct ..invalid_index (:as java/lang/Object member))))
+               (panic! (exception.construct ..invalid_index (:as java/lang/Object member))))
 
              #.None)
-           (error! (exception.construct ..invalid_index (:as java/lang/Object member))))))))
+           (panic! (exception.construct ..invalid_index (:as java/lang/Object member))))))))
 
 (def: (lux_wrapper_equality value)
   (-> (Array java/lang/Object) org/jruby/internal/runtime/methods/DynamicMethod)
@@ -532,7 +532,7 @@
            (org/jruby/RubyBoolean::newBoolean ..initial_ruby_runtime))
 
        #.None
-       (error! (exception.construct ..invalid_operation ["respond_to?"]))))))
+       (panic! (exception.construct ..invalid_operation ["respond_to?"]))))))
 
 (exception: (unknown_method {method Text})
   (exception.report
@@ -565,7 +565,7 @@
                         (org/jruby/runtime/callsite/CacheEntry::new (..lux_wrapper_respond_to? value) 4)
 
                         _
-                        (error! (exception.construct ..unknown_method [(:as Text method)])))))]
+                        (panic! (exception.construct ..unknown_method [(:as Text method)])))))]
     (org/jruby/java/proxies/JavaProxy::new ..initial_ruby_runtime meta_class (:as java/lang/Object value))))
 
 (exception: (cannot_apply_a_non_function {object java/lang/Object})