From 604041dd225e4dd0713c49d594fbb857c95e05d0 Mon Sep 17 00:00:00 2001 From: Julia Longtin Date: Tue, 7 May 2019 17:27:39 +0100 Subject: [PATCH] spacing and comment changes. --- Graphics/Implicit/ExtOpenScad/Util/ArgParser.hs | 4 +++- Graphics/Implicit/ObjectUtil/GetBox2.hs | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Graphics/Implicit/ExtOpenScad/Util/ArgParser.hs b/Graphics/Implicit/ExtOpenScad/Util/ArgParser.hs index 56d7814..5510ba1 100644 --- a/Graphics/Implicit/ExtOpenScad/Util/ArgParser.hs +++ b/Graphics/Implicit/ExtOpenScad/Util/ArgParser.hs @@ -15,6 +15,7 @@ import Prelude(String, Maybe(Just, Nothing), ($), (++), concat, show, error, ret import qualified Prelude as Prelude (null) import Graphics.Implicit.ExtOpenScad.Definitions (ArgParser(AP, APTest, APBranch, APTerminator, APFailIf, APExample), OVal (OError), TestInvariant(EulerCharacteristic)) + import Graphics.Implicit.ExtOpenScad.Util.OVal (fromOObj, toOObj, OTypeMirror) import Graphics.Implicit.Definitions(ℕ) @@ -31,6 +32,7 @@ import Control.Arrow(first) -- ** argument and combinators +-- | Builds an argparser for the type that is expected from it. argument :: forall desiredType. (OTypeMirror desiredType) => String -> ArgParser desiredType argument name = AP name Nothing "" $ \oObjVal -> do @@ -74,7 +76,7 @@ eulerCharacteristic _ _ = error "Impossible!" -- | Apply arguments to an ArgParser argMap :: - [(Maybe String, OVal)] -- ^ arguments + [(Maybe String, OVal)] -- ^ arguments -> ArgParser a -- ^ ArgParser to apply them to -> (Maybe a, [String]) -- ^ (result, error messages) diff --git a/Graphics/Implicit/ObjectUtil/GetBox2.hs b/Graphics/Implicit/ObjectUtil/GetBox2.hs index 905f617..29df518 100644 --- a/Graphics/Implicit/ObjectUtil/GetBox2.hs +++ b/Graphics/Implicit/ObjectUtil/GetBox2.hs @@ -45,7 +45,7 @@ outsetBox r (a,b) = getBox2 :: SymbolicObj2 -> Box2 -- Primitives getBox2 (RectR _ a b) = (a,b) -getBox2 (Circle r) = ((-r, -r), (r,r)) +getBox2 (Circle r) = ((-r, -r), (r,r)) getBox2 (PolygonR _ points) = pointsBox points -- (Rounded) CSG getBox2 (Complement2 _) =