Changeset 8207

Timestamp:

12/13/05 11:24:11 (3 years ago)

Author:

gaal

Message:

* minor refactoring: type PadMutator? = (Pad -> Pad)

Location:

src/Pugs

Files:

• AST.hs (modified) (2 diffs)
• AST/Internals.hs (modified) (2 diffs)
• AST/Pad.hs (modified) (1 diff)
• Eval.hs (modified) (3 diffs)
• Monads.hs (modified) (4 diffs)
• Prim.hs (modified) (3 diffs)
• Run.hs (modified) (1 diff)

src/Pugs/AST.hs

@@ -101 +101 @@
 (Is this correct?)
 -}
-genMultiSym :: MonadSTM m => String -> VRef -> m (Pad -> Pad)
+genMultiSym :: MonadSTM m => String -> VRef -> m PadMutator
 genMultiSym name ref = do
     tvar    <- liftSTM $ newTVar ref
@@ -114 +114 @@
 (right?), shadowing any earlier or outer definition.
 -}
-genSym :: MonadSTM m => String -> VRef -> m (Pad -> Pad)
+genSym :: MonadSTM m => String -> VRef -> m PadMutator
 genSym name ref = do
     tvar    <- liftSTM $ newTVar ref

src/Pugs/AST/Internals.hs

@@ -13 +13 @@
     EvalT(..), ContT(..),
 
-    Pad(..), -- uses Var, TVar, VRef
+    Pad(..), PadMutator, -- uses Var, TVar, VRef
     Param(..), -- uses Cxt, Exp
     Params, -- uses Param
@@ -1159 +1159 @@
 listToPad = MkPad . Map.fromList
 
+-- | type for a function introducing a change to a Pad
+type PadMutator = (Pad -> Pad)
+
 {- Eval Monad -}
 -- type Eval x = EvalT (ContT Val (ReaderT Env SIO)) x

src/Pugs/AST/Pad.hs

@@ -45 +45 @@
 -}
 updateSubPad :: VCode        -- ^ Initial sub
-             -> (Pad -> Pad) -- ^ 'Pad'-transforming function
+             -> PadMutator   -- ^ 'Pad'-transforming function
              -> VCode        -- ^ Sub with altered lexical pad
 updateSubPad sub f = sub

src/Pugs/Eval.hs

@@ -51 +51 @@
 emptyEnv :: (MonadIO m, MonadSTM m) 
          => String             -- ^ Name associated with the environment
-         -> [STM (Pad -> Pad)] -- ^ List of 'Pad'-mutating transactions used
+         -> [STM PadMutator]   -- ^ List of 'Pad'-mutating transactions used
                                --     to declare an initial set of global
                                --     variables
@@ -158 +158 @@
 Used by 'reduceSym'.
 -}
-addGlobalSym :: (Pad -> Pad) -- ^ 'Pad'-transformer that will insert the new
-                             --     symbol
+addGlobalSym :: PadMutator -- ^ 'Pad'-transformer that will insert the new
+                           --     symbol
              -> Eval ()
 addGlobalSym newSym = do
@@ -986 +986 @@
             { envCaller = Just env
             , envDepth = envDepth env + 1 }
-    doBind :: [Pad -> Pad] -> [(Param, Exp)] -> Eval ([Pad -> Pad], [ApplyArg])
+    doBind :: [PadMutator] -> [(Param, Exp)] -> Eval ([PadMutator], [ApplyArg])
     doBind syms [] = return (syms, [])
     doBind syms ((prm, exp):rest) = do

src/Pugs/Monads.hs

@@ -54 +54 @@
 (Subsequent chained 'Eval's do /not/ see this new scope.)
 -}
-enterLex :: [Pad -> Pad] -- ^ Transformations on current 'Pad' to produce the
+enterLex :: [PadMutator] -- ^ Transformations on current 'Pad' to produce the
                          --     new 'Pad'.
          -> Eval a       -- ^ Evaluation to be performed in the new scope
@@ -167 +167 @@
                                     --     (must have leading @&@ sigil)
            -> ([Val] -> Eval Val)   -- ^ The actual primitive to wrap
-           -> ((Pad -> Pad) -> m t) -- ^ A (lambda) function that the 'Pad'
+           -> (PadMutator -> m t)   -- ^ A (lambda) function that the 'Pad'
                                     --     transformer is given to
            -> m t -- ^ Result of passing the pad-transformer to the \'action\'
@@ -188 +188 @@
 -}
 genSymCC :: String -- ^ Name of the primitive in the symbol table ('Pad').
-         -> ((Pad -> Pad) -> Eval Val) -- ^ An \'action\' function that will
+         -> (PadMutator -> Eval Val)   -- ^ An \'action\' function that will
                                        --     take the pad-transformer and use
                                        --     it to perform some evaluation 
@@ -263 +263 @@
         }
 
-genSubs :: t -> Var -> (t -> VCode) -> Eval [Pad -> Pad]
+genSubs :: t -> Var -> (t -> VCode) -> Eval [PadMutator]
 genSubs env name gen = sequence
     [ genMultiSym name (codeRef $ gen env)

src/Pugs/Prim.hs

@@ -1312 +1312 @@
 -- The Pad symbol name is prefixed with \"&*\" for functions and
 -- \"&*\" ~ fixity ~ \":\" for operators.
-primOp :: String -> String -> Params -> String -> Bool -> STM (Pad -> Pad)
+primOp :: String -> String -> Params -> String -> Bool -> STM (PadMutator)
 primOp sym assoc prms ret isSafe =
     -- In safemode, we filter all prims marked as "unsafe".
@@ -1362 +1362 @@
 
 -- |Produce a Pad update transaction with 'primOp' from a string description
-primDecl :: String -> STM (Pad -> Pad)
+primDecl :: String -> STM PadMutator
 primDecl str = primOp sym assoc params ret (safe == "safe")
     where
@@ -1428 +1428 @@
 --
 -- >  ret_val   assoc   op_name [safe|unsafe] args
-initSyms :: STM [Pad -> Pad]
+initSyms :: STM [PadMutator]
 initSyms = mapM primDecl syms
     where

src/Pugs/Run.hs

@@ -165 +165 @@
     hideInSafemode x = if safeMode then MkRef $ constScalar undef else x
 
-initClassObjects :: [Type] -> ClassTree -> IO [STM (Pad -> Pad)]
+initClassObjects :: [Type] -> ClassTree -> IO [STM PadMutator]
 initClassObjects parent (Node typ children) = do
     obj     <- createObject (mkType "Class") $