isabelle process -T THEORY;
authorwenzelm
Fri, 18 Mar 2016 22:19:46 +0100
changeset 62677 0df43889f496
parent 62676 1792f8ed2b04
child 62678 843ff6f1de38
isabelle process -T THEORY;
src/Doc/System/Environment.thy
src/HOL/Mirabelle/lib/scripts/mirabelle.pl
src/HOL/Mutabelle/lib/Tools/mutabelle
src/HOL/TPTP/CASC/ReadMe
src/HOL/TPTP/lib/Tools/tptp_graph
src/Pure/Tools/ml_process.scala
--- a/src/Doc/System/Environment.thy	Fri Mar 18 22:15:51 2016 +0100
+++ b/src/Doc/System/Environment.thy	Fri Mar 18 22:19:46 2016 +0100
@@ -305,6 +305,7 @@
 \<open>Usage: isabelle process [OPTIONS]
 
   Options are:
+    -T THEORY    load theory
     -d DIR       include session directory
     -e ML_EXPR   evaluate ML expression on startup
     -f ML_FILE   evaluate ML file on startup
@@ -321,6 +322,10 @@
   premature exit of the ML process with return code 1.
 
   \<^medskip>
+  Option \<^verbatim>\<open>-T\<close> loads a specified theory file. This is a wrapper for \<^verbatim>\<open>-e\<close> with
+  a suitable @{ML use_thy} invocation.
+
+  \<^medskip>
   Option \<^verbatim>\<open>-l\<close> specifies the logic session name. Option \<^verbatim>\<open>-d\<close> specifies
   additional directories for session roots, see also \secref{sec:tool-build}.
 
--- a/src/HOL/Mirabelle/lib/scripts/mirabelle.pl	Fri Mar 18 22:15:51 2016 +0100
+++ b/src/HOL/Mirabelle/lib/scripts/mirabelle.pl	Fri Mar 18 22:19:46 2016 +0100
@@ -159,7 +159,7 @@
 
 my $cmd =
   "isabelle process -o quick_and_dirty -o threads=1" .
-  " -e 'use_thy \"$path/$new_thy_name\"' -l $mirabelle_logic" . $quiet;
+  " -T \"$path/$new_thy_name\" -l $mirabelle_logic" . $quiet;
 my $result = system "bash", "-c", $cmd;
 
 if ($output_log) {
--- a/src/HOL/Mutabelle/lib/Tools/mutabelle	Fri Mar 18 22:15:51 2016 +0100
+++ b/src/HOL/Mutabelle/lib/Tools/mutabelle	Fri Mar 18 22:19:46 2016 +0100
@@ -134,7 +134,7 @@
 # execution
 
 isabelle process -o auto_time_limit=10.0 \
-  -e 'use_thy "$MUTABELLE_OUTPUT_PATH/Mutabelle_Test"' -l "$MUTABELLE_LOGIC" > "$MUTABELLE_OUTPUT_PATH/err" 2>&1
+  -T "$MUTABELLE_OUTPUT_PATH/Mutabelle_Test" -l "$MUTABELLE_LOGIC" > "$MUTABELLE_OUTPUT_PATH/err" 2>&1
 
 
 [ $? -ne 0 ] && echo "isabelle processing of mutabelle failed"
--- a/src/HOL/TPTP/CASC/ReadMe	Fri Mar 18 22:15:51 2016 +0100
+++ b/src/HOL/TPTP/CASC/ReadMe	Fri Mar 18 22:19:46 2016 +0100
@@ -180,7 +180,7 @@
 
   Then I ran
 
-    ./bin/isabelle process -e 'use_thy "/tmp/T";'  
+    ./bin/isabelle process -T /tmp/T
 
   I also performed the aforementioned sanity tests.
 
--- a/src/HOL/TPTP/lib/Tools/tptp_graph	Fri Mar 18 22:15:51 2016 +0100
+++ b/src/HOL/TPTP/lib/Tools/tptp_graph	Fri Mar 18 22:19:46 2016 +0100
@@ -118,7 +118,7 @@
 begin ML_file \"$TPTP_HOME/TPTP_Parser/tptp_to_dot.ML\" \
 ML {* TPTP_To_Dot.write_proof_dot \"$1\" \"$2\" *} end" \
         > $WORKDIR/$LOADER.thy
-  isabelle process -e "use_thy \"$WORKDIR/$LOADER\";" -l Pure
+  isabelle process -T "$WORKDIR/$LOADER" -l Pure
 }
 
 function cleanup_workdir()
--- a/src/Pure/Tools/ml_process.scala	Fri Mar 18 22:15:51 2016 +0100
+++ b/src/Pure/Tools/ml_process.scala	Fri Mar 18 22:19:46 2016 +0100
@@ -118,6 +118,7 @@
 Usage: isabelle process [OPTIONS]
 
   Options are:
+    -T THEORY    load theory
     -d DIR       include session directory
     -e ML_EXPR   evaluate ML expression on startup
     -f ML_FILE   evaluate ML file on startup
@@ -127,6 +128,8 @@
 
   Run the raw Isabelle ML process in batch mode.
 """,
+        "T:" -> (arg =>
+          eval_args = eval_args ::: List("--eval", "use_thy " + ML_Syntax.print_string0(arg))),
         "d:" -> (arg => dirs = dirs ::: List(Path.explode(arg))),
         "e:" -> (arg => eval_args = eval_args ::: List("--eval", arg)),
         "f:" -> (arg => eval_args = eval_args ::: List("--use", arg)),