Merge branch 'master' into hawaii

Incorporate fix of replacing = with - as flagged by @domokato.
lspector · Jan 1, 2017 · 3f08b23 · 3f08b23
2 parents dd981ec + 628881e
commit 3f08b23
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/src/clojush/instructions/tag.clj b/src/clojush/instructions/tag.clj
@@ -161,7 +161,7 @@
   ^{:stack-types [:integer :tag :exec]}
   (fn [state]
     (if (not (empty? (:integer state)))
-      (push-item (symbol (str "tagged_" (mod (#(if (neg? %) (= %) %) (stack-ref :integer 0 state))
+      (push-item (symbol (str "tagged_" (mod (#(if (neg? %) (- %) %) (stack-ref :integer 0 state))
                                              @global-tag-limit)))
                  :exec
                  (pop-item :integer state))
@@ -172,7 +172,7 @@
   ^{:stack-types [:integer :tag :exec]}
   (fn [state]
     (if (not (empty? (:integer state)))
-      (push-item (symbol (str "untag_" (mod (#(if (neg? %) (= %) %) (stack-ref :integer 0 state))
+      (push-item (symbol (str "untag_" (mod (#(if (neg? %) (- %) %) (stack-ref :integer 0 state))
                                             @global-tag-limit)))
                  :exec
                  (pop-item :integer state))
@@ -183,7 +183,7 @@
   ^{:stack-types [:integer :tag :exec]}
   (fn [state]
     (if (not (empty? (:integer state)))
-      (push-item (symbol (str "tag_exec_" (mod (#(if (neg? %) (= %) %) (stack-ref :integer 0 state))
+      (push-item (symbol (str "tag_exec_" (mod (#(if (neg? %) (- %) %) (stack-ref :integer 0 state))
                                                @global-tag-limit)))
                  :exec
                  (pop-item :integer state))
@@ -194,7 +194,7 @@
   ^{:stack-types [:integer :tag :exec :code]}
   (fn [state]
     (if (not (empty? (:integer state)))
-      (push-item (symbol (str "tag_code_" (mod (#(if (neg? %) (= %) %) (stack-ref :integer 0 state))
+      (push-item (symbol (str "tag_code_" (mod (#(if (neg? %) (- %) %) (stack-ref :integer 0 state))
                                                @global-tag-limit)))
                  :exec
                  (pop-item :integer state))
@@ -205,7 +205,7 @@
   ^{:stack-types [:integer :tag :exec]}
   (fn [state]
     (if (not (empty? (:integer state)))
-      (push-item (symbol (str "tag_integer_" (mod (#(if (neg? %) (= %) %) (stack-ref :integer 0 state))
+      (push-item (symbol (str "tag_integer_" (mod (#(if (neg? %) (- %) %) (stack-ref :integer 0 state))
                                                   @global-tag-limit)))
                  :exec
                  (pop-item :integer state))
@@ -216,7 +216,7 @@
   ^{:stack-types [:integer :tag :exec :float]}
   (fn [state]
     (if (not (empty? (:integer state)))
-      (push-item (symbol (str "tag_float_" (mod (#(if (neg? %) (= %) %) (stack-ref :integer 0 state))
+      (push-item (symbol (str "tag_float_" (mod (#(if (neg? %) (- %) %) (stack-ref :integer 0 state))
                                                 @global-tag-limit)))
                  :exec
                  (pop-item :integer state))
@@ -227,7 +227,7 @@
   ^{:stack-types [:integer :tag :exec :boolean]}
   (fn [state]
     (if (not (empty? (:integer state)))
-      (push-item (symbol (str "tag_boolean_" (mod (#(if (neg? %) (= %) %) (stack-ref :integer 0 state))
+      (push-item (symbol (str "tag_boolean_" (mod (#(if (neg? %) (- %) %) (stack-ref :integer 0 state))
                                                   @global-tag-limit)))
                  :exec
                  (pop-item :integer state))
@@ -238,7 +238,7 @@
   ^{:stack-types [:integer :tag :exec :char]}
   (fn [state]
     (if (not (empty? (:integer state)))
-      (push-item (symbol (str "tag_char_" (mod (#(if (neg? %) (= %) %) (stack-ref :integer 0 state))
+      (push-item (symbol (str "tag_char_" (mod (#(if (neg? %) (- %) %) (stack-ref :integer 0 state))
                                                @global-tag-limit)))
                  :exec
                  (pop-item :integer state))
@@ -249,7 +249,7 @@
   ^{:stack-types [:integer :tag :exec :string]}
   (fn [state]
     (if (not (empty? (:integer state)))
-      (push-item (symbol (str "tag_string_" (mod (#(if (neg? %) (= %) %) (stack-ref :integer 0 state))
+      (push-item (symbol (str "tag_string_" (mod (#(if (neg? %) (- %) %) (stack-ref :integer 0 state))
                                                  @global-tag-limit)))
                  :exec
                  (pop-item :integer state))
@@ -260,7 +260,7 @@
   ^{:stack-types [:integer :tag :exec :zip]}
   (fn [state]
     (if (not (empty? (:integer state)))
-      (push-item (symbol (str "tag_zip_" (mod (#(if (neg? %) (= %) %) (stack-ref :integer 0 state))
+      (push-item (symbol (str "tag_zip_" (mod (#(if (neg? %) (- %) %) (stack-ref :integer 0 state))
                                               @global-tag-limit)))
                  :exec
                  (pop-item :integer state))
@@ -271,8 +271,9 @@
   ^{:stack-types [:integer :tag :exec :genome]}
   (fn [state]
     (if (not (empty? (:integer state)))
-      (push-item (symbol (str "tag_genome_" (mod (#(if (neg? %) (= %) %) (stack-ref :integer 0 state))
+      (push-item (symbol (str "tag_genome_" (mod (#(if (neg? %) (- %) %) (stack-ref :integer 0 state))
                                                  @global-tag-limit)))
                  :exec
                  (pop-item :integer state))
       state)))
+