Merge branch 'master' into pr/456

This commit is contained in:
Nicolas Dandrimont 2014-01-23 21:43:09 +01:00
commit 7b8f6fa9e4
3 changed files with 4 additions and 4 deletions

View File

@ -37,3 +37,4 @@
* Vasudev Kamath <kamathvasudev@gmail.com> * Vasudev Kamath <kamathvasudev@gmail.com>
* Yuval Langer <yuval.langer@gmail.com> * Yuval Langer <yuval.langer@gmail.com>
* Fatih Kadir Akın <fka@fatihak.in> * Fatih Kadir Akın <fka@fatihak.in>
* Jack Hooper <contact.jhooper@gmail.com>

View File

@ -20,7 +20,7 @@ Command line options
.. cmdoption:: --spy .. cmdoption:: --spy
Print equivalent Hy code before executing. For example:: Print equivalent Python code before executing. For example::
=> (defn salutationsnm [name] (print (+ "Hy " name "!"))) => (defn salutationsnm [name] (print (+ "Hy " name "!")))
def salutationsnm(name): def salutationsnm(name):

View File

@ -363,7 +363,7 @@ In hy, you could do these like:
(list-comp (list-comp
(, x y) (, x y)
(x (range 9) (x (range 8)
y "ABCDEFGH")) y "ABCDEFGH"))
; [(0, 'A'), (0, 'B'), (0, 'C'), (0, 'D'), (0, 'E'), (0, 'F'), (0, 'G'), (0, 'H'), ; [(0, 'A'), (0, 'B'), (0, 'C'), (0, 'D'), (0, 'E'), (0, 'F'), (0, 'G'), (0, 'H'),
@ -373,8 +373,7 @@ In hy, you could do these like:
; (4, 'A'), (4, 'B'), (4, 'C'), (4, 'D'), (4, 'E'), (4, 'F'), (4, 'G'), (4, 'H'), ; (4, 'A'), (4, 'B'), (4, 'C'), (4, 'D'), (4, 'E'), (4, 'F'), (4, 'G'), (4, 'H'),
; (5, 'A'), (5, 'B'), (5, 'C'), (5, 'D'), (5, 'E'), (5, 'F'), (5, 'G'), (5, 'H'), ; (5, 'A'), (5, 'B'), (5, 'C'), (5, 'D'), (5, 'E'), (5, 'F'), (5, 'G'), (5, 'H'),
; (6, 'A'), (6, 'B'), (6, 'C'), (6, 'D'), (6, 'E'), (6, 'F'), (6, 'G'), (6, 'H'), ; (6, 'A'), (6, 'B'), (6, 'C'), (6, 'D'), (6, 'E'), (6, 'F'), (6, 'G'), (6, 'H'),
; (7, 'A'), (7, 'B'), (7, 'C'), (7, 'D'), (7, 'E'), (7, 'F'), (7, 'G'), (7, 'H'), ; (7, 'A'), (7, 'B'), (7, 'C'), (7, 'D'), (7, 'E'), (7, 'F'), (7, 'G'), (7, 'H')]
; (8, 'A'), (8, 'B'), (8, 'C'), (8, 'D'), (8, 'E'), (8, 'F'), (8, 'G'), (8, 'H')]
Python has support for various fancy argument and keyword arguments. Python has support for various fancy argument and keyword arguments.