[Git][java-team/jcodings][master] 10 commits: update convertInternal.

[Hideki Yamane]

Hideki Yamane pushed to branch master at Debian Java Maintainers / jcodings


Commits:
9dcb383c by kiichi at 2020-05-03T00:33:19+09:00
update convertInternal.
this change make all the following test cases pass.
 1. TestTranscode#test_ill_formed_utf_8_replace
 2. TestTranscode#test_unicode_public_review_issue_121

- - - - -
408210ce by kiichi at 2020-05-06T00:55:19+09:00
fix wrong right shift by 160 bits.

- - - - -
184ccc4e by Marcin Mielżyński at 2020-05-05T22:40:30+02:00
Merge pull request #35 from k77ch7/fix-getGB4bt2

Fix getGB4bt2
- - - - -
886655cb by Marcin Mielżyński at 2020-05-05T22:43:27+02:00
Merge pull request #34 from k77ch7/update-Econv

Update Econv convertInternal method
- - - - -
5445899d by Charles Oliver Nutter at 2020-05-08T17:51:47-05:00
[maven-release-plugin] prepare release jcodings-1.0.51

- - - - -
47605d00 by Charles Oliver Nutter at 2020-05-08T17:51:55-05:00
[maven-release-plugin] prepare for next development iteration

- - - - -
3f6b50c2 by kiichi at 2020-05-12T00:00:05+09:00
Fix failling TestTranscode#test_to_cp50221
see https://github.com/ruby/ruby/blob/v2_6_6/enc/trans/iso2022.trans#L466

- - - - -
ae6417ca by Charles Oliver Nutter at 2020-05-11T17:02:23-05:00
Merge pull request #36 from k77ch7/fix-cp50221-transcoder

Fix failling TestTranscode#test_to_cp50221
- - - - -
5b856464 by Charles Oliver Nutter at 2020-05-11T17:54:59-05:00
[maven-release-plugin] prepare release jcodings-1.0.52

- - - - -
fcfa08f5 by Charles Oliver Nutter at 2020-05-11T17:55:07-05:00
[maven-release-plugin] prepare for next development iteration

- - - - -


4 changed files:

- pom.xml
- src/org/jcodings/transcode/EConv.java
- src/org/jcodings/transcode/TranscodeFunctions.java
- src/org/jcodings/transcode/Transcoding.java


Changes:

=====================================
pom.xml
=====================================
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jruby.jcodings</groupId>
   <artifactId>jcodings</artifactId>
-  <version>1.0.51-SNAPSHOT</version>
+  <version>1.0.53-SNAPSHOT</version>
   <name>JCodings</name>
   <description>Byte based encoding support library for java</description>
   <parent>


=====================================
src/org/jcodings/transcode/EConv.java
=====================================
@@ -395,7 +395,7 @@ public final class EConv implements EConvFlags {
             Ptr inDataStartPtr = new Ptr(inBuf.dataStart);
             res = transConv(inBuf.bytes, inDataStartPtr, inBuf.dataEnd, out, outPtr, outStop, (flags & ~AFTER_OUTPUT) | PARTIAL_INPUT, resultPosition);
             inBuf.dataStart = inDataStartPtr.p;
-            if (!res.isSourceBufferEmpty()) return convertInternalResult(EConvResult.SourceBufferEmpty, resultPosition);
+            if (!res.isSourceBufferEmpty()) return convertInternalResult(res, resultPosition);
         }
 
         if (hasOutput && (flags & AFTER_OUTPUT) != 0 && inPtr.p != inStop) {


=====================================
src/org/jcodings/transcode/TranscodeFunctions.java
=====================================
@@ -519,7 +519,7 @@ public class TranscodeFunctions {
             int c = sp[2] & 0x7F;
             int p = (c - 0x21) * 2;
             byte[] pBytes = tbl0208;
-            if (sp[1] == G0_JISX0208_1983) {
+            if (sp[1] != G0_JISX0208_1983) {
                 o[oStart++] = 0x1B;
                 o[oStart++] = (byte)'$';
                 o[oStart++] = (byte)'B';


=====================================
src/org/jcodings/transcode/Transcoding.java
=====================================
@@ -666,7 +666,7 @@ public class Transcoding implements TranscodingInstruction {
     }
 
     public static byte getGB4bt2(int a) {
-        return (byte)(a >>> 160);
+        return (byte)(a >>> 16);
     }
 
     public static byte getGB4bt3(int a) {



View it on GitLab: https://salsa.debian.org/java-team/jcodings/-/compare/9bb060b15bcfa12e92146ec25b5539e6fd00f07b...fcfa08f5aaeb35ae3e7b3a1b28f6a9951f47faa8

-- 
View it on GitLab: https://salsa.debian.org/java-team/jcodings/-/compare/9bb060b15bcfa12e92146ec25b5539e6fd00f07b...fcfa08f5aaeb35ae3e7b3a1b28f6a9951f47faa8
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20200512/87751152/attachment.html>