Haskell-Things/ImplicitCAD
1
1
Fork 0
mirror of https://github.com/Haskell-Things/ImplicitCAD.git synced 2024-11-04 01:26:48 +03:00
Code Issues Projects Releases Wiki Activity

more optimizations.

Browse Source
This commit is contained in:
Julia Longtin 2019-08-08 00:54:33 +01:00
parent d6c199ffe9
commit 00073f1305
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Graphics/Implicit/ExtOpenScad/Eval/Statement.hs
View File

@ -7,7 +7,7 @@
module Graphics.Implicit.ExtOpenScad.Eval.Statement (runStatementI) where
import Prelude(Maybe(Just, Nothing), Bool(True, False), Either(Left, Right), (.), ($), show, concatMap, return, (++), reverse, fst, snd, readFile, filter, length, lookup, (+), (<), (||), (>), (&&), (==), (<$>))
import Prelude(Maybe(Just, Nothing), Bool(True, False), Either(Left, Right), (.), ($), show, concatMap, return, (++), reverse, fst, snd, readFile, filter, length, lookup, (+), (<), (||), (>), (&&), (==))
import Graphics.Implicit.ExtOpenScad.Definitions (
Statement(Include, (:=), Echo, For, If, NewModule, ModuleCall, DoNothing),
@ -111,8 +111,7 @@ runStatementI (StatementI sourcePos (NewModule name argTemplate suite)) = do
return (argName, val)
let
varlookup' = union (fromList newNameVals) varlookup
suiteVals = runSuiteCapture (VarLookup varlookup') suite
return suiteVals
return $ runSuiteCapture (VarLookup varlookup') suite
-- | Interpret a call to a module.
runStatementI (StatementI sourcePos (ModuleCall (Symbol name) argsExpr suite)) = do
@ -175,23 +174,20 @@ runStatementI (StatementI sourcePos (ModuleCall (Symbol name) argsExpr suite)) =
val <- evalExpr sourcePos expr
return (posName, val)
-- Run the function.
childVals <- reverse <$> runSuiteCapture varlookup suite
childVals <- runSuiteCapture varlookup suite
let
argparser = mod' childVals
argsMapped = argMap argsVal argparser
ioNewVals <- fromMaybe (return []) (fst argsMapped)
argsMapped = argMap argsVal $ mod' childVals
forM_ (snd argsMapped) $ errorC sourcePos
return ioNewVals
fromMaybe (return []) (fst argsMapped)
Just (OModule _ _ mod') -> do
-- Evaluate all of the arguments.
argsVal <- forM argsExpr $ \(posName, expr) -> do
val <- evalExpr sourcePos expr
return (posName, val)
-- Run the function.
childVals <- reverse <$> runSuiteCapture varlookup suite
childVals <- runSuiteCapture varlookup suite
let
argparser = mod' childVals
argsMapped = argMap argsVal argparser
argsMapped = argMap argsVal $ mod' childVals
ioNewVals = fromMaybe (return []) (fst argsMapped)
forM_ (snd argsMapped) $ errorC sourcePos
liftIO ioNewVals
@ -240,4 +236,4 @@ runSuiteCapture varlookup suite = do
let
moveMessage (Message mtype mpos text) = addMessage mtype mpos text
mapM_ moveMessage messages
return res
return $ reverse res