package net.sf.yacas;


import java.io.*;


class StdFileInput extends StringInput
{
  public StdFileInput(String aFileName, InputStatus aStatus) throws Exception
  {
    super(new StringBuffer(),aStatus);
    FileInputStream stream = new FileInputStream(aFileName);
    int c;
    while (true)
    {
      c = stream.read();
      if (c == -1)
        break;
      iString.append((char)c);
    }
  }
  public StdFileInput(InputStream aStream, InputStatus aStatus) throws Exception
  {
    super(new StringBuffer(),aStatus);
    int c;
    while (true)
    {
      c = aStream.read();
      if (c == -1)
        break;
      iString.append((char)c);
    }
  }

}

@@ -78,16 +78,18 @@
 Input%0A%7B%0A
+  
   public
@@ -109,22 +109,18 @@
 (String 
-aFileN
+fn
 ame, Inp
@@ -120,34 +120,33 @@
 me, InputStatus 
-aS
+s
 tatus) throws Ex
@@ -144,37 +144,39 @@
 throws Exception
-%0A 
  %7B%0A
+    
     super(new St
@@ -184,34 +184,34 @@
 ingBuffer(),
-aS
+ s
 tatus);%0A
     FileInpu
@@ -194,24 +194,37 @@
 ), status);%0A
+        %0A    
     FileInpu
@@ -264,20 +264,95 @@
 eam(
-aFileName);%0A
+fname);%0A        InputStreamReader reader = new InputStreamReader(stream, %22UTF-8%22);%0A    
     
@@ -354,32 +354,36 @@
      int c;%0A    
+ 
+   
 while (true)%0A   
@@ -370,39 +370,41 @@
     while (true)
-%0A
+ %7B%0A 
     
-%7B%0A
+ 
       c = stream
@@ -397,22 +397,22 @@
     c = 
-st
 rea
-m
+der
 .read();
@@ -410,32 +410,38 @@
 r.read();%0A      
+  
+    
 if (c == -1)%0A   
@@ -432,33 +432,41 @@
 if (c == -1)
-%0A
+ %7B%0A      
         
 break;%0A     
@@ -445,39 +445,61 @@
 %7B%0A              
+  
 break;%0A
+            %7D%0A      
       iString.ap
@@ -509,28 +509,39 @@
 d((char)
+ 
 c);%0A
+        %7D%0A
     %7D%0A  
 %7D%0A  publ
@@ -532,17 +532,18 @@
     %7D%0A  
-%7D
+  
 %0A  publi

handle unicode when reading files Task #112 - jyacas doesn't read unicode files