14fddbe6c3
Give `require` the same features as `import` You can now do (require foo), (require [foo [a b c]]), (require [foo [*]]), and (require [foo :as bar]). The first and last forms get you macros named foo.a, foo.b, etc. or bar.a, bar.b, etc., respectively. The second form only gets the macros in the list. Implements #1118 and perhaps partly addresses #277. N.B. The new meaning of (require foo) will cause all existing code that uses macros to break. Simply replace these forms with (require [foo [*]]) to get your code working again. There's a bit of a hack involved in the forms (require foo) or (require [foo :as bar]). When you call (foo.a ...) or (bar.a ...), Hy doesn't actually look inside modules. Instead, these (require ...) forms give the macros names that have periods in them, which happens to work fine with the way Hy finds and interprets macro calls. * Make `require` syntax stricter and add tests * Update documentation for `require` * Documentation wording improvements * Allow :as in `require` name lists
146 lines
5.0 KiB
Hy
146 lines
5.0 KiB
Hy
;; Copyright (c) 2013 James King <james@agentultra.com>
|
|
|
|
;; Permission is hereby granted, free of charge, to any person obtaining a
|
|
;; copy of this software and associated documentation files (the "Software"),
|
|
;; to deal in the Software without restriction, including without limitation
|
|
;; the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
;; and/or sell copies of the Software, and to permit persons to whom the
|
|
;; Software is furnished to do so, subject to the following conditions:
|
|
|
|
;; The above copyright notice and this permission notice shall be included in
|
|
;; all copies or substantial portions of the Software.
|
|
|
|
;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
;; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
;; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
;; THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
;; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
;; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
;; DEALINGS IN THE SOFTWARE.
|
|
|
|
(import [hy.errors [HyMacroExpansionError]])
|
|
(require [hy.contrib.anaphoric [*]])
|
|
|
|
;;;; some simple helpers
|
|
|
|
(defn assert-true [x]
|
|
(assert (= True x)))
|
|
|
|
(defn assert-false [x]
|
|
(assert (= False x)))
|
|
|
|
(defn assert-equal [x y]
|
|
(assert (= x y)))
|
|
|
|
|
|
(defn test-ap-if []
|
|
"NATIVE: testing anaphoric if"
|
|
(ap-if true (assert-true it))
|
|
(ap-if false true (assert-false it))
|
|
(try (macroexpand '(ap-if true))
|
|
(except [HyMacroExpansionError] true)
|
|
(else (assert false))))
|
|
|
|
(defn test-ap-each []
|
|
"NATIVE: testing anaphoric each"
|
|
(setv res [])
|
|
(ap-each [1 2 3 4] (.append res it))
|
|
(assert-equal res [1 2 3 4]))
|
|
|
|
(defn test-ap-each-while []
|
|
"NATIVE: testing anaphoric each-while"
|
|
(setv res [])
|
|
(ap-each-while [2 2 4 3 4 5 6] (even? it) (.append res it))
|
|
(assert-equal res [2 2 4]))
|
|
|
|
(defn test-ap-map []
|
|
"NATIVE: testing anaphoric map"
|
|
(assert-equal (list (ap-map (* it 3) [1 2 3]))
|
|
[3 6 9])
|
|
(assert-equal (list (ap-map (* it 3) []))
|
|
[])
|
|
(assert-equal (let [v 1 f 1] (list (ap-map (it v f) [(fn [a b] (+ a b))])))
|
|
[2]))
|
|
|
|
(defn test-ap-map-when []
|
|
"NATIVE: testing anaphoric map-when"
|
|
(assert-equal (list (ap-map-when even? (* it 2) [1 2 3 4]))
|
|
[1 4 3 8]))
|
|
|
|
(defn test-ap-filter []
|
|
"NATIVE: testing anaphoric filter"
|
|
(assert-equal (list (ap-filter (> it 2) [1 2 3 4]))
|
|
[3 4])
|
|
(assert-equal (list (ap-filter (even? it) [1 2 3 4]))
|
|
[2 4]))
|
|
|
|
(defn test-ap-reject []
|
|
"NATIVE: testing anaphoric filter"
|
|
(assert-equal (list (ap-reject (> it 2) [1 2 3 4]))
|
|
[1 2])
|
|
(assert-equal (list (ap-reject (even? it) [1 2 3 4]))
|
|
[1 3]))
|
|
|
|
(defn test-ap-dotimes []
|
|
"NATIVE: testing anaphoric dotimes"
|
|
(assert-equal (let [n []] (ap-dotimes 3 (.append n 3)) n)
|
|
[3 3 3])
|
|
(assert-equal (let [n []] (ap-dotimes 3 (.append n it)) n)
|
|
[0 1 2]))
|
|
|
|
(defn test-ap-first []
|
|
"NATIVE: testing anaphoric first"
|
|
(assert-equal (ap-first (> it 5) (range 10)) 6)
|
|
(assert-equal (ap-first (even? it) [1 2 3 4]) 2)
|
|
(assert-equal (ap-first (> it 10) (range 10)) None))
|
|
|
|
(defn test-ap-last []
|
|
"NATIVE: testing anaphoric last"
|
|
(assert-equal (ap-last (> it 5) (range 10)) 9)
|
|
(assert-equal (ap-last (even? it) [1 2 3 4]) 4)
|
|
(assert-equal (ap-last (> it 10) (range 10)) None))
|
|
|
|
(defn test-ap-reduce []
|
|
"NATIVE: testing anaphoric reduce"
|
|
(assert-equal (ap-reduce (* acc it) [1 2 3]) 6)
|
|
(assert-equal (ap-reduce (* acc it) [1 2 3] 6) 36)
|
|
(assert-equal (ap-reduce (+ acc " on " it) ["Hy" "meth"])
|
|
"Hy on meth")
|
|
(assert-equal (ap-reduce (+ acc it) [] 1) 1))
|
|
|
|
(defn test-ap-pipe []
|
|
"NATIVE: testing anaphoric pipe"
|
|
(assert-equal (ap-pipe 2 (+ it 1) (* it 3)) 9)
|
|
(assert-equal (ap-pipe [4 5 6 7] (list (rest it)) (len it)) 3))
|
|
|
|
(defn test-ap-compose []
|
|
"NATIVE: testing anaphoric compose"
|
|
(assert-equal ((ap-compose (+ it 1) (* it 3)) 2) 9)
|
|
(assert-equal ((ap-compose (list (rest it)) (len it)) [4 5 6 7]) 3))
|
|
|
|
(defn test-xi []
|
|
"NATIVE: testing xi forms"
|
|
;; test ordering
|
|
(assert-equal ((xi / x1 x2) 2 4) 0.5)
|
|
(assert-equal ((xi / x2 x1) 2 4) 2)
|
|
(assert-equal ((xi identity (, x5 x4 x3 x2 x1)) 1 2 3 4 5) (, 5 4 3 2 1))
|
|
(assert-equal ((xi identity (, x1 x2 x3 x4 x5)) 1 2 3 4 5) (, 1 2 3 4 5))
|
|
(assert-equal ((xi identity (, x1 x5 x2 x3 x4)) 1 2 3 4 5) (, 1 5 2 3 4))
|
|
;; test &rest
|
|
(assert-equal ((xi sum xi) 1 2 3) 6)
|
|
(assert-equal ((xi identity (, x1 xi)) 10 1 2 3) (, 10 (, 1 2 3)))
|
|
;; no parameters
|
|
(assert-equal ((xi list)) [])
|
|
(assert-equal ((xi identity "Hy!")) "Hy!")
|
|
(assert-equal ((xi identity "xi")) "xi")
|
|
(assert-equal ((xi + "Hy " "world!")) "Hy world!")
|
|
;; test skipped parameters
|
|
(assert-equal ((xi identity [x3 x1]) 1 2 3) [3 1])
|
|
;; test nesting
|
|
(assert-equal ((xi identity [x1 (, x2 [x3] "Hy" [xi])]) 1 2 3 4 5)
|
|
[1 (, 2 [3] "Hy" [(, 4 5)])])
|
|
;; test arg as function
|
|
(assert-equal ((xi x1 2 4) +) 6)
|
|
(assert-equal ((xi x1 2 4) -) -2)
|
|
(assert-equal ((xi x1 2 4) /) 0.5))
|