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

Move max-stack-items to globals

Browse Source 
This creates a `push/utils/globals/cljc` similar to that created by @mcgirjau and moved the `max-stack-items` def to that namespace, updating `polymorphic` as necessary.
This commit is contained in:
Nic McPhee 2020-11-24 16:00:03 -06:00
parent f675f69276
commit da84852245
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/propeller/push/instructions/polymorphic.cljc
View File

@ -5,6 +5,7 @@
(:require [propeller.utils :as utils]
[propeller.push.state :as state]
[propeller.push.utils.helpers :refer [make-instruction]]
[propeller.push.utils.globals :as globals]
#?(:clj
[propeller.push.utils.macros :refer [def-instruction
generate-instructions]])))
@ -25,17 +26,12 @@
state
(state/push-to-stack state stack top-item)))))
;; Limits the number of items that can be duplicated onto a stack at once.
;; We might want to extend to limit all the different that things may be
;; placed on a stack.
(def max-stack-items 100)
;; Duplicates n copies of the top item (i.e leaves n copies there). Does not pop
;; its argument (since that would negate the effect of the duplication). The
;; number n is determined by the top INTEGER. For n = 0, equivalent to POP.
;; For n = 1, equivalent to NOOP. For n = 2, equivalent to DUP. Negative values
;; of n are treated as 0. The final number of items on the stack is limited to
;; max-stack-items.
;; globals/max-stack-items.
(def _dup_times
^{:stacks #{:integer}}
(fn [stack state]
@ -45,7 +41,7 @@
(not (state/empty-stack? state :integer))
(not (state/empty-stack? state stack))))
(let [n (min (state/peek-stack state :integer)
(inc (- max-stack-items (state/stack-size state stack))))
(inc (- globals/max-stack-items (state/stack-size state stack))))
popped-state (state/pop-stack state :integer)
top-item (state/peek-stack popped-state stack)
top-item-dup (take (- n 1) (repeat top-item))]
@ -57,14 +53,14 @@
;; Duplicates the top n items on the stack, one time each. The number n is
;; determined by the top INTEGER. If n <= 0, no items will be duplicated. If
;; fewer than n items are on the stack, the entire stack will be duplicated.
;; The final number of items on the stack is limited to max-stack-items.
;; The final number of items on the stack is limited to globals/max-stack-items.
(def _dup_items
^{:stacks #{:integer}}
(fn [stack state]
(if (state/empty-stack? state :integer)
state
(let [n (min (state/peek-stack state :integer)
(- max-stack-items (state/stack-size state stack)))
(- globals/max-stack-items (state/stack-size state stack)))
popped-state (state/pop-stack state :integer)
top-items (take n (get popped-state stack))]
(state/push-to-stack-many popped-state stack top-items)))))

11
src/propeller/push/utils/globals.cljc Normal file
View File

@ -0,0 +1,11 @@
(ns propeller.push.utils.globals)
;; =============================================================================
;; Values used by the Push instructions to keep the stack sizes within
;; reasonable limits.
;; =============================================================================
;; Limits the number of items that can be duplicated onto a stack at once.
;; We might want to extend this to limit all the different that things may be
;; placed on a stack.
(def max-stack-items 100)