Skip to content

Commit 8d06bbe

Browse files
committed
UTF-8版のINSPECT CONVERTINGのバグを修正
Fixed UTF-8 version bug in INSPECT-CONVERTING to figurative char.
1 parent 4db634c commit 8d06bbe

File tree

3 files changed

+34
-32
lines changed

3 files changed

+34
-32
lines changed

libcob/strings.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,12 +428,14 @@ cob_inspect_converting (const cob_field *f1, const cob_field *f2)
428428
"Unexpected char X(%02X) in INSPECT CONVERTING (value before)",
429429
f1->data[j]);
430430
cob_stop_run (1);
431+
} else if (fig_const) {
432+
/* iteratively map to figurative */
431433
} else if (!(nc2 = COB_U8BYTE_1 (f2->data[j]))) {
432434
cob_runtime_error (
433435
"Unexpected char X(%02X) in INSPECT CONVERTING (value after)",
434436
f2->data[j]);
435437
cob_stop_run (1);
436-
} else if (!fig_const && nc1 != nc2) {
438+
} else if (nc1 != nc2) {
437439
memset (buf1, 0, sizeof (buf1));
438440
memset (buf2, 0, sizeof (buf2));
439441
memcpy (buf1, &(f1->data[j]), nc1);

po/ja.gmo

0 Bytes
Binary file not shown.

po/ja.po

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: opensource COBOL v1.3.2J\n"
99
"Report-Msgid-Bugs-To: [email protected]\n"
10-
"POT-Creation-Date: 2014-02-26 16:05+0900\n"
10+
"POT-Creation-Date: 2014-03-05 18:03+0900\n"
1111
"PO-Revision-Date: 2014-02-07 11:40+0900\n"
1212
"Last-Translator: Kazuyoshi Tanaka <kazuyoshi.tanaka.zs@hitachi-solutions."
1313
"com>\n"
@@ -1099,83 +1099,83 @@ msgstr "LOCK
10991099
msgid "Invalid mnemonic name"
11001100
msgstr "不当な作成者語です"
11011101

1102-
#: cobc/pplex.l:155
1102+
#: cobc/pplex.l:146
11031103
msgid "PROCESS statement is ignored"
11041104
msgstr "PROCESS 文は無視されます"
11051105

1106-
#: cobc/pplex.l:519 cobc/pplex.l:595
1106+
#: cobc/pplex.l:510 cobc/pplex.l:586
11071107
#, c-format
11081108
msgid "%s: %s"
11091109
msgstr "%s: %s"
11101110

1111-
#: cobc/pplex.l:660 cobc/pplex.l:720
1111+
#: cobc/pplex.l:651 cobc/pplex.l:711
11121112
msgid "Invalid directive - ignored"
11131113
msgstr "不当なコンパイル指令 - 無視します"
11141114

1115-
#: cobc/pplex.l:768
1115+
#: cobc/pplex.l:759
11161116
msgid "$IF is nested more than 10 times"
11171117
msgstr "$IF文が10回以上ネストしています"
11181118

1119-
#: cobc/pplex.l:774
1119+
#: cobc/pplex.l:765
11201120
msgid "Fatal error in $IF statement"
11211121
msgstr "$IF文で致命的なエラー"
11221122

1123-
#: cobc/pplex.l:779
1123+
#: cobc/pplex.l:770
11241124
msgid "Arguments not enough to $IF statemen"
11251125
msgstr "$IF文の引数が足りません"
11261126

1127-
#: cobc/pplex.l:795
1127+
#: cobc/pplex.l:786
11281128
msgid "Invalid argument $IF statemen"
11291129
msgstr "$IF文に不正な引数があります"
11301130

1131-
#: cobc/pplex.l:813
1131+
#: cobc/pplex.l:804
11321132
#, c-format
11331133
msgid "%s is not a string"
11341134
msgstr "`%s' 文字列ではありません"
11351135

1136-
#: cobc/pplex.l:837
1136+
#: cobc/pplex.l:828
11371137
msgid "Fatal error in $ELSE statement"
11381138
msgstr "$ELSE文で致命的なエラー"
11391139

1140-
#: cobc/pplex.l:843
1140+
#: cobc/pplex.l:834
11411141
msgid "$IF has no defined before the $ELSE"
11421142
msgstr "$ELSEに対応する$IFがありません"
11431143

1144-
#: cobc/pplex.l:850
1144+
#: cobc/pplex.l:841
11451145
msgid "$ELSE has continued"
11461146
msgstr "$ELSEが連続しています"
11471147

1148-
#: cobc/pplex.l:860
1148+
#: cobc/pplex.l:851
11491149
msgid "Fatal error in $END statement"
11501150
msgstr "$END文で致命的なエラー"
11511151

1152-
#: cobc/pplex.l:866
1152+
#: cobc/pplex.l:857
11531153
msgid "$IF has no defined before the $END"
11541154
msgstr "$ENDに対応する$IFがありません"
11551155

1156-
#: cobc/pplex.l:884
1156+
#: cobc/pplex.l:875
11571157
msgid "Invalid $SET"
11581158
msgstr "不当な$SET文です"
11591159

1160-
#: cobc/pplex.l:889
1160+
#: cobc/pplex.l:880
11611161
msgid "Invalid $ statements"
11621162
msgstr "不当な$文です"
11631163

1164-
#: cobc/pplex.l:971
1164+
#: cobc/pplex.l:962
11651165
msgid "Line not terminated by a newline"
11661166
msgstr "ファイルが改行で終わっていません"
11671167

1168-
#: cobc/pplex.l:1049
1168+
#: cobc/pplex.l:1040
11691169
#, c-format
11701170
msgid "Invalid indicator '%c' at column 7"
11711171
msgstr "7 桁目が不当な指示子です `%c'"
11721172

1173-
#: cobc/pplex.l:1092
1173+
#: cobc/pplex.l:1083
11741174
#, c-format
11751175
msgid "Source text after column %d"
11761176
msgstr "ソース行が %d 桁を越えています"
11771177

1178-
#: cobc/pplex.l:1121 cobc/pplex.l:1131
1178+
#: cobc/pplex.l:1112 cobc/pplex.l:1122
11791179
msgid "Invalid line continuation"
11801180
msgstr "不当な行連結です"
11811181

@@ -1623,50 +1623,50 @@ msgstr "`%s'
16231623
msgid "Integer value expected"
16241624
msgstr "数値が必要です"
16251625

1626-
#: cobc/scanner.l:194
1626+
#: cobc/scanner.l:184
16271627
msgid "X Binary literal found."
16281628
msgstr "16進数X文字定数が使用されています"
16291629

1630-
#: cobc/scanner.l:204
1630+
#: cobc/scanner.l:194
16311631
msgid "NX Binary literal found."
16321632
msgstr "16進数NX文字定数が使用されています"
16331633

1634-
#: cobc/scanner.l:577
1634+
#: cobc/scanner.l:567
16351635
msgid "User defined name must be less than 32 characters"
16361636
msgstr "利用者定義名の長さは32文字以下でなくてはなりません"
16371637

1638-
#: cobc/scanner.l:640
1638+
#: cobc/scanner.l:630
16391639
#, c-format
16401640
msgid "CONSTANT (78 level) may not be used here - '%s'"
16411641
msgstr "定数(78レベル)は指定できません - `%s'"
16421642

1643-
#: cobc/scanner.l:653
1643+
#: cobc/scanner.l:643
16441644
msgid "PROGRAM-ID length exceeds C89 function name limit"
16451645
msgstr "PROGRAM-ID の長さがC89標準における関数名の上限を超過します"
16461646

1647-
#: cobc/scanner.l:827
1647+
#: cobc/scanner.l:817
16481648
msgid "Alphanumeric literal has zero length"
16491649
msgstr "文字列が必要です"
16501650

1651-
#: cobc/scanner.l:828
1651+
#: cobc/scanner.l:818
16521652
msgid "A SPACE will be assumed"
16531653
msgstr "ひとつのSPACEを仮定します"
16541654

1655-
#: cobc/scanner.l:917
1655+
#: cobc/scanner.l:907
16561656
#, c-format
16571657
msgid "Invalid X literal: %s"
16581658
msgstr "不当な X 定数です: %s"
16591659

1660-
#: cobc/scanner.l:953
1660+
#: cobc/scanner.l:943
16611661
#, c-format
16621662
msgid "Invalid H literal: %s"
16631663
msgstr "不当な H 定数です: %s"
16641664

1665-
#: cobc/scanner.l:978 cobc/scanner.l:981
1665+
#: cobc/scanner.l:968 cobc/scanner.l:971
16661666
msgid "Invalid numeric literal"
16671667
msgstr "不当な数字定数です"
16681668

1669-
#: cobc/scanner.l:1131
1669+
#: cobc/scanner.l:1121
16701670
msgid "Scanner unget buffer overflow"
16711671
msgstr "字句解析でungetバッファがオーバーフローしました"
16721672

0 commit comments

Comments
 (0)