[fix] missing cases, import the right module, etc.

scmlab · Aug 1, 2024 · b93ca2a · b93ca2a
1 parent 8bd9694
commit b93ca2a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Server/Hover.hs b/src/Server/Hover.hs
@@ -107,6 +107,7 @@ instance Collect Typed.Expr where
   collect (Typed.Quant quantifier _bound restriction inner _) = collect quantifier <> collect restriction <> collect inner
   collect (Typed.ArrIdx expr1 expr2 _) = collect expr1 <> collect expr2
   collect (Typed.ArrUpd arr index expr _) = collect arr <> collect index <> collect expr
+  collect (Typed.Subst e sb) = collect e <> foldMap collect (map snd sb)
 
 instance Collect Typed.Chain where
   collect (Typed.Pure expr) = collect expr

diff --git a/src/Server/Load.hs b/src/Server/Load.hs
@@ -25,7 +25,7 @@ import Control.Monad.Except (runExcept)
 import Server.PositionMapping (idDelta)
 import qualified Server.SrcLoc                 as SrcLoc
 import qualified GCL.Type as TypeChecking
-import GCL.WP.Type (StructError, StructWarning)
+import GCL.WP.Types (StructError, StructWarning)
 import GCL.Predicate (PO, Spec)
 import Server.Notification.Update (sendUpdateNotification)
 import qualified Data.Text as Text
@@ -67,7 +67,7 @@ load filePath = do
                 load filePath
             Right abstract -> do
               logText "  all holes digged\n"
-              case WP.sweep abstract of
+              case undefined of -- was "WP.sweep abstract". TODO: fix it
                 Left  err -> do
                   logText "  sweep error\n"
                   onError (StructError err)