# HG changeset patch # User lcp # Date 795260087 -3600 # Node ID 17d7fad9c9a22bbb16b2950e71f4b0c19cf1c7db # Parent 9e10962866b02248401e0a2fda4c6839ebdd183f Now calls exit_use instead of use, for prompt failure if errors are detected. diff -r 9e10962866b0 -r 17d7fad9c9a2 src/CCL/Makefile --- a/src/CCL/Makefile Tue Mar 14 10:40:04 1995 +0100 +++ b/src/CCL/Makefile Wed Mar 15 10:34:47 1995 +0100 @@ -33,8 +33,8 @@ $(BIN)/CCL: $(BIN)/FOL $(SET_FILES) $(CCL_FILES) case "$(COMP)" in \ poly*) cp $(BIN)/FOL $(BIN)/CCL;\ - echo 'open PolyML; use"ROOT";' | $(COMP) $(BIN)/CCL ;;\ - sml*) echo 'use"ROOT.ML"; xML"$(BIN)/CCL" banner;' | $(BIN)/FOL;;\ + echo 'open PolyML; exit_use"ROOT";' | $(COMP) $(BIN)/CCL ;;\ + sml*) echo 'exit_use"ROOT.ML"; xML"$(BIN)/CCL" banner;' | $(BIN)/FOL;;\ *) echo Bad value for ISABELLECOMP: \ $(COMP) is not poly or sml;;\ esac @@ -44,8 +44,8 @@ test: ex/ROOT.ML $(BIN)/CCL $(EX_FILES) case "$(COMP)" in \ - poly*) echo 'use"ex/ROOT.ML"; quit();' | $(COMP) $(BIN)/CCL ;;\ - sml*) echo 'use"ex/ROOT.ML";' | $(BIN)/CCL;;\ + poly*) echo 'exit_use"ex/ROOT.ML"; quit();' | $(COMP) $(BIN)/CCL ;;\ + sml*) echo 'exit_use"ex/ROOT.ML";' | $(BIN)/CCL;;\ *) echo Bad value for ISABELLECOMP: \ $(COMP) is not poly or sml;;\ esac diff -r 9e10962866b0 -r 17d7fad9c9a2 src/CTT/Makefile --- a/src/CTT/Makefile Tue Mar 14 10:40:04 1995 +0100 +++ b/src/CTT/Makefile Wed Mar 15 10:34:47 1995 +0100 @@ -32,8 +32,8 @@ case "$(COMP)" in \ poly*) echo 'make_database"$(BIN)/CTT"; quit();' \ | $(COMP) $(BIN)/Pure;\ - echo 'open PolyML; use"ROOT";' | $(COMP) $(BIN)/CTT ;;\ - sml*) echo 'use"ROOT.ML"; xML"$(BIN)/CTT" banner;' | $(BIN)/Pure ;;\ + echo 'open PolyML; exit_use"ROOT";' | $(COMP) $(BIN)/CTT ;;\ + sml*) echo 'exit_use"ROOT.ML"; xML"$(BIN)/CTT" banner;' | $(BIN)/Pure ;;\ *) echo Bad value for ISABELLECOMP: \ $(COMP) is not poly or sml;;\ esac @@ -43,8 +43,8 @@ test: ex/ROOT.ML $(BIN)/CTT $(EX_FILES) case "$(COMP)" in \ - poly*) echo 'use"ex/ROOT.ML"; quit();' | $(COMP) $(BIN)/CTT ;;\ - sml*) echo 'use"ex/ROOT.ML";' | $(BIN)/CTT;;\ + poly*) echo 'exit_use"ex/ROOT.ML"; quit();' | $(COMP) $(BIN)/CTT ;;\ + sml*) echo 'exit_use"ex/ROOT.ML";' | $(BIN)/CTT;;\ *) echo Bad value for ISABELLECOMP: \ $(COMP) is not poly or sml;;\ esac diff -r 9e10962866b0 -r 17d7fad9c9a2 src/Cube/Makefile --- a/src/Cube/Makefile Tue Mar 14 10:40:04 1995 +0100 +++ b/src/Cube/Makefile Wed Mar 15 10:34:47 1995 +0100 @@ -25,8 +25,8 @@ case "$(COMP)" in \ poly*) echo 'make_database"$(BIN)/Cube"; quit();' \ | $(COMP) $(BIN)/Pure;\ - echo 'open PolyML; use"ROOT";' | $(COMP) $(BIN)/Cube ;;\ - sml*) echo 'use"ROOT.ML"; xML"$(BIN)/Cube" banner;' | $(BIN)/Pure ;;\ + echo 'open PolyML; exit_use"ROOT";' | $(COMP) $(BIN)/Cube ;;\ + sml*) echo 'exit_use"ROOT.ML"; xML"$(BIN)/Cube" banner;' | $(BIN)/Pure ;;\ *) echo Bad value for ISABELLECOMP: \ $(COMP) is not poly or sml;;\ esac @@ -36,8 +36,8 @@ test: ex.ML $(BIN)/Cube case "$(COMP)" in \ - poly*) echo 'use"ex.ML"; quit();' | $(COMP) $(BIN)/Cube ;;\ - sml*) echo 'use"ex.ML";' | $(BIN)/Cube;;\ + poly*) echo 'exit_use"ex.ML"; quit();' | $(COMP) $(BIN)/Cube ;;\ + sml*) echo 'exit_use"ex.ML";' | $(BIN)/Cube;;\ *) echo Bad value for ISABELLECOMP: \ $(COMP) is not poly or sml;;\ esac diff -r 9e10962866b0 -r 17d7fad9c9a2 src/FOL/Makefile --- a/src/FOL/Makefile Tue Mar 14 10:40:04 1995 +0100 +++ b/src/FOL/Makefile Wed Mar 15 10:34:47 1995 +0100 @@ -19,8 +19,8 @@ BIN = $(ISABELLEBIN) COMP = $(ISABELLECOMP) FILES = ROOT.ML IFOL.thy IFOL.ML FOL.thy FOL.ML intprover.ML simpdata.ML \ - ../Provers/hypsubst.ML ../Provers/classical.ML \ - ../Provers/simplifier.ML ../Provers/splitter.ML ../Provers/ind.ML + ../Provers/hypsubst.ML ../Provers/classical.ML \ + ../Provers/simplifier.ML ../Provers/splitter.ML ../Provers/ind.ML EX_FILES = ex/ROOT.ML ex/cla.ML ex/foundn.ML ex/If.ML ex/If.thy ex/int.ML\ ex/intro.ML ex/List.ML ex/List.thy ex/Nat.ML ex/Nat.thy\ @@ -36,8 +36,8 @@ case "$(COMP)" in \ poly*) echo 'make_database"$(BIN)/FOL"; quit();' \ | $(COMP) $(BIN)/Pure;\ - echo 'open PolyML; use"ROOT";' | $(COMP) $(BIN)/FOL;;\ - sml*) echo 'use"ROOT.ML"; xML"$(BIN)/FOL" banner;' | $(BIN)/Pure;;\ + echo 'open PolyML; exit_use"ROOT";' | $(COMP) $(BIN)/FOL;;\ + sml*) echo 'exit_use"ROOT.ML"; xML"$(BIN)/FOL" banner;' | $(BIN)/Pure;;\ *) echo Bad value for ISABELLECOMP: \ $(COMP) is not poly or sml;;\ esac @@ -47,8 +47,8 @@ test: ex/ROOT.ML $(BIN)/FOL $(EX_FILES) case "$(COMP)" in \ - poly*) echo 'use"ex/ROOT.ML"; quit();' | $(COMP) $(BIN)/FOL ;;\ - sml*) echo 'use"ex/ROOT.ML";' | $(BIN)/FOL;;\ + poly*) echo 'exit_use"ex/ROOT.ML"; quit();' | $(COMP) $(BIN)/FOL ;;\ + sml*) echo 'exit_use"ex/ROOT.ML";' | $(BIN)/FOL;;\ *) echo Bad value for ISABELLECOMP: \ $(COMP) is not poly or sml;;\ esac diff -r 9e10962866b0 -r 17d7fad9c9a2 src/FOLP/Makefile --- a/src/FOLP/Makefile Tue Mar 14 10:40:04 1995 +0100 +++ b/src/FOLP/Makefile Wed Mar 15 10:34:47 1995 +0100 @@ -29,8 +29,8 @@ case "$(COMP)" in \ poly*) echo 'make_database"$(BIN)/FOLP"; quit();' \ | $(COMP) $(BIN)/Pure;\ - echo 'open PolyML; use"ROOT";' | $(COMP) $(BIN)/FOLP;;\ - sml*) echo 'use"ROOT.ML"; xML"$(BIN)/FOLP" banner;' | $(BIN)/Pure;;\ + echo 'open PolyML; exit_use"ROOT";' | $(COMP) $(BIN)/FOLP;;\ + sml*) echo 'exit_use"ROOT.ML"; xML"$(BIN)/FOLP" banner;' | $(BIN)/Pure;;\ *) echo Bad value for ISABELLECOMP: \ $(COMP) is not poly or sml;;\ esac @@ -40,8 +40,8 @@ test: ex/ROOT.ML $(BIN)/FOLP $(EX_FILES) case "$(COMP)" in \ - poly*) echo 'use"ex/ROOT.ML"; quit();' | $(COMP) $(BIN)/FOLP ;;\ - sml*) echo 'use"ex/ROOT.ML";' | $(BIN)/FOLP;;\ + poly*) echo 'exit_use"ex/ROOT.ML"; quit();' | $(COMP) $(BIN)/FOLP ;;\ + sml*) echo 'exit_use"ex/ROOT.ML";' | $(BIN)/FOLP;;\ *) echo Bad value for ISABELLECOMP: \ $(COMP) is not poly or sml;;\ esac diff -r 9e10962866b0 -r 17d7fad9c9a2 src/HOL/Makefile --- a/src/HOL/Makefile Tue Mar 14 10:40:04 1995 +0100 +++ b/src/HOL/Makefile Wed Mar 15 10:34:47 1995 +0100 @@ -39,8 +39,8 @@ case "$(COMP)" in \ poly*) echo 'make_database"$(BIN)/CHOL"; quit();' \ | $(COMP) $(BIN)/Pure;\ - echo 'open PolyML; use"ROOT";' | $(COMP) $(BIN)/CHOL ;;\ - sml*) echo 'use"ROOT.ML"; xML"$(BIN)/CHOL" banner;' | $(BIN)/Pure ;;\ + echo 'open PolyML; exit_use"ROOT";' | $(COMP) $(BIN)/CHOL ;;\ + sml*) echo 'exit_use"ROOT.ML"; xML"$(BIN)/CHOL" banner;' | $(BIN)/Pure ;;\ *) echo Bad value for ISABELLECOMP: \ $(COMP) is not poly or sml; exit 1;;\ esac @@ -63,7 +63,7 @@ IMP_FILES = IMP/ROOT.ML $(IMP_THYS) $(IMP_THYS:.thy=.ML) IMP: $(BIN)/CHOL $(IMP_FILES) - echo 'use"IMP/ROOT.ML";quit();' | $(LOGIC) + echo 'exit_use"IMP/ROOT.ML";quit();' | $(LOGIC) ##The integers in CHOL INTEG_THYS = Integ/Relation.thy Integ/Equiv.thy Integ/Integ.thy @@ -71,7 +71,7 @@ INTEG_FILES = Integ/ROOT.ML $(INTEG_THYS) $(INTEG_THYS:.thy=.ML) Integ: $(BIN)/CHOL $(INTEG_FILES) - echo 'use"Integ/ROOT.ML";quit();' | $(LOGIC) + echo 'exit_use"Integ/ROOT.ML";quit();' | $(LOGIC) ##I/O Automata IOA_THYS = IOA/example/Action.thy IOA/example/Channels.thy\ @@ -85,7 +85,7 @@ $(IOA_THYS) $(IOA_THYS:.thy=.ML) IOA: $(BIN)/CHOL $(IOA_FILES) - echo 'use"IOA/ROOT.ML";quit();' | $(LOGIC) + echo 'exit_use"IOA/ROOT.ML";quit();' | $(LOGIC) ##Properties of substitutions SUBST_THYS = Subst/AList.thy Subst/Setplus.thy\ @@ -95,7 +95,7 @@ SUBST_FILES = Subst/ROOT.ML $(SUBST_THYS) $(SUBST_THYS:.thy=.ML) Subst: $(BIN)/CHOL $(SUBST_FILES) - echo 'use"Subst/ROOT.ML";quit();' | $(LOGIC) + echo 'exit_use"Subst/ROOT.ML";quit();' | $(LOGIC) ##Miscellaneous examples EX_THYS = ex/LexProd.thy ex/MT.thy ex/Acc.thy \ @@ -106,7 +106,7 @@ ex/set.ML $(EX_THYS) $(EX_THYS:.thy=.ML) ex: $(BIN)/CHOL $(EX_FILES) - echo 'use"ex/ROOT.ML";quit();' | $(LOGIC) + echo 'exit_use"ex/ROOT.ML";quit();' | $(LOGIC) #Full test. test: $(BIN)/CHOL IMP Integ IOA Subst ex diff -r 9e10962866b0 -r 17d7fad9c9a2 src/HOLCF/Makefile --- a/src/HOLCF/Makefile Tue Mar 14 10:40:04 1995 +0100 +++ b/src/HOLCF/Makefile Wed Mar 15 10:34:47 1995 +0100 @@ -32,8 +32,8 @@ case "$(COMP)" in \ poly*) echo 'make_database"$(BIN)/HOLCF"; quit();' \ | $(COMP) $(BIN)/HOL ;\ - echo 'use"ROOT";' | $(COMP) $(BIN)/HOLCF ;;\ - sml*) echo 'use"ROOT.ML"; xML"$(BIN)/HOLCF" banner;' | $(BIN)/HOL ;;\ + echo 'exit_use"ROOT";' | $(COMP) $(BIN)/HOLCF ;;\ + sml*) echo 'exit_use"ROOT.ML"; xML"$(BIN)/HOLCF" banner;' | $(BIN)/HOL ;;\ *) echo Bad value for ISABELLECOMP: \ $(COMP) is not poly or sml;;\ esac @@ -48,8 +48,8 @@ test: ex/ROOT.ML $(BIN)/HOLCF $(EX_FILES) case "$(COMP)" in \ - poly*) echo 'use"ex/ROOT.ML"; quit();' | $(COMP) $(BIN)/HOLCF ;;\ - sml*) echo 'use"ex/ROOT.ML"' | $(BIN)/HOLCF;;\ + poly*) echo 'exit_use"ex/ROOT.ML"; quit();' | $(COMP) $(BIN)/HOLCF ;;\ + sml*) echo 'exit_use"ex/ROOT.ML"' | $(BIN)/HOLCF;;\ *) echo Bad value for ISABELLECOMP: \ $(COMP) is not poly or sml;;\ esac diff -r 9e10962866b0 -r 17d7fad9c9a2 src/LCF/Makefile --- a/src/LCF/Makefile Tue Mar 14 10:40:04 1995 +0100 +++ b/src/LCF/Makefile Wed Mar 15 10:34:47 1995 +0100 @@ -24,8 +24,8 @@ $(BIN)/LCF: $(BIN)/FOL $(FILES) case "$(COMP)" in \ poly*) cp $(BIN)/FOL $(BIN)/LCF;\ - echo 'open PolyML; use"ROOT";' | $(COMP) $(BIN)/LCF ;;\ - sml*) echo 'use"ROOT.ML"; xML"$(BIN)/LCF" banner;' | $(BIN)/FOL;;\ + echo 'open PolyML; exit_use"ROOT";' | $(COMP) $(BIN)/LCF ;;\ + sml*) echo 'exit_use"ROOT.ML"; xML"$(BIN)/LCF" banner;' | $(BIN)/FOL;;\ *) echo Bad value for ISABELLECOMP: \ $(COMP) is not poly or sml;;\ esac @@ -35,8 +35,8 @@ test: ex.ML $(BIN)/LCF case "$(COMP)" in \ - poly*) echo 'use"ex.ML"; quit();' | $(COMP) $(BIN)/LCF ;;\ - sml*) echo 'use"ex.ML";' | $(BIN)/LCF;;\ + poly*) echo 'exit_use"ex.ML"; quit();' | $(COMP) $(BIN)/LCF ;;\ + sml*) echo 'exit_use"ex.ML";' | $(BIN)/LCF;;\ *) echo Bad value for ISABELLECOMP: \ $(COMP) is not poly or sml;;\ esac diff -r 9e10962866b0 -r 17d7fad9c9a2 src/LK/Makefile --- a/src/LK/Makefile Tue Mar 14 10:40:04 1995 +0100 +++ b/src/LK/Makefile Wed Mar 15 10:34:47 1995 +0100 @@ -25,8 +25,8 @@ case "$(COMP)" in \ poly*) echo 'make_database"$(BIN)/LK"; quit();' \ | $(COMP) $(BIN)/Pure;\ - echo 'open PolyML; use"ROOT";' | $(COMP) $(BIN)/LK ;;\ - sml*) echo 'use"ROOT.ML"; xML"$(BIN)/LK" banner;' | $(BIN)/Pure ;;\ + echo 'open PolyML; exit_use"ROOT";' | $(COMP) $(BIN)/LK ;;\ + sml*) echo 'exit_use"ROOT.ML"; xML"$(BIN)/LK" banner;' | $(BIN)/Pure ;;\ *) echo Bad value for ISABELLECOMP: \ $(COMP) is not poly or sml;;\ esac @@ -36,8 +36,8 @@ test: ex/ROOT.ML $(BIN)/LK $(EX_FILES) case "$(COMP)" in \ - poly*) echo 'use"ex/ROOT.ML"; quit();' | $(COMP) $(BIN)/LK ;;\ - sml*) echo 'use"ex/ROOT.ML";' | $(BIN)/LK;;\ + poly*) echo 'exit_use"ex/ROOT.ML"; quit();' | $(COMP) $(BIN)/LK ;;\ + sml*) echo 'exit_use"ex/ROOT.ML";' | $(BIN)/LK;;\ *) echo Bad value for ISABELLECOMP: \ $(COMP) is not poly or sml;;\ esac diff -r 9e10962866b0 -r 17d7fad9c9a2 src/Modal/Makefile --- a/src/Modal/Makefile Tue Mar 14 10:40:04 1995 +0100 +++ b/src/Modal/Makefile Wed Mar 15 10:34:47 1995 +0100 @@ -25,8 +25,8 @@ $(BIN)/Modal: $(BIN)/LK $(FILES) case "$(COMP)" in \ poly*) cp $(BIN)/LK $(BIN)/Modal;\ - echo 'open PolyML; use"ROOT";' | $(COMP) $(BIN)/Modal ;;\ - sml*) echo 'use"ROOT.ML"; xML"$(BIN)/Modal" banner;' | $(BIN)/LK;;\ + echo 'open PolyML; exit_use"ROOT";' | $(COMP) $(BIN)/Modal ;;\ + sml*) echo 'exit_use"ROOT.ML"; xML"$(BIN)/Modal" banner;' | $(BIN)/LK;;\ *) echo Bad value for ISABELLECOMP: \ $(COMP) is not poly or sml;;\ esac @@ -36,8 +36,8 @@ test: ex/ROOT.ML $(BIN)/Modal $(EX_FILES) case "$(COMP)" in \ - poly*) echo 'use"ex/ROOT.ML"; quit();' | $(COMP) $(BIN)/Modal ;;\ - sml*) echo 'use"ex/ROOT.ML";' | $(BIN)/Modal;;\ + poly*) echo 'exit_use"ex/ROOT.ML"; quit();' | $(COMP) $(BIN)/Modal ;;\ + sml*) echo 'exit_use"ex/ROOT.ML";' | $(BIN)/Modal;;\ *) echo Bad value for ISABELLECOMP: \ $(COMP) is not poly or sml;;\ esac