rename 'lookback'-accessors

examples/Example.hs

@@ -124,7 +124,7 @@ example8 =
   readInput x ints AssumeValid <>
   tillExit (
     readInput x ints AssumeValid <>
-    branch (currentValue' x 1 .+. currentValue x .==. intLit 0)
+    branch (recentValue x 1 .+. currentValue x .==. intLit 0)
       exit
       nop
     ) <>
@@ -387,7 +387,7 @@ hangmanSpec word = tillExit (
      branch (winCond $ allValues g) (writeOutput [Text "correct!"] <> exit) mempty
   <> writeOutput [Text "Game state:"  <> Wildcard]
   <> readInput g digits AssumeValid
-  <> branch ((currentValue g `isIn` listLit word) .&&. (currentValue g `isNotIn` allValues' g 1))
+  <> branch ((currentValue g `isIn` listLit word) .&&. (currentValue g `isNotIn` recentValues g 1))
     (writeOptionalOutput [Text "good guess!"])
     (writeOptionalOutput [Text "wrong guess!"])
   )

src/Test/IOTasks/Internal/Term.hs

@@ -126,14 +126,14 @@ termVarExps (termStruct -> VariableC e _) = [toVarList e]
 termVarExps (termStruct -> VariableA e _) = [toVarList e]
 
 instance Accessor Term where
-  currentValue' :: forall a e. (Typeable a, VarExp e) => e -> Int -> Term a
-  currentValue' =  matchType @a
+  recentValue :: forall a e. (Typeable a, VarExp e) => e -> Int -> Term a
+  recentValue =  matchType @a
     [ inCaseOfE' @Integer $ \HRefl -> Current
     , inCaseOfE' @String $ \HRefl -> Current
     , fallbackCase' $ error $ "variable type not supported for Terms: " ++ show (typeRep @a)
     ]
-  allValues' :: forall a e. (Typeable a, VarExp e) => e -> Int -> Term [a]
-  allValues' =  matchType @a
+  recentValues :: forall a e. (Typeable a, VarExp e) => e -> Int -> Term [a]
+  recentValues =  matchType @a
     [ inCaseOfE' @Integer $ \HRefl -> All
     , inCaseOfE' @String $ \HRefl -> All
     , fallbackCase' $ error $ "variable type not supported for Terms: " ++ show (typeRep @a)

src/Test/IOTasks/OutputTerm.hs

@@ -63,8 +63,8 @@ instance Ord (OutputTerm a) where
   compare = compare `on` toExpr
 
 instance Accessor OutputTerm where
-  currentValue' x n = checkNames x $ Transparent $ Current x n
-  allValues' x n = checkNames x $ Transparent $ All x n
+  recentValue x n = checkNames x $ Transparent $ Current x n
+  recentValues x n = checkNames x $ Transparent $ All x n
 
 data SomeOutputTerm where
   SomeOutputTerm :: Typeable a => OutputTerm a -> SomeOutputTerm

src/Test/IOTasks/Terms.hs

@@ -111,12 +111,12 @@ instance Typeable a => VarExp [Var a] where
 
 class Accessor t where
   currentValue :: (OverflowType a, VarExp e) => e -> t a
-  currentValue x = currentValue' x 0
-  currentValue' :: (OverflowType a, VarExp e) => e -> Int -> t a
+  currentValue x = recentValue x 0
+  recentValue :: (OverflowType a, VarExp e) => e -> Int -> t a
 
   allValues :: (OverflowType a, VarExp e) => e -> t [a]
-  allValues x = allValues' x 0
-  allValues' :: (OverflowType a, VarExp e) => e -> Int -> t [a]
+  allValues x = recentValues x 0
+  recentValues :: (OverflowType a, VarExp e) => e -> Int -> t [a]
 
 as :: Typeable a => t a -> t a
 as = id