X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=bundles%2Forg.simantics.scl.runtime%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fruntime%2Fio%2FSclIO.java;h=8cdeb77b0e0bd83cb7243b5418928627dc873cf5;hb=refs%2Fchanges%2F38%2F238%2F2;hp=69cfa77be98cdba4f9d1c246b73b1c10165c8e91;hpb=24e2b34260f219f0d1644ca7a138894980e25b14;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.scl.runtime/src/org/simantics/scl/runtime/io/SclIO.java b/bundles/org.simantics.scl.runtime/src/org/simantics/scl/runtime/io/SclIO.java
index 69cfa77be..8cdeb77b0 100644
--- a/bundles/org.simantics.scl.runtime/src/org/simantics/scl/runtime/io/SclIO.java
+++ b/bundles/org.simantics.scl.runtime/src/org/simantics/scl/runtime/io/SclIO.java
@@ -1,283 +1,283 @@
-package org.simantics.scl.runtime.io;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.charset.Charset;
-
-import gnu.trove.list.array.TByteArrayList;
-
-public class SclIO {
-
-    private static final Charset UTF8 = Charset.forName("UTF-8");
-    
-    public static byte readByte(InputStream in) throws IOException {
-        int ch1 = in.read();
-        if(ch1 < 0)
-            throw new EOFException();
-        return (byte)ch1;
-    }
-    
-    public static boolean readBoolean(InputStream in) throws IOException {
-        int ch1 = in.read();
-        if(ch1 < 0)
-            throw new EOFException();
-        return ch1 != 0;
-    }
-    
-    public static char readCharacter(InputStream in) throws IOException {
-        int ch1 = in.read();
-        int ch2 = in.read();
-        if ((ch1 | ch2) < 0)
-            throw new EOFException();
-        return (char)((ch1 << 8) + ch2);
-    }
-    
-    public static short readShort(InputStream in) throws IOException {
-        int ch1 = in.read();
-        int ch2 = in.read();
-        if ((ch1 | ch2) < 0)
-            throw new EOFException();
-        return (short)((ch1 << 8) + ch2);
-    }
-    
-    public static int readInteger(InputStream in) throws IOException {
-        int ch1 = in.read();
-        int ch2 = in.read();
-        int ch3 = in.read();
-        int ch4 = in.read();
-        if ((ch1 | ch2 | ch3 | ch4) < 0)
-            throw new EOFException();
-        return (ch1 << 24) + (ch2 << 16) + (ch3 << 8) + ch4;
-    }
-
-    public static long readLong(InputStream in) throws IOException {
-        int ch1 = in.read();
-        int ch2 = in.read();
-        int ch3 = in.read();
-        int ch4 = in.read();
-        int ch5 = in.read();
-        int ch6 = in.read();
-        int ch7 = in.read();
-        int ch8 = in.read();
-        if ((ch1 | ch2 | ch3 | ch4 | ch5 | ch6 | ch7 | ch8) < 0)
-            throw new EOFException();
-        return ((long)ch1 << 56) +
-                ((long)ch2 << 48) +
-                ((long)ch3 << 40) +
-                ((long)ch4 << 32) +
-                ((long)ch5 << 24) +
-                (ch6 << 16) +
-                (ch7 <<  8) +
-                ch8;
-    }
-
-    public static float readFloat(InputStream in) throws IOException {
-        return Float.intBitsToFloat(readInteger(in));
-    }
-
-    public static double readDouble(InputStream in) throws IOException {
-        return Double.longBitsToDouble(readLong(in));
-    }
-
-    public static int readLength(InputStream in) throws IOException {
-        int length = in.read()&0xff; 
-        if(length >= 0x80) {
-            if(length >= 0xc0) {
-                if(length >= 0xe0) {
-                    if(length >= 0xf0) {
-                        length &= 0x0f;
-                        length += in.read()<<3;
-                        length += in.read()<<11;
-                        length += in.read()<<19;
-                        length += 0x10204080;
-                    }
-                    else {
-                        length &= 0x1f;
-                        length += in.read()<<4;
-                        length += in.read()<<12;
-                        length += in.read()<<20;
-                        length += 0x204080;
-                    }
-                }
-                else {
-                    length &= 0x3f;
-                    length += in.read()<<5;
-                    length += in.read()<<13;
-                    length += 0x4080;
-                }
-            }
-            else {
-                length &= 0x7f;
-                length += in.read()<<6;
-                length += 0x80;
-            }
-        }
-        return length;
-    }    
-
-    private static byte[] readFully(InputStream in, int length) throws IOException {
-        byte[] result = new byte[length];
-        int cur = 0;
-        while(cur < length) {
-            int c = in.read(result, cur, length-cur);
-            if(c <= 0)
-                throw new EOFException();
-            cur += c;
-        }
-        return result;
-    }
-    
-    public static byte[] readByteArray(InputStream in) throws IOException {
-        int length = readLength(in);
-        return readFully(in, length);
-    }
-
-    public static double[] readDoubleArray(InputStream in) throws IOException {
-        int length = readLength(in);
-        double[] result = new double[length];
-        for(int i=0;i<length;++i)
-            result[i] = readDouble(in);
-        return result;
-    }
-    
-    public static String readString(InputStream in) throws IOException {
-        return new String(readByteArray(in), UTF8);
-    }
-    
-    public static byte[] readAllByteArrayAndClose(InputStream in) throws IOException {
-        try {
-            TByteArrayList l = new TByteArrayList();
-            byte[] buffer = new byte[1024];
-            while(true) {
-                int c = in.read(buffer, 0, buffer.length);
-                if(c <= 0)
-                    break;
-                l.add(buffer, 0, c);
-            }
-            return l.toArray();
-        }
-        finally {
-            if(in != null)
-                in.close();
-        }
-    }
-    
-    public static String readAllStringAndClose(InputStream in) throws IOException {
-        return new String(readAllByteArrayAndClose(in), UTF8);
-    }
-    
-    public static void writeByte(OutputStream out, byte v) throws IOException {
-        out.write((int)v);
-    }
-    
-    public static void writeBoolean(OutputStream out, boolean v) throws IOException {
-        out.write(v ? 1 : 0);
-    }
-    
-    public static void writeCharacter(OutputStream out, char v) throws IOException {
-        out.write((int)(v >>> 8));
-        out.write((int)(v));
-    }
-    
-    public static void writeShort(OutputStream out, short v) throws IOException {
-        out.write((int)(v >>> 8));
-        out.write((int)(v));
-    }
-    
-    public static void writeInteger(OutputStream out, int v) throws IOException {
-        out.write(v >>> 24);
-        out.write(v >>> 16);
-        out.write(v >>>  8);
-        out.write(v);
-    }
-    
-    public static void writeLong(OutputStream out, long v) throws IOException {
-        out.write((int)(v >>> 56));
-        out.write((int)(v >>> 48));
-        out.write((int)(v >>> 40));
-        out.write((int)(v >>> 32));        
-        out.write((int)(v >>> 24));
-        out.write((int)(v >>> 16));
-        out.write((int)(v >>>  8));
-        out.write((int)v);
-    }
-    
-    public static void writeFloat(OutputStream out, float v) throws IOException {
-        writeInteger(out, Float.floatToRawIntBits(v));
-    }
-    
-    public static void writeDouble(OutputStream out, double v) throws IOException {
-        writeLong(out, Double.doubleToRawLongBits(v));
-    }
-    
-    public static void writeLength(OutputStream out, int length) throws IOException {      
-        if(length < 0x80) {
-            out.write(length);
-        }
-        else {
-            length -= 0x80;
-            if(length < 0x4000) {
-                out.write( ((length&0x3f) | 0x80) );
-                out.write( (length>>>6) );
-            }
-            else {
-                length -= 0x4000;
-                if(length < 0x200000) {
-                    out.write( (length&0x1f) | 0xc0 );
-                    out.write( length>>>5 );
-                    out.write( length>>>13 );  
-                }
-                else {
-                    length -= 0x200000;
-                    if(length < 0x10000000) {
-                        out.write( (length&0x0f) | 0xe0 );
-                        out.write( length>>>4 );
-                        out.write( length>>>12 );  
-                        out.write( length>>>20 );
-                    }
-                    else {
-                        length -= 0x10000000;
-                        out.write( ((length&0x07) | 0xf0) );
-                        out.write( length>>>3 );
-                        out.write( length>>>11 );  
-                        out.write( length>>>19 );
-                        out.write( length>>>27 );
-                    }
-                }               
-            }
-        }   
-    }
-    
-    public static void writeByteArray(OutputStream out, byte[] v) throws IOException {
-        writeLength(out, v.length);
-        out.write(v);
-    }
-    
-    public static void writeDoubleArray(OutputStream out, double[] v) throws IOException {
-        writeLength(out, v.length);
-        for(double s : v)
-            writeDouble(out, s);
-    }
-    
-    public static void writeString(OutputStream out, String v) throws IOException {
-        writeByteArray(out, v.getBytes(UTF8));
-    }
-
-    public static int ioSizeString(String v) {
-        return ioSizeLength(v.length()) + v.getBytes().length;
-    }
-    
-    public static int ioSizeLength(int length) {
-        if(length < 0x80)
-            return 1;
-        if(length < 0x4080)
-            return 2;
-        if(length < 0x204080)
-            return 3;
-        if(length < 0x10204080)
-            return 4;
-        return 5;
-    }
-}
+package org.simantics.scl.runtime.io;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.charset.Charset;
+
+import gnu.trove.list.array.TByteArrayList;
+
+public class SclIO {
+
+    private static final Charset UTF8 = Charset.forName("UTF-8");
+    
+    public static byte readByte(InputStream in) throws IOException {
+        int ch1 = in.read();
+        if(ch1 < 0)
+            throw new EOFException();
+        return (byte)ch1;
+    }
+    
+    public static boolean readBoolean(InputStream in) throws IOException {
+        int ch1 = in.read();
+        if(ch1 < 0)
+            throw new EOFException();
+        return ch1 != 0;
+    }
+    
+    public static char readCharacter(InputStream in) throws IOException {
+        int ch1 = in.read();
+        int ch2 = in.read();
+        if ((ch1 | ch2) < 0)
+            throw new EOFException();
+        return (char)((ch1 << 8) + ch2);
+    }
+    
+    public static short readShort(InputStream in) throws IOException {
+        int ch1 = in.read();
+        int ch2 = in.read();
+        if ((ch1 | ch2) < 0)
+            throw new EOFException();
+        return (short)((ch1 << 8) + ch2);
+    }
+    
+    public static int readInteger(InputStream in) throws IOException {
+        int ch1 = in.read();
+        int ch2 = in.read();
+        int ch3 = in.read();
+        int ch4 = in.read();
+        if ((ch1 | ch2 | ch3 | ch4) < 0)
+            throw new EOFException();
+        return (ch1 << 24) + (ch2 << 16) + (ch3 << 8) + ch4;
+    }
+
+    public static long readLong(InputStream in) throws IOException {
+        int ch1 = in.read();
+        int ch2 = in.read();
+        int ch3 = in.read();
+        int ch4 = in.read();
+        int ch5 = in.read();
+        int ch6 = in.read();
+        int ch7 = in.read();
+        int ch8 = in.read();
+        if ((ch1 | ch2 | ch3 | ch4 | ch5 | ch6 | ch7 | ch8) < 0)
+            throw new EOFException();
+        return ((long)ch1 << 56) +
+                ((long)ch2 << 48) +
+                ((long)ch3 << 40) +
+                ((long)ch4 << 32) +
+                ((long)ch5 << 24) +
+                (ch6 << 16) +
+                (ch7 <<  8) +
+                ch8;
+    }
+
+    public static float readFloat(InputStream in) throws IOException {
+        return Float.intBitsToFloat(readInteger(in));
+    }
+
+    public static double readDouble(InputStream in) throws IOException {
+        return Double.longBitsToDouble(readLong(in));
+    }
+
+    public static int readLength(InputStream in) throws IOException {
+        int length = in.read()&0xff; 
+        if(length >= 0x80) {
+            if(length >= 0xc0) {
+                if(length >= 0xe0) {
+                    if(length >= 0xf0) {
+                        length &= 0x0f;
+                        length += in.read()<<3;
+                        length += in.read()<<11;
+                        length += in.read()<<19;
+                        length += 0x10204080;
+                    }
+                    else {
+                        length &= 0x1f;
+                        length += in.read()<<4;
+                        length += in.read()<<12;
+                        length += in.read()<<20;
+                        length += 0x204080;
+                    }
+                }
+                else {
+                    length &= 0x3f;
+                    length += in.read()<<5;
+                    length += in.read()<<13;
+                    length += 0x4080;
+                }
+            }
+            else {
+                length &= 0x7f;
+                length += in.read()<<6;
+                length += 0x80;
+            }
+        }
+        return length;
+    }    
+
+    private static byte[] readFully(InputStream in, int length) throws IOException {
+        byte[] result = new byte[length];
+        int cur = 0;
+        while(cur < length) {
+            int c = in.read(result, cur, length-cur);
+            if(c <= 0)
+                throw new EOFException();
+            cur += c;
+        }
+        return result;
+    }
+    
+    public static byte[] readByteArray(InputStream in) throws IOException {
+        int length = readLength(in);
+        return readFully(in, length);
+    }
+
+    public static double[] readDoubleArray(InputStream in) throws IOException {
+        int length = readLength(in);
+        double[] result = new double[length];
+        for(int i=0;i<length;++i)
+            result[i] = readDouble(in);
+        return result;
+    }
+    
+    public static String readString(InputStream in) throws IOException {
+        return new String(readByteArray(in), UTF8);
+    }
+    
+    public static byte[] readAllByteArrayAndClose(InputStream in) throws IOException {
+        try {
+            TByteArrayList l = new TByteArrayList();
+            byte[] buffer = new byte[1024];
+            while(true) {
+                int c = in.read(buffer, 0, buffer.length);
+                if(c <= 0)
+                    break;
+                l.add(buffer, 0, c);
+            }
+            return l.toArray();
+        }
+        finally {
+            if(in != null)
+                in.close();
+        }
+    }
+    
+    public static String readAllStringAndClose(InputStream in) throws IOException {
+        return new String(readAllByteArrayAndClose(in), UTF8);
+    }
+    
+    public static void writeByte(OutputStream out, byte v) throws IOException {
+        out.write((int)v);
+    }
+    
+    public static void writeBoolean(OutputStream out, boolean v) throws IOException {
+        out.write(v ? 1 : 0);
+    }
+    
+    public static void writeCharacter(OutputStream out, char v) throws IOException {
+        out.write((int)(v >>> 8));
+        out.write((int)(v));
+    }
+    
+    public static void writeShort(OutputStream out, short v) throws IOException {
+        out.write((int)(v >>> 8));
+        out.write((int)(v));
+    }
+    
+    public static void writeInteger(OutputStream out, int v) throws IOException {
+        out.write(v >>> 24);
+        out.write(v >>> 16);
+        out.write(v >>>  8);
+        out.write(v);
+    }
+    
+    public static void writeLong(OutputStream out, long v) throws IOException {
+        out.write((int)(v >>> 56));
+        out.write((int)(v >>> 48));
+        out.write((int)(v >>> 40));
+        out.write((int)(v >>> 32));        
+        out.write((int)(v >>> 24));
+        out.write((int)(v >>> 16));
+        out.write((int)(v >>>  8));
+        out.write((int)v);
+    }
+    
+    public static void writeFloat(OutputStream out, float v) throws IOException {
+        writeInteger(out, Float.floatToRawIntBits(v));
+    }
+    
+    public static void writeDouble(OutputStream out, double v) throws IOException {
+        writeLong(out, Double.doubleToRawLongBits(v));
+    }
+    
+    public static void writeLength(OutputStream out, int length) throws IOException {      
+        if(length < 0x80) {
+            out.write(length);
+        }
+        else {
+            length -= 0x80;
+            if(length < 0x4000) {
+                out.write( ((length&0x3f) | 0x80) );
+                out.write( (length>>>6) );
+            }
+            else {
+                length -= 0x4000;
+                if(length < 0x200000) {
+                    out.write( (length&0x1f) | 0xc0 );
+                    out.write( length>>>5 );
+                    out.write( length>>>13 );  
+                }
+                else {
+                    length -= 0x200000;
+                    if(length < 0x10000000) {
+                        out.write( (length&0x0f) | 0xe0 );
+                        out.write( length>>>4 );
+                        out.write( length>>>12 );  
+                        out.write( length>>>20 );
+                    }
+                    else {
+                        length -= 0x10000000;
+                        out.write( ((length&0x07) | 0xf0) );
+                        out.write( length>>>3 );
+                        out.write( length>>>11 );  
+                        out.write( length>>>19 );
+                        out.write( length>>>27 );
+                    }
+                }               
+            }
+        }   
+    }
+    
+    public static void writeByteArray(OutputStream out, byte[] v) throws IOException {
+        writeLength(out, v.length);
+        out.write(v);
+    }
+    
+    public static void writeDoubleArray(OutputStream out, double[] v) throws IOException {
+        writeLength(out, v.length);
+        for(double s : v)
+            writeDouble(out, s);
+    }
+    
+    public static void writeString(OutputStream out, String v) throws IOException {
+        writeByteArray(out, v.getBytes(UTF8));
+    }
+
+    public static int ioSizeString(String v) {
+        return ioSizeLength(v.length()) + v.getBytes().length;
+    }
+    
+    public static int ioSizeLength(int length) {
+        if(length < 0x80)
+            return 1;
+        if(length < 0x4080)
+            return 2;
+        if(length < 0x204080)
+            return 3;
+        if(length < 0x10204080)
+            return 4;
+        return 5;
+    }
+}