move around operator.

Author: julialongtin

Graphics/Implicit/ExtOpenScad/Definitions.hs

@@ -34,7 +34,8 @@ module Graphics.Implicit.ExtOpenScad.Definitions (ArgParser(AP, APTest, APBranch
                                                   varUnion,
                                                   runImplicitCadM,
                                                   CanCompState,
-                                                  CanCompState'
+                                                  CanCompState',
+                                                  (<|>)
                                                   ) where
 
 import Prelude(Eq, Show, Ord, Maybe, Bool(True, False), IO, FilePath, (==), show, ($), (<>), and, zipWith, Int, (<$>))
@@ -308,3 +309,7 @@ data TestInvariant =
   | ContoursAreClosed
   | MeshIsWaterTight
     deriving (Show)
+
+-- | for composing ArgParsers.
+--(<|>) :: ArgParser a -> ArgParser a -> ArgParser a
+--(<|>) = mplus

Graphics/Implicit/ExtOpenScad/Primitives.hs

@@ -13,15 +13,15 @@
 {-# LANGUAGE OverloadedStrings #-}
 
 -- Export one set containing all of the primitive modules.
-module Graphics.Implicit.ExtOpenScad.Primitives (primitiveModules) where
+module Graphics.Implicit.ExtOpenScad.Primitives (primitiveModules, argument) where
 
 import Prelude(any, concat, elem, error, fromIntegral, foldr, head, length, mapM, (.), (+), Either(Left, Right), Bool(True, False), Maybe(Just, Nothing), ($), pure, show, either, id, (-), (==), (&&), (<), (*), cos, sin, pi, (/), (>), const, uncurry, (/=), (||), not, null, fmap, (<>), otherwise, (<*>), (<$>))
 
 import Graphics.Implicit.Definitions (ℝ, ℝ2, ℝ3, ℕ, SymbolicObj2, SymbolicObj3, ExtrudeMScale(C1), fromℕtoℝ, isScaleID)
 
 import Graphics.Implicit.Export.Util (centroid)
 
-import Graphics.Implicit.ExtOpenScad.Definitions (ArgParser, OVal (OObj2, OObj3, ONModule, ONModuleWithSuite), ScadOpts(importsAllowed), SourcePosition, StateC, Symbol(Symbol))
+import Graphics.Implicit.ExtOpenScad.Definitions (ArgParser, OVal (OObj2, OObj3, ONModule, ONModuleWithSuite), ScadOpts(importsAllowed), SourcePosition, StateC, Symbol(Symbol), (<|>))
 
 import Graphics.Implicit.ExtOpenScad.Util.ArgParser (contoursAreClosed, doc, defaultTo, example, meshIsWaterTight, test, eulerCharacteristic)
 
@@ -38,7 +38,7 @@ import Graphics.Implicit.TriUtil (Tri, Triangle)
 -- Note the use of a qualified import, so we don't have the functions in this file conflict with what we're importing.
 import qualified Graphics.Implicit.Primitives as Prim (withRounding, sphere, rect3, rect, translate, circle, polygon, polyhedron, extrude, cylinder2, union, unionR, intersect, intersectR, difference, differenceR, rotate, slice, transform, rotate3V, rotate3, transform3, scale, extrudeM, rotateExtrude, shell, mirror, pack3, pack2, torus, ellipsoid, cone)
 
-import Control.Monad (foldM, mplus)
+import Control.Monad (foldM)
 
 import Data.ByteString (readFile)
 
@@ -869,9 +869,6 @@ multmatrix = moduleWithSuite "multmatrix" $ \_ children -> do
 
 ---------------
 
-(<|>) :: ArgParser a -> ArgParser a -> ArgParser a
-(<|>) = mplus
-
 moduleWithSuite :: Text -> (SourcePosition -> [OVal] -> ArgParser (StateC [OVal])) -> (Symbol, SourcePosition -> [OVal] -> ArgParser (StateC [OVal]))
 moduleWithSuite name modArgMapper = (Symbol name, modArgMapper)