Merge branch 'master' into paultag/bugfix/python3.4

This commit is contained in:
Paul Tagliamonte 2014-01-04 12:51:55 -05:00
commit 85bdd3fe19
2 changed files with 64 additions and 12 deletions

View File

@ -45,6 +45,19 @@
(_numeric-check n) (_numeric-check n)
(- n 1)) (- n 1))
(defn disassemble [tree &optional [codegen false]]
"Dump the python AST for a given Hy tree to standard output
If the second argument is true, generate python code instead."
(import astor)
(import hy.compiler)
(fake-source-positions tree)
(setv compiled (hy.compiler.hy_compile tree (calling-module-name)))
(print ((if codegen
astor.codegen.to_source
astor.dump)
compiled)))
(defn distinct [coll] (defn distinct [coll]
"Return a generator from the original collection with duplicates "Return a generator from the original collection with duplicates
removed" removed"
@ -81,6 +94,15 @@
(_numeric-check n) (_numeric-check n)
(= (% n 2) 0)) (= (% n 2) 0))
(defn fake-source-positions [tree]
"Fake the source positions for a given tree"
(if (and (iterable? tree) (not (string? tree)))
(for* [subtree tree]
(fake-source-positions subtree)))
(for* [attr '[start-line end-line start-column end-column]]
(if (not (hasattr tree attr))
(setattr tree attr 1))))
(defn filter [pred coll] (defn filter [pred coll]
"Return all elements from `coll` that pass `pred`" "Return all elements from `coll` that pass `pred`"
(let [[citer (iter coll)]] (let [[citer (iter coll)]]
@ -119,6 +141,14 @@
(finally (.release _gensym_lock))) (finally (.release _gensym_lock)))
new_symbol)) new_symbol))
(defn calling-module-name [&optional [n 1]]
"Get the name of the module calling `n` levels up the stack from the
`calling-module-name` function call (by default, one level up)"
(import inspect)
(setv f (get (.stack inspect) (+ n 1) 0))
(get f.f_globals "__name__"))
(defn inc [n] (defn inc [n]
"Increment n by 1" "Increment n by 1"
(_numeric-check n) (_numeric-check n)
@ -153,20 +183,16 @@
(defn macroexpand [form] (defn macroexpand [form]
"Return the full macro expansion of form" "Return the full macro expansion of form"
(import inspect)
(import hy.macros) (import hy.macros)
(setv f (get (get (.stack inspect) 1) 0)) (setv name (calling-module-name))
(setv name (get f.f_globals "__name__"))
(hy.macros.macroexpand form name)) (hy.macros.macroexpand form name))
(defn macroexpand-1 [form] (defn macroexpand-1 [form]
"Return the single step macro expansion of form" "Return the single step macro expansion of form"
(import inspect)
(import hy.macros) (import hy.macros)
(setv f (get (get (.stack inspect) 1) 0)) (setv name (calling-module-name))
(setv name (get f.f_globals "__name__"))
(hy.macros.macroexpand-1 form name)) (hy.macros.macroexpand-1 form name))
(defn neg? [n] (defn neg? [n]
@ -272,9 +298,9 @@
(_numeric_check n) (_numeric_check n)
(= n 0)) (= n 0))
(def *exports* '[cycle dec distinct drop drop-while empty? even? filter (def *exports* '[calling-module-name cycle dec distinct disassemble drop
flatten float? gensym inc instance? integer integer? drop-while empty? even? filter flatten float? gensym
iterable? iterate iterator? macroexpand macroexpand-1 inc instance? integer integer? iterable? iterate
neg? nil? none? nth numeric? odd? pos? remove repeat iterator? macroexpand macroexpand-1 neg? nil? none?
repeatedly second string string? take take-nth nth numeric? odd? pos? remove repeat repeatedly second
take-while zero?]) string string? take take-nth take-while zero?])

View File

@ -862,3 +862,29 @@
"Test macroexpand-1 on ->" "Test macroexpand-1 on ->"
(assert (= (macroexpand-1 '(-> (a b) (-> (c d) (e f)))) (assert (= (macroexpand-1 '(-> (a b) (-> (c d) (e f))))
'(-> (a b) (c d) (e f))))) '(-> (a b) (c d) (e f)))))
(defn test-calling-module-name []
"NATIVE: Test the calling-module-name function"
(assert (= (calling-module-name -1) "hy.core.language"))
(assert (= (calling-module-name 0) "tests.native_tests.language")))
(defn test-disassemble []
"NATIVE: Test the disassemble function"
(import sys)
(if-python2
(import [io [BytesIO :as StringIO]])
(import [io [StringIO]]))
(setv prev-stdout sys.stdout)
(setv sys.stdout (StringIO))
(disassemble '(do (leaky) (leaky) (macros)))
(setv stdout (.getvalue sys.stdout))
(setv sys.stdout prev-stdout)
(assert (in "leaky" stdout))
(assert (in "macros" stdout))
(setv sys.stdout (StringIO))
(disassemble '(do (leaky) (leaky) (macros)) true)
(setv stdout (.getvalue sys.stdout))
(setv sys.stdout prev-stdout)
(assert (= stdout "leaky()\nleaky()\nmacros()\n")))