Remove #! support.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index bc40950207b110e35ad9918605086b93938d6e48..26bfd6c4c60c252d91e87641135489df77378bef 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-26  Bruno Haible  <bruno@clisp.org>
+
+       * format-scheme.c (parse_upto): Remove support for ~!.
+       Reported by Kevin Ryde <user42@zip.com.au>.
+
 2005-02-24  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.14.2 released.

diff --git a/gettext-tools/src/format-scheme.c b/gettext-tools/src/format-scheme.c
index d3208dbaf0bd2996036a30ee468de07c817a71e6..b01aaedbdb5ed47bee5ba858bbe49a610cbe9eb0 100644 (file)
--- a/gettext-tools/src/format-scheme.c
+++ b/gettext-tools/src/format-scheme.c
@@ -3236,17 +3236,6 @@ parse_upto (const char **formatp,
            *separatorp = (colon_p ? 2 : 1);
            return true;
 
-         case '!': /* FORMAT-CALL, a CLISP extension */
-           if (!nocheck_params (&list, paramcount, params,
-                                spec->directives, invalid_reason))
-             return false;
-           if (position >= 0)
-             {
-               add_req_type_constraint (&list, position++, FAT_FUNCTION);
-               add_req_type_constraint (&list, position++, FAT_OBJECT);
-             }
-           break;
-
          default:
            --format;
            *invalid_reason =

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index bcdaf1c8a4aeea9e323584cafbd96ec1b89b5c8e..426558faeabc043f43c20f6481b46a43f242a692 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-26  Bruno Haible  <bruno@clisp.org>
+
+       * format-scheme-1: Remove test for #!.
+
 2005-02-24  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.14.2 released.

diff --git a/gettext-tools/tests/format-scheme-1 b/gettext-tools/tests/format-scheme-1
index 41f10aff1c870495bb288124176c718bc9a79bcc..735274376ce3790ff03d5d62f0d6f2b9190cb4b7 100755 (executable)
--- a/gettext-tools/tests/format-scheme-1
+++ b/gettext-tools/tests/format-scheme-1
@@ -241,8 +241,6 @@ cat <<\EOF > f-sc-1.data
 "abc~{~(~}~)"
 # Invalid: wrongly nested
 "abc~{~<~}~>"
-# Valid: FORMAT-CALL, (f * | . *)
-"abc~!"
 # Valid: any number of arguments
 "abc~v,v,v,v,v!"
 # Invalid: type incompatibility between integer and list