[jcodings] 01/03: Imported Upstream version 1.0.11
Hideki Yamane
henrich at moszumanska.debian.org
Fri Jan 2 13:33:52 UTC 2015
This is an automated email from the git hooks/post-receive script.
henrich pushed a commit to branch master
in repository jcodings.
commit 77dec83b8a37993ba45078e5527a2622b5939754
Author: Hideki Yamane <henrich at debian.org>
Date: Wed Jan 15 19:48:22 2014 +0900
Imported Upstream version 1.0.11
---
.gitignore | 1 +
README.md | 8 +
pom.xml | 54 ++-----
resources/tables/Transcoder_Big5_ByteArray.bin | Bin 133967 -> 0 bytes
resources/tables/Transcoder_Big5_WordArray.bin | Bin 436952 -> 0 bytes
resources/tables/Transcoder_Chinese_ByteArray.bin | Bin 46111 -> 0 bytes
resources/tables/Transcoder_Chinese_WordArray.bin | Bin 130828 -> 0 bytes
.../Transcoder_EmojiIso2022Kddi_ByteArray.bin | Bin 26506 -> 0 bytes
.../Transcoder_EmojiIso2022Kddi_WordArray.bin | Bin 76416 -> 0 bytes
.../Transcoder_EmojiSjisDocomo_ByteArray.bin | Bin 27222 -> 0 bytes
.../Transcoder_EmojiSjisDocomo_WordArray.bin | Bin 84716 -> 0 bytes
.../tables/Transcoder_EmojiSjisKddi_ByteArray.bin | Bin 27420 -> 0 bytes
.../tables/Transcoder_EmojiSjisKddi_WordArray.bin | Bin 88680 -> 0 bytes
.../Transcoder_EmojiSjisSoftbank_ByteArray.bin | Bin 27222 -> 0 bytes
.../Transcoder_EmojiSjisSoftbank_WordArray.bin | Bin 84716 -> 0 bytes
resources/tables/Transcoder_Emoji_ByteArray.bin | Bin 15572 -> 0 bytes
resources/tables/Transcoder_Emoji_WordArray.bin | Bin 24072 -> 0 bytes
resources/tables/Transcoder_Escape_ByteArray.bin | Bin 1059 -> 0 bytes
resources/tables/Transcoder_Escape_WordArray.bin | Bin 84 -> 0 bytes
resources/tables/Transcoder_Gb18030_ByteArray.bin | Bin 56186 -> 0 bytes
resources/tables/Transcoder_Gb18030_WordArray.bin | Bin 115588 -> 0 bytes
resources/tables/Transcoder_Gbk_ByteArray.bin | Bin 6260 -> 0 bytes
resources/tables/Transcoder_Gbk_WordArray.bin | Bin 182924 -> 0 bytes
resources/tables/Transcoder_Iso2022_ByteArray.bin | Bin 1249 -> 0 bytes
resources/tables/Transcoder_Iso2022_WordArray.bin | Bin 280 -> 0 bytes
.../tables/Transcoder_JapaneseEuc_ByteArray.bin | Bin 53786 -> 0 bytes
.../tables/Transcoder_JapaneseEuc_WordArray.bin | Bin 179452 -> 0 bytes
.../tables/Transcoder_JapaneseSjis_ByteArray.bin | Bin 39406 -> 0 bytes
.../tables/Transcoder_JapaneseSjis_WordArray.bin | Bin 104512 -> 0 bytes
resources/tables/Transcoder_Japanese_ByteArray.bin | Bin 899 -> 0 bytes
resources/tables/Transcoder_Japanese_WordArray.bin | Bin 144 -> 0 bytes
resources/tables/Transcoder_Korean_ByteArray.bin | Bin 40459 -> 0 bytes
resources/tables/Transcoder_Korean_WordArray.bin | Bin 196872 -> 0 bytes
.../tables/Transcoder_SingleByte_ByteArray.bin | Bin 25194 -> 0 bytes
.../tables/Transcoder_SingleByte_WordArray.bin | Bin 49212 -> 0 bytes
resources/tables/Transcoder_Utf1632_ByteArray.bin | Bin 1292 -> 0 bytes
resources/tables/Transcoder_Utf1632_WordArray.bin | Bin 428 -> 0 bytes
resources/tables/Transcoder_Utf8Mac_ByteArray.bin | Bin 9974 -> 0 bytes
resources/tables/Transcoder_Utf8Mac_WordArray.bin | Bin 23224 -> 0 bytes
src/org/jcodings/unicode/UnicodeEncoding.java | 169 +++++++++++----------
40 files changed, 113 insertions(+), 119 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..eb5a316
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+target
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..78e53a5
--- /dev/null
+++ b/README.md
@@ -0,0 +1,8 @@
+jcodings
+========
+
+Java-based codings helper classes for Joni and JRuby
+
+## License
+
+JCodings is released under the [MIT License](http://www.opensource.org/licenses/MIT).
diff --git a/pom.xml b/pom.xml
index 3387804..8b51819 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,24 +1,29 @@
<?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">
+<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">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jruby.jcodings</groupId>
<artifactId>jcodings</artifactId>
- <version>1.0.10</version>
+ <version>1.0.11</version>
<name>JCodings</name>
<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>JIRA</system>
- <url>http://jira.codehaus.org/browse/JRUBY</url>
+ <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://github.com/jruby/jcodings.git</developerConnection>
- <url>http://github.com/jruby/jcodings</url>
+ <developerConnection>scm:git:git at github.com:jruby/jcodings.git</developerConnection>
+ <url>https://github.com/jruby/jcodings</url>
</scm>
<licenses>
@@ -29,38 +34,6 @@
</license>
</licenses>
- <distributionManagement>
- <repository>
- <id>codehaus-jruby-repository</id>
- <name>JRuby Central Repository</name>
- <url>dav:https://dav.codehaus.org/repository/jruby</url>
- </repository>
- <snapshotRepository>
- <id>codehaus-jruby-snapshot-repository</id>
- <name>JRuby Central Development Repository</name>
- <url>dav:https://dav.codehaus.org/snapshots.repository/jruby</url>
- </snapshotRepository>
- <site>
- <id>codehaus-jruby-site</id>
- <name>JRuby Maven site</name>
- <url>dav:https://dav.codehaus.org/jruby/info</url>
- </site>
- </distributionManagement>
-
- <repositories>
- <repository>
- <id>codehaus</id>
- <name>Codehaus Repository</name>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <url>http://repository.codehaus.org</url>
- </repository>
- </repositories>
-
<developers>
<developer>
<id>lopex</id>
@@ -114,9 +87,6 @@
</goals>
</execution>
</executions>
- <configuration>
- <skip>true</skip>
- </configuration>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
diff --git a/resources/tables/Transcoder_Big5_ByteArray.bin b/resources/tables/Transcoder_Big5_ByteArray.bin
deleted file mode 100644
index 9beb7e0..0000000
Binary files a/resources/tables/Transcoder_Big5_ByteArray.bin and /dev/null differ
diff --git a/resources/tables/Transcoder_Big5_WordArray.bin b/resources/tables/Transcoder_Big5_WordArray.bin
deleted file mode 100644
index a71788a..0000000
Binary files a/resources/tables/Transcoder_Big5_WordArray.bin and /dev/null differ
diff --git a/resources/tables/Transcoder_Chinese_ByteArray.bin b/resources/tables/Transcoder_Chinese_ByteArray.bin
deleted file mode 100644
index 260ee16..0000000
Binary files a/resources/tables/Transcoder_Chinese_ByteArray.bin and /dev/null differ
diff --git a/resources/tables/Transcoder_Chinese_WordArray.bin b/resources/tables/Transcoder_Chinese_WordArray.bin
deleted file mode 100644
index 65de496..0000000
Binary files a/resources/tables/Transcoder_Chinese_WordArray.bin and /dev/null differ
diff --git a/resources/tables/Transcoder_EmojiIso2022Kddi_ByteArray.bin b/resources/tables/Transcoder_EmojiIso2022Kddi_ByteArray.bin
deleted file mode 100644
index 8eb44c8..0000000
Binary files a/resources/tables/Transcoder_EmojiIso2022Kddi_ByteArray.bin and /dev/null differ
diff --git a/resources/tables/Transcoder_EmojiIso2022Kddi_WordArray.bin b/resources/tables/Transcoder_EmojiIso2022Kddi_WordArray.bin
deleted file mode 100644
index caf4e73..0000000
Binary files a/resources/tables/Transcoder_EmojiIso2022Kddi_WordArray.bin and /dev/null differ
diff --git a/resources/tables/Transcoder_EmojiSjisDocomo_ByteArray.bin b/resources/tables/Transcoder_EmojiSjisDocomo_ByteArray.bin
deleted file mode 100644
index 8590df7..0000000
Binary files a/resources/tables/Transcoder_EmojiSjisDocomo_ByteArray.bin and /dev/null differ
diff --git a/resources/tables/Transcoder_EmojiSjisDocomo_WordArray.bin b/resources/tables/Transcoder_EmojiSjisDocomo_WordArray.bin
deleted file mode 100644
index bca728e..0000000
Binary files a/resources/tables/Transcoder_EmojiSjisDocomo_WordArray.bin and /dev/null differ
diff --git a/resources/tables/Transcoder_EmojiSjisKddi_ByteArray.bin b/resources/tables/Transcoder_EmojiSjisKddi_ByteArray.bin
deleted file mode 100644
index 1d26346..0000000
Binary files a/resources/tables/Transcoder_EmojiSjisKddi_ByteArray.bin and /dev/null differ
diff --git a/resources/tables/Transcoder_EmojiSjisKddi_WordArray.bin b/resources/tables/Transcoder_EmojiSjisKddi_WordArray.bin
deleted file mode 100644
index 6593b69..0000000
Binary files a/resources/tables/Transcoder_EmojiSjisKddi_WordArray.bin and /dev/null differ
diff --git a/resources/tables/Transcoder_EmojiSjisSoftbank_ByteArray.bin b/resources/tables/Transcoder_EmojiSjisSoftbank_ByteArray.bin
deleted file mode 100644
index 8590df7..0000000
Binary files a/resources/tables/Transcoder_EmojiSjisSoftbank_ByteArray.bin and /dev/null differ
diff --git a/resources/tables/Transcoder_EmojiSjisSoftbank_WordArray.bin b/resources/tables/Transcoder_EmojiSjisSoftbank_WordArray.bin
deleted file mode 100644
index c551972..0000000
Binary files a/resources/tables/Transcoder_EmojiSjisSoftbank_WordArray.bin and /dev/null differ
diff --git a/resources/tables/Transcoder_Emoji_ByteArray.bin b/resources/tables/Transcoder_Emoji_ByteArray.bin
deleted file mode 100644
index 3f1b58f..0000000
Binary files a/resources/tables/Transcoder_Emoji_ByteArray.bin and /dev/null differ
diff --git a/resources/tables/Transcoder_Emoji_WordArray.bin b/resources/tables/Transcoder_Emoji_WordArray.bin
deleted file mode 100644
index 2811a15..0000000
Binary files a/resources/tables/Transcoder_Emoji_WordArray.bin and /dev/null differ
diff --git a/resources/tables/Transcoder_Escape_ByteArray.bin b/resources/tables/Transcoder_Escape_ByteArray.bin
deleted file mode 100644
index a425608..0000000
Binary files a/resources/tables/Transcoder_Escape_ByteArray.bin and /dev/null differ
diff --git a/resources/tables/Transcoder_Escape_WordArray.bin b/resources/tables/Transcoder_Escape_WordArray.bin
deleted file mode 100644
index 0d70563..0000000
Binary files a/resources/tables/Transcoder_Escape_WordArray.bin and /dev/null differ
diff --git a/resources/tables/Transcoder_Gb18030_ByteArray.bin b/resources/tables/Transcoder_Gb18030_ByteArray.bin
deleted file mode 100644
index ef63d6e..0000000
Binary files a/resources/tables/Transcoder_Gb18030_ByteArray.bin and /dev/null differ
diff --git a/resources/tables/Transcoder_Gb18030_WordArray.bin b/resources/tables/Transcoder_Gb18030_WordArray.bin
deleted file mode 100644
index 35672be..0000000
Binary files a/resources/tables/Transcoder_Gb18030_WordArray.bin and /dev/null differ
diff --git a/resources/tables/Transcoder_Gbk_ByteArray.bin b/resources/tables/Transcoder_Gbk_ByteArray.bin
deleted file mode 100644
index 9c393fd..0000000
Binary files a/resources/tables/Transcoder_Gbk_ByteArray.bin and /dev/null differ
diff --git a/resources/tables/Transcoder_Gbk_WordArray.bin b/resources/tables/Transcoder_Gbk_WordArray.bin
deleted file mode 100644
index a86b2e3..0000000
Binary files a/resources/tables/Transcoder_Gbk_WordArray.bin and /dev/null differ
diff --git a/resources/tables/Transcoder_Iso2022_ByteArray.bin b/resources/tables/Transcoder_Iso2022_ByteArray.bin
deleted file mode 100644
index f06a9ec..0000000
Binary files a/resources/tables/Transcoder_Iso2022_ByteArray.bin and /dev/null differ
diff --git a/resources/tables/Transcoder_Iso2022_WordArray.bin b/resources/tables/Transcoder_Iso2022_WordArray.bin
deleted file mode 100644
index 6e07c64..0000000
Binary files a/resources/tables/Transcoder_Iso2022_WordArray.bin and /dev/null differ
diff --git a/resources/tables/Transcoder_JapaneseEuc_ByteArray.bin b/resources/tables/Transcoder_JapaneseEuc_ByteArray.bin
deleted file mode 100644
index cd793f9..0000000
Binary files a/resources/tables/Transcoder_JapaneseEuc_ByteArray.bin and /dev/null differ
diff --git a/resources/tables/Transcoder_JapaneseEuc_WordArray.bin b/resources/tables/Transcoder_JapaneseEuc_WordArray.bin
deleted file mode 100644
index b13845f..0000000
Binary files a/resources/tables/Transcoder_JapaneseEuc_WordArray.bin and /dev/null differ
diff --git a/resources/tables/Transcoder_JapaneseSjis_ByteArray.bin b/resources/tables/Transcoder_JapaneseSjis_ByteArray.bin
deleted file mode 100644
index d4dbbdd..0000000
Binary files a/resources/tables/Transcoder_JapaneseSjis_ByteArray.bin and /dev/null differ
diff --git a/resources/tables/Transcoder_JapaneseSjis_WordArray.bin b/resources/tables/Transcoder_JapaneseSjis_WordArray.bin
deleted file mode 100644
index acfc1f6..0000000
Binary files a/resources/tables/Transcoder_JapaneseSjis_WordArray.bin and /dev/null differ
diff --git a/resources/tables/Transcoder_Japanese_ByteArray.bin b/resources/tables/Transcoder_Japanese_ByteArray.bin
deleted file mode 100644
index a8494e6..0000000
Binary files a/resources/tables/Transcoder_Japanese_ByteArray.bin and /dev/null differ
diff --git a/resources/tables/Transcoder_Japanese_WordArray.bin b/resources/tables/Transcoder_Japanese_WordArray.bin
deleted file mode 100644
index 98ee66b..0000000
Binary files a/resources/tables/Transcoder_Japanese_WordArray.bin and /dev/null differ
diff --git a/resources/tables/Transcoder_Korean_ByteArray.bin b/resources/tables/Transcoder_Korean_ByteArray.bin
deleted file mode 100644
index 789e8c1..0000000
Binary files a/resources/tables/Transcoder_Korean_ByteArray.bin and /dev/null differ
diff --git a/resources/tables/Transcoder_Korean_WordArray.bin b/resources/tables/Transcoder_Korean_WordArray.bin
deleted file mode 100644
index 4d4102b..0000000
Binary files a/resources/tables/Transcoder_Korean_WordArray.bin and /dev/null differ
diff --git a/resources/tables/Transcoder_SingleByte_ByteArray.bin b/resources/tables/Transcoder_SingleByte_ByteArray.bin
deleted file mode 100644
index abfd879..0000000
Binary files a/resources/tables/Transcoder_SingleByte_ByteArray.bin and /dev/null differ
diff --git a/resources/tables/Transcoder_SingleByte_WordArray.bin b/resources/tables/Transcoder_SingleByte_WordArray.bin
deleted file mode 100644
index 7c3c28d..0000000
Binary files a/resources/tables/Transcoder_SingleByte_WordArray.bin and /dev/null differ
diff --git a/resources/tables/Transcoder_Utf1632_ByteArray.bin b/resources/tables/Transcoder_Utf1632_ByteArray.bin
deleted file mode 100644
index 71f9db7..0000000
Binary files a/resources/tables/Transcoder_Utf1632_ByteArray.bin and /dev/null differ
diff --git a/resources/tables/Transcoder_Utf1632_WordArray.bin b/resources/tables/Transcoder_Utf1632_WordArray.bin
deleted file mode 100644
index f2ee427..0000000
Binary files a/resources/tables/Transcoder_Utf1632_WordArray.bin and /dev/null differ
diff --git a/resources/tables/Transcoder_Utf8Mac_ByteArray.bin b/resources/tables/Transcoder_Utf8Mac_ByteArray.bin
deleted file mode 100644
index 066d285..0000000
Binary files a/resources/tables/Transcoder_Utf8Mac_ByteArray.bin and /dev/null differ
diff --git a/resources/tables/Transcoder_Utf8Mac_WordArray.bin b/resources/tables/Transcoder_Utf8Mac_WordArray.bin
deleted file mode 100644
index dfcd30b..0000000
Binary files a/resources/tables/Transcoder_Utf8Mac_WordArray.bin and /dev/null differ
diff --git a/src/org/jcodings/unicode/UnicodeEncoding.java b/src/org/jcodings/unicode/UnicodeEncoding.java
index 18f87b8..f069f20 100644
--- a/src/org/jcodings/unicode/UnicodeEncoding.java
+++ b/src/org/jcodings/unicode/UnicodeEncoding.java
@@ -94,7 +94,7 @@ public abstract class UnicodeEncoding extends MultiByteEncoding {
p_ += length(name, p_, end);
}
- Integer ctype = CTypeNameHash.get(buf, 0, len);
+ Integer ctype = CTypeName.CTypeNameHash.get(buf, 0, len);
if (ctype == null) throw new CharacterPropertyException(ErrorMessages.ERR_INVALID_CHAR_PROPERTY_NAME, name, p, end);
return ctype;
}
@@ -119,7 +119,7 @@ public abstract class UnicodeEncoding extends MultiByteEncoding {
}
}
- int to[] = FoldHash.get(code);
+ int to[] = CaseFold.FoldHash.get(code);
if (to != null) {
if (to.length == 1) {
return codeToMbc(to[0], fold, foldP);
@@ -146,9 +146,9 @@ public abstract class UnicodeEncoding extends MultiByteEncoding {
/* if (CaseFoldInited == 0) init_case_fold_table(); */
int[]code = new int[]{0};
- for (int i=0; i<CaseUnfold_11_From.length; i++) {
- int from = CaseUnfold_11_From[i];
- int[]to = CaseUnfold_11_To[i];
+ for (int i=0; i<CaseFold11.CaseUnfold_11_From.length; i++) {
+ int from = CaseFold11.CaseUnfold_11_From[i];
+ int[]to = CaseFold11.CaseUnfold_11_To[i];
for (int j=0; j<to.length; j++) {
code[0] = from;
@@ -178,9 +178,9 @@ public abstract class UnicodeEncoding extends MultiByteEncoding {
code[0] = 0x0069;
fun.apply(0x0130, code, 1, arg);
} else {
- for (int i=0; i<CaseUnfold_11_Locale_From.length; i++) {
- int from = CaseUnfold_11_Locale_From[i];
- int[]to = CaseUnfold_11_Locale_To[i];
+ for (int i=0; i<CaseFold11.CaseUnfold_11_Locale_From.length; i++) {
+ int from = CaseFold11.CaseUnfold_11_Locale_From[i];
+ int[]to = CaseFold11.CaseUnfold_11_Locale_To[i];
for (int j=0; j<to.length; j++) {
code[0] = from;
@@ -201,9 +201,9 @@ public abstract class UnicodeEncoding extends MultiByteEncoding {
} // USE_UNICODE_CASE_FOLD_TURKISH_AZERI
if ((flag & Config.INTERNAL_ENC_CASE_FOLD_MULTI_CHAR) != 0) {
- for (int i=0; i<CaseUnfold_12.length; i+=2) {
- int[]from = CaseUnfold_12[i];
- int[]to = CaseUnfold_12[i + 1];
+ for (int i=0; i<CaseFold12.CaseUnfold_12.length; i+=2) {
+ int[]from = CaseFold12.CaseUnfold_12[i];
+ int[]to = CaseFold12.CaseUnfold_12[i + 1];
for (int j=0; j<to.length; j++) {
fun.apply(to[j], from, 2, arg);
@@ -216,9 +216,9 @@ public abstract class UnicodeEncoding extends MultiByteEncoding {
}
if (!Config.USE_UNICODE_CASE_FOLD_TURKISH_AZERI || (flag & Config.ENC_CASE_FOLD_TURKISH_AZERI) == 0) {
- for (int i=0; i<CaseUnfold_12_Locale.length; i+=2) {
- int[]from = CaseUnfold_12_Locale[i];
- int[]to = CaseUnfold_12_Locale[i + 1];
+ for (int i=0; i<CaseFold12.CaseUnfold_12_Locale.length; i+=2) {
+ int[]from = CaseFold12.CaseUnfold_12_Locale[i];
+ int[]to = CaseFold12.CaseUnfold_12_Locale[i + 1];
for (int j=0; j<to.length; j++) {
fun.apply(to[j], from, 2, arg);
@@ -231,9 +231,9 @@ public abstract class UnicodeEncoding extends MultiByteEncoding {
}
} // !USE_UNICODE_CASE_FOLD_TURKISH_AZERI
- for (int i=0; i<CaseUnfold_13.length; i+=2) {
- int[]from = CaseUnfold_13[i];
- int[]to = CaseUnfold_13[i + 1];
+ for (int i=0; i<CaseFold13.CaseUnfold_13.length; i+=2) {
+ int[]from = CaseFold13.CaseUnfold_13[i];
+ int[]to = CaseFold13.CaseUnfold_13[i + 1];
for (int j=0; j<to.length; j++) {
fun.apply(to[j], from, 3, arg); //// ????
@@ -271,7 +271,7 @@ public abstract class UnicodeEncoding extends MultiByteEncoding {
int n = 0;
int fn = 0;
- int[]to = FoldHash.get(code);
+ int[]to = CaseFold.FoldHash.get(code);
CaseFoldCodeItem[]items = null;
if (to != null) {
items = new CaseFoldCodeItem[Config.ENC_GET_CASE_FOLD_CODES_MAX_NUM];
@@ -283,7 +283,7 @@ public abstract class UnicodeEncoding extends MultiByteEncoding {
n++;
code = to[0];
- to = Unfold1Hash.get(code);
+ to = CaseFold11.Unfold1Hash.get(code);
if (to != null) {
for (int i=0; i<to.length; i++) {
@@ -299,7 +299,7 @@ public abstract class UnicodeEncoding extends MultiByteEncoding {
for (fn=0; fn<to.length; fn++) {
cs[fn][0] = to[fn];
- int[]z3 = Unfold1Hash.get(cs[fn][0]);
+ int[]z3 = CaseFold11.Unfold1Hash.get(cs[fn][0]);
if (z3 != null) {
for (int i=0; i<z3.length; i++) {
cs[fn][i+1] = z3[i];
@@ -318,7 +318,7 @@ public abstract class UnicodeEncoding extends MultiByteEncoding {
}
}
- int[]z2 = Unfold2Hash.get(to);
+ int[]z2 = CaseFold12.Unfold2Hash.get(to);
if (z2 != null) {
for (int i=0; i<z2.length; i++) {
if (z2[i] == code) continue;
@@ -335,7 +335,7 @@ public abstract class UnicodeEncoding extends MultiByteEncoding {
}
}
}
- int[]z2 = Unfold3Hash.get(to);
+ int[]z2 = CaseFold13.Unfold3Hash.get(to);
if (z2 != null) {
for (int i=0; i<z2.length; i++) {
if (z2[i] == code) continue;
@@ -348,7 +348,7 @@ public abstract class UnicodeEncoding extends MultiByteEncoding {
flag = 0; /* DISABLE_CASE_FOLD_MULTI_CHAR(flag); */
}
} else {
- to = Unfold1Hash.get(code);
+ to = CaseFold11.Unfold1Hash.get(code);
if (to != null) {
items = new CaseFoldCodeItem[Config.ENC_GET_CASE_FOLD_CODES_MAX_NUM];
for (int i=0; i<to.length; i++) {
@@ -366,7 +366,7 @@ public abstract class UnicodeEncoding extends MultiByteEncoding {
final int codes0 = code;
final int codes1;
code = mbcToCode(bytes, p, end);
- to = FoldHash.get(code);
+ to = CaseFold.FoldHash.get(code);
if (to != null && to.length == 1) {
codes1 = to[0];
} else {
@@ -375,7 +375,7 @@ public abstract class UnicodeEncoding extends MultiByteEncoding {
int clen = length(bytes, p, end);
len += clen;
- int[]z2 = Unfold2Hash.get(codes0, codes1);
+ int[]z2 = CaseFold12.Unfold2Hash.get(codes0, codes1);
if (z2 != null) {
for (int i=0; i<z2.length; i++) {
items[n] = new CaseFoldCodeItem(len, 1, new int[]{z2[i]});
@@ -387,7 +387,7 @@ public abstract class UnicodeEncoding extends MultiByteEncoding {
if (p < end) {
final int codes2;
code = mbcToCode(bytes, p, end);
- to = FoldHash.get(code);
+ to = CaseFold.FoldHash.get(code);
if (to != null && to.length == 1) {
codes2 = to[0];
} else {
@@ -395,7 +395,7 @@ public abstract class UnicodeEncoding extends MultiByteEncoding {
}
clen = length(bytes, p, end);
len += clen;
- z2 = Unfold3Hash.get(codes0, codes1, codes2);
+ z2 = CaseFold13.Unfold3Hash.get(codes0, codes1, codes2);
if (z2 != null) {
for (int i=0; i<z2.length; i++) {
items[n] = new CaseFoldCodeItem(len, 1, new int[]{z2[i]});
@@ -467,65 +467,80 @@ public abstract class UnicodeEncoding extends MultiByteEncoding {
}
}
- private static CaseInsensitiveBytesHash<Integer> initializeCTypeNameTable() {
- CaseInsensitiveBytesHash<Integer> table = new CaseInsensitiveBytesHash<Integer>();
- for (int i = 0; i < UnicodeProperties.CodeRangeTable.length; i++) {
- table.putDirect(UnicodeProperties.CodeRangeTable[i].name, i);
+ static class CTypeName {
+ private static final CaseInsensitiveBytesHash<Integer> CTypeNameHash = initializeCTypeNameTable();
+
+ private static CaseInsensitiveBytesHash<Integer> initializeCTypeNameTable() {
+ CaseInsensitiveBytesHash<Integer> table = new CaseInsensitiveBytesHash<Integer>();
+ for (int i = 0; i < UnicodeProperties.CodeRangeTable.length; i++) {
+ table.putDirect(UnicodeProperties.CodeRangeTable[i].name, i);
+ }
+ return table;
}
- return table;
}
- static final CaseInsensitiveBytesHash<Integer> CTypeNameHash = initializeCTypeNameTable();
-
- static final int CaseFold_From[] = readIntArray("CaseFold_From");
- static final int CaseFold_To[][] = readNestedIntArray("CaseFold_To");
- static final int CaseFold_Locale_From[] = readIntArray("CaseFold_Locale_From");
- static final int CaseFold_Locale_To[][] = readNestedIntArray("CaseFold_Locale_To");
- static final int CaseUnfold_11_From[] = readIntArray("CaseUnfold_11_From");
- static final int CaseUnfold_11_To[][] = readNestedIntArray("CaseUnfold_11_To");
- static final int CaseUnfold_11_Locale_From[] = readIntArray("CaseUnfold_11_Locale_From");
- static final int CaseUnfold_11_Locale_To[][] = readNestedIntArray("CaseUnfold_11_Locale_To");
- static final int CaseUnfold_12[][] = readNestedIntArray("CaseUnfold_12");
- static final int CaseUnfold_12_Locale[][] = readNestedIntArray("CaseUnfold_12_Locale");
- static final int CaseUnfold_13[][] = readNestedIntArray("CaseUnfold_13");
-
- private static IntHash<int[]> initializeFoldHash() {
- IntHash<int[]> fold = new IntHash<int[]>(1200);
- for (int i = 0; i < CaseFold_From.length; i++)
- fold.putDirect(CaseFold_From[i], CaseFold_To[i]);
- for (int i = 0; i < CaseFold_Locale_From.length; i++)
- fold.putDirect(CaseFold_Locale_From[i], CaseFold_Locale_To[i]);
- return fold;
- }
+ private static class CaseFold {
+ private static final int CaseFold_From[] = readIntArray("CaseFold_From");
+ private static final int CaseFold_To[][] = readNestedIntArray("CaseFold_To");
+ private static final int CaseFold_Locale_From[] = readIntArray("CaseFold_Locale_From");
+ private static final int CaseFold_Locale_To[][] = readNestedIntArray("CaseFold_Locale_To");
+
+ private static IntHash<int[]> initializeFoldHash() {
+ IntHash<int[]> fold = new IntHash<int[]>(1200);
+ for (int i = 0; i < CaseFold_From.length; i++)
+ fold.putDirect(CaseFold_From[i], CaseFold_To[i]);
+ for (int i = 0; i < CaseFold_Locale_From.length; i++)
+ fold.putDirect(CaseFold_Locale_From[i], CaseFold_Locale_To[i]);
+ return fold;
+ }
- private static IntHash<int[]> initializeUnfold1Hash() {
- IntHash<int[]> unfold1 = new IntHash<int[]>(1000);
- for (int i = 0; i < CaseUnfold_11_From.length; i++)
- unfold1.putDirect(CaseUnfold_11_From[i], CaseUnfold_11_To[i]);
- for (int i = 0; i < CaseUnfold_11_Locale_From.length; i++)
- unfold1.putDirect(CaseUnfold_11_Locale_From[i], CaseUnfold_11_Locale_To[i]);
- return unfold1;
+ static final IntHash<int[]>FoldHash = initializeFoldHash();
}
- private static IntArrayHash<int[]> initializeUnfold2Hash() {
- IntArrayHash<int[]> unfold2 = new IntArrayHash<int[]>(200);
- for (int i = 0; i < CaseUnfold_12.length; i += 2)
- unfold2.putDirect(CaseUnfold_12[i], CaseUnfold_12[i + 1]);
- for (int i = 0; i < CaseUnfold_12_Locale.length; i += 2)
- unfold2.putDirect(CaseUnfold_12_Locale[i], CaseUnfold_12_Locale[i + 1]);
- return unfold2;
+ private static class CaseFold11 {
+ private static final int CaseUnfold_11_From[] = readIntArray("CaseUnfold_11_From");
+ private static final int CaseUnfold_11_To[][] = readNestedIntArray("CaseUnfold_11_To");
+ private static final int CaseUnfold_11_Locale_From[] = readIntArray("CaseUnfold_11_Locale_From");
+ private static final int CaseUnfold_11_Locale_To[][] = readNestedIntArray("CaseUnfold_11_Locale_To");
+
+ private static IntHash<int[]> initializeUnfold1Hash() {
+ IntHash<int[]> unfold1 = new IntHash<int[]>(1000);
+ for (int i = 0; i < CaseUnfold_11_From.length; i++)
+ unfold1.putDirect(CaseUnfold_11_From[i], CaseUnfold_11_To[i]);
+ for (int i = 0; i < CaseUnfold_11_Locale_From.length; i++)
+ unfold1.putDirect(CaseUnfold_11_Locale_From[i], CaseUnfold_11_Locale_To[i]);
+ return unfold1;
+ }
+
+ static final IntHash<int[]> Unfold1Hash = initializeUnfold1Hash();
}
- private static IntArrayHash<int[]> initializeUnfold3Hash() {
- IntArrayHash<int[]> unfold3 = new IntArrayHash<int[]>(30);
- for (int i = 0; i < CaseUnfold_13.length; i += 2)
- unfold3.putDirect(CaseUnfold_13[i], CaseUnfold_13[i + 1]);
- return unfold3;
+ private static class CaseFold12 {
+ private static final int CaseUnfold_12[][] = readNestedIntArray("CaseUnfold_12");
+ private static final int CaseUnfold_12_Locale[][] = readNestedIntArray("CaseUnfold_12_Locale");
+
+ private static IntArrayHash<int[]> initializeUnfold2Hash() {
+ IntArrayHash<int[]> unfold2 = new IntArrayHash<int[]>(200);
+ for (int i = 0; i < CaseUnfold_12.length; i += 2)
+ unfold2.putDirect(CaseUnfold_12[i], CaseUnfold_12[i + 1]);
+ for (int i = 0; i < CaseUnfold_12_Locale.length; i += 2)
+ unfold2.putDirect(CaseUnfold_12_Locale[i], CaseUnfold_12_Locale[i + 1]);
+ return unfold2;
+ }
+
+ static final IntArrayHash<int[]> Unfold2Hash = initializeUnfold2Hash();
}
- static final IntHash<int[]> FoldHash = initializeFoldHash();
- static final IntHash<int[]> Unfold1Hash = initializeUnfold1Hash();
- static final IntArrayHash<int[]> Unfold2Hash = initializeUnfold2Hash();
- static final IntArrayHash<int[]> Unfold3Hash = initializeUnfold3Hash();
+ private static class CaseFold13 {
+ private static final int CaseUnfold_13[][] = readNestedIntArray("CaseUnfold_13");
+ private static IntArrayHash<int[]> initializeUnfold3Hash() {
+ IntArrayHash<int[]> unfold3 = new IntArrayHash<int[]>(30);
+ for (int i = 0; i < CaseUnfold_13.length; i += 2)
+ unfold3.putDirect(CaseUnfold_13[i], CaseUnfold_13[i + 1]);
+ return unfold3;
+ }
+
+ static final IntArrayHash<int[]> Unfold3Hash = initializeUnfold3Hash();
+ }
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jcodings.git
More information about the pkg-java-commits
mailing list