# HG changeset patch
# User wenzelm
# Date 964954135 -7200
# Node ID 53d7ad5bec396d07ac76baf3a08ec32bf357c37e
# Parent  259349bb8397061df13dd79c7e8a68e96fdf3e1d
Logic.goal_const;

diff -r 259349bb8397 -r 53d7ad5bec39 src/Pure/drule.ML
--- a/src/Pure/drule.ML	Fri Jul 28 16:08:41 2000 +0200
+++ b/src/Pure/drule.ML	Sun Jul 30 12:48:55 2000 +0200
@@ -661,7 +661,7 @@
     (tag_rule internal_tag (standard (Thm.equal_elim G_def (Thm.assume G))));
 end;
 
-val mk_cgoal = Thm.capply (Thm.cterm_of proto_sign (Const ("Goal", propT --> propT)));
+val mk_cgoal = Thm.capply (Thm.cterm_of proto_sign Logic.goal_const);
 fun assume_goal ct = Thm.assume (mk_cgoal ct) RS rev_triv_goal;
 
 
diff -r 259349bb8397 -r 53d7ad5bec39 src/Pure/logic.ML
--- a/src/Pure/logic.ML	Fri Jul 28 16:08:41 2000 +0200
+++ b/src/Pure/logic.ML	Sun Jul 30 12:48:55 2000 +0200
@@ -1,54 +1,57 @@
-(*  Title: 	Pure/logic.ML
+(*  Title:      Pure/logic.ML
     ID:         $Id$
-    Author: 	Lawrence C Paulson, Cambridge University Computer Laboratory
+    Author:     Lawrence C Paulson, Cambridge University Computer Laboratory
     Copyright   Cambridge University 1992
 
-Supporting code for defining the abstract type "thm"
+Abstract syntax operations of the Pure meta-logic.
 *)
 
 infix occs;
 
-signature LOGIC = 
+signature LOGIC =
 sig
-  val assum_pairs	: term -> (term*term)list
-  val auto_rename	: bool ref   
-  val close_form	: term -> term   
-  val count_prems	: term * int -> int
-  val dest_equals	: term -> term * term
-  val dest_flexpair	: term -> term * term
-  val dest_implies	: term -> term * term
-  val dest_inclass	: term -> typ * class
-  val dest_type		: term -> typ
-  val flatten_params	: int -> term -> term
-  val incr_indexes	: typ list * int -> term -> term
   val is_all            : term -> bool
+  val mk_equals         : term * term -> term
+  val dest_equals       : term -> term * term
   val is_equals         : term -> bool
+  val mk_implies        : term * term -> term
+  val dest_implies      : term -> term * term
   val is_implies        : term -> bool
-  val lift_fns		: term * int -> (term -> term) * (term -> term)
-  val list_flexpairs	: (term*term)list * term -> term
-  val list_implies	: term list * term -> term
+  val list_implies      : term list * term -> term
+  val strip_imp_prems   : term -> term list
+  val strip_imp_concl   : term -> term
+  val strip_prems       : int * term list * term -> term list * term
+  val count_prems       : term * int -> int
+  val mk_flexpair       : term * term -> term
+  val dest_flexpair     : term -> term * term
+  val list_flexpairs    : (term*term)list * term -> term
+  val rule_of           : (term*term)list * term list * term -> term
+  val strip_flexpairs   : term -> (term*term)list * term
+  val skip_flexpairs    : term -> term
+  val strip_horn        : term -> (term*term)list * term list * term
+  val mk_cond_defpair   : term list -> term * term -> string * term
+  val mk_defpair        : term * term -> string * term
+  val mk_type           : typ -> term
+  val dest_type         : term -> typ
+  val mk_inclass        : typ * class -> term
+  val dest_inclass      : term -> typ * class
+  val goal_const        : term
+  val mk_goal           : term -> term
+  val dest_goal         : term -> term
+  val occs              : term * term -> bool
+  val close_form        : term -> term
+  val incr_indexes      : typ list * int -> term -> term
+  val lift_fns          : term * int -> (term -> term) * (term -> term)
+  val strip_assums_hyp  : term -> term list
+  val strip_assums_concl: term -> term
+  val strip_params      : term -> (string * typ) list
+  val flatten_params    : int -> term -> term
+  val auto_rename       : bool ref
+  val set_rename_prefix : string -> unit
   val list_rename_params: string list * term -> term
-  val mk_cond_defpair	: term list -> term * term -> string * term
-  val mk_defpair	: term * term -> string * term
-  val mk_equals		: term * term -> term
-  val mk_flexpair	: term * term -> term
-  val mk_implies	: term * term -> term
-  val mk_inclass	: typ * class -> term
-  val mk_type		: typ -> term
-  val occs		: term * term -> bool
-  val rule_of		: (term*term)list * term list * term -> term
-  val set_rename_prefix	: string -> unit   
-  val skip_flexpairs	: term -> term
-  val strip_assums_concl: term -> term
-  val strip_assums_hyp	: term -> term list
-  val strip_flexpairs	: term -> (term*term)list * term
-  val strip_horn	: term -> (term*term)list * term list * term
-  val strip_imp_concl	: term -> term
-  val strip_imp_prems	: term -> term list
-  val strip_params	: term -> (string * typ) list
-  val strip_prems	: int * term list * term -> term list * term
-  val unvarify		: term -> term
-  val varify		: term -> term
+  val assum_pairs       : term -> (term*term)list
+  val varify            : term -> term
+  val unvarify          : term -> term
 end;
 
 structure Logic : LOGIC =
@@ -101,11 +104,11 @@
   | strip_imp_concl A = A : term;
 
 (*Strip and return premises: (i, [], A1==>...Ai==>B)
-    goes to   ([Ai, A(i-1),...,A1] , B) 	(REVERSED) 
+    goes to   ([Ai, A(i-1),...,A1] , B)         (REVERSED)
   if  i<0 or else i too big then raises  TERM*)
-fun strip_prems (0, As, B) = (As, B) 
-  | strip_prems (i, As, Const("==>", _) $ A $ B) = 
-	strip_prems (i-1, A::As, B)
+fun strip_prems (0, As, B) = (As, B)
+  | strip_prems (i, As, Const("==>", _) $ A $ B) =
+        strip_prems (i-1, A::As, B)
   | strip_prems (_, As, A) = raise TERM("strip_prems", A::As);
 
 (*Count premises -- quicker than (length ostrip_prems) *)
@@ -125,13 +128,13 @@
     goes to (a1=?=b1) ==>...(an=?=bn)==>C *)
 fun list_flexpairs ([], A) = A
   | list_flexpairs ((t,u)::pairs, A) =
-	implies $ (mk_flexpair(t,u)) $ list_flexpairs(pairs,A);
+        implies $ (mk_flexpair(t,u)) $ list_flexpairs(pairs,A);
 
 (*Make the object-rule tpairs==>As==>B   *)
 fun rule_of (tpairs, As, B) = list_flexpairs(tpairs, list_implies(As, B));
 
-(*Remove and return flexflex pairs: 
-    (a1=?=b1)==>...(an=?=bn)==>C  to  ( [(a1,b1),...,(an,bn)] , C )	
+(*Remove and return flexflex pairs:
+    (a1=?=b1)==>...(an=?=bn)==>C  to  ( [(a1,b1),...,(an,bn)] , C )
   [Tail recursive in order to return a pair of results] *)
 fun strip_flex_aux (pairs, Const("==>", _) $ (Const("=?=",_)$t$u) $ C) =
         strip_flex_aux ((t,u)::pairs, C)
@@ -141,14 +144,14 @@
 
 (*Discard flexflex pairs*)
 fun skip_flexpairs (Const("==>", _) $ (Const("=?=",_)$_$_) $ C) =
-	skip_flexpairs C
+        skip_flexpairs C
   | skip_flexpairs C = C;
 
-(*strip a proof state (Horn clause): 
+(*strip a proof state (Horn clause):
    (a1==b1)==>...(am==bm)==>B1==>...Bn==>C
     goes to   ( [(a1,b1),...,(am,bm)] , [B1,...,Bn] , C)    *)
 fun strip_horn A =
-  let val (tpairs,horn) = strip_flexpairs A 
+  let val (tpairs,horn) = strip_flexpairs A
   in  (tpairs, strip_imp_prems horn, strip_imp_concl horn)   end;
 
 
@@ -182,6 +185,15 @@
   | dest_inclass t = raise TERM ("dest_inclass", [t]);
 
 
+(** atomic goals **)
+
+val goal_const = Const ("Goal", propT --> propT);
+fun mk_goal t = goal_const $ t;
+
+fun dest_goal (Const ("Goal", _) $ t) = t
+  | dest_goal t = raise TERM ("dest_goal", [t]);
+
+
 (*** Low-level term operations ***)
 
 (*Does t occur in u?  Or is alpha-convertible to u?
@@ -197,16 +209,16 @@
 
 (*For all variables in the term, increment indexnames and lift over the Us
     result is ?Gidx(B.(lev+n-1),...,B.lev) where lev is abstraction level *)
-fun incr_indexes (Us: typ list, inc:int) t = 
-  let fun incr (Var ((a,i), T), lev) = 
-		Unify.combound (Var((a, i+inc), Us---> incr_tvar inc T),
-				lev, length Us)
-	| incr (Abs (a,T,body), lev) =
-		Abs (a, incr_tvar inc T, incr(body,lev+1))
-	| incr (Const(a,T),_) = Const(a, incr_tvar inc T)
-	| incr (Free(a,T),_) = Free(a, incr_tvar inc T)
-	| incr (f$t, lev) = incr(f,lev) $ incr(t,lev)
-	| incr (t,lev) = t
+fun incr_indexes (Us: typ list, inc:int) t =
+  let fun incr (Var ((a,i), T), lev) =
+                Unify.combound (Var((a, i+inc), Us---> incr_tvar inc T),
+                                lev, length Us)
+        | incr (Abs (a,T,body), lev) =
+                Abs (a, incr_tvar inc T, incr(body,lev+1))
+        | incr (Const(a,T),_) = Const(a, incr_tvar inc T)
+        | incr (Free(a,T),_) = Free(a, incr_tvar inc T)
+        | incr (f$t, lev) = incr(f,lev) $ incr(t,lev)
+        | incr (t,lev) = t
   in  incr(t,0)  end;
 
 (*Make lifting functions from subgoal and increment.
@@ -214,14 +226,14 @@
     lift_all operates on propositions     *)
 fun lift_fns (B,inc) =
   let fun lift_abs (Us, Const("==>", _) $ _ $ B) u = lift_abs (Us,B) u
-	| lift_abs (Us, Const("all",_)$Abs(a,T,t)) u =
-	      Abs(a, T, lift_abs (T::Us, t) u)
-	| lift_abs (Us, _) u = incr_indexes(rev Us, inc) u
+        | lift_abs (Us, Const("all",_)$Abs(a,T,t)) u =
+              Abs(a, T, lift_abs (T::Us, t) u)
+        | lift_abs (Us, _) u = incr_indexes(rev Us, inc) u
       fun lift_all (Us, Const("==>", _) $ A $ B) u =
-	      implies $ A $ lift_all (Us,B) u
-	| lift_all (Us, Const("all",_)$Abs(a,T,t)) u = 
-	      all T $ Abs(a, T, lift_all (T::Us,t) u)
-	| lift_all (Us, _) u = incr_indexes(rev Us, inc) u;
+              implies $ A $ lift_all (Us,B) u
+        | lift_all (Us, Const("all",_)$Abs(a,T,t)) u =
+              all T $ Abs(a, T, lift_all (T::Us,t) u)
+        | lift_all (Us, _) u = incr_indexes(rev Us, inc) u;
   in  (lift_abs([],B), lift_all([],B))  end;
 
 (*Strips assumptions in goal, yielding list of hypotheses.   *)
@@ -240,14 +252,14 @@
   | strip_params B = [];
 
 (*Removes the parameters from a subgoal and renumber bvars in hypotheses,
-    where j is the total number of parameters (precomputed) 
+    where j is the total number of parameters (precomputed)
   If n>0 then deletes assumption n. *)
-fun remove_params j n A = 
+fun remove_params j n A =
     if j=0 andalso n<=0 then A  (*nothing left to do...*)
     else case A of
-        Const("==>", _) $ H $ B => 
-	  if n=1 then                           (remove_params j (n-1) B)
-	  else implies $ (incr_boundvars j H) $ (remove_params j (n-1) B)
+        Const("==>", _) $ H $ B =>
+          if n=1 then                           (remove_params j (n-1) B)
+          else implies $ (incr_boundvars j H) $ (remove_params j (n-1) B)
       | Const("all",_)$Abs(a,T,t) => remove_params (j-1) n t
       | _ => if n>0 then raise TERM("remove_params", [A])
              else A;
@@ -274,26 +286,26 @@
   if n>0 then deletes assumption n. *)
 fun flatten_params n A =
     let val params = strip_params A;
-	val vars = if !auto_rename 
-		   then rename_vars (!rename_prefix, params)
-		   else ListPair.zip (variantlist(map #1 params,[]),
-				      map #2 params)
+        val vars = if !auto_rename
+                   then rename_vars (!rename_prefix, params)
+                   else ListPair.zip (variantlist(map #1 params,[]),
+                                      map #2 params)
     in  list_all (vars, remove_params (length vars) n A)
     end;
 
 (*Makes parameters in a goal have the names supplied by the list cs.*)
 fun list_rename_params (cs, Const("==>", _) $ A $ B) =
       implies $ A $ list_rename_params (cs, B)
-  | list_rename_params (c::cs, Const("all",_)$Abs(_,T,t)) = 
+  | list_rename_params (c::cs, Const("all",_)$Abs(_,T,t)) =
       all T $ Abs(c, T, list_rename_params (cs, t))
   | list_rename_params (cs, B) = B;
 
 (*Strips assumptions in goal yielding  ( [Hn,...,H1], [xm,...,x1], B )
   where H1,...,Hn are the hypotheses and x1...xm are the parameters.   *)
-fun strip_assums_aux (Hs, params, Const("==>", _) $ H $ B) = 
-	strip_assums_aux (H::Hs, params, B)
+fun strip_assums_aux (Hs, params, Const("==>", _) $ H $ B) =
+        strip_assums_aux (H::Hs, params, B)
   | strip_assums_aux (Hs, params, Const("all",_)$Abs(a,T,t)) =
-	strip_assums_aux (Hs, (a,T)::params, t)
+        strip_assums_aux (Hs, (a,T)::params, t)
   | strip_assums_aux (Hs, params, B) = (Hs, params, B);
 
 fun strip_assums A = strip_assums_aux ([],[],A);
@@ -305,9 +317,9 @@
 fun assum_pairs A =
   let val (Hs, params, B) = strip_assums A
       val D = Unify.rlist_abs(params, B)
-      fun pairrev ([],pairs) = pairs  
-        | pairrev (H::Hs,pairs) = 
-	    pairrev(Hs, (Unify.rlist_abs(params,H), D) :: pairs)
+      fun pairrev ([],pairs) = pairs
+        | pairrev (H::Hs,pairs) =
+            pairrev(Hs, (Unify.rlist_abs(params,H), D) :: pairs)
   in  pairrev (Hs,[])   (*WAS:  map pair (rev Hs)  *)
   end;