1.1 --- a/src/Pure/Tools/isabelle_process.scala Thu Aug 28 22:26:21 2008 +0200
1.2 +++ b/src/Pure/Tools/isabelle_process.scala Thu Aug 28 22:26:22 2008 +0200
1.3 @@ -11,16 +11,13 @@
1.4 import java.util.Properties
1.5 import java.util.concurrent.LinkedBlockingQueue
1.6 import java.io.{BufferedReader, BufferedWriter, InputStreamReader, OutputStreamWriter,
1.7 - InputStream, OutputStream, FileInputStream, IOException}
1.8 + InputStream, OutputStream, IOException}
1.9
1.10 import isabelle.{Symbol, XML}
1.11
1.12
1.13 object IsabelleProcess {
1.14
1.15 - private val charset = "UTF-8"
1.16 -
1.17 -
1.18 /* results */
1.19
1.20 object Kind extends Enumeration {
1.21 @@ -176,7 +173,7 @@
1.22
1.23 private class StdinThread(out_stream: OutputStream) extends Thread("isabelle: stdin") {
1.24 override def run() = {
1.25 - val writer = new BufferedWriter(new OutputStreamWriter(out_stream, charset))
1.26 + val writer = new BufferedWriter(new OutputStreamWriter(out_stream, IsabelleSystem.charset))
1.27 var finished = false
1.28 while (!finished) {
1.29 try {
1.30 @@ -206,7 +203,7 @@
1.31
1.32 private class StdoutThread(in_stream: InputStream) extends Thread("isabelle: stdout") {
1.33 override def run() = {
1.34 - val reader = new BufferedReader(new InputStreamReader(in_stream, charset))
1.35 + val reader = new BufferedReader(new InputStreamReader(in_stream, IsabelleSystem.charset))
1.36 var result = new StringBuilder(100)
1.37
1.38 var finished = false
1.39 @@ -244,7 +241,7 @@
1.40
1.41 private class MessageThread(fifo: String) extends Thread("isabelle: messages") {
1.42 override def run() = {
1.43 - val reader = new BufferedReader(new InputStreamReader(new FileInputStream(fifo), charset))
1.44 + val reader = IsabelleSystem.fifo_reader(fifo)
1.45 var kind: Kind.Value = null
1.46 var props: Properties = null
1.47 var result = new StringBuilder
1.48 @@ -344,7 +341,8 @@
1.49 val fifo =
1.50 try {
1.51 val mkfifo = IsabelleSystem.exec(List(IsabelleSystem.getenv_strict("ISATOOL"), "mkfifo"))
1.52 - val fifo = new BufferedReader(new InputStreamReader(mkfifo.getInputStream, charset)).readLine
1.53 + val fifo = new BufferedReader(new
1.54 + InputStreamReader(mkfifo.getInputStream, IsabelleSystem.charset)).readLine
1.55 if (mkfifo.waitFor == 0) fifo
1.56 else error("Failed to create message fifo")
1.57 }