diff --git a/src/propeller/problems/software/number_io.cljc b/src/propeller/problems/software/number_io.cljc index 2acae61..fcbef5f 100755 --- a/src/propeller/problems/software/number_io.cljc +++ b/src/propeller/problems/software/number_io.cljc @@ -71,9 +71,9 @@ program (assoc state/empty-state :input {:in1 (first input) :in2 (last input)} - :output '("")) + :print '("")) (:step-limit argmap)) - :output)) + :print)) inputs) parsed-outputs (map (fn [output] (try (read-string output) diff --git a/src/propeller/problems/software/smallest.cljc b/src/propeller/problems/software/smallest.cljc index a70ac59..9ca4dbb 100755 --- a/src/propeller/problems/software/smallest.cljc +++ b/src/propeller/problems/software/smallest.cljc @@ -75,9 +75,9 @@ :in2 (get input 1) :in3 (get input 2) :in4 (get input 3)} - :output '("")) + :print '("")) (:step-limit argmap)) - :output)) + :print)) inputs) errors (map (fn [correct-output output] (let [parsed-output (try (read-string output) diff --git a/src/propeller/push/instructions/input_output.cljc b/src/propeller/push/instructions/input_output.cljc index 9d52d54..b597c7b 100755 --- a/src/propeller/push/instructions/input_output.cljc +++ b/src/propeller/push/instructions/input_output.cljc @@ -31,9 +31,9 @@ :print_newline ^{:stacks [:print]} (fn [state] - (let [current-output (state/peek-stack state :output) - popped-state (state/pop-stack state :output)] - (state/push-to-stack popped-state :output (str current-output \newline))))) + (let [current-output (state/peek-stack state :print) + popped-state (state/pop-stack state :print)] + (state/push-to-stack popped-state :print (str current-output \newline))))) (def _print ^{:stacks [:print] @@ -46,10 +46,10 @@ (char? top-item)) top-item (pr-str top-item)) - current-output (state/peek-stack state :output) - popped-state (state/pop-stack (state/pop-stack state stack) :output)] + current-output (state/peek-stack state :print) + popped-state (state/pop-stack (state/pop-stack state stack) :print)] (state/push-to-stack popped-state - :output + :print (str current-output top-item-str)))))) (generate-instructions diff --git a/src/propeller/push/state.cljc b/src/propeller/push/state.cljc index b49227e..647509c 100755 --- a/src/propeller/push/state.cljc +++ b/src/propeller/push/state.cljc @@ -7,8 +7,9 @@ :exec '() :float '() :input {} + :output {} :integer '() - :output '("") + :print '("") :string '() :vector_boolean '() :vector_float '()