summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Newton <kddnewton@gmail.com>2023-11-12 00:11:14 -0500
committergit <svn-admin@ruby-lang.org>2023-11-16 17:39:36 +0000
commita7df025c3f1b56444aef579f25cf7821ae4a0141 (patch)
treef5d16ac29a2b64cb3c4428759f09464d659aba68
parent076d0957b9f2f293a58a8572d7004e90b8affded (diff)
[ruby/prism] IBM857 encoding
https://github.com/ruby/prism/commit/8c9b580f84
-rw-r--r--prism/enc/pm_encoding.h1
-rw-r--r--prism/enc/pm_tables.c35
-rw-r--r--prism/prism.c2
-rw-r--r--test/prism/encoding_test.rb1
4 files changed, 39 insertions, 0 deletions
diff --git a/prism/enc/pm_encoding.h b/prism/enc/pm_encoding.h
index 777387c885..70b6d44e1c 100644
--- a/prism/enc/pm_encoding.h
+++ b/prism/enc/pm_encoding.h
@@ -170,6 +170,7 @@ extern pm_encoding_t pm_encoding_ibm737;
extern pm_encoding_t pm_encoding_ibm775;
extern pm_encoding_t pm_encoding_ibm852;
extern pm_encoding_t pm_encoding_ibm855;
+extern pm_encoding_t pm_encoding_ibm857;
extern pm_encoding_t pm_encoding_iso_8859_1;
extern pm_encoding_t pm_encoding_iso_8859_2;
extern pm_encoding_t pm_encoding_iso_8859_3;
diff --git a/prism/enc/pm_tables.c b/prism/enc/pm_tables.c
index ab4ac358e4..2c9c5cecda 100644
--- a/prism/enc/pm_tables.c
+++ b/prism/enc/pm_tables.c
@@ -242,6 +242,30 @@ static uint8_t pm_encoding_ibm855_table[256] = {
/**
* Each element of the following table contains a bitfield that indicates a
+ * piece of information about the corresponding IBM857 character.
+ */
+static uint8_t pm_encoding_ibm857_table[256] = {
+// 0 1 2 3 4 5 6 7 8 9 A B C D E F
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2x
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, // 3x
+ 0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 4x
+ 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, // 5x
+ 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 6x
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, // 7x
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8x
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9x
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ax
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Bx
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Cx
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Dx
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Ex
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Fx
+};
+
+/**
+ * Each element of the following table contains a bitfield that indicates a
* piece of information about the corresponding ISO-8859-1 character.
*/
static uint8_t pm_encoding_iso_8859_1_table[256] = {
@@ -914,6 +938,7 @@ PRISM_ENCODING_TABLE(ibm737)
PRISM_ENCODING_TABLE(ibm775)
PRISM_ENCODING_TABLE(ibm852)
PRISM_ENCODING_TABLE(ibm855)
+PRISM_ENCODING_TABLE(ibm857)
PRISM_ENCODING_TABLE(iso_8859_1)
PRISM_ENCODING_TABLE(iso_8859_2)
PRISM_ENCODING_TABLE(iso_8859_3)
@@ -1052,6 +1077,16 @@ pm_encoding_t pm_encoding_ibm855 = {
.multibyte = false
};
+/** IBM857 */
+pm_encoding_t pm_encoding_ibm857 = {
+ .name = "IBM857",
+ .char_width = pm_encoding_single_char_width,
+ .alnum_char = pm_encoding_ibm857_alnum_char,
+ .alpha_char = pm_encoding_ibm857_alpha_char,
+ .isupper_char = pm_encoding_ibm857_isupper_char,
+ .multibyte = false
+};
+
/** ISO-8859-1 */
pm_encoding_t pm_encoding_iso_8859_1 = {
.name = "ISO-8859-1",
diff --git a/prism/prism.c b/prism/prism.c
index d6b9e28a73..6f1f68a179 100644
--- a/prism/prism.c
+++ b/prism/prism.c
@@ -6071,6 +6071,7 @@ parser_lex_magic_comment_encoding_value(pm_parser_t *parser, const uint8_t *star
ENCODING1("CP850", pm_encoding_cp850);
ENCODING1("CP852", pm_encoding_cp852);
ENCODING1("CP855", pm_encoding_cp855);
+ ENCODING1("CP857", pm_encoding_ibm857);
ENCODING1("CP878", pm_encoding_koi8_r);
ENCODING2("CP932", "csWindows31J", pm_encoding_windows_31j);
ENCODING1("CP936", pm_encoding_gbk);
@@ -6104,6 +6105,7 @@ parser_lex_magic_comment_encoding_value(pm_parser_t *parser, const uint8_t *star
ENCODING1("IBM850", pm_encoding_cp850);
ENCODING1("IBM852", pm_encoding_ibm852);
ENCODING1("IBM855", pm_encoding_ibm855);
+ ENCODING1("IBM857", pm_encoding_ibm857);
ENCODING2("ISO-8859-1", "ISO8859-1", pm_encoding_iso_8859_1);
ENCODING2("ISO-8859-2", "ISO8859-2", pm_encoding_iso_8859_2);
ENCODING2("ISO-8859-3", "ISO8859-3", pm_encoding_iso_8859_3);
diff --git a/test/prism/encoding_test.rb b/test/prism/encoding_test.rb
index fe2c33febb..d8301f794e 100644
--- a/test/prism/encoding_test.rb
+++ b/test/prism/encoding_test.rb
@@ -20,6 +20,7 @@ module Prism
Encoding::IBM775,
Encoding::IBM852,
Encoding::IBM855,
+ Encoding::IBM857,
Encoding::ISO_8859_1,
Encoding::ISO_8859_2,
Encoding::ISO_8859_3,