jruby · Feb 24, 2014 · Feb 25, 2014 · Feb 25, 2014 · Feb 25, 2014 · Feb 25, 2014
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1 @@
+language: java
diff --git a/resources/tables/Transcoder_Newline_ByteArray.bin b/resources/tables/Transcoder_Newline_ByteArray.bin
diff --git a/resources/tables/Transcoder_Newline_WordArray.bin b/resources/tables/Transcoder_Newline_WordArray.bin
diff --git a/scripts/ExtractTables.rb b/scripts/ExtractTables.rb
@@ -11,121 +11,122 @@
 INDENT = " " * 4
 
 def assert_eq a, b, msg = ""
-    raise "unmet condition: #{a.inspect} == #{b.inspect}, info #{msg}" unless a == b
+  raise "unmet condition: #{a.inspect} == #{b.inspect}, info #{msg}" unless a == b
 end
 
 def assert_not_eq a, b, msg = ""
-    raise "unmet condition: #{a.inspect} != #{b.inspect}, info: #{msg}" unless a != b
+  raise "unmet condition: #{a.inspect} != #{b.inspect}, info: #{msg}" unless a != b
 end
 
 def extract_to to, file
-    to = to.map do |t|
-        case t
-        when /^0x[0-9a-f]+$/
-            t.to_i(16)
-        else
-            t = t.split(',').map{|t|t.strip}
-            assert_eq(t.all?{|e|e =~ /^0x[0-9a-f]+$/}, true)
-            t.map{|t| t.to_i(16)}
-        end
+  to = to.map do |t|
+    case t
+      when /^0x[0-9a-f]+$/
+        t.to_i(16)
+      else
+        t = t.split(',').map { |t| t.strip }
+        assert_eq(t.all? { |e| e =~ /^0x[0-9a-f]+$/ }, true)
+        t.map { |t| t.to_i(16) }
     end
-
-    open(file, "wb") do |f|
-        f << [to.size].pack("N")
-        to.each do |t| case t
-            when Fixnum
-                f << [1].pack("N")
-                f << [t].pack("N")
-            when Array
-                f << [t.size].pack("N")
-                t.each{|tx| f << [tx].pack("N")}
-            else
-                raise "foo"
-            end
-        end
+  end
+
+  open(file, "wb") do |f|
+    f << [to.size].pack("N")
+    to.each do |t|
+      case t
+        when Fixnum
+          f << [1].pack("N")
+          f << [t].pack("N")
+        when Array
+          f << [t.size].pack("N")
+          t.each { |tx| f << [tx].pack("N") }
+        else
+          raise "foo"
+      end
     end
+  end
 end
 
 folds = folds_src.scan(/static\s+const\s+(\w+)\s+(\w+)\[\]\s+=\s+\{(.*?)\}\;/m).map do |(type, name, tab)|
-    case type
-        when /Case(\w+)_11_Type/
-            from, to = tab.scan(/(\w+).+\{\w+?.+?\{(.+?)\s?\}/).transpose
-
-            assert_eq(to.size, from.size)
+  case type
+    when /Case(\w+)_11_Type/
+      from, to = tab.scan(/(\w+).+\{\w+?.+?\{(.+?)\s?\}/).transpose
 
-            assert_eq(from.all?{|e| e =~ /^0x[0-9a-f]+$/}, true)
-            from = from.map{|e| e.to_i(16)}
-            open("#{dst_bin_dir}/#{name}_From.bin", "wb") do |f|
-                f << [from.size].pack("N")
-                from.each{|fr| f << [fr].pack("N")}
-            end
+      assert_eq(to.size, from.size)
 
-            extract_to to, "#{dst_bin_dir}/#{name}_To.bin"
+      assert_eq(from.all? { |e| e =~ /^0x[0-9a-f]+$/ }, true)
+      from = from.map { |e| e.to_i(16) }
+      open("#{dst_bin_dir}/#{name}_From.bin", "wb") do |f|
+        f << [from.size].pack("N")
+        from.each { |fr| f << [fr].pack("N") }
+      end
 
-        when "CaseUnfold_12_Type", "CaseUnfold_13_Type"
-            fld =  tab.scan(/\{\s?\{(.+?)\}.+\{\w+?.+?\{(.+?)\s?\}/).flatten
+      extract_to to, "#{dst_bin_dir}/#{name}_To.bin"
 
-            extract_to fld, "#{dst_bin_dir}/#{name}.bin"
-        else
-            raise "error"
-    end
+    when "CaseUnfold_12_Type", "CaseUnfold_13_Type"
+      fld = tab.scan(/\{\s?\{(.+?)\}.+\{\w+?.+?\{(.+?)\s?\}/).flatten
+
+      extract_to fld, "#{dst_bin_dir}/#{name}.bin"
+    else
+      raise "error"
+  end
 end
 
 unicode_src.scan(/static\s+const\s+(\w+)\s+(\w+)\[\]\s+=\s+\{(.*?)\}\;/m).each do |(type, name, tab)|
-    tab = tab.split(",").map{|e|e.strip}
-    assert_eq(tab.last, "")
-    tab.pop
-    
-    size = tab.size
-    head = tab.shift
-    
-    assert_eq(head =~ /^\d+$/, 0)
-    head = head.to_i
-
-    assert_eq(tab[1..-1].all?{|e| e =~ /^0x[0-9a-f]+$/}, true)
-
-    tab = tab.map{|e| e.to_i(16)}
-    assert_eq(tab.all?{|e|e >= 0 && e <= 4294967295}, true)
-
-    open("#{dst_bin_dir}/#{name}.bin", "wb") do |f|
-        f << [size].pack("N")
-        f << [head].pack("N")
-        tab.each{|e| f << [e].pack("N") }
-    end
+  tab = tab.split(",").map { |e| e.strip }
+  assert_eq(tab.last, "")
+  tab.pop
+
+  size = tab.size
+  head = tab.shift
+
+  assert_eq(head =~ /^\d+$/, 0)
+  head = head.to_i
+
+  assert_eq(tab[1..-1].all? { |e| e =~ /^0x[0-9a-f]+$/ }, true)
+
+  tab = tab.map { |e| e.to_i(16) }
+  assert_eq(tab.all? { |e| e >= 0 && e <= 4294967295 }, true)
+
+  open("#{dst_bin_dir}/#{name}.bin", "wb") do |f|
+    f << [size].pack("N")
+    f << [head].pack("N")
+    tab.each { |e| f << [e].pack("N") }
+  end
 end
 
 
-cr_map =  unicode_src.scan(/#define (CR_.*?) (.*)/).inject(Hash.new{|h, k|k}){|h, (k,v)| h[k] = v;h}
+cr_map = unicode_src.scan(/#define (CR_.*?) (.*)/).inject(Hash.new { |h, k| k }) { |h, (k, v)| h[k] = v; h }
 
-aliases = unicode_src[/%%(.*?)%%/m, 1].scan(/(.*?),\s+(\d+)/).inject(Hash.new{|h, k| h[k] = []}){|h, (name, num)| h[num.to_i] << name; h}.inject({}) do |h, (k, v)|
-    full, *abbr = v.map{|e|e.strip}
-    h[full] = abbr
-    h
+aliases = unicode_src[/%%(.*?)%%/m, 1].scan(/(.*?),\s+(\d+)/).inject(Hash.new { |h, k| h[k] = [] }) { |h, (name, num)| h[num.to_i] << name; h }.inject({}) do |h, (k, v)|
+  full, *abbr = v.map { |e| e.strip }
+  h[full] = abbr
+  h
 end
 
 unicode_src.scan(/CodeRanges\[\]\s+=\s+\{(.*?)\}\;/m) do |e|
-    names = e.first.scan(/CR_\w+/)
-
-    cnames = names.map do |c|
-        n = c[/CR_(.*)/, 1]
-        px = case n
-            when /Age_(\d)_(\d)/
-                "age=#{$1}.#{$2}"
-            else
-                n.tr('_', '').downcase
-        end
-
-       ([px] + aliases[px].to_a).map{|n| "#{INDENT * 4}new CodeRangeEntry(\"#{n}\", \"#{cr_map[c]}\")"}.join(",\n")
-    end
-
-    open("#{enc_dir}/UnicodeProperties.java", "wb") do |f|
-        f << open("UnicodePropertiesTemplate.java", "rb").read.
+  names = e.first.scan(/CR_\w+/)
+
+  cnames = names.map do |c|
+    n = c[/CR_(.*)/, 1]
+    px = case n
+           when /Age_(\d)_(\d)/
+             "age=#{$1}.#{$2}"
+           else
+             n.tr('_', '').downcase
+         end
+
+    ([px] + aliases[px].to_a).map { |n| "#{INDENT * 4}new CodeRangeEntry(\"#{n}\", \"#{cr_map[c]}\")" }.join(",\n")
+  end
+
+  open("#{enc_dir}/UnicodeProperties.java", "wb") do |f|
+    f << open("UnicodePropertiesTemplate.java", "rb").read.
         sub(/%\{stdcrs\}/, cnames[0..14].join(",\n")).
         sub(/%\{extcrs\}/, cnames.join(",\n"))
-    end
+  end
 end
 
-enc_db = open("#{repo_path}/encdb.h").read.tr('()', '').scan(/ENC_([A-Z_]+)(.*?);/m).reject{|a, b| a =~ /DEFINE/}
+enc_db = open("#{repo_path}/encdb.h").read.tr('()', '').scan(/ENC_([A-Z_]+)(.*?);/m).reject { |a, b| a =~ /DEFINE/ }
 
-open("#{dst_dir}/EncodingList.java", "wb"){|f| f << open("EncodingListTemplate.java", "rb").read.
-    sub(/%\{body\}/, enc_db.map{|cmd, from, to| "#{INDENT*2}{\"#{cmd[0,1]}\", #{from}#{to.nil? ? "" : to}}"}.join(",\n"))}
+open("#{dst_dir}/EncodingList.java", "wb") { |f| f << open("EncodingListTemplate.java", "rb").read.
+    sub(/%\{body\}/, enc_db.map { |cmd, from, to| "#{INDENT*2}{\"#{cmd[0, 1]}\", #{from}#{to.nil? ? "" : to}}" }.join(",\n")) }
diff --git a/src/org/jcodings/EncodingDB.java b/src/org/jcodings/EncodingDB.java
@@ -134,7 +134,7 @@ public boolean isDummy() {
         "UTF-32LE",     "UTF32LE",
         "Windows-1251", "CP1251",
         "GB2312",       "EUCKR",         // done via rb_enc_register
-        "Windows-31J",  "SJIS"           // TODO: Windows-31J is actually a variant of SJIS
+        "Windows-31J",  "Windows_31J"           // TODO: Windows-31J is actually a variant of SJIS
     };
 
     static Entry ascii;
@@ -177,10 +177,15 @@ public static void replicate(String replica, String original) {
     public static void set_base(String name, String original) {
     }
 
+    public static Entry dummy(byte[] bytes) {
+        if (encodings.get(bytes) != null) throw new InternalException(ErrorMessages.ERR_ENCODING_ALREADY_REGISTERED, new String(bytes));
+        Entry entry = new Entry(bytes);
+        encodings.putDirect(bytes, entry);
+        return entry;
+    }
+
     public static void dummy(String name) {
-        byte[]bytes = name.getBytes();
-        if (encodings.get(bytes) != null) throw new InternalException(ErrorMessages.ERR_ENCODING_ALREADY_REGISTERED, name);
-        encodings.putDirect(bytes, new Entry(bytes));
+        dummy(name.getBytes());
     }
 
     static {

diff --git a/src/org/jcodings/EncodingList.java b/src/org/jcodings/EncodingList.java
@@ -133,8 +133,8 @@ final class EncodingList {
         {"R", "UTF8-MAC", "UTF-8"},
         {"A", "UTF-8-MAC", "UTF8-MAC"},
         {"A", "UTF-8-HFS", "UTF8-MAC" /* Emacs 23.2 */},
-        {"D", "UTF-16"},
-        {"D", "UTF-32"},
+        {"R", "UTF-16", "UTF-16BE"},
+        {"R", "UTF-32", "UTF-32BE"},
         {"A", "UCS-2BE", "UTF-16BE"},
         {"A", "UCS-4BE", "UTF-32BE"},
         {"A", "UCS-4LE", "UTF-32LE"},

diff --git a/src/org/jcodings/specific/BaseSJISEncoding.java b/src/org/jcodings/specific/BaseSJISEncoding.java
@@ -32,8 +32,8 @@
 
 abstract class BaseSJISEncoding extends CanBeTrailTableEncoding {
 
-    protected BaseSJISEncoding(int[][]Trans) {
-        super("Shift_JIS", 1, 2, SjisEncLen, Trans, AsciiTables.AsciiCtypeTable, SJIS_CAN_BE_TRAIL_TABLE);
+    protected BaseSJISEncoding(String name, int[][]Trans) {
+        super(name, 1, 2, SjisEncLen, Trans, AsciiTables.AsciiCtypeTable, SJIS_CAN_BE_TRAIL_TABLE);
     }
 
     @Override

diff --git a/src/org/jcodings/specific/NonStrictSJISEncoding.java b/src/org/jcodings/specific/NonStrictSJISEncoding.java
@@ -22,7 +22,7 @@
 public final class NonStrictSJISEncoding extends BaseSJISEncoding {
 
     protected NonStrictSJISEncoding() {
-        super(null);
+        super("Shift_JIS", null);
     }
 
     @Override

diff --git a/src/org/jcodings/specific/SJISEncoding.java b/src/org/jcodings/specific/SJISEncoding.java
@@ -24,7 +24,7 @@
 public final class SJISEncoding extends BaseSJISEncoding {
 
     protected SJISEncoding() {
-        super(SjisTrans);
+        super("Shift_JIS", SjisTrans);
     }
 
     @Override
@@ -36,7 +36,7 @@ public int length(byte[]bytes, int p, int end) {
         }
     }
 
-    private static final int SjisTrans[][] = Config.VANILLA ? null : new int[][]{
+    static final int SjisTrans[][] = Config.VANILLA ? null : new int[][]{
         { /* S0   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
           /* 0 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
           /* 1 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,

diff --git a/src/org/jcodings/specific/Windows_31JEncoding.java b/src/org/jcodings/specific/Windows_31JEncoding.java
@@ -0,0 +1,44 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package org.jcodings.specific;
+
+import org.jcodings.Config;
+
+public final class Windows_31JEncoding extends BaseSJISEncoding {
+    protected Windows_31JEncoding() {
+        super("Windows-31J", SJISEncoding.SjisTrans);
+    }
+
+    @Override
+    public String getCharsetName() {
+        return "Windows-31J";
+    }
+
+    @Override
+    public int length(byte[]bytes, int p, int end) {
+        if (Config.VANILLA) {
+            return length(bytes[p]);
+        } else {
+            return safeLengthForUptoTwo(bytes, p, end);
+        }
+    }
+
+    public static final Windows_31JEncoding INSTANCE = new Windows_31JEncoding();
+}
diff --git a/src/org/jcodings/transcode/AsciiCompatibility.java b/src/org/jcodings/transcode/AsciiCompatibility.java
@@ -22,15 +22,15 @@
 public enum AsciiCompatibility {
     CONVERTER, DECODER, ENCODER;
 
-    boolean isConverter() {
+    public boolean isConverter() {
         return this == CONVERTER;
     }
 
-    boolean isDecoder() {
+    public boolean isDecoder() {
         return this == DECODER;
     }
 
-    boolean isEncoder() {
+    public boolean isEncoder() {
         return this == ENCODER;
     }
 }