src/HOL/UNITY/Union.thy
changeset 6012 1894bfc4aee9
parent 5804 8e0a4c4fd67b
child 6295 351b3c2b0d83
     1.1 --- a/src/HOL/UNITY/Union.thy	Wed Dec 02 16:14:09 1998 +0100
     1.2 +++ b/src/HOL/UNITY/Union.thy	Thu Dec 03 10:45:06 1998 +0100
     1.3 @@ -11,25 +11,33 @@
     1.4  Union = SubstAx + FP +
     1.5  
     1.6  constdefs
     1.7 +  eqStates :: ['a set, 'a => 'b program] => bool
     1.8 +    "eqStates I F == EX St. ALL i:I. States (F i) = St"
     1.9 +
    1.10    JOIN  :: ['a set, 'a => 'b program] => 'b program
    1.11 -    "JOIN I F == mk_program (INT i:I. Init (F i), UN i:I. Acts (F i))"
    1.12 +    "JOIN I F == mk_program (INT i:I. States (F i),
    1.13 +			     INT i:I. Init (F i),
    1.14 +			     UN i:I. Acts (F i))"
    1.15  
    1.16    Join :: ['a program, 'a program] => 'a program      (infixl 65)
    1.17 -    "F Join G == mk_program (Init F Int Init G, Acts F Un Acts G)"
    1.18 +    "F Join G == mk_program (States F Int States G,
    1.19 +			     Init F Int Init G,
    1.20 +			     Acts F Un Acts G)"
    1.21  
    1.22 -  SKIP :: 'a program
    1.23 -    "SKIP == mk_program (UNIV, {})"
    1.24 +  SKIP :: 'a set => 'a program
    1.25 +    "SKIP states == mk_program (states, states, {})"
    1.26  
    1.27    Diff :: "['a program, ('a * 'a)set set] => 'a program"
    1.28 -    "Diff F acts == mk_program (Init F, Acts F - acts)"
    1.29 +    "Diff F acts == mk_program (States F, Init F, Acts F - acts)"
    1.30  
    1.31    (*The set of systems that regard "v" as local to F*)
    1.32    localTo :: ['a => 'b, 'a program] => 'a program set  (infixl 80)
    1.33      "v localTo F == {G. ALL z. Diff G (Acts F) : stable {s. v s = z}}"
    1.34  
    1.35 -  (*Two programs with disjoint actions, except for Id (idling)*)
    1.36 +  (*Two programs with disjoint actions, except for identity actions *)
    1.37    Disjoint :: ['a program, 'a program] => bool
    1.38 -    "Disjoint F G == Acts F Int Acts G <= {Id}"
    1.39 +    "Disjoint F G == States F = States G &
    1.40 +                     Acts F Int Acts G <= {diag (States G)}"
    1.41  
    1.42  syntax
    1.43    "@JOIN"      :: [pttrn, 'a set, 'b set] => 'b set  ("(3JN _:_./ _)" 10)