Skip to content

Commit

Permalink
Updated includes to use clj.
Browse files Browse the repository at this point in the history
  • Loading branch information
oubiwann committed Oct 24, 2015
1 parent 56eda54 commit 44b5735
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/lutil-math.lfe
Original file line number Diff line number Diff line change
@@ -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)))
Expand Down
13 changes: 10 additions & 3 deletions src/lutil-type.lfe
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down Expand Up @@ -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 ...
Expand Down
2 changes: 1 addition & 1 deletion test/lutil-math-tests.lfe
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion test/lutil-type-tests.lfe
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
Expand Down

0 comments on commit 44b5735

Please sign in to comment.