renamed IsabelleProcess to Isabelle_Process;
authorwenzelm
Thu Jun 25 13:25:35 2009 +0200 (2009-06-25)
changeset 31797203d5e61e3bc
parent 31796 117300d72398
child 31801 b97b34e7c853
renamed IsabelleProcess to Isabelle_Process;
renamed IsabelleSystem to Isabelle_System;
bin/isabelle-process
src/Pure/Isar/isar.scala
src/Pure/Isar/isar_document.scala
src/Pure/System/isabelle_process.ML
src/Pure/System/isabelle_process.scala
     1.1 --- a/bin/isabelle-process	Thu Jun 25 13:24:45 2009 +0200
     1.2 +++ b/bin/isabelle-process	Thu Jun 25 13:25:35 2009 +0200
     1.3 @@ -214,7 +214,7 @@
     1.4  NICE="nice"
     1.5  if [ -n "$WRAPPER_OUTPUT" ]; then
     1.6    [ "$WRAPPER_OUTPUT" = "-" -o -p "$WRAPPER_OUTPUT" ] || fail "Bad named pipe: $WRAPPER_OUTPUT"
     1.7 -  MLTEXT="$MLTEXT; IsabelleProcess.init \"$WRAPPER_OUTPUT\";"
     1.8 +  MLTEXT="$MLTEXT; Isabelle_Process.init \"$WRAPPER_OUTPUT\";"
     1.9  elif [ -n "$PGIP" ]; then
    1.10    MLTEXT="$MLTEXT; ProofGeneralPgip.init_pgip $ISAR;"
    1.11  elif [ -n "$PROOFGENERAL" ]; then
     2.1 --- a/src/Pure/Isar/isar.scala	Thu Jun 25 13:24:45 2009 +0200
     2.2 +++ b/src/Pure/Isar/isar.scala	Thu Jun 25 13:25:35 2009 +0200
     2.3 @@ -7,8 +7,9 @@
     2.4  package isabelle
     2.5  
     2.6  
     2.7 -class Isar(isabelle_system: IsabelleSystem, results: EventBus[IsabelleProcess.Result], args: String*)
     2.8 -  extends IsabelleProcess(isabelle_system, results, args: _*)
     2.9 +class Isar(isabelle_system: Isabelle_System,
    2.10 +    results: EventBus[Isabelle_Process.Result], args: String*)
    2.11 +  extends Isabelle_Process(isabelle_system, results, args: _*)
    2.12  {
    2.13    /* basic editor commands */
    2.14  
     3.1 --- a/src/Pure/Isar/isar_document.scala	Thu Jun 25 13:24:45 2009 +0200
     3.2 +++ b/src/Pure/Isar/isar_document.scala	Thu Jun 25 13:25:35 2009 +0200
     3.3 @@ -14,7 +14,7 @@
     3.4    type Document_ID = String
     3.5  }
     3.6  
     3.7 -trait IsarDocument extends IsabelleProcess
     3.8 +trait IsarDocument extends Isabelle_Process
     3.9  {
    3.10    import IsarDocument._
    3.11  
     4.1 --- a/src/Pure/System/isabelle_process.ML	Thu Jun 25 13:24:45 2009 +0200
     4.2 +++ b/src/Pure/System/isabelle_process.ML	Thu Jun 25 13:25:35 2009 +0200
     4.3 @@ -27,7 +27,7 @@
     4.4    val init: string -> unit
     4.5  end;
     4.6  
     4.7 -structure IsabelleProcess: ISABELLE_PROCESS =
     4.8 +structure Isabelle_Process: ISABELLE_PROCESS =
     4.9  struct
    4.10  
    4.11  (* print modes *)
     5.1 --- a/src/Pure/System/isabelle_process.scala	Thu Jun 25 13:24:45 2009 +0200
     5.2 +++ b/src/Pure/System/isabelle_process.scala	Thu Jun 25 13:25:35 2009 +0200
     5.3 @@ -12,7 +12,7 @@
     5.4    InputStream, OutputStream, IOException}
     5.5  
     5.6  
     5.7 -object IsabelleProcess {
     5.8 +object Isabelle_Process {
     5.9  
    5.10    /* results */
    5.11  
    5.12 @@ -96,7 +96,7 @@
    5.13      def is_system = Kind.is_system(kind)
    5.14    }
    5.15  
    5.16 -  def parse_message(isabelle_system: IsabelleSystem, result: Result) =
    5.17 +  def parse_message(isabelle_system: Isabelle_System, result: Result) =
    5.18    {
    5.19      XML.Elem(Markup.MESSAGE, (Markup.CLASS, Kind.markup(result.kind)) :: result.props,
    5.20        YXML.parse_body_failsafe(isabelle_system.symbols.decode(result.result)))
    5.21 @@ -104,16 +104,16 @@
    5.22  }
    5.23  
    5.24  
    5.25 -class IsabelleProcess(isabelle_system: IsabelleSystem,
    5.26 -  results: EventBus[IsabelleProcess.Result], args: String*)
    5.27 +class Isabelle_Process(isabelle_system: Isabelle_System,
    5.28 +  results: EventBus[Isabelle_Process.Result], args: String*)
    5.29  {
    5.30 -  import IsabelleProcess._
    5.31 +  import Isabelle_Process._
    5.32  
    5.33  
    5.34    /* demo constructor */
    5.35  
    5.36    def this(args: String*) =
    5.37 -    this(new IsabelleSystem, new EventBus[IsabelleProcess.Result] + Console.println, args: _*)
    5.38 +    this(new Isabelle_System, new EventBus[Isabelle_Process.Result] + Console.println, args: _*)
    5.39  
    5.40  
    5.41    /* process information */
    5.42 @@ -128,7 +128,7 @@
    5.43    /* results */
    5.44  
    5.45    def parse_message(result: Result): XML.Tree =
    5.46 -    IsabelleProcess.parse_message(isabelle_system, result)
    5.47 +    Isabelle_Process.parse_message(isabelle_system, result)
    5.48  
    5.49    private val result_queue = new LinkedBlockingQueue[Result]
    5.50  
    5.51 @@ -230,7 +230,7 @@
    5.52  
    5.53    private class StdinThread(out_stream: OutputStream) extends Thread("isabelle: stdin") {
    5.54      override def run() = {
    5.55 -      val writer = new BufferedWriter(new OutputStreamWriter(out_stream, IsabelleSystem.charset))
    5.56 +      val writer = new BufferedWriter(new OutputStreamWriter(out_stream, Isabelle_System.charset))
    5.57        var finished = false
    5.58        while (!finished) {
    5.59          try {
    5.60 @@ -260,7 +260,7 @@
    5.61  
    5.62    private class StdoutThread(in_stream: InputStream) extends Thread("isabelle: stdout") {
    5.63      override def run() = {
    5.64 -      val reader = new BufferedReader(new InputStreamReader(in_stream, IsabelleSystem.charset))
    5.65 +      val reader = new BufferedReader(new InputStreamReader(in_stream, Isabelle_System.charset))
    5.66        var result = new StringBuilder(100)
    5.67  
    5.68        var finished = false