rowan.a.tl/propeller
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix error in vector/_last

Browse Source 
Similar to `vector/_first`, this didn't check for the empty vector case, so I've changed it to return `:ignore-instruction` in that case.

There's a lot of duplication between `_first` and `_last`, which makes me think there's some refactoring opportunities.
This commit is contained in:
Nic McPhee 2020-12-18 17:03:56 -06:00
parent ab1f6d4396
commit 91df21dba5
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/propeller/push/instructions/vector.cljc
View File

@ -52,7 +52,7 @@
(make-instruction state empty? [stack] :boolean))) (make-instruction state empty? [stack] :boolean)))
;; Pushes the first item of the top element of the vector stack onto the ;; Pushes the first item of the top element of the vector stack onto the
;; approrpiately-typed literal stack. If the vector is empty, return ;; appropriately-typed literal stack. If the vector is empty, return
;; :ignore-instruction so that nothing is changed on the stacks. ;; :ignore-instruction so that nothing is changed on the stacks.
(def _first (def _first
^{:stacks #{:elem}} ^{:stacks #{:elem}}
@ -101,7 +101,11 @@
^{:stacks #{:elem}} ^{:stacks #{:elem}}
(fn [stack state] (fn [stack state]
(let [lit-stack (get-vector-literal-type stack)] (let [lit-stack (get-vector-literal-type stack)]
(make-instruction state last [stack] lit-stack)))) (make-instruction
state
#(if (empty? %) :ignore-instruction (last %))
[stack]
lit-stack))))
;; Pushes the length of the top item onto the INTEGER stack ;; Pushes the length of the top item onto the INTEGER stack
(def _length (def _length