* src/scan-skel.l: Postprocess quadrigraphs.

* src/reader.c (copy_character): New function, used to output
single characters while replacing `[' and `]' with quadrigraphs, to
avoid troubles with M4 quotes.
(copy_comment): Output characters with copy_character.
(read_additionnal_code): Likewise.
(copy_string2): Likewise.
(copy_definition): Likewise.
* tests/calc.at: Exercise M4 quoting.

diff --git a/ChangeLog b/ChangeLog
index 405359b3d0f6c45fc82ec60404557bc184f93273..9dbb7318fd73b64e223e0e7717e91aac53cd3f7e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2002-04-25  Robert Anisko  <robert@lrde.epita.fr>
+
+       * src/scan-skel.l: Postprocess quadrigraphs.
+
+       * src/reader.c (copy_character): New function, used to output
+       single characters while replacing `[' and `]' with quadrigraphs, to
+       avoid troubles with M4 quotes.
+       (copy_comment): Output characters with copy_character.
+       (read_additionnal_code): Likewise.
+       (copy_string2): Likewise.
+       (copy_definition): Likewise.
+
+       * tests/calc.at: Exercise M4 quoting.
+
 2002-04-25  Akim Demaille  <akim@epita.fr>
 
        * tests/sets.at (AT_EXTRACT_SETS): Sed portability issue: no space

diff --git a/src/reader.c b/src/reader.c
index 099f32dabc63bf2b27269f0e83de0d73ede3e085..3375fa2a3f48d250d39401e6a436c7e777a0ff35 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -332,6 +332,28 @@ get_type_name (int n, symbol_list *rule)
   return rp->sym->type_name;
 }
 \f
+/*------------------------------------------------------------------.
+| Copy the character C to OOUT, and insert quadigraphs when needed. |
+`------------------------------------------------------------------*/
+
+static inline void
+copy_character (struct obstack *oout, int c)
+{
+  switch (c)
+    {
+    case '[':
+      obstack_sgrow (oout, "@<:@");
+      break;
+
+    case ']':
+      obstack_sgrow (oout, "@:>@");
+      break;
+
+    default:
+      obstack_1grow (oout, c);
+    }
+}
+
 /*------------------------------------------------------------.
 | Dump the string from FIN to OOUT if non null.  MATCH is the |
 | delimiter of the string (either ' or ").                    |
@@ -359,14 +381,14 @@ copy_string2 (FILE *fin, struct obstack *oout, int match, int store)
          continue;
        }
 
-      obstack_1grow (oout, c);
+      copy_character (oout, c);
 
       if (c == '\\')
        {
          c = getc (fin);
          if (c == EOF)
            fatal (_("unterminated string at end of file"));
-         obstack_1grow (oout, c);
+         copy_character (oout, c);
 
          if (c == '\n')
            ++lineno;
@@ -463,7 +485,7 @@ copy_comment (FILE *fin, struct obstack *oout)
        fatal (_("unterminated comment"));
       else
        {
-         obstack_1grow (oout, c);
+         copy_character (oout, c);
          c = getc (fin);
        }
     }
@@ -634,7 +656,7 @@ copy_definition (struct obstack *oout)
          fatal ("%s", _("unterminated `%{' definition"));
 
        default:
-         obstack_1grow (oout, c);
+         copy_character (oout, c);
        }
 
       c = getc (finput);
@@ -1666,7 +1688,7 @@ read_additionnal_code (void)
     }
 
   while ((c = getc (finput)) != EOF)
-    obstack_1grow (&el_obstack, c);
+    copy_character (&el_obstack, c);
 
   obstack_1grow (&el_obstack, 0);
   muscle_insert ("epilogue", obstack_finish (&el_obstack));

diff --git a/src/scan-skel.l b/src/scan-skel.l
index 9a01ffefe37d4b870d1c2cd81dfbb8d404346490..e7eeaa568ee24a142ef237df84dee97889075748 100644 (file)
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -38,9 +38,12 @@ static char *yyoutname = NULL;
      yylineno = 1;
    }
 
+"@<:@" fputc ('[', yyout);
+"@:>@" fputc (']', yyout);
+
 "__oline__"      fprintf (yyout, "%d", yylineno);
 "__ofile__"      fprintf (yyout, "%s", yyoutname);
-[^_\n]+          ECHO;
+[^@_\n]+         ECHO;
 \n+              yylineno += yyleng; ECHO;
 .                ECHO;
 

diff --git a/tests/calc.at b/tests/calc.at
index ecd4c67380249880ad98ff1e73ba537b40eb977f..2cc0757f3a5f51e1ae7b7c569c93c93a38b4d9cb 100644 (file)
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -67,6 +67,8 @@ typedef int value_t;
 
 %}
 
+/* Exercise M4 quoting: '@:>@@:>@', 0.  */
+
 /* Also exercise %union. */
 %union
 {
@@ -76,6 +78,9 @@ typedef int value_t;
 /* Exercise post-prologue dependency to %union.  */
 %{
 static void id (YYSTYPE *lval);
+
+/* Exercise quotes in declarations.  */
+char quote[] = "@:>@@:>@,";
 %}
 
 /* Bison Declarations */
@@ -83,6 +88,9 @@ static void id (YYSTYPE *lval);
 %token <ival> NUM "number"
 %type  <ival> exp
 
+/* Exercise quotes in strings.  */
+%token "fake @>:@@>:@,"
+
 %nonassoc '=' /* comparison           */
 %left '-' '+'
 %left '*' '/'
@@ -100,9 +108,14 @@ input:
 
 line:
   '\n'
-| exp '\n' {}
+| exp '\n'
+  {
+    /* Exercise quotes in braces.  */
+    char tmp[] = "@>:@@:>@,";
+  }
 ;
 
+/* Exercise M4 quoting: '@:>@@:>@', 1.  */
 exp:
   NUM                { $$ = $1;             }
 | exp '=' exp
@@ -124,6 +137,7 @@ exp:
 /* The input. */
 FILE *yyin;
 
+/* Exercise M4 quoting: '@:>@@:>@', 2.  */
 static void
 yyerror (const char *s)
 {