+2014-12-12 Daiki Ueno <ueno@gnu.org>
+
+ * format-lisp-2, format-scheme-2: Test type compatibility with
+ non-strict checking mode.
+
2014-12-09 Daiki Ueno <ueno@gnu.org>
* gettext-8-prg.c: Include <assert.h>.
# Invalid: justification catches ~^
msgid "abc~<~D~;~^~D~>~C"
msgstr "abc~D~^~D~C"
+# Invalid: type compatibility with non-strict checking
+msgid "abc~{~c~c~}"
+msgid_plural "abc~{~c~c~}"
+msgstr[0] "xyz~{~c~d~}"
+msgstr[1] "xyz~{~c~d~}"
EOF
: ${MSGFMT=msgfmt}
while read comment; do
read msgid_line
read msgstr_line
+ msgid_plural_line=""
+ if echo "$msgstr_line" | grep '^msgid_plural' > /dev/null; then
+ msgid_plural_line="$msgstr_line"
+ read msgstr0_line
+ read msgstr1_line
+ fi
n=`expr $n + 1`
- cat <<EOF > f-l-2-$n.po
+ if test -z "$msgid_plural_line"; then
+ cat <<EOF > f-l-2-$n.po
#, lisp-format
${msgid_line}
${msgstr_line}
EOF
+ else
+ cat <<EOF > f-l-2-$n.po
+#, lisp-format
+${msgid_line}
+${msgid_plural_line}
+${msgstr0_line}
+${msgstr1_line}
+EOF
+ fi
fail=
if echo "$comment" | grep 'Valid:' > /dev/null; then
if ${MSGFMT} --check-format -o f-l-2-$n.mo f-l-2-$n.po; then
# Invalid: ~^ inside iteration depends on position
msgid "abc~{~D ~^~C~}"
msgstr "xyz~{~1@*~C~2:*~D~1*~^~}"
+# Invalid: type compatibility with non-strict checking
+msgid "abc~{~c~c~}"
+msgid_plural "abc~{~c~c~}"
+msgstr[0] "xyz~{~c~d~}"
+msgstr[1] "xyz~{~c~d~}"
EOF
: ${MSGFMT=msgfmt}
while read comment; do
read msgid_line
read msgstr_line
+ msgid_plural_line=""
+ if echo "$msgstr_line" | grep '^msgid_plural' > /dev/null; then
+ msgid_plural_line="$msgstr_line"
+ read msgstr0_line
+ read msgstr1_line
+ fi
n=`expr $n + 1`
- cat <<EOF > f-sc-2-$n.po
+ if test -z "$msgid_plural_line"; then
+ cat <<EOF > f-sc-2-$n.po
#, scheme-format
${msgid_line}
${msgstr_line}
EOF
+ else
+ cat <<EOF > f-l-2-$n.po
+#, lisp-format
+${msgid_line}
+${msgid_plural_line}
+${msgstr0_line}
+${msgstr1_line}
+EOF
+ fi
fail=
if echo "$comment" | grep 'Valid:' > /dev/null; then
if ${MSGFMT} --check-format -o f-sc-2-$n.mo f-sc-2-$n.po; then