Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Return Vm instead of Stack #242

Merged
merged 1 commit into from
Feb 5, 2024
Merged

Return Vm instead of Stack #242

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions app/elm/Vm/Vm.elm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,13 +298,13 @@ popValue3 vm =


{-| Pop a number of values from the stack. Return a list of values and the
remaining stack.
vm with the remaining stack.

Return `Err (Internal InvalidStack)` if not enough values are on the stack or
if not all items are a `Stack.Value`.

-}
popValues : Int -> Vm -> Result Error ( List Type.Value, Stack )
popValues : Int -> Vm -> Result Error ( List Type.Value, Vm )
popValues n vm =
let
stackSize =
Expand All @@ -329,7 +329,7 @@ popValues n vm =
Result.map2 (\value_ acc_ -> value_ :: acc_) value acc
)
(Ok [])
|> Result.map (\first -> ( first, List.drop n vm.stack ))
|> Result.map (\first -> ( first, { vm | stack = List.drop n vm.stack } ))


parseAndCompileProgram : Parser Program -> String -> Result Error CompiledProgram
Expand Down Expand Up @@ -487,11 +487,12 @@ evalN : P.PrimitiveN -> Int -> Vm -> Result Error Vm
evalN primitive n vm =
popValues n vm
|> Result.andThen
(\( arguments, rest ) ->
(\( arguments, newVm ) ->
primitive.f arguments
|> Result.map
(\value ->
{ vm | stack = Stack.Value value :: rest }
newVm
|> pushValue1 value
|> incrementProgramCounter
)
|> Result.mapError (mapWrongInput primitive.name)
Expand Down Expand Up @@ -548,11 +549,11 @@ commandN : C.CommandN -> Int -> Vm -> Result Error Vm
commandN command n vm =
popValues n vm
|> Result.andThen
(\( arguments, rest ) ->
(\( arguments, newVm ) ->
command.f arguments vm.environment
|> Result.map
(\environment ->
{ vm | stack = rest, environment = environment }
{ newVm | environment = environment }
|> incrementProgramCounter
)
|> Result.mapError (mapWrongInput command.name)
Expand Down