add source locations to inner syntax

lib/Quox/Typing/Context.idr

@@ -31,9 +31,9 @@ record TyContext d n where
   {auto dimLen  : Singleton d}
   {auto termLen : Singleton n}
   dctx   : DimEq d
-  dnames : NContext d
+  dnames : BContext d
   tctx   : TContext d n
-  tnames : NContext n
+  tnames : BContext n
   qtys   : QContext n -- only used for printing
 %name TyContext ctx
 
@@ -44,9 +44,9 @@ record EqContext n where
   {dimLen : Nat}
   {auto termLen : Singleton n}
   dassign : DimAssign dimLen -- only used for printing
-  dnames  : NContext dimLen -- only used for printing
+  dnames  : BContext dimLen -- only used for printing
   tctx    : TContext 0 n
-  tnames  : NContext n
+  tnames  : BContext n
   qtys    : QContext n -- only used for printing
 %name EqContext ctx
 
@@ -54,8 +54,8 @@ record EqContext n where
 public export
 record WhnfContext d n where
   constructor MkWhnfContext
-  dnames : NContext d
-  tnames : NContext n
+  dnames : BContext d
+  tnames : BContext n
   tctx   : TContext d n
 %name WhnfContext ctx
 
@@ -76,7 +76,7 @@ extendLen (tel :< _) x = [|S $ extendLen tel x|]
 
 public export
 CtxExtension : Nat -> Nat -> Nat -> Type
-CtxExtension d = Telescope ((Qty, BaseName,) . Term d)
+CtxExtension d = Telescope ((Qty, BindName,) . Term d)
 
 namespace TyContext
   public export %inline
@@ -101,11 +101,11 @@ namespace TyContext
     }
 
   export %inline
-  extendTy : Qty -> BaseName -> Term d n -> TyContext d n -> TyContext d (S n)
+  extendTy : Qty -> BindName -> Term d n -> TyContext d n -> TyContext d (S n)
   extendTy q x s = extendTyN [< (q, x, s)]
 
   export %inline
-  extendDim : BaseName -> TyContext d n -> TyContext (S d) n
+  extendDim : BindName -> TyContext d n -> TyContext (S d) n
   extendDim x (MkTyContext {dimLen, dctx, dnames, tctx, tnames, qtys}) =
     MkTyContext {
       dctx   = dctx :<? Nothing,
@@ -141,8 +141,8 @@ namespace QOutput
 
 export
 makeDAssign : DSubst d 0 -> DimAssign d
-makeDAssign (Shift SZ)   = [<]
-makeDAssign (K e ::: th) = makeDAssign th :< e
+makeDAssign (Shift SZ)     = [<]
+makeDAssign (K e _ ::: th) = makeDAssign th :< e
 
 export
 makeEqContext' : {d : Nat} -> TyContext d n -> DSubst d 0 -> EqContext n
@@ -172,8 +172,7 @@ namespace EqContext
   null ctx = null ctx.dnames && null ctx.tnames
 
   export %inline
-  extendTyN : Telescope (\n => (Qty, BaseName, Term 0 n)) from to ->
-              EqContext from -> EqContext to
+  extendTyN : CtxExtension 0 from to -> EqContext from -> EqContext to
   extendTyN xss (MkEqContext {termLen, dassign, dnames, tctx, tnames, qtys}) =
     let (qs, xs, ss) = unzip3 xss in
     MkEqContext {
@@ -185,11 +184,11 @@ namespace EqContext
     }
 
   export %inline
-  extendTy : Qty -> BaseName -> Term 0 n -> EqContext n -> EqContext (S n)
+  extendTy : Qty -> BindName -> Term 0 n -> EqContext n -> EqContext (S n)
   extendTy q x s = extendTyN [< (q, x, s)]
 
   export %inline
-  extendDim : BaseName -> DimConst -> EqContext n -> EqContext n
+  extendDim : BindName -> DimConst -> EqContext n -> EqContext n
   extendDim x e (MkEqContext {dassign, dnames, tctx, tnames, qtys}) =
     MkEqContext {dassign = dassign :< e, dnames = dnames :< x,
                  tctx, tnames, qtys}
@@ -214,7 +213,7 @@ namespace WhnfContext
   empty = MkWhnfContext [<] [<] [<]
 
   export
-  extendDimN : {s : Nat} -> NContext s -> WhnfContext d n ->
+  extendDimN : {s : Nat} -> BContext s -> WhnfContext d n ->
                WhnfContext (s + d) n
   extendDimN ns (MkWhnfContext {dnames, tnames, tctx}) =
     MkWhnfContext {
@@ -224,16 +223,16 @@ namespace WhnfContext
     }
 
   export
-  extendDim : BaseName -> WhnfContext d n -> WhnfContext (S d) n
+  extendDim : BindName -> WhnfContext d n -> WhnfContext (S d) n
   extendDim i = extendDimN [< i]
 
 
 private
-data CtxBinder a = MkCtxBinder BaseName a
+data CtxBinder a = MkCtxBinder BindName a
 
 PrettyHL a => PrettyHL (CtxBinder a) where
   prettyM (MkCtxBinder x t) = pure $
-    sep [hsep [!(pretty0M $ TV x), colonD], !(pretty0M t)]
+    sep [hsep [!(pretty0M $ TV x.name), colonD], !(pretty0M t)]
 
 parameters (unicode : Bool)
   private
@@ -241,16 +240,16 @@ parameters (unicode : Bool)
   pipeD = hl Syntax "|"
 
   export covering
-  prettyTContext : NContext d ->
-                   QContext n -> NContext n ->
+  prettyTContext : BContext d ->
+                   QContext n -> BContext n ->
                    TContext d n -> Doc HL
   prettyTContext ds qs xs ctx = separate comma $ toList $ go qs xs ctx where
-    go : QContext m -> NContext m -> TContext d m -> SnocList (Doc HL)
+    go : QContext m -> BContext m -> TContext d m -> SnocList (Doc HL)
     go [<]       [<]       [<] = [<]
     go (qs :< q) (xs :< x) (ctx :< t) =
       let bind = MkWithQty q $ MkCtxBinder x t in
       go qs xs ctx :<
-      runPrettyWith unicode (toSnocList' ds) (toSnocList' xs) (pretty0M bind)
+      runPrettyWith unicode (toNames ds) (toNames xs) (pretty0M bind)
 
   export covering
   prettyTyContext : TyContext d n -> Doc HL