Skip to content

Commit 5cf3db4

Browse files
committed
Print exponent symbol as ⏨.
Update test of output encoding.
1 parent 62021b7 commit 5cf3db4

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

encoding.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ static const bool GOST_LATIN = true; // default latin
3636
static const unsigned short gost_to_unicode_cyr[256] = {
3737
/* 000-007 */ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
3838
/* 010-017 */ 0x38, 0x39, 0x2b, 0x2d, 0x2f, 0x2c, 0x2e, 0x20,
39-
/* 020-027 */ 0x65, 0x2191, 0x28, 0x29, 0xd7, 0x3d, 0x3b, 0x5b,
39+
/* 020-027 */ 0x23e8, 0x2191, 0x28, 0x29, 0xd7, 0x3d, 0x3b, 0x5b,
4040
/* 030-037 */ 0x5d, 0x2a, 0x2018, 0x2019, 0x2260, 0x3c, 0x3e, 0x3a,
4141
/* 040-047 */ 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417,
4242
/* 050-057 */ 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, 0x041f,
@@ -51,7 +51,7 @@ static const unsigned short gost_to_unicode_cyr[256] = {
5151
static const unsigned short gost_to_unicode_lat[256] = {
5252
/* 000-007 */ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
5353
/* 010-017 */ 0x38, 0x39, 0x2b, 0x2d, 0x2f, 0x2c, 0x2e, 0x20,
54-
/* 020-027 */ 0x65, 0x2191, 0x28, 0x29, 0xd7, 0x3d, 0x3b, 0x5b,
54+
/* 020-027 */ 0x23e8, 0x2191, 0x28, 0x29, 0xd7, 0x3d, 0x3b, 0x5b,
5555
/* 030-037 */ 0x5d, 0x2a, 0x2018, 0x2019, 0x2260, 0x3c, 0x3e, 0x3a,
5656
/* 040-047 */ 0x41, 0x0411, 0x42, 0x0413, 0x0414, 0x45, 0x0416, 0x0417,
5757
/* 050-057 */ 0x0418, 0x0419, 0x4b, 0x041b, 0x4d, 0x48, 0x4f, 0x041f,

tests/expect_e64_simple.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,6 @@
8585
GOST ENCODING
8686
14 34 56701 02 143 6543
8787
567076543210
88-
+3141592653577390e+01
88+
+3141592653577390⏨+01
8989
ИTM ENCODING
9090
29CBB8FAC688

tests/session_test.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -930,8 +930,8 @@ _(
930930
writeln(' ', chr(20в), chr(25в), chr(26в), chr(27в));
931931
writeln(' ', chr(30в), chr(31в), chr(32в), chr(33в));
932932
writeln(' ', chr(34в), chr(35в), chr(36в), chr(37в));
933-
writeln(' ', chr(40в), chr(41в), chr(61в), chr(101в));
934-
writeln(' ', chr(43в), chr(100в), chr(134в), chr(136в));
933+
writeln(' ', chr(43в), chr(44в), chr(45в), chr(46в));
934+
writeln(' ', chr(77в), chr(100в), chr(134в), chr(136в));
935935
_).
936936
*library:22
937937
*execute
@@ -942,9 +942,13 @@ _).
942942
‘―↑⏨
943943
≠°÷’
944944
⊃≡∨¬
945-
!1A
946-
≠°|‾
945+
≠◇%∧
946+
↑°‾|
947947
)";
948+
// Note: in PRINT8 routine, ISO symbol 0136 '^' is converted
949+
// to GOST symbol 0130 '|'.
950+
// But in OS Dubna, it's converted to GOST 0131 '―'.
951+
948952
output = extract_after_execute(output);
949953
check_output(output, expect);
950954
}

0 commit comments

Comments
 (0)