From cdc38f23dd08b1624262539201a87ff2419138cf Mon Sep 17 00:00:00 2001 From: "Kurisu.Ti.Na" Date: Fri, 23 Sep 2016 13:33:32 +0800 Subject: [PATCH] update local var name --- src/CallByName/Evaluator.hs | 4 ++-- src/CallByNeed/Evaluator.hs | 4 ++-- src/CallByReference/Evaluator.hs | 4 ++-- src/ExplicitRefs/Evaluator.hs | 4 ++-- src/ImplicitRefs/Evaluator.hs | 2 +- src/ImplicitRefsCont/Evaluator.hs | 2 +- src/LetRecLang/Evaluator.hs | 4 ++-- src/MutablePairs/Evaluator.hs | 4 ++-- src/NamelessIntp/Evaluator.hs | 4 ++-- src/ProcLang/Evaluator.hs | 4 ++-- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/CallByName/Evaluator.hs b/src/CallByName/Evaluator.hs index 4f0203a..8c282db 100644 --- a/src/CallByName/Evaluator.hs +++ b/src/CallByName/Evaluator.hs @@ -228,9 +228,9 @@ evalCallExpr ratorExpr randExprs env = do recOpVal exprs env tryRef = (:) <$> tryRef <*> valueOfOperands exprs env unpackProc :: ExpressedValue -> StatedTry Procedure unpackProc (ExprProc proc) = return proc - unpackProc noProc = throwError $ + unpackProc notProc = throwError $ "Operator of call expression should be procedure, but got: " - `mappend` show noProc + `mappend` show notProc safeZip :: [a] -> [b] -> StatedTry [(a, b)] safeZip [] [] = return [] safeZip (_:_) [] = throwError "Not enough arguments!" diff --git a/src/CallByNeed/Evaluator.hs b/src/CallByNeed/Evaluator.hs index 08fea15..621f27e 100644 --- a/src/CallByNeed/Evaluator.hs +++ b/src/CallByNeed/Evaluator.hs @@ -248,9 +248,9 @@ evalCallExpr ratorExpr randExprs env = do recOpVal exprs env tryRef = (:) <$> tryRef <*> valueOfOperands exprs env unpackProc :: ExpressedValue -> StatedTry Procedure unpackProc (ExprProc proc) = return proc - unpackProc noProc = throwError $ + unpackProc notProc = throwError $ "Operator of call expression should be procedure, but got: " - `mappend` show noProc + `mappend` show notProc safeZip :: [a] -> [b] -> StatedTry [(a, b)] safeZip [] [] = return [] safeZip (_:_) [] = throwError "Not enough arguments!" diff --git a/src/CallByReference/Evaluator.hs b/src/CallByReference/Evaluator.hs index 5f3f47a..e74a5df 100644 --- a/src/CallByReference/Evaluator.hs +++ b/src/CallByReference/Evaluator.hs @@ -229,9 +229,9 @@ evalCallExpr ratorExpr randExprs env = do (ref:) <$> valueOfOperands exprs env unpackProc :: ExpressedValue -> StatedTry Procedure unpackProc (ExprProc proc) = return proc - unpackProc noProc = throwError $ + unpackProc notProc = throwError $ "Operator of call expression should be procedure, but got: " - `mappend` show noProc + `mappend` show notProc safeZip :: [a] -> [b] -> StatedTry [(a, b)] safeZip [] [] = return [] safeZip (_:_) [] = throwError "Not enough arguments!" diff --git a/src/ExplicitRefs/Evaluator.hs b/src/ExplicitRefs/Evaluator.hs index 757c8c6..45df1b3 100644 --- a/src/ExplicitRefs/Evaluator.hs +++ b/src/ExplicitRefs/Evaluator.hs @@ -226,9 +226,9 @@ evalCallExpr ratorExpr randExprs env = do where unpackProc :: ExpressedValue -> StatedTry Procedure unpackProc (ExprProc proc) = return proc - unpackProc noProc = throwError $ + unpackProc notProc = throwError $ "Operator of call expression should be procedure, but got: " - `mappend` show noProc + `mappend` show notProc safeZip :: [a] -> [b] -> StatedTry [(a, b)] safeZip [] [] = return [] safeZip (_:_) [] = throwError "Not enough arguments!" diff --git a/src/ImplicitRefs/Evaluator.hs b/src/ImplicitRefs/Evaluator.hs index ad66a1a..141e61a 100644 --- a/src/ImplicitRefs/Evaluator.hs +++ b/src/ImplicitRefs/Evaluator.hs @@ -57,7 +57,7 @@ unpackExprRef notRef = throwError $ TypeMismatch "reference" notRef unpackProc :: ExpressedValue -> IOTry Procedure unpackProc (ExprProc proc) = return proc -unpackProc noProc = throwError $ TypeMismatch "procedure" noProc +unpackProc notProc = throwError $ TypeMismatch "procedure" notProc getExprRef :: String -> Environment -> Store -> IOTry Ref getExprRef name env store = do diff --git a/src/ImplicitRefsCont/Evaluator.hs b/src/ImplicitRefsCont/Evaluator.hs index 2655314..9327574 100644 --- a/src/ImplicitRefsCont/Evaluator.hs +++ b/src/ImplicitRefsCont/Evaluator.hs @@ -90,7 +90,7 @@ unpackExprRef notRef = throwError $ TypeMismatch "reference" notRef unpackProc :: ExpressedValue -> IOTry Procedure unpackProc (ExprProc proc) = return proc -unpackProc noProc = throwError $ TypeMismatch "procedure" noProc +unpackProc notProc = throwError $ TypeMismatch "procedure" notProc evalConstExpr :: ExpressedValue -> Store -> Continuation -> EvaluateResult evalConstExpr val store cont = applyCont store cont val diff --git a/src/LetRecLang/Evaluator.hs b/src/LetRecLang/Evaluator.hs index 8e82a02..89dd5c2 100644 --- a/src/LetRecLang/Evaluator.hs +++ b/src/LetRecLang/Evaluator.hs @@ -192,9 +192,9 @@ evalCallExpr rator rand env = do where unpackProc :: ExpressedValue -> Try Procedure unpackProc (ExprProc proc) = Right proc - unpackProc noProc = Left $ + unpackProc notProc = Left $ "Operator of call expression should be procedure, but got: " - `mappend` show noProc + `mappend` show notProc func :: Try [ExpressedValue] -> Try ExpressedValue -> Try [ExpressedValue] func maybeArgs maybeArg = do args <- maybeArgs diff --git a/src/MutablePairs/Evaluator.hs b/src/MutablePairs/Evaluator.hs index 53b766c..e020b07 100644 --- a/src/MutablePairs/Evaluator.hs +++ b/src/MutablePairs/Evaluator.hs @@ -264,9 +264,9 @@ evalCallExpr ratorExpr randExprs env = do where unpackProc :: ExpressedValue -> StatedTry Procedure unpackProc (ExprProc proc) = return proc - unpackProc noProc = throwError $ + unpackProc notProc = throwError $ "Operator of call expression should be procedure, but got: " - `mappend` show noProc + `mappend` show notProc safeZip :: [a] -> [b] -> StatedTry [(a, b)] safeZip [] [] = return [] safeZip (_:_) [] = throwError "Not enough arguments!" diff --git a/src/NamelessIntp/Evaluator.hs b/src/NamelessIntp/Evaluator.hs index 693bd05..81fdf43 100644 --- a/src/NamelessIntp/Evaluator.hs +++ b/src/NamelessIntp/Evaluator.hs @@ -171,9 +171,9 @@ evalCallExpr rator rand env = do applyProcedure proc randVal where unpackProc (ExprProc proc) = Right proc - unpackProc noProc = Left $ + unpackProc notProc = Left $ "Operator of call expression should be procedure, " - `mappend` "but got: " `mappend` show noProc + `mappend` "but got: " `mappend` show notProc applyProcedure (NamelessProcedure body savedEnv) rand = valueOf body (extend rand savedEnv) diff --git a/src/ProcLang/Evaluator.hs b/src/ProcLang/Evaluator.hs index 2317d35..e909177 100644 --- a/src/ProcLang/Evaluator.hs +++ b/src/ProcLang/Evaluator.hs @@ -174,9 +174,9 @@ evalCallExpr rator rand env = do where unpackProc :: ExpressedValue -> Try Procedure unpackProc (ExprProc proc) = Right proc - unpackProc noProc = Left $ + unpackProc notProc = Left $ "Operator of call expression should be procedure, but got: " - `mappend` show noProc + `mappend` show notProc func :: Try [ExpressedValue] -> Try ExpressedValue -> Try [ExpressedValue] func maybeArgs maybeArg = do args <- maybeArgs