Removing VM code

rumblesan · Apr 12, 2020 · 408f15a · 408f15a
1 parent 2f1b1c9
commit 408f15a
Show file tree

Hide file tree

Showing 17 changed files with 2 additions and 1,048 deletions.
diff --git a/improviz.cabal b/improviz.cabal
@@ -84,18 +84,6 @@ executable improviz
                      , Language.Ast
                      , Language.Ast.Transformers
                      , Language.Ast.Transformers.Globalise
-                     , Language.Compiler
-                     , Language.Compiler.State
-                     , Language.ImpVM
-                     , Language.ImpVM.StdLib
-                     , Language.ImpVM.StdLib.BlockHandling
-                     , Language.ImpVM.StdLib.ColourOps
-                     , Language.ImpVM.StdLib.Maths
-                     , Language.ImpVM.StdLib.MatrixOps
-                     , Language.ImpVM.StdLib.PostEffects
-                     , Language.ImpVM.StdLib.Shapes
-                     , Language.ImpVM.Types
-                     , Language.ImpVM.VM
                      , Language.Interpreter
                      , Language.Interpreter.Operators
                      , Language.Interpreter.Scope
@@ -186,18 +174,6 @@ test-suite improviz-test
                      , Language.Ast
                      , Language.Ast.Transformers
                      , Language.Ast.Transformers.Globalise
-                     , Language.Compiler
-                     , Language.Compiler.State
-                     , Language.ImpVM
-                     , Language.ImpVM.StdLib
-                     , Language.ImpVM.StdLib.BlockHandling
-                     , Language.ImpVM.StdLib.ColourOps
-                     , Language.ImpVM.StdLib.Maths
-                     , Language.ImpVM.StdLib.MatrixOps
-                     , Language.ImpVM.StdLib.PostEffects
-                     , Language.ImpVM.StdLib.Shapes
-                     , Language.ImpVM.Types
-                     , Language.ImpVM.VM
                      , Language.Interpreter
                      , Language.Interpreter.Operators
                      , Language.Interpreter.Scope
@@ -238,7 +214,6 @@ test-suite improviz-test
                      , Tests.Language.Parser.Loops
                      , Tests.Language.Parser.Operators
                      , Tests.Language.Parser.Symbols
-                     , Tests.Language.VM
                      , Util
   default-language:    Haskell2010
 

diff --git a/src/Improviz/Runtime.hs b/src/Improviz/Runtime.hs
@@ -4,7 +4,6 @@ module Improviz.Runtime
   ( ImprovizRuntime
   , makeRuntimeState
   , initialInterpreter
-  , impVMState
   , currentAst
   , updateProgram
   , resetProgram
@@ -13,13 +12,9 @@ module Improviz.Runtime
   )
 where
 
-import qualified Data.Map.Strict               as M
-
 import           Language                       ( initialInterpreterState )
 import           Language.Ast                   ( Program(..) )
 import           Language.Interpreter.Types     ( InterpreterState )
-import           Language.ImpVM.Types           ( VMState )
-import           Language.ImpVM                 ( cleanVM )
 import           Lens.Simple                    ( (^.)
                                                 , set
                                                 , view
@@ -34,7 +29,6 @@ data ImprovizRuntime gfxContext = ImprovizRuntime
   , _currentAst         :: Program
   , _lastWorkingAst     :: Program
   , _initialInterpreter :: InterpreterState
-  , _impVMState :: VMState gfxContext
   }
 
 makeLenses ''ImprovizRuntime
@@ -48,7 +42,6 @@ makeRuntimeState userCode ctx = do
                          , _currentAst         = Program []
                          , _lastWorkingAst     = Program []
                          , _initialInterpreter = initial
-                         , _impVMState         = cleanVM ctx M.empty
                          }
 
 updateProgram :: String -> Program -> ImprovizRuntime eg -> ImprovizRuntime eg

diff --git a/src/Language/Compiler.hs b/src/Language/Compiler.hs
diff --git a/src/Language/Compiler/State.hs b/src/Language/Compiler/State.hs