fixing name clash

agda · Aug 28, 2024 · 4871437 · 4871437
1 parent fc1b7c3
commit 4871437
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/Cubical/Data/List/Properties.agda b/Cubical/Data/List/Properties.agda
@@ -341,8 +341,8 @@ lookupAlways a [] _ = a
 lookupAlways _ (x ∷ _) zero = x
 lookupAlways a (x ∷ xs) (suc k) = lookupAlways a xs k
 
-lookup : List A → ℕ → Maybe A
-lookup = lookupAlways nothing ∘S map just
+lookupMb : List A → ℕ → Maybe A
+lookupMb = lookupAlways nothing ∘S map just
 
 rot : List A → List A
 rot [] = []

diff --git a/Cubical/Tactics/PathSolver/MonoidalSolver/PathEval.agda b/Cubical/Tactics/PathSolver/MonoidalSolver/PathEval.agda
@@ -294,7 +294,7 @@ fill-flatten' = hTop ∘S atVarOrConOrDefMmp
  fill-offsetPa' : ℕ → List (R.Arg R.Term) → List (R.Arg R.Term)
  fill-offsetPa' n xs =
   let hd = fromJust-def (varg (R.lit (R.string "fatal in PathEval - offsetPa'")))
-            (lookup xs zero)
+            (lookupMb xs zero)
       hs* = mapArg (dropFillWraps headFW) hd
       hd' = mapArg
              (replaceVarWithCon (λ { zero → just (quote i0) ; _ → nothing })) hs*
@@ -310,7 +310,7 @@ fill-flatten' = hTop ∘S atVarOrConOrDefMmp
 
  hTop : List R.Term → List R.Term
  hTop = L.map (Mb.fromJust-def ( (R.lit (R.string "imposible in fill-flatten'")) )
-   ∘S map-Maybe (unArg) ∘S flip lookup zero) ∘S h ∘S [_] ∘S L.map varg
+   ∘S map-Maybe (unArg) ∘S flip lookupMb zero) ∘S h ∘S [_] ∘S L.map varg
 
  df : ℕ →
         R.Name →

diff --git a/Cubical/Tactics/PathSolver/NSolver/NSolver.agda b/Cubical/Tactics/PathSolver/NSolver/NSolver.agda
@@ -309,9 +309,9 @@ module _ (ty : R.Type) where
    fcs0₀ ← Mb.rec (R.typeError [ "imposible" ]ₑ)
               (λ y → mapM (λ k → (getVert 100 (replaceAt k true v0)) (fst y)
                             <|> fail ("fcs1 fail" ∷nl [ k ]ₑ))  (range dim))
-             (lookup fcs0 0)
+             (lookupMb fcs0 0)
    fcs0₁ ← Mb.rec (R.typeError [ "imposible" ]ₑ)
-     (getVert 100 (replaceAt (predℕ dim) true v0) ∘S fst) (lookup fcs0 1)
+     (getVert 100 (replaceAt (predℕ dim) true v0) ∘S fst) (lookupMb fcs0 1)
 
    fcs1 ← mapM (idfun _)
            (zipWith (markVertSnd 100 dim) (fcs0₁ ∷ fcs0₀) ((snd ∘S snd) <$> xs))
@@ -480,7 +480,7 @@ solvePathsSolver goal = R.withReduceDefs (false , doNotReduceInPathSolver) do
  R.debugPrint "solvePaths" 0 $ [ "solvePaths - matchNCube done" ]ₑ
  let dim = length fcs
 
- (t0 , _) ← Mb.rec (R.typeError [ "imposible in solvePaths''" ]ₑ) pure (lookup fcs zero)
+ (t0 , _) ← Mb.rec (R.typeError [ "imposible in solvePaths''" ]ₑ) pure (lookupMb fcs zero)
 
  cuFcs ← ((zipWithIndex <$> quoteBd bdTM
             -- <|> R.typeError [ "quoteBd - failed" ]ₑ

diff --git a/Cubical/Tactics/Reflection/Utilities.agda b/Cubical/Tactics/Reflection/Utilities.agda
@@ -387,7 +387,7 @@ replaceVarWithTerm f =
 
 
 substTms : List Term → Term →  Term
-substTms xs = dropVars.rv (length xs) zero ∘S replaceVarWithTerm (lookup (map (liftVarsFrom (length xs) 0) xs))
+substTms xs = dropVars.rv (length xs) zero ∘S replaceVarWithTerm (lookupMb (map (liftVarsFrom (length xs) 0) xs))
 
 replaceAtTrm : ℕ → Term → Term → Term
 replaceAtTrm k t =