# HG changeset patch # User wenzelm # Date 1245929135 -7200 # Node ID 203d5e61e3bcc9cbe924eb123d325106958cb33b # Parent 117300d72398809e2c19e7f6fe83ae0b706bfca6 renamed IsabelleProcess to Isabelle_Process; renamed IsabelleSystem to Isabelle_System; diff -r 117300d72398 -r 203d5e61e3bc bin/isabelle-process --- a/bin/isabelle-process Thu Jun 25 13:24:45 2009 +0200 +++ b/bin/isabelle-process Thu Jun 25 13:25:35 2009 +0200 @@ -214,7 +214,7 @@ NICE="nice" if [ -n "$WRAPPER_OUTPUT" ]; then [ "$WRAPPER_OUTPUT" = "-" -o -p "$WRAPPER_OUTPUT" ] || fail "Bad named pipe: $WRAPPER_OUTPUT" - MLTEXT="$MLTEXT; IsabelleProcess.init \"$WRAPPER_OUTPUT\";" + MLTEXT="$MLTEXT; Isabelle_Process.init \"$WRAPPER_OUTPUT\";" elif [ -n "$PGIP" ]; then MLTEXT="$MLTEXT; ProofGeneralPgip.init_pgip $ISAR;" elif [ -n "$PROOFGENERAL" ]; then diff -r 117300d72398 -r 203d5e61e3bc src/Pure/Isar/isar.scala --- a/src/Pure/Isar/isar.scala Thu Jun 25 13:24:45 2009 +0200 +++ b/src/Pure/Isar/isar.scala Thu Jun 25 13:25:35 2009 +0200 @@ -7,8 +7,9 @@ package isabelle -class Isar(isabelle_system: IsabelleSystem, results: EventBus[IsabelleProcess.Result], args: String*) - extends IsabelleProcess(isabelle_system, results, args: _*) +class Isar(isabelle_system: Isabelle_System, + results: EventBus[Isabelle_Process.Result], args: String*) + extends Isabelle_Process(isabelle_system, results, args: _*) { /* basic editor commands */ diff -r 117300d72398 -r 203d5e61e3bc src/Pure/Isar/isar_document.scala --- a/src/Pure/Isar/isar_document.scala Thu Jun 25 13:24:45 2009 +0200 +++ b/src/Pure/Isar/isar_document.scala Thu Jun 25 13:25:35 2009 +0200 @@ -14,7 +14,7 @@ type Document_ID = String } -trait IsarDocument extends IsabelleProcess +trait IsarDocument extends Isabelle_Process { import IsarDocument._ diff -r 117300d72398 -r 203d5e61e3bc src/Pure/System/isabelle_process.ML --- a/src/Pure/System/isabelle_process.ML Thu Jun 25 13:24:45 2009 +0200 +++ b/src/Pure/System/isabelle_process.ML Thu Jun 25 13:25:35 2009 +0200 @@ -27,7 +27,7 @@ val init: string -> unit end; -structure IsabelleProcess: ISABELLE_PROCESS = +structure Isabelle_Process: ISABELLE_PROCESS = struct (* print modes *) diff -r 117300d72398 -r 203d5e61e3bc src/Pure/System/isabelle_process.scala --- a/src/Pure/System/isabelle_process.scala Thu Jun 25 13:24:45 2009 +0200 +++ b/src/Pure/System/isabelle_process.scala Thu Jun 25 13:25:35 2009 +0200 @@ -12,7 +12,7 @@ InputStream, OutputStream, IOException} -object IsabelleProcess { +object Isabelle_Process { /* results */ @@ -96,7 +96,7 @@ def is_system = Kind.is_system(kind) } - def parse_message(isabelle_system: IsabelleSystem, result: Result) = + def parse_message(isabelle_system: Isabelle_System, result: Result) = { XML.Elem(Markup.MESSAGE, (Markup.CLASS, Kind.markup(result.kind)) :: result.props, YXML.parse_body_failsafe(isabelle_system.symbols.decode(result.result))) @@ -104,16 +104,16 @@ } -class IsabelleProcess(isabelle_system: IsabelleSystem, - results: EventBus[IsabelleProcess.Result], args: String*) +class Isabelle_Process(isabelle_system: Isabelle_System, + results: EventBus[Isabelle_Process.Result], args: String*) { - import IsabelleProcess._ + import Isabelle_Process._ /* demo constructor */ def this(args: String*) = - this(new IsabelleSystem, new EventBus[IsabelleProcess.Result] + Console.println, args: _*) + this(new Isabelle_System, new EventBus[Isabelle_Process.Result] + Console.println, args: _*) /* process information */ @@ -128,7 +128,7 @@ /* results */ def parse_message(result: Result): XML.Tree = - IsabelleProcess.parse_message(isabelle_system, result) + Isabelle_Process.parse_message(isabelle_system, result) private val result_queue = new LinkedBlockingQueue[Result] @@ -230,7 +230,7 @@ private class StdinThread(out_stream: OutputStream) extends Thread("isabelle: stdin") { override def run() = { - val writer = new BufferedWriter(new OutputStreamWriter(out_stream, IsabelleSystem.charset)) + val writer = new BufferedWriter(new OutputStreamWriter(out_stream, Isabelle_System.charset)) var finished = false while (!finished) { try { @@ -260,7 +260,7 @@ private class StdoutThread(in_stream: InputStream) extends Thread("isabelle: stdout") { override def run() = { - val reader = new BufferedReader(new InputStreamReader(in_stream, IsabelleSystem.charset)) + val reader = new BufferedReader(new InputStreamReader(in_stream, Isabelle_System.charset)) var result = new StringBuilder(100) var finished = false