lib: theory import fixes for new sessions

Signed-off-by: Gerwin Klein <gerwin.klein@proofcraft.systems>

lib/Corres_UL.thy

@@ -7,8 +7,8 @@
 theory Corres_UL
 imports
   Crunch_Instances_NonDet
-  WPEx
+  Monads.WPEx
-  WPFix
+  Monads.WPFix
   HaskellLemmaBucket
 begin
 

lib/Crunch.thy

@@ -6,7 +6,7 @@
 
 theory Crunch
 imports
-  WPSimp
+  Monads.WPSimp
   Lib
   ML_Utils.ML_Utils
 keywords "crunch" "crunch_ignore" "crunches" :: thy_decl

lib/Crunch_Instances_Trace.thy

@@ -7,7 +7,7 @@
 theory Crunch_Instances_Trace
 imports
   Crunch
-  TraceMonadVCG
+  Monads.TraceMonadVCG
 begin
 
 lemmas [crunch_param_rules] = Let_def return_bind returnOk_bindE

lib/EVTutorial/EquivValidTutorial.thy

@@ -55,7 +55,7 @@ In this sense, EquivValid statements could be thought of as \<^emph>\<open>relat
 
 text \<open> This tutorial will introduce some syntactic sugar to emphasise the similarity
 between Hoare triples and EquivValid statements.
-(Here, \<open>\<top>\<top>\<close> is an alias provided by Lib.NonDetMonad for the trivial binary predicate,
+(Here, \<open>\<top>\<top>\<close> is an alias provided by Monads.NonDetMonad for the trivial binary predicate,
 which always returns \<open>True\<close>; similarly, there is also \<open>\<bottom>\<bottom>\<close> for \<open>False\<close>.) \<close>
 
 abbreviation
@@ -140,7 +140,7 @@ where
 text \<open> We could just as well define equivalences similarly for
 \<open>inbox\<close>, \<open>outbox\<close>, or \<open>job\<close> -- we omit these here. \<close>
 
-text \<open> Furthermore, you can use the \<open>and\<close> alias provided by @{theory Lib.Fun_Pred_Syntax}
+text \<open> Furthermore, you can use the \<open>and\<close> alias provided by @{theory Monads.Fun_Pred_Syntax}
 to write the conjunction of two binary predicates.
 (Similarly, there is also an \<open>or\<close> alias for disjunction.)\<close>
 

lib/EmptyFailLib.thy

@@ -6,7 +6,7 @@
 
 theory EmptyFailLib
 imports
-  NonDetMonad
+  Monads.NonDetMonad
   HaskellLib_H
 begin
 

lib/Extract_Conjunct.thy

@@ -7,7 +7,7 @@
 theory Extract_Conjunct
 imports
   "Main"
-  "Eisbach_Methods"
+  Eisbach_Tools.Eisbach_Methods
 begin
 
 section \<open>Extracting conjuncts in the conclusion\<close>

lib/GenericLib.thy

@@ -7,7 +7,7 @@
 theory GenericLib
 imports
   Crunch_Instances_NonDet
-  WPEx
+  Monads.WPEx
   HaskellLemmaBucket
 begin
 

lib/Guess_ExI.thy

@@ -6,8 +6,8 @@
 
 theory Guess_ExI
 imports
-  Eisbach_Methods
+  Eisbach_Tools.Eisbach_Methods
-  Apply_Debug
+  Eisbach_Tools.Apply_Debug
 begin
 
 (*

lib/LexordList.thy

@@ -6,7 +6,7 @@
 
 theory LexordList imports
   Main
-  Eisbach_Methods (* for tests *)
+  Eisbach_Tools.Eisbach_Methods (* for tests *)
 begin
 
 text \<open>

lib/Lib.thy

@@ -18,8 +18,8 @@ imports
   Extract_Conjunct
   ML_Goal
   Eval_Bool
-  Fun_Pred_Syntax
+  Monads.Fun_Pred_Syntax
-  Monad_Lib
+  Monads.Monad_Lib
   NICTATools
   "Word_Lib.WordSetup"
 begin

lib/Monad_Equations.thy

@@ -9,7 +9,7 @@
    Should not be Hoare triples (those go into a different theory). *)
 
 theory Monad_Equations
-  imports MonadEq_Lemmas
+  imports Monads.MonadEq_Lemmas
 begin
 
 lemmas assertE_assert = assertE_liftE

lib/NICTATools.thy

@@ -7,16 +7,16 @@
 (* Miscellaneous Isabelle tools. *)
 theory NICTATools
 imports
-  Apply_Trace_Cmd
+  Eisbach_Tools.Apply_Trace_Cmd
-  Apply_Debug
+  Eisbach_Tools.Apply_Debug
   Find_Names
   (* Solves_Tac *)
-  Rule_By_Method
+  Eisbach_Tools.Rule_By_Method
-  Eisbach_Methods
+  Eisbach_Tools.Eisbach_Methods
   Time_Methods_Cmd
   Try_Attribute
   Repeat_Attribute
-  Trace_Schematic_Insts
+  Eisbach_Tools.Trace_Schematic_Insts
   Insulin
   ShowTypes
   Locale_Abbrev

lib/ROOT

@@ -19,11 +19,9 @@ session Lib (lib) = Word_Lib +
     List_Lib
     SubMonadLib
     Simulation
-    MonadEq
     SimpStrategy
     Extract_Conjunct
     GenericLib
-    ProvePart
     Corres_Adjust_Preconds
     Requalify
     Value_Abbreviation
@@ -41,7 +39,6 @@ session Lib (lib) = Word_Lib +
     Try_Methods
     ListLibLemmas
     Time_Methods_Cmd
-    Apply_Debug
     MonadicRewrite
     HaskellLemmaBucket
     FP_Eval
@@ -122,7 +119,6 @@ session LibTest (lib) in test = Refine +
     RangeMap_Test
     FP_Eval_Tests
     Trace_Schematic_Insts_Test
-    Local_Method_Tests
     Qualify_Test
     Locale_Abbrev_Test
     Value_Type_Test

lib/Try_Methods.thy

@@ -6,7 +6,7 @@
 
 theory Try_Methods
 
-imports Eisbach_Methods
+imports Eisbach_Tools.Eisbach_Methods
 
 keywords "trym" :: diag
   and "add_try_method" :: thy_decl

lib/clib/BitFieldProofsLib.thy

@@ -6,7 +6,7 @@
 
 theory BitFieldProofsLib
 imports
-  "Lib.Eisbach_Methods"
+  "Eisbach_Tools.Eisbach_Methods"
   TypHeapLib
 begin
 

lib/clib/Simpl_Rewrite.thy

@@ -10,8 +10,8 @@ text \<open>A simple proof method for rewriting Simpl programs under a predicate
 theory Simpl_Rewrite
 imports
   "Simpl-VCG.Vcg"
-  "Lib.Eisbach_Methods"
+  "Eisbach_Tools.Eisbach_Methods"
-  "Lib.Apply_Debug"
+  "Eisbach_Tools.Apply_Debug"
 begin
 
 text \<open>One layer of context around a Simpl program.

lib/concurrency/Prefix_Refinement.thy

@@ -7,7 +7,7 @@ theory Prefix_Refinement
 
 imports
   Triv_Refinement
-  "Lib.TraceMonadLemmas"
+  "Monads.TraceMonadLemmas"
 
 begin
 

lib/concurrency/Triv_Refinement.thy

@@ -6,8 +6,8 @@
 theory Triv_Refinement
 
 imports
-  "Lib.TraceMonadVCG"
+  "Monads.TraceMonadVCG"
-  "Lib.Strengthen"
+  "Monads.Strengthen"
 
 begin
 

lib/test/Apply_Debug_Test.thy

@@ -6,8 +6,8 @@
 
 theory Apply_Debug_Test
 imports
-  Lib.Apply_Debug
+  Eisbach_Tools.Apply_Debug
-  Lib.Apply_Trace_Cmd
+  Eisbach_Tools.Apply_Trace_Cmd
 begin
 
 chapter \<open>Apply_Debug\<close>

lib/test/Match_Abbreviation_Test.thy

@@ -7,7 +7,7 @@ theory Match_Abbreviation_Test
 
 imports
   Lib.Match_Abbreviation
-  Lib.NonDetMonad
+  Monads.NonDetMonad
 begin
 
 experiment

lib/test/Time_Methods_Cmd_Test.thy

@@ -6,7 +6,7 @@
 
 theory Time_Methods_Cmd_Test imports
   Lib.Time_Methods_Cmd
-  Lib.Eisbach_Methods
+  Eisbach_Tools.Eisbach_Methods
   "HOL-Library.Sublist"
 begin
 

lib/test/Trace_Schematic_Insts_Test.thy

@@ -6,7 +6,7 @@
 
 theory Trace_Schematic_Insts_Test
 imports
-  Lib.Trace_Schematic_Insts
+  Eisbach_Tools.Trace_Schematic_Insts
 begin
 
 text \<open>