diff --git a/NEWS b/NEWS index be48b1f..ff75884 100644 --- a/NEWS +++ b/NEWS @@ -60,7 +60,7 @@ Changes from 0.10.0 * nth returns default value when out of bounds * merge-with added * doto macro added - * keyword? to findout keywords + * keyword? to find out keywords * setv no longer allows "." in names [Internals ] diff --git a/docs/language/internals.rst b/docs/language/internals.rst index 9fb1d53..a038f93 100644 --- a/docs/language/internals.rst +++ b/docs/language/internals.rst @@ -177,7 +177,7 @@ A cons cell is a 2-item object, containing a ``car`` (head) and a building block, and S-expressions are actually represented as linked lists of cons cells. This is not the case in Hy, as the usual expressions are made of Python lists wrapped in a -``HyExpression``. However, the ``HyCons`` mimicks the behavior of +``HyExpression``. However, the ``HyCons`` mimics the behavior of "usual" Lisp variants thusly: - ``(cons something nil)`` is ``(HyExpression [something])`` diff --git a/docs/style-guide.rst b/docs/style-guide.rst index 2e3bd12..b577d79 100644 --- a/docs/style-guide.rst +++ b/docs/style-guide.rst @@ -9,7 +9,7 @@ Hy Style Guide The Hy style guide intends to be a set of ground rules for the Hyve (yes, the Hy community prides itself in appending Hy to everything) to write idiomatic Hy code. Hy derives a lot from Clojure & Common -Lisp, while always maintaining Python interopability. +Lisp, while always maintaining Python interoperability. Prelude diff --git a/hy/compiler.py b/hy/compiler.py index 8259a2c..4738080 100644 --- a/hy/compiler.py +++ b/hy/compiler.py @@ -974,7 +974,7 @@ class HyASTCompiler(object): col_offset=expr.start_column, ctx=ast.Load()) else: - # [] → all exceptions catched + # [] → all exceptions caught _type = Result() elif isinstance(exceptions_list, HySymbol): _type = self.compile(exceptions_list) diff --git a/hy/contrib/anaphoric.hy b/hy/contrib/anaphoric.hy index 019d6db..9129bd4 100644 --- a/hy/contrib/anaphoric.hy +++ b/hy/contrib/anaphoric.hy @@ -35,7 +35,7 @@ (defmacro ap-each-while [lst form &rest body] - "Evalutate the body form for each element in the list while the + "Evaluate the body form for each element in the list while the predicate form evaluates to True." `(let [p (lambda [it] ~form)] (for [it ~lst] @@ -140,7 +140,7 @@ (.startswith a 'x) (.isdigit (cdr a)))) [0]))))]) - ;; generate the &rest paremeter only if 'xi is present in body + ;; generate the &rest parameter only if 'xi is present in body ~@(if (in 'xi flatbody) '(&rest xi) '())] diff --git a/tests/macros/test_reader_macros.py b/tests/macros/test_reader_macros.py index 791a046..11f90eb 100644 --- a/tests/macros/test_reader_macros.py +++ b/tests/macros/test_reader_macros.py @@ -4,7 +4,7 @@ from hy.lex import tokenize def test_reader_macro_error(): - """Check if we get correct error with wrong disptach character""" + """Check if we get correct error with wrong dispatch character""" try: macroexpand(tokenize("(dispatch_reader_macro '- '())")[0], __name__) except HyTypeError as e: diff --git a/tests/native_tests/reader_macros.hy b/tests/native_tests/reader_macros.hy index be61c5c..28604d7 100644 --- a/tests/native_tests/reader_macros.hy +++ b/tests/native_tests/reader_macros.hy @@ -2,7 +2,7 @@ (defn test-reader-macro [] - "Test a basic redaer macro" + "Test a basic reader macro" (defreader ^ [expr] expr) @@ -55,7 +55,7 @@ (assert (= (, (, 2 3 4) {"quux" 5 "baz" 6}) (foo 1 2 3 :quux 4 :baz 5))) - ;; @wraps preserved the doctstring and __name__ + ;; @wraps preserved the docstring and __name__ (assert (= "foo" (. foo --name--))) (assert (= "Bar." (. foo --doc--)))