[Git][java-team/jcodings][master] 57 commits: [maven-release-plugin] prepare release jcodings-1.0.31
Hideki Yamane
gitlab at salsa.debian.org
Mon Oct 15 13:43:31 BST 2018
Hideki Yamane pushed to branch master at Debian Java Maintainers / jcodings
Commits:
8914725b by Thomas E. Enebo at 2018-08-13T15:26:38Z
[maven-release-plugin] prepare release jcodings-1.0.31
- - - - -
a71866ed by Thomas E. Enebo at 2018-08-13T15:26:43Z
[maven-release-plugin] prepare for next development iteration
- - - - -
fee64cd8 by Marcin Mielzynski at 2018-08-13T18:51:29Z
use Encoding.NEW_LINE
- - - - -
bdea837a by Marcin Mielzynski at 2018-08-22T21:08:54Z
Fixes #24
- - - - -
cde0bd63 by Charles Oliver Nutter at 2018-09-06T03:58:52Z
Switch to YAML for pom.
- - - - -
9ee52a22 by Charles Oliver Nutter at 2018-09-06T04:00:54Z
Add module-info at root to support Java 9 modules.
- - - - -
1c780645 by Charles Oliver Nutter at 2018-09-06T04:18:01Z
Remove inline maps for readability.
- - - - -
ce26aafc by Charles Oliver Nutter at 2018-09-06T05:35:19Z
Use openjdk9 only for now.
- - - - -
0e62a3f9 by Charles Oliver Nutter at 2018-09-06T05:40:11Z
Formatting.
- - - - -
0025b6df by Charles Oliver Nutter at 2018-09-06T05:43:04Z
build.xml is no longer needed.
- - - - -
f66c1d34 by Charles Oliver Nutter at 2018-09-06T05:45:54Z
Remove multi-release config that snuck in.
- - - - -
92c740e5 by Charles Oliver Nutter at 2018-09-06T05:52:57Z
Ah. Travis does not detect pom.yml.
- - - - -
ad049c01 by Charles Oliver Nutter at 2018-09-06T06:23:04Z
Restore multi-release jar config and add manifest line.
This line is apparently needed for the JDK tools to detect that
you are using a multi-release jar.
See discussion at https://twitter.com/rfscholte/status/1037578869681926144
- - - - -
f7317382 by Charles Oliver Nutter at 2018-09-06T06:33:28Z
Cleanup some unnecessary noise.
- - - - -
090e1984 by Thomas E. Enebo at 2018-09-06T16:14:07Z
[maven-release-plugin] prepare release jcodings-1.0.32
- - - - -
bfc5daa5 by Thomas E. Enebo at 2018-09-06T16:14:15Z
[maven-release-plugin] prepare for next development iteration
- - - - -
8eeacc7a by Charles Oliver Nutter at 2018-09-07T05:47:05Z
Give up on multi-release jar for module-info for now.
See https://twitter.com/headius/status/1037931427000725504
- - - - -
022968e7 by Charles Oliver Nutter at 2018-09-07T06:29:58Z
Bump dev version since 1.0.32 was released on master.
- - - - -
2aa60820 by Charles Oliver Nutter at 2018-09-10T16:15:53Z
Merge branch 'java9'
- - - - -
fe1f1f23 by Charles Oliver Nutter at 2018-09-12T08:46:19Z
Unnecessary.
- - - - -
fd4d569c by Charles Oliver Nutter at 2018-09-12T08:46:42Z
Isolate module-info to JDK9+ builds.
- - - - -
933c03f6 by Charles Oliver Nutter at 2018-09-12T08:47:09Z
Add back Java 8.
- - - - -
da5a62f2 by Charles Oliver Nutter at 2018-09-12T08:47:43Z
Add IDEA files to ignore.
- - - - -
3adef241 by Charles Oliver Nutter at 2018-09-12T09:01:58Z
Tidy up and add some whitespace for readability.
- - - - -
c14e6dc7 by Charles Oliver Nutter at 2018-09-12T09:58:26Z
Move release-related targets into jdk9-specific profile.
- - - - -
c51cede3 by Charles Oliver Nutter at 2018-09-13T20:11:08Z
Switch back to XML so we can use release plugin.
- - - - -
49a7bd7c by Charles Oliver Nutter at 2018-09-14T18:41:40Z
Go back to Sonatype parent pom for now.
- - - - -
f80d2fc1 by Charles Oliver Nutter at 2018-09-14T18:49:38Z
[maven-release-plugin] prepare release jcodings-1.0.34
- - - - -
fcf7edac by Charles Oliver Nutter at 2018-09-14T18:49:45Z
[maven-release-plugin] prepare for next development iteration
- - - - -
9de14d3e by Charles Oliver Nutter at 2018-09-14T19:11:08Z
Remove Maven polyglot extension.
- - - - -
fffdfe0f by Marcin Mielzynski at 2018-09-17T16:52:01Z
update surefire plugin
- - - - -
bdf027df by Marcin Mielzynski at 2018-09-17T18:08:57Z
finalize some classes
- - - - -
adb0d335 by Marcin Mielzynski at 2018-09-17T18:12:23Z
bump to 2.5.1 for table generation
- - - - -
7f70c64f by Marcin Mielzynski at 2018-09-18T10:30:05Z
move EMPTY_FOLD_CODES to CaseFoldCodeItem
- - - - -
9bca923f by Marcin Mielzynski at 2018-09-19T19:08:02Z
[maven-release-plugin] prepare release jcodings-1.0.35
- - - - -
e4d04fad by Marcin Mielzynski at 2018-09-19T19:08:17Z
[maven-release-plugin] prepare for next development iteration
- - - - -
7de4842a by Charles Oliver Nutter at 2018-09-19T19:48:13Z
Open-ended activation for JDK 9 on up.
- - - - -
4a2a72d2 by Marcin Mielzynski at 2018-09-19T23:13:32Z
remove empty foldcodes
- - - - -
34f4f4ce by Marcin Mielzynski at 2018-09-20T15:01:42Z
[maven-release-plugin] prepare release jcodings-1.0.36
- - - - -
fcebd8d8 by Marcin Mielzynski at 2018-09-20T15:01:50Z
[maven-release-plugin] prepare for next development iteration
- - - - -
d8f4e053 by Marcin Mielzynski at 2018-09-20T15:37:43Z
[maven-release-plugin] prepare release jcodings-1.0.37
- - - - -
6066231c by Marcin Mielzynski at 2018-09-20T15:37:52Z
[maven-release-plugin] prepare for next development iteration
- - - - -
a4682023 by Marcin Mielzynski at 2018-09-20T15:45:31Z
[maven-release-plugin] prepare release jcodings-1.0.38
- - - - -
c90c36f6 by Marcin Mielzynski at 2018-09-20T15:52:40Z
make new snapshot
- - - - -
85877440 by Marcin Mielzynski at 2018-09-20T15:53:26Z
[maven-release-plugin] prepare release jcodings-1.0.39
- - - - -
7463a2d7 by Marcin Mielzynski at 2018-09-20T15:53:34Z
[maven-release-plugin] prepare for next development iteration
- - - - -
7fde2999 by Marcin Mielzynski at 2018-09-20T16:18:02Z
[maven-release-plugin] prepare release jcodings-1.0.40
- - - - -
a35d2eae by Marcin Mielzynski at 2018-09-20T16:18:13Z
[maven-release-plugin] prepare for next development iteration
- - - - -
422a1235 by Marcin Mielzynski at 2018-09-22T23:22:43Z
add -html5 javadoc option
- - - - -
78505daf by Marcin Mielzynski at 2018-10-03T21:49:11Z
add shebang
- - - - -
ee1d9e08 by Marcin Mielzynski at 2018-10-03T23:04:30Z
sort transcoder entries by name
- - - - -
226a7597 by Marcin Mielzynski at 2018-10-03T23:07:44Z
use .rodata section on linux
- - - - -
1443a7b4 by Marcin Mielzynski at 2018-10-04T19:33:22Z
fix code range and transcoder binary file naming
- - - - -
70c6621e by Marcin Mielzynski at 2018-10-05T19:31:14Z
whoops, redundant
- - - - -
a90dbc47 by Marcin Mielzynski at 2018-10-11T18:18:24Z
support table generation on osx
- - - - -
292dde52 by Marcin Mielzynski at 2018-10-12T17:05:00Z
[maven-release-plugin] prepare release jcodings-1.0.41
- - - - -
f3ab278b by Marcin Mielzynski at 2018-10-12T17:05:13Z
[maven-release-plugin] prepare for next development iteration
- - - - -
16 changed files:
- .gitignore
- .travis.yml
- − build.xml
- pom.xml
- resources/tables/CR_In_Miscellaneous_Symbols_And_Pictographs.bin → resources/tables/CR_In_Miscellaneous_Symbols_and_Pictographs.bin
- resources/tables/CR_In_Transport_And_Map_Symbols.bin → resources/tables/CR_In_Transport_and_Map_Symbols.bin
- scripts/generate.rb
- + src/module-info.java
- src/org/jcodings/AbstractEncoding.java
- src/org/jcodings/CaseFoldCodeItem.java
- src/org/jcodings/CaseFoldMapEncoding.java
- src/org/jcodings/CodeRange.java
- src/org/jcodings/EncodingDB.java
- src/org/jcodings/specific/ISO8859_1Encoding.java
- src/org/jcodings/transcode/TranscodeFunctions.java
- src/org/jcodings/unicode/UnicodeEncoding.java
Changes:
=====================================
.gitignore
=====================================
@@ -1 +1,4 @@
target
+jcodings.iml
+.idea/
+
=====================================
.travis.yml
=====================================
@@ -1 +1,8 @@
language: java
+
+jdk:
+- openjdk8
+- openjdk9
+
+script: mvn test
+
=====================================
build.xml deleted
=====================================
@@ -1,39 +0,0 @@
-<?xml version="1.0" ?>
-<project name="JCodings" default="build">
-
- <property name="src.dir" value="src" />
- <property name="bin.dir" value="target/classes" />
- <property name="dist.dir" value="target" />
- <property name="jar.name" value="jcodings.jar" />
-
- <target name="clean">
- <delete dir="${bin.dir}" />
- <delete dir="${dist.dir}" />
-
- </target>
-
- <target name="compile">
- <mkdir dir="${bin.dir}" />
- <javac srcdir="${src.dir}" destdir="${bin.dir}"/>
- </target>
-
- <target name="build" depends="compile">
- <mkdir dir="${dist.dir}" />
-
- <tstamp>
- <format property="buildDate" pattern="yyyy-MM-dd" />
- <format property="buildTime" pattern="HH:mm:ss" />
- </tstamp>
-
- <jar destfile="${dist.dir}/${jar.name}" manifest="MANIFEST.MF">
- <fileset dir="${bin.dir}" />
-
- <manifest>
- <attribute name="Built-By" value="${user.name}" />
- <attribute name="Built-Date" value="${buildDate}" />
- <attribute name="Built-Time" value="${buildTime}" />
- </manifest>
- </jar>
-
- </target>
-</project>
=====================================
pom.xml
=====================================
@@ -1,31 +1,16 @@
-<?xml version="1.0" ?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jruby.jcodings</groupId>
<artifactId>jcodings</artifactId>
- <version>1.0.31-SNAPSHOT</version>
+ <version>1.0.42-SNAPSHOT</version>
<name>JCodings</name>
- <description>
- Byte based encoding support library for java
- </description>
-
+ <description>Byte based encoding support library for java</description>
<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>7</version>
</parent>
-
- <issueManagement>
- <system>Github</system>
- <url>https://github.com/jruby/jcodings/issues</url>
- </issueManagement>
-
- <scm>
- <connection>scm:git:git://github.com/jruby/jcodings.git</connection>
- <developerConnection>scm:git:git at github.com:jruby/jcodings.git</developerConnection>
- <url>https://github.com/jruby/jcodings</url>
- </scm>
-
<licenses>
<license>
<name>MIT License</name>
@@ -33,15 +18,28 @@
<distribution>repo</distribution>
</license>
</licenses>
-
<developers>
<developer>
<id>lopex</id>
<name>Marcin Mielzynski</name>
<email>lopx at gazeta.pl</email>
</developer>
+ <developer>
+ <id>headius</id>
+ <name>Charles Oliver Nutter</name>
+ <email>headius at headius.com</email>
+ </developer>
</developers>
-
+ <scm>
+ <connection>scm:git:git://github.com/jruby/jcodings.git</connection>
+ <developerConnection>scm:git:git at github.com:jruby/jcodings.git</developerConnection>
+ <url>https://github.com/jruby/jcodings</url>
+ <tag>HEAD</tag>
+ </scm>
+ <issueManagement>
+ <system>Github</system>
+ <url>https://github.com/jruby/jcodings/issues</url>
+ </issueManagement>
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -50,12 +48,10 @@
<scope>test</scope>
</dependency>
</dependencies>
-
<build>
<sourceDirectory>src</sourceDirectory>
<scriptSourceDirectory>scripts</scriptSourceDirectory>
<testSourceDirectory>test</testSourceDirectory>
- <finalName>jcodings</finalName>
<extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
@@ -63,41 +59,30 @@
<version>2.1</version>
</extension>
</extensions>
+ <resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>resources</directory>
+ </resource>
+ </resources>
+ <finalName>jcodings</finalName>
<plugins>
<plugin>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9</version>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.0</version>
<executions>
<execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
+ <id>default-compile</id>
+ <configuration>
+ <source>1.7</source>
+ <target>1.7</target>
+ <excludes>
+ <exclude>module-info.java</exclude>
+ </excludes>
+ </configuration>
</execution>
</executions>
<configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- <quiet>true</quiet>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>1.7</source>
- <target>1.7</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
@@ -111,22 +96,74 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.6</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.20.1</version>
- <configuration>
- <argLine>-Dfile.encoding=UTF-8</argLine>
- </configuration>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.22.0</version>
+ <configuration>
+ <argLine>-Dfile.encoding=UTF-8</argLine>
+ </configuration>
</plugin>
</plugins>
- <resources>
- <resource>
- <directory>resources</directory>
- </resource>
- </resources>
</build>
+ <profiles>
+ <profile>
+ <id>release-on-9</id>
+ <activation>
+ <jdk>[9,)</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>compile9</id>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ <configuration>
+ <release>9</release>
+ <includes>
+ <include>module-info.java</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.2.1</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.0.1</version>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <additionalJOption>-Xdoclint:none</additionalJOption>
+ <additionalOptions>-html5</additionalOptions>
+ <quiet>true</quiet>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
=====================================
resources/tables/CR_In_Miscellaneous_Symbols_And_Pictographs.bin → resources/tables/CR_In_Miscellaneous_Symbols_and_Pictographs.bin
=====================================
=====================================
resources/tables/CR_In_Transport_And_Map_Symbols.bin → resources/tables/CR_In_Transport_and_Map_Symbols.bin
=====================================
=====================================
scripts/generate.rb
=====================================
@@ -1,7 +1,13 @@
+#!/usr/bin/env ruby
# coding: utf-8
-REPO_PATH = ARGV.first || '/usr/src/ruby-2.5.0' # path to ruby repo
-SECTION_NAME = "rdata"
+REPO_PATH = ARGV.first || '/usr/src/ruby-2.5.1' # path to ruby repo
+SECTION_NAME, G_PREFIX = case RUBY_PLATFORM
+when /linux/i; ["rodata", ""]
+when /darwin/i; ["const_data", "g"]
+else ;["rdata", ""]
+end
+
UNICODE_VERSION = "10.0.0"
SRC_DIR = "../src/org/jcodings"
DST_BIN_DIR = "../resources/tables"
@@ -18,8 +24,8 @@ end
def process_binary obj_name
binary = open(obj_name, "rb"){|f|f.read}
- offset = `objdump -h -j .#{SECTION_NAME} #{obj_name}`[/\.#{SECTION_NAME}.*?(\w+)\s+\S+$/, 1].to_i(16)
- `nm --no-sort --defined-only #{obj_name}`.split("\n").map{|s|s.split(/\s+/)}.each do |address, _, name|
+ offset = `#{G_PREFIX}objdump -h -j .#{SECTION_NAME} #{obj_name}`[/\.#{SECTION_NAME}.*?(\w+)\s+\S+$/, 1].to_i(16)
+ `#{G_PREFIX}nm --no-sort --defined-only #{obj_name}`.split("\n").map{|s|s.split(/\s+/)}.each do |address, _, name|
yield name, binary, address.to_i(16) + offset
end
end
@@ -86,7 +92,7 @@ def generate_transcoder_list
generic_list = []
transcoder_list = []
- Dir["#{REPO_PATH}/enc/trans/*.c"].reject{|f| f =~ /transdb/}.each do |trans_file|
+ Dir["#{REPO_PATH}/enc/trans/*.c"].reject{|f| f =~ /transdb/}.sort.each do |trans_file|
name = trans_file[/(\w+)\.c/, 1].split('_').map{|e| e.capitalize}.join("")
trans_src = open(trans_file){|f|f.read}
@@ -113,23 +119,24 @@ def generate_transcoder_list
end
def generate_transoder_data
- Dir["#{REPO_PATH}/enc/trans/*.c"].reject{|f| f =~ /transdb/}.each do |trans_file|
+ Dir["#{REPO_PATH}/enc/trans/*.c"].reject{|f| f =~ /transdb/}.sort.each do |trans_file|
# next unless trans_file =~ /utf8/
trans_file = trans_file[/(.*)\./, 1]
src = open("#{trans_file}.c", "rb").read
+ make_name = -> (name) {name.split('_').map{|e|e.capitalize}.join('')}
process_binary "#{trans_file}.o" do |name, binary, address|
case name
when /(.*)_byte_array/
name = $1
size = src[/(\w+?_byte_array)\[(\d+?)\]/m, 2].to_i
- open("#{DST_BIN_DIR}/" + "Transcoder_#{name.capitalize.tr('_', '')}_ByteArray.bin", "wb") do |f|
+ open("#{DST_BIN_DIR}/" + "Transcoder_#{make_name.(name)}_ByteArray.bin", "wb") do |f|
f << [size].pack("N")
f << binary[address, size]
end
when /(.*)_word_array/
name = $1
size = src[/(\w+?_word_array)\[(\d+?)\]/m, 2].to_i
- open("#{DST_BIN_DIR}/" + "Transcoder_#{name.capitalize.tr('_', '')}_WordArray.bin", "wb") do |f|
+ open("#{DST_BIN_DIR}/" + "Transcoder_#{make_name.(name)}_WordArray.bin", "wb") do |f|
f << [size].pack("N")
address.step(address + (size * 4 - 1), 4).each do |adr|
f << binary[adr, 4].unpack("l").pack("N")
=====================================
src/module-info.java
=====================================
@@ -0,0 +1,12 @@
+open module org.jruby.jcodings {
+ exports org.jcodings;
+ exports org.jcodings.ascii;
+ exports org.jcodings.constants;
+ exports org.jcodings.exception;
+ exports org.jcodings.specific;
+ exports org.jcodings.spi;
+ exports org.jcodings.transcode;
+ exports org.jcodings.transcode.specific;
+ exports org.jcodings.unicode;
+ exports org.jcodings.util;
+}
\ No newline at end of file
=====================================
src/org/jcodings/AbstractEncoding.java
=====================================
@@ -50,7 +50,7 @@ abstract class AbstractEncoding extends Encoding {
*/
@Override
public boolean isNewLine(byte[]bytes, int p, int end) {
- return p < end ? bytes[p] == (byte)0x0a : false;
+ return p < end ? bytes[p] == Encoding.NEW_LINE : false;
}
protected final int asciiMbcCaseFold(int flag, byte[]bytes, IntHolder pp, int end, byte[]lower) {
@@ -85,7 +85,6 @@ abstract class AbstractEncoding extends Encoding {
asciiApplyAllCaseFold(flag, fun, arg);
}
- protected static final CaseFoldCodeItem[] EMPTY_FOLD_CODES = new CaseFoldCodeItem[]{};
protected final CaseFoldCodeItem[]asciiCaseFoldCodesByString(int flag, byte[]bytes, int p, int end) {
int b = bytes[p] & 0xff;
@@ -94,7 +93,7 @@ abstract class AbstractEncoding extends Encoding {
} else if (0x61 <= b && b <= 0x7a) {
return new CaseFoldCodeItem[]{CaseFoldCodeItem.create(1, b - 0x20)};
} else {
- return EMPTY_FOLD_CODES;
+ return CaseFoldCodeItem.EMPTY_FOLD_CODES;
}
}
=====================================
src/org/jcodings/CaseFoldCodeItem.java
=====================================
@@ -20,6 +20,8 @@
package org.jcodings;
public final class CaseFoldCodeItem {
+ public static final CaseFoldCodeItem[] EMPTY_FOLD_CODES = new CaseFoldCodeItem[]{};
+
public final int byteLen;
public final int code[];
=====================================
src/org/jcodings/CaseFoldMapEncoding.java
=====================================
@@ -106,7 +106,7 @@ public abstract class CaseFoldMapEncoding extends SingleByteEncoding {
}
}
}
- return EMPTY_FOLD_CODES;
+ return CaseFoldCodeItem.EMPTY_FOLD_CODES;
}
@Override
=====================================
src/org/jcodings/CodeRange.java
=====================================
@@ -19,7 +19,7 @@
*/
package org.jcodings;
-public class CodeRange {
+public final class CodeRange {
public static boolean isInCodeRange(int[]p, int code) {
return isInCodeRange(p, 0, code);
}
=====================================
src/org/jcodings/EncodingDB.java
=====================================
@@ -23,7 +23,7 @@ import org.jcodings.exception.ErrorMessages;
import org.jcodings.exception.InternalException;
import org.jcodings.util.CaseInsensitiveBytesHash;
-public class EncodingDB {
+public final class EncodingDB {
public static final class Entry {
private static int count;
=====================================
src/org/jcodings/specific/ISO8859_1Encoding.java
=====================================
@@ -85,7 +85,7 @@ public final class ISO8859_1Encoding extends ISOEncoding {
return new CaseFoldCodeItem[]{CaseFoldCodeItem.create(1, b - 0x20)};
}
}
- return EMPTY_FOLD_CODES;
+ return CaseFoldCodeItem.EMPTY_FOLD_CODES;
}
@Override
=====================================
src/org/jcodings/transcode/TranscodeFunctions.java
=====================================
@@ -420,11 +420,11 @@ public class TranscodeFunctions {
{
long s0 = s[sStart] & 0xFF;
long s1 = s[sStart+1] & 0xFF;
- long s2 = s[sStart+2] & 0xFF;
- long s3 = s[sStart+3] & 0xFF;
long diff = info >> 8;
long u; /* Unicode Scalar Value */
if ((diff & 0x20000) != 0) { /* GB18030 4 bytes */
+ long s2 = s[sStart+2] & 0xFF;
+ long s3 = s[sStart+3] & 0xFF;
u = (((s0 * 10 + s1) * 126 + s2) * 10 + s3 - diff - 0x170000) & 0xFFFFFFFFL;
}
else { /* GB18030 2 bytes */
@@ -498,7 +498,7 @@ public class TranscodeFunctions {
public static final int EMACS_MULE_LEADING_CODE_JISX0208_1978 = 0220;
public static final int EMACS_MULE_LEADING_CODE_JISX0208_1983 = 0222;
-
+
public static final byte[] tbl0208 = {
(byte)0x21, (byte)0x23, (byte)0x21, (byte)0x56, (byte)0x21, (byte)0x57, (byte)0x21, (byte)0x22, (byte)0x21, (byte)0x26, (byte)0x25, (byte)0x72, (byte)0x25, (byte)0x21, (byte)0x25, (byte)0x23,
(byte)0x25, (byte)0x25, (byte)0x25, (byte)0x27, (byte)0x25, (byte)0x29, (byte)0x25, (byte)0x63, (byte)0x25, (byte)0x65, (byte)0x25, (byte)0x67, (byte)0x25, (byte)0x43, (byte)0x21, (byte)0x3C,
=====================================
src/org/jcodings/unicode/UnicodeEncoding.java
=====================================
@@ -407,7 +407,7 @@ public abstract class UnicodeEncoding extends MultiByteEncoding {
}
}
- if (items == null || n == 0) return EMPTY_FOLD_CODES;
+ if (items == null || n == 0) return CaseFoldCodeItem.EMPTY_FOLD_CODES;
if (n < items.length) {
CaseFoldCodeItem [] tmp = new CaseFoldCodeItem[n];
System.arraycopy(items, 0, tmp, 0, n);
View it on GitLab: https://salsa.debian.org/java-team/jcodings/compare/695e9647420ce7985f20ff39a0c90ff32974581d...f3ab278bfee65fba3948287fc2f98efa74723d7f
--
View it on GitLab: https://salsa.debian.org/java-team/jcodings/compare/695e9647420ce7985f20ff39a0c90ff32974581d...f3ab278bfee65fba3948287fc2f98efa74723d7f
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/20181015/58a4f111/attachment.html>
More information about the pkg-java-commits
mailing list