Use more common spelling of deferrable.

Deferable is apprently a less common but correct spelling.

diff --git a/Makefile b/Makefile
index 231af42..60fc212 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -57,7 +57,7 @@ TEST_OPTS =
 # later steps.
 REGRESS =
 
-DEFERABLE=1
+DEFERRABLE=1
 OPTIONAL=1
 
 # Extra implementation specific options to pass to runtest.py
@@ -135,7 +135,7 @@ haxe_RUNSTEP_python = python3 ../$(2) $(3)
 haxe_RUNSTEP_cpp    = ../$(2) $(3)
 haxe_RUNSTEP_js     = node ../$(2) $(3)
 
-opt_DEFERABLE       = $(if $(strip $(DEFERABLE)),$(if $(filter t true T True TRUE 1 y yes Yes YES,$(DEFERABLE)),--deferable,--no-deferable),--no-deferable)
+opt_DEFERRABLE       = $(if $(strip $(DEFERRABLE)),$(if $(filter t true T True TRUE 1 y yes Yes YES,$(DEFERRABLE)),--deferrable,--no-deferrable),--no-deferrable)
 opt_OPTIONAL        = $(if $(strip $(OPTIONAL)),$(if $(filter t true T True TRUE 1 y yes Yes YES,$(OPTIONAL)),--optional,--no-optional),--no-optional)
 
 # Return list of test files for a given step. If REGRESS is set then
@@ -336,8 +336,8 @@ $(ALL_TESTS): $$(call $$(word 2,$$(subst ^, ,$$(@)))_STEP_TO_PROG,$$(word 3,$$(s
            $(foreach test,$(call STEP_TEST_FILES,$(impl),$(step)),\
              echo '----------------------------------------------' && \
              echo 'Testing $@, step file: $+, test file: $(test)' && \
-             echo 'Running: $(call get_run_prefix,$(impl))../runtest.py $(TEST_OPTS) $(opt_DEFERABLE) $(opt_OPTIONAL) $(call $(impl)_TEST_OPTS) ../$(test) -- $(call $(impl)_RUNSTEP,$(step),$(+))' && \
-             $(call get_run_prefix,$(impl))../runtest.py $(TEST_OPTS) $(opt_DEFERABLE) $(opt_OPTIONAL) $(call $(impl)_TEST_OPTS) ../$(test) -- $(call $(impl)_RUNSTEP,$(step),$(+)) &&) \
+             echo 'Running: $(call get_run_prefix,$(impl))../runtest.py $(TEST_OPTS) $(opt_DEFERRABLE) $(opt_OPTIONAL) $(call $(impl)_TEST_OPTS) ../$(test) -- $(call $(impl)_RUNSTEP,$(step),$(+))' && \
+             $(call get_run_prefix,$(impl))../runtest.py $(TEST_OPTS) $(opt_DEFERRABLE) $(opt_OPTIONAL) $(call $(impl)_TEST_OPTS) ../$(test) -- $(call $(impl)_RUNSTEP,$(step),$(+)) &&) \
            true))
 
 # Allow test, tests, test^STEP, test^IMPL, and test^IMPL^STEP

diff --git a/process/guide.md b/process/guide.md
index 85cf65c..170a897 100644 (file)
--- a/process/guide.md
+++ b/process/guide.md
@@ -760,7 +760,7 @@ Try out the basic functionality you have implemented:
 * Add the following functions to `core.ns`:
   * `prn`: call `pr_str` on the first parameter with `print_readably`
     set to true, prints the result to the screen and then return
-    `nil`. Note that the full version of `prn` is a deferable below.
+    `nil`. Note that the full version of `prn` is a deferrable below.
   * `list`: take the parameters and return them as a list.
   * `list?`: return true if the first parameter is a list, false
     otherwise.

diff --git a/runtest.py b/runtest.py
index 7584082..71ff268 100755 (executable)
--- a/runtest.py
+++ b/runtest.py
@@ -52,12 +52,12 @@ parser.add_argument('--debug-file', type=str,
 parser.add_argument('--hard', action='store_true',
         help="Turn soft tests following a ';>>> soft=True' into hard failures")
 
-# Control whether deferable and optional tests are executed
-parser.add_argument('--deferable', dest='deferable', action='store_true',
-        help="Enable deferable tests that follow a ';>>> deferable=True'")
-parser.add_argument('--no-deferable', dest='deferable', action='store_false',
-        help="Disable deferable tests that follow a ';>>> deferable=True'")
-parser.set_defaults(deferable=True)
+# Control whether deferrable and optional tests are executed
+parser.add_argument('--deferrable', dest='deferrable', action='store_true',
+        help="Enable deferrable tests that follow a ';>>> deferrable=True'")
+parser.add_argument('--no-deferrable', dest='deferrable', action='store_false',
+        help="Disable deferrable tests that follow a ';>>> deferrable=True'")
+parser.set_defaults(deferrable=True)
 parser.add_argument('--optional', dest='optional', action='store_true',
         help="Enable optional tests that follow a ';>>> optional=True'")
 parser.add_argument('--no-optional', dest='optional', action='store_false',
@@ -158,7 +158,7 @@ class TestReader:
         self.line_num = 0
         self.data = test_file.read().split('\n')
         self.soft = False
-        self.deferable = False
+        self.deferrable = False
         self.optional = False
 
     def next(self):
@@ -182,8 +182,8 @@ class TestReader:
                 exec(line[5:], {}, settings)
                 if 'soft' in settings:
                     self.soft = settings['soft']
-                if 'deferable' in settings and settings['deferable']:
-                    self.deferable = "\nSkipping deferable and optional tests"
+                if 'deferrable' in settings and settings['deferrable']:
+                    self.deferrable = "\nSkipping deferrable and optional tests"
                     return True
                 if 'optional' in settings and settings['optional']:
                     self.optional = "\nSkipping optional tests"
@@ -255,8 +255,8 @@ soft_fail_cnt = 0
 failures = []
 
 while t.next():
-    if args.deferable == False and t.deferable:
-        log(t.deferable)
+    if args.deferrable == False and t.deferrable:
+        log(t.deferrable)
         break
 
     if args.optional == False and t.optional:

diff --git a/tests/step1_read_print.mal b/tests/step1_read_print.mal
index 63e38c5..69e4336 100644 (file)
--- a/tests/step1_read_print.mal
+++ b/tests/step1_read_print.mal
@@ -43,10 +43,10 @@ abc-def
 ;=>(1 2 3)
 
 
-;>>> deferable=True
+;>>> deferrable=True
 
 ;;
-;; -------- Deferable Functionality --------
+;; -------- Deferrable Functionality --------
 
 ;; Testing read of nil/true/false
 nil

diff --git a/tests/step2_eval.mal b/tests/step2_eval.mal
index 2954bb7..a077d20 100644 (file)
--- a/tests/step2_eval.mal
+++ b/tests/step2_eval.mal
@@ -27,10 +27,10 @@
 ()
 ;=>()
 
-;>>> deferable=True
+;>>> deferrable=True
 ;>>> optional=True
 ;;
-;; -------- Deferable/Optional Functionality --------
+;; -------- Deferrable/Optional Functionality --------
 
 ;; Testing evaluation within collection literals
 [1 2 (+ 1 2)]

diff --git a/tests/step3_env.mal b/tests/step3_env.mal
index 91653b0..5cc98ba 100644 (file)
--- a/tests/step3_env.mal
+++ b/tests/step3_env.mal
@@ -46,10 +46,10 @@ x
 a
 ;=>4
 
-;>>> deferable=True
+;>>> deferrable=True
 ;>>> optional=True
 ;;
-;; -------- Deferable/Optional Functionality --------
+;; -------- Deferrable/Optional Functionality --------
 
 ;; Testing let* with vector bindings
 (let* [z 9] z)

diff --git a/tests/step4_if_fn_do.mal b/tests/step4_if_fn_do.mal
index ca7fbf1..19c602a 100644 (file)
--- a/tests/step4_if_fn_do.mal
+++ b/tests/step4_if_fn_do.mal
@@ -202,9 +202,9 @@ a
 ;;;;=>89
 
 
-;>>> deferable=True
+;>>> deferrable=True
 ;;
-;; -------- Deferable Functionality --------
+;; -------- Deferrable Functionality --------
 
 ;; Testing variable length arguments
 

diff --git a/tests/step6_file.mal b/tests/step6_file.mal
index a3ebd44..02e3736 100644 (file)
--- a/tests/step6_file.mal
+++ b/tests/step6_file.mal
@@ -94,10 +94,10 @@
 (f)
 ;=>9
 
-;>>> deferable=True
+;>>> deferrable=True
 ;>>> optional=True
 ;;
-;; -------- Deferable/Optional Functionality --------
+;; -------- Deferrable/Optional Functionality --------
 
 ;; Testing comments in a file
 (load-file "../tests/incB.mal")

diff --git a/tests/step7_quote.mal b/tests/step7_quote.mal
index dce3836..bd5b22f 100644 (file)
--- a/tests/step7_quote.mal
+++ b/tests/step7_quote.mal
@@ -104,9 +104,9 @@ b
 ;;;((fn* [q] (quasiquote ((unquote q) (quote (unquote q))))) (quote (fn* [q] (quasiquote ((unquote q) (quote (unquote q)))))))
 ;;;=>((fn* [q] (quasiquote ((unquote q) (quote (unquote q))))) (quote (fn* [q] (quasiquote ((unquote q) (quote (unquote q)))))))
 
-;>>> deferable=True
+;>>> deferrable=True
 ;;
-;; -------- Deferable Functionality --------
+;; -------- Deferrable Functionality --------
 
 ;; Testing ' (quote) reader macro
 '7

diff --git a/tests/step8_macros.mal b/tests/step8_macros.mal
index 0050a04..8d0ac4b 100644 (file)
--- a/tests/step8_macros.mal
+++ b/tests/step8_macros.mal
@@ -28,9 +28,9 @@
 ;=>123
 
 
-;>>> deferable=True
+;>>> deferrable=True
 ;;
-;; -------- Deferable Functionality --------
+;; -------- Deferrable Functionality --------
 
 ;; Testing non-macro function
 (not (= 1 1))

diff --git a/tests/step9_try.mal b/tests/step9_try.mal
index 245b5de..3d6f86e 100644 (file)
--- a/tests/step9_try.mal
+++ b/tests/step9_try.mal
@@ -70,9 +70,9 @@
 (map (fn* (x) (symbol? x)) (list 1 (quote two) "three"))
 ;=>(false true false)
 
-;>>> deferable=True
+;>>> deferrable=True
 ;;
-;; ------- Deferable Functionality ----------
+;; ------- Deferrable Functionality ----------
 ;; ------- (Needed for self-hosting) -------
 
 ;; Testing symbol and keyword functions

diff --git a/tests/stepA_mal.mal b/tests/stepA_mal.mal
index 9ea8520..a349c09 100644 (file)
--- a/tests/stepA_mal.mal
+++ b/tests/stepA_mal.mal
@@ -18,9 +18,9 @@
 ;=>false
 
 
-;>>> deferable=True
+;>>> deferrable=True
 ;;
-;; ------- Deferable Functionality ----------
+;; ------- Deferrable Functionality ----------
 ;; ------- (Needed for self-hosting) -------
 
 ;;