From e880b7165ab34f173eea7bbff9f2df73cdbcd7a8 Mon Sep 17 00:00:00 2001
From: rhiannon morris <rhi@rhiannon.website>
Date: Sun, 5 May 2024 19:44:27 +0200
Subject: [PATCH] remove Loc suffix from fromVar and Context.get

---
 lib/Quox/Syntax/Dim.idr        |  4 ++--
 lib/Quox/Syntax/Subst.idr      | 12 ++++++------
 lib/Quox/Syntax/Term/Subst.idr |  8 ++++----
 lib/Quox/Untyped/Syntax.idr    |  4 ++--
 lib/Quox/Var.idr               |  4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/Quox/Syntax/Dim.idr b/lib/Quox/Syntax/Dim.idr
index 5f60a17..f495486 100644
--- a/lib/Quox/Syntax/Dim.idr
+++ b/lib/Quox/Syntax/Dim.idr
@@ -84,7 +84,7 @@ DSubst : Nat -> Nat -> Type
 DSubst = Subst Dim
 
 
-public export FromVar Dim where fromVarLoc = B
+public export FromVar Dim where fromVar = B
 
 
 export
@@ -95,7 +95,7 @@ CanShift Dim where
 export
 CanSubstSelf Dim where
   K e loc // _  = K e loc
-  B i loc // th = getLoc th i loc
+  B i loc // th = get th i loc
 
 
 export Uninhabited (B i loc1 = K e loc2) where uninhabited _ impossible
diff --git a/lib/Quox/Syntax/Subst.idr b/lib/Quox/Syntax/Subst.idr
index 1e14d4d..06734b2 100644
--- a/lib/Quox/Syntax/Subst.idr
+++ b/lib/Quox/Syntax/Subst.idr
@@ -49,10 +49,10 @@ interface FromVar term => CanSubstSelf term where
 
 
 public export
-getLoc : FromVar term => Subst term from to -> Var from -> Loc -> term to
-getLoc (Shift by) i      loc = fromVarLoc (shift by i) loc
-getLoc (t ::: th) VZ     _   = t
-getLoc (t ::: th) (VS i) loc = getLoc th i loc
+get : FromVar term => Subst term from to -> Var from -> Loc -> term to
+get (Shift by) i      loc = fromVar (shift by i) loc
+get (t ::: th) VZ     _   = t
+get (t ::: th) (VS i) loc = get th i loc
 
 
 public export
@@ -97,7 +97,7 @@ map f (t ::: th) = f t ::: map f th
 
 public export %inline
 push : CanSubstSelf f => Loc -> Subst f from to -> Subst f (S from) (S to)
-push loc th = fromVarLoc VZ loc ::: (th . shift 1)
+push loc th = fromVar VZ loc ::: (th . shift 1)
 
 -- [fixme] a better way to do this?
 public export
@@ -107,7 +107,7 @@ pushN 0     _   th = th
 pushN (S s) loc th =
   rewrite plusSuccRightSucc s from in
   rewrite plusSuccRightSucc s to in
-  pushN s loc $ fromVarLoc VZ loc ::: (th . shift 1)
+  pushN s loc $ fromVar VZ loc ::: (th . shift 1)
 
 public export
 drop1 : Subst f (S from) to -> Subst f from to
diff --git a/lib/Quox/Syntax/Term/Subst.idr b/lib/Quox/Syntax/Term/Subst.idr
index afc8eef..54dd990 100644
--- a/lib/Quox/Syntax/Term/Subst.idr
+++ b/lib/Quox/Syntax/Term/Subst.idr
@@ -60,8 +60,8 @@ namespace DSubst.DScopeTermN
   S ns (N body) // th = S ns $ N $ body // th
 
 
-export %inline FromVar (Elim d) where fromVarLoc = B
-export %inline FromVar (Term d) where fromVarLoc = E .: fromVarLoc
+export %inline FromVar (Elim d) where fromVar = B
+export %inline FromVar (Term d) where fromVar = E .: fromVar
 
 
 ||| does the minimal reasonable work:
@@ -73,7 +73,7 @@ export %inline FromVar (Term d) where fromVarLoc = E .: fromVarLoc
 export
 CanSubstSelf (Elim d) where
   F x u loc       // _  = F x u loc
-  B i loc         // th = getLoc th i loc
+  B i loc         // th = get th i loc
   CloE (Sub e ph) // th = assert_total CloE $ Sub e $ ph . th
   e               // th = case force th of
                                Shift SZ => e
@@ -272,7 +272,7 @@ PushSubsts Elim Subst.isCloE where
   pushSubstsWith th ph (F x u loc) =
     nclo $ F x u loc
   pushSubstsWith th ph (B i loc) =
-    let res = getLoc ph i loc in
+    let res = get ph i loc in
     case nchoose $ isCloE res of
       Left  yes => assert_total pushSubsts res
       Right no  => Element res no
diff --git a/lib/Quox/Untyped/Syntax.idr b/lib/Quox/Untyped/Syntax.idr
index 06f02f0..fb19e46 100644
--- a/lib/Quox/Untyped/Syntax.idr
+++ b/lib/Quox/Untyped/Syntax.idr
@@ -255,7 +255,7 @@ USubst : Nat -> Nat -> Type
 USubst = Subst Term
 
 
-public export FromVar Term where fromVarLoc = B
+public export FromVar Term where fromVar = B
 
 
 public export
@@ -264,7 +264,7 @@ CanSubstSelf Term where
     F x loc =>
       F x loc
     B i loc =>
-      getLoc th i loc
+      get th i loc
     Lam x body loc =>
       Lam x (assert_total $ body // push x.loc th) loc
     App fun arg loc =>
diff --git a/lib/Quox/Var.idr b/lib/Quox/Var.idr
index 732b012..9d5bf6f 100644
--- a/lib/Quox/Var.idr
+++ b/lib/Quox/Var.idr
@@ -139,10 +139,10 @@ weakIsSpec p i = toNatInj $ trans (weakCorrect p i) (sym $ weakSpecCorrect p i)
 
 
 public export
-interface FromVar f where %inline fromVarLoc : Var n -> Loc -> f n
+interface FromVar f where %inline fromVar : Var n -> Loc -> f n
 
 
-public export FromVar Var where fromVarLoc x _ = x
+public export FromVar Var where fromVar x _ = x
 
 export
 tabulateV : {0 tm : Nat -> Type} -> (forall n. Var n -> tm n) ->