diff --git a/src/lutil-math.lfe b/src/lutil-math.lfe index 245fe7b..8af9a24 100644 --- a/src/lutil-math.lfe +++ b/src/lutil-math.lfe @@ -1,7 +1,7 @@ (defmodule lutil-math (export all)) -(include-lib "lutil/include/predicates.lfe") +(include-lib "clj/include/predicates.lfe") (defun floor (x) (let ((truncated (trunc x))) diff --git a/src/lutil-type.lfe b/src/lutil-type.lfe index 24f2c46..2f5108c 100644 --- a/src/lutil-type.lfe +++ b/src/lutil-type.lfe @@ -3,7 +3,7 @@ (defmodule lutil-type (export all)) -(include-lib "lutil/include/predicates.lfe") +(include-lib "clj/include/predicates.lfe") (defun add-tuples (a b) "Given two tuples, add them together." @@ -55,8 +55,15 @@ val2) (defun get-in (data keys) - "This function is not intended to be used directly (though one certainly may) - but rather to be used via the macro defined in include/core.lfe." + "DEPRECATED + + This function was not intended to be used directly (though one certainly + might have) but rather was to be used via the macro that used to be defined + in include/core.lfe. + + That macro is now in the clj library in include/seq.lfe and the get-in + function is in the module clj-seq.lfe. + " ;; XXX We'll take the cheap way out right now and assume (uh-oh ...) that ;; any error here will be keys or indices not found, and thus return ;; undefined. Might be better to only do this for function_clause errors ... diff --git a/test/lutil-math-tests.lfe b/test/lutil-math-tests.lfe index 552a7f3..31e2662 100644 --- a/test/lutil-math-tests.lfe +++ b/test/lutil-math-tests.lfe @@ -2,8 +2,8 @@ (behaviour ltest-unit) (export all)) +(include-lib "clj/include/predicates.lfe") (include-lib "ltest/include/ltest-macros.lfe") -(include-lib "lutil/include/predicates.lfe") (deftest fast-floor (is-equal 0 (lutil-math:fast-floor 0.0)) diff --git a/test/lutil-type-tests.lfe b/test/lutil-type-tests.lfe index baeb7aa..6e13706 100644 --- a/test/lutil-type-tests.lfe +++ b/test/lutil-type-tests.lfe @@ -2,8 +2,8 @@ (behaviour ltest-unit) (export all)) +(include-lib "clj/include/predicates.lfe") (include-lib "ltest/include/ltest-macros.lfe") -(include-lib "lutil/include/predicates.lfe") (deftest add-tuples (let ((data1 (list (tuple 1 2 3) (tuple 2 3 4)))