Encoding and Decoding now understand how to encode/decode byte[] and …

…Encoding. FrozenString and StringLiteral fixed up to properly dump encoding and coderange.
jruby · Mar 11, 2015 · b173aca · b173aca
1 parent 4192682
commit b173aca
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 13 deletions.
diff --git a/core/src/main/java/org/jruby/ir/operands/FrozenString.java b/core/src/main/java/org/jruby/ir/operands/FrozenString.java
@@ -8,6 +8,7 @@
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.ByteList;
+import org.jruby.util.StringSupport;
 
 /**
  * Represents a literal string value.
@@ -18,11 +19,11 @@
  */
 public class FrozenString extends StringLiteral {
     public FrozenString(ByteList byteList, int cr) {
-        super(byteList, cr);
+        super(OperandType.FROZEN_STRING, byteList, cr);
     }
 
     public FrozenString(String s) {
-        super(s);
+        this(ByteList.create(s), StringSupport.CR_7BIT);
     }
 
     @Override

diff --git a/core/src/main/java/org/jruby/ir/operands/StringLiteral.java b/core/src/main/java/org/jruby/ir/operands/StringLiteral.java
@@ -33,11 +33,15 @@ public class StringLiteral extends Operand {
     final public int      coderange;
 
     public StringLiteral(ByteList val) {
-        this(val, StringSupport.CR_7BIT);
+        this(OperandType.STRING_LITERAL, val, StringSupport.CR_7BIT);
     }
 
     public StringLiteral(ByteList val, int coderange) {
-        super(OperandType.STRING_LITERAL);
+        this(OperandType.STRING_LITERAL, val, coderange);
+    }
+
+    protected StringLiteral(OperandType type, ByteList val, int coderange) {
+        super(type);
 
         bytelist = val;
         this.coderange = coderange;

diff --git a/core/src/main/java/org/jruby/ir/persistence/IRReaderDecoder.java b/core/src/main/java/org/jruby/ir/persistence/IRReaderDecoder.java
@@ -6,6 +6,7 @@
 
 package org.jruby.ir.persistence;
 
+import org.jcodings.Encoding;
 import org.jruby.ir.IRScope;
 import org.jruby.ir.IRScopeType;
 import org.jruby.ir.Operation;
@@ -37,6 +38,8 @@ public interface IRReaderDecoder {
     public OperandType decodeOperandType();
     public boolean decodeBoolean();
     public byte decodeByte();
+    public byte[] decodeByteArray();
+    public Encoding decodeEncoding();
     public ByteList decodeByteList();
     public char decodeChar();
     public int decodeInt();

diff --git a/core/src/main/java/org/jruby/ir/persistence/IRReaderFile.java b/core/src/main/java/org/jruby/ir/persistence/IRReaderFile.java
@@ -7,6 +7,7 @@
 package org.jruby.ir.persistence;
 
 import org.jcodings.Encoding;
+import org.jcodings.EncodingDB;
 import org.jruby.RubyInstanceConfig;
 import org.jruby.ir.IRManager;
 import org.jruby.ir.IRScope;
@@ -64,15 +65,20 @@ public IRReaderFile(IRManager manager, File file) {
 
     @Override
     public ByteList decodeByteList() {
+        return new ByteList(decodeByteArray(), decodeEncoding());
+    }
+
+    @Override
+    public byte[] decodeByteArray() {
         int size = decodeInt();
         byte[] bytes = new byte[size];
         buf.get(bytes);
-        // FIXME: This is horrible :)
-        // FIXME: Add direct encode/decode support for Encoding
-        String encoding = decodeString();
-        Encoding actualEncoding = Encoding.load(encoding);
+        return bytes;
+    }
 
-        return new ByteList(bytes, actualEncoding);
+    @Override
+    public Encoding decodeEncoding() {
+        return EncodingDB.getEncodings().get(decodeByteArray()).getEncoding();
     }
 
     @Override

diff --git a/core/src/main/java/org/jruby/ir/persistence/IRWriterAnalzer.java b/core/src/main/java/org/jruby/ir/persistence/IRWriterAnalzer.java
@@ -6,6 +6,7 @@
 
 package org.jruby.ir.persistence;
 
+import org.jcodings.Encoding;
 import org.jruby.ir.IRScope;
 import org.jruby.ir.IRScopeType;
 import org.jruby.ir.Operation;
@@ -40,6 +41,16 @@ public void encode(Instr instr) {
     public void encode(ByteList value) {
     }
 
+    @Override
+    public void encode(byte[] value) {
+
+    }
+
+    @Override
+    public void encode(Encoding encoding) {
+
+    }
+
     @Override
     public void encode(String value) {
     }

diff --git a/core/src/main/java/org/jruby/ir/persistence/IRWriterEncoder.java b/core/src/main/java/org/jruby/ir/persistence/IRWriterEncoder.java
@@ -1,5 +1,6 @@
 package org.jruby.ir.persistence;
 
+import org.jcodings.Encoding;
 import org.jruby.ir.IRScope;
 import org.jruby.ir.IRScopeType;
 import org.jruby.ir.Operation;
@@ -18,6 +19,7 @@
 public interface IRWriterEncoder {
 
     public void encode(ByteList bytelist);
+    public void encode(Encoding encoding);
     public void encode(String value);
     public void encode(String[] values);
     public void encode(Instr value);
@@ -28,6 +30,7 @@ public interface IRWriterEncoder {
     public void encode(Operand value);
     public void encode(Operand[] value);
     public void encode(OperandType value);
+    public void encode(byte[] values);
     public void encode(boolean value);
     public void encode(byte value);
     public void encode(char value);

diff --git a/core/src/main/java/org/jruby/ir/persistence/IRWriterFile.java b/core/src/main/java/org/jruby/ir/persistence/IRWriterFile.java
@@ -6,6 +6,7 @@
 
 package org.jruby.ir.persistence;
 
+import org.jcodings.Encoding;
 import org.jruby.ir.IRScope;
 import org.jruby.ir.IRScopeType;
 import org.jruby.ir.Operation;
@@ -115,12 +116,19 @@ public void encode(double value) {
 
     @Override
     public void encode(ByteList value) {
-        byte[] bytes = value.bytes();
+        encode(value.bytes());
+        encode(value.getEncoding());
+    }
 
+    @Override
+    public void encode(byte[] bytes) {
         encode(bytes.length);
         buf.put(bytes);
-        // FIXME: Consider writing this out differently?
-        encode(value.getEncoding().toString());
+    }
+
+    @Override
+    public void encode(Encoding encoding) {
+        encode(encoding.getName());
     }
 
     @Override

diff --git a/core/src/main/java/org/jruby/ir/persistence/OperandDecoderMap.java b/core/src/main/java/org/jruby/ir/persistence/OperandDecoderMap.java
@@ -42,6 +42,7 @@ public Operand decode(OperandType type) {
             case DYNAMIC_SYMBOL: return new DynamicSymbol(d.decodeOperand());
             case FIXNUM: return new Fixnum(d.decodeLong());
             case FLOAT: return new org.jruby.ir.operands.Float(d.decodeDouble());
+            case FROZEN_STRING: return FrozenString.decode(d);
             case GLOBAL_VARIABLE: return new GlobalVariable(d.decodeString());
             case HASH: return decodeHash();
             case IR_EXCEPTION: return IRException.getExceptionFromOrdinal(d.decodeByte());
@@ -55,7 +56,7 @@ public Operand decode(OperandType type) {
             case SELF: return Self.SELF;
             case SPLAT: return new Splat(d.decodeOperand());
             case STANDARD_ERROR: return new StandardError();
-            case STRING_LITERAL: return new StringLiteral(d.decodeString());
+            case STRING_LITERAL: return StringLiteral.decode(d);
             case SVALUE: return new SValue(d.decodeOperand());
             // FIXME: This is broken since there is no encode/decode for encoding
             case SYMBOL: return new Symbol(d.decodeString(), USASCIIEncoding.INSTANCE);