* src/getargs.h, src/getargs.c (trace_e, trace_args, trace_types):

Add support for --trace=skeleton.
* src/scan-skel.l: %option debug.
Scan strings of non-@ or n instead of character by character.
(scan_skel): Handle trace_skeleton.
(QPUTS): New.
(@output_parser_name@, @output_header_name@): ``Restore'' their
support (used to be M4 macros).
* data/yacc.c: Quote larger chunks, a la glr.c.
* data/lalr1.cc: Likewise.
The header guards are no longer available, so use some other
string than `YYLSP_NEEDED'.

diff --git a/ChangeLog b/ChangeLog
index 4e9fc32c9752accacc9a7f5401d96118f7183023..375a990d65f7c9e5896b373edd6309db6e0ba12f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2002-11-16  Akim Demaille  <akim@epita.fr>
+
+       * src/getargs.h, src/getargs.c (trace_e, trace_args, trace_types):
+       Add support for --trace=skeleton.
+       * src/scan-skel.l: %option debug.
+       Scan strings of non-@ or \n instead of character by character.
+       (scan_skel): Handle trace_skeleton.
+       (QPUTS): New.
+       (@output_parser_name@, @output_header_name@): ``Restore'' their
+       support (used to be M4 macros).
+       * data/yacc.c: Quote larger chunks, a la glr.c.
+       * data/lalr1.cc: Likewise.
+       The header guards are no longer available, so use some other
+       string than `YYLSP_NEEDED'.
+

 2002-11-16  Akim Demaille  <akim@epita.fr>
 
        Make the ``Printers and Destructors'' test more verbose, taking
 2002-11-16  Akim Demaille  <akim@epita.fr>
 
        Make the ``Printers and Destructors'' test more verbose, taking

diff --git a/data/lalr1.cc b/data/lalr1.cc
index 0dd1eb066fc98bc663492d23de1d0b73a3bb3867..48cfe3eb6da799c8367cb28f656331a0f37ad263 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -91,9 +91,11 @@ m4_changecom()
 m4_divert(0)dnl
 @output @output_header_name@
 b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison],
 m4_divert(0)dnl
 @output @output_header_name@
 b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison],

-             [2002])
-#ifndef YYLSP_NEEDED
-# define YYLSP_NEEDED
+             [2002])[
+/* FIXME: This is wrong, we want computed header guards.
+   I don't know why the macros are missing now. :( */
+#ifndef PARSER_HEADER_H
+# define PARSER_HEADER_H

 
 #include "stack.hh"
 #include "location.hh"
 
 #include "stack.hh"
 #include "location.hh"


@@ -102,50 +104,50 @@ b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison],
 #include <iostream>
 
 /* Using locations.  */
 #include <iostream>
 
 /* Using locations.  */

-#define YYLSP_NEEDED b4_locations_flag
+#define YYLSP_NEEDED ]b4_locations_flag[

 
 

-b4_token_defines(b4_tokens)
+]b4_token_defines(b4_tokens)[

 
 /* Copy the first part of user declarations.  */
 
 /* Copy the first part of user declarations.  */

-b4_pre_prologue
+]b4_pre_prologue[

 
 

-/* Line __line__ of __file__.  */
-b4_syncline([@oline@], [@ofile@])
+]/* Line __line__ of __file__.  */
+b4_syncline([@oline@], [@ofile@])[

 
 /* Enabling traces.  */
 #ifndef YYDEBUG
 
 /* Enabling traces.  */
 #ifndef YYDEBUG

-# define YYDEBUG b4_debug
+# define YYDEBUG ]b4_debug[

 #endif
 
 /* Enabling verbose error message.  */
 #ifndef YYERROR_VERBOSE
 #endif
 
 /* Enabling verbose error message.  */
 #ifndef YYERROR_VERBOSE

-# define YYERROR_VERBOSE b4_error_verbose
+# define YYERROR_VERBOSE ]b4_error_verbose[

 #endif
 
 #ifndef YYSTYPE
 #endif
 
 #ifndef YYSTYPE

-m4_ifdef([b4_stype],
+]m4_ifdef([b4_stype],

 [b4_syncline([b4_stype_line], [b4_filename])
 typedef union b4_stype yystype;
 /* Line __line__ of __file__.  */
 b4_syncline([@oline@], [@ofile@])],
 [b4_syncline([b4_stype_line], [b4_filename])
 typedef union b4_stype yystype;
 /* Line __line__ of __file__.  */
 b4_syncline([@oline@], [@ofile@])],

-[typedef int yystype;])
+[typedef int yystype;])[

 # define YYSTYPE yystype
 #endif
 
 /* Copy the second part of user declarations.  */
 # define YYSTYPE yystype
 #endif
 
 /* Copy the second part of user declarations.  */

-b4_post_prologue
+]b4_post_prologue[

 
 

-/* Line __line__ of __file__.  */
-b4_syncline([@oline@], [@ofile@])
+]/* Line __line__ of __file__.  */
+b4_syncline([@oline@], [@ofile@])[

 #ifndef YYLLOC_DEFAULT
 # define YYLLOC_DEFAULT(Current, Rhs, N) \
 #ifndef YYLLOC_DEFAULT
 # define YYLLOC_DEFAULT(Current, Rhs, N) \

-   Current.last_line = Rhs[[N]].last_line; \
-   Current.last_column = Rhs[[N]].last_column;
+   Current.last_line = Rhs[N].last_line; \
+   Current.last_column = Rhs[N].last_column;

 #endif
 
 namespace yy
 {
 #endif
 
 namespace yy
 {

-  class b4_parser_class_name;
+  class ]b4_parser_class_name[;

 
   template < typename P >
   struct Traits
 
   template < typename P >
   struct Traits


@@ -153,47 +155,47 @@ namespace yy
   };
 
   template < >
   };
 
   template < >

-  struct Traits< b4_parser_class_name >
+  struct Traits< ]b4_parser_class_name[ >

   {
   {

-    typedef b4_int_type_for([b4_translate]) TokenNumberType;
-    typedef b4_int_type_for([b4_rhs])       RhsNumberType;
+    typedef ]b4_int_type_for([b4_translate])[ TokenNumberType;
+    typedef ]b4_int_type_for([b4_rhs])[       RhsNumberType;

     typedef int      StateType;
     typedef yystype  SemanticType;
     typedef int      StateType;
     typedef yystype  SemanticType;

-    typedef b4_location_type LocationType;
+    typedef ]b4_location_type[ LocationType;

   };
 }
 
 namespace yy
 {
   };
 }
 
 namespace yy
 {

-  class b4_parser_class_name b4_inherit
+  class ]b4_parser_class_name b4_inherit[

   {
   public:
 
   {
   public:
 

-    typedef Traits< b4_parser_class_name >::TokenNumberType TokenNumberType;
-    typedef Traits< b4_parser_class_name >::RhsNumberType   RhsNumberType;
-    typedef Traits< b4_parser_class_name >::StateType       StateType;
-    typedef Traits< b4_parser_class_name >::SemanticType    SemanticType;
-    typedef Traits< b4_parser_class_name >::LocationType    LocationType;
+    typedef Traits< ]b4_parser_class_name[ >::TokenNumberType TokenNumberType;
+    typedef Traits< ]b4_parser_class_name[ >::RhsNumberType   RhsNumberType;
+    typedef Traits< ]b4_parser_class_name[ >::StateType       StateType;
+    typedef Traits< ]b4_parser_class_name[ >::SemanticType    SemanticType;
+    typedef Traits< ]b4_parser_class_name[ >::LocationType    LocationType;

 
     typedef Stack< StateType >    StateStack;
     typedef Stack< SemanticType > SemanticStack;
     typedef Stack< LocationType > LocationStack;
 
 #if YYLSP_NEEDED
 
     typedef Stack< StateType >    StateStack;
     typedef Stack< SemanticType > SemanticStack;
     typedef Stack< LocationType > LocationStack;
 
 #if YYLSP_NEEDED

-    b4_parser_class_name (bool debug,
-           LocationType initlocation[]b4_param) :
-      b4_constructor[]debug_ (debug),
+    ]b4_parser_class_name[ (bool debug,
+           LocationType initlocation][]b4_param[) :
+      ]b4_constructor[][debug_ (debug),

       cdebug_ (std::cerr),
       initlocation_ (initlocation)
 #else
       cdebug_ (std::cerr),
       initlocation_ (initlocation)
 #else

-    b4_parser_class_name (bool debug[]b4_param) :
-      b4_constructor[]debug_ (debug),
+    ]b4_parser_class_name[ (bool debug][]b4_param[) :
+      ]b4_constructor[][debug_ (debug),

       cdebug_ (std::cerr)
 #endif
     {
     }
 
       cdebug_ (std::cerr)
 #endif
     {
     }
 

-    virtual ~b4_parser_class_name ()
+    virtual ~]b4_parser_class_name[ ()

     {
     }
 
     {
     }
 


@@ -211,28 +213,28 @@ namespace yy
     LocationStack location_stack_;
 
     /* Tables.  */
     LocationStack location_stack_;
 
     /* Tables.  */

-    static const b4_int_type_for([b4_pact]) pact_[[]];
-    static const b4_int_type_for([b4_pact]) pact_ninf_;
-    static const b4_int_type_for([b4_defact]) defact_[[]];
-    static const b4_int_type_for([b4_pgoto]) pgoto_[[]];
-    static const b4_int_type_for([b4_defgoto]) defgoto_[[]];
-    static const b4_int_type_for([b4_table]) table_[[]];
-    static const b4_int_type_for([b4_table]) table_ninf_;
-    static const b4_int_type_for([b4_check]) check_[[]];
-    static const b4_int_type_for([b4_r1]) r1_[[]];
-    static const b4_int_type_for([b4_r2]) r2_[[]];
+    static const ]b4_int_type_for([b4_pact])[ pact_[];
+    static const ]b4_int_type_for([b4_pact])[ pact_ninf_;
+    static const ]b4_int_type_for([b4_defact])[ defact_[];
+    static const ]b4_int_type_for([b4_pgoto])[ pgoto_[];
+    static const ]b4_int_type_for([b4_defgoto])[ defgoto_[];
+    static const ]b4_int_type_for([b4_table])[ table_[];
+    static const ]b4_int_type_for([b4_table])[ table_ninf_;
+    static const ]b4_int_type_for([b4_check])[ check_[];
+    static const ]b4_int_type_for([b4_r1])[ r1_[];
+    static const ]b4_int_type_for([b4_r2])[ r2_[];

 
 #if YYDEBUG || YYERROR_VERBOSE
 
 #if YYDEBUG || YYERROR_VERBOSE

-    static const char* const name_[[]];
+    static const char* const name_[];

 #endif
 
     /* More tables, for debugging.  */
 #if YYDEBUG
 #endif
 
     /* More tables, for debugging.  */
 #if YYDEBUG

-    static const RhsNumberType rhs_[[]];
-    static const b4_int_type_for([b4_prhs]) prhs_[[]];
-    static const b4_int_type_for([b4_rline]) rline_[[]];
-    static const b4_int_type_for([b4_stos]) stos_[[]];
-    static const b4_int_type_for([b4_toknum]) token_number_[[]];
+    static const RhsNumberType rhs_[];
+    static const ]b4_int_type_for([b4_prhs])[ prhs_[];
+    static const ]b4_int_type_for([b4_rline])[ rline_[];
+    static const ]b4_int_type_for([b4_stos])[ stos_[];
+    static const ]b4_int_type_for([b4_toknum])[ token_number_[];

 #endif
 
     /* Even more tables.  */
 #endif
 
     /* Even more tables.  */


@@ -281,11 +283,11 @@ namespace yy
   };
 }
 
   };
 }
 

-#endif /* ! defined YYLSP_NEEDED */
+#endif /* ! defined PARSER_HEADER_H */]

 dnl
 @output @output_parser_name@
 b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison],
 dnl
 @output @output_parser_name@
 b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison],

-             [2002])
+             [2002])[

 
 #include @output_header_name@
 
 
 #include @output_header_name@
 


@@ -297,7 +299,7 @@ b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison],
 #endif /* !YYDEBUG */
 
 int
 #endif /* !YYDEBUG */
 
 int

-yy::b4_parser_class_name::parse ()
+yy::]b4_parser_class_name[::parse ()

 {
   int nerrs = 0;
   int errstatus = 0;
 {
   int nerrs = 0;
   int errstatus = 0;


@@ -325,7 +327,7 @@ yy::b4_parser_class_name::parse ()
  yybackup:
 
   /* Try to take a decision without lookahead.  */
  yybackup:
 
   /* Try to take a decision without lookahead.  */

-  n_ = pact_[[state_]];
+  n_ = pact_[state_];

   if (n_ == pact_ninf_)
     goto yydefault;
 
   if (n_ == pact_ninf_)
     goto yydefault;
 


@@ -350,7 +352,7 @@ yy::b4_parser_class_name::parse ()
       if (debug_)
        {
          YYCDEBUG << "Next token is " << looka_
       if (debug_)
        {
          YYCDEBUG << "Next token is " << looka_

-                << " (" << name_[[ilooka_]];
+                << " (" << name_[ilooka_];

          print_ ();
          YYCDEBUG << ')' << std::endl;
        }
          print_ ();
          YYCDEBUG << ')' << std::endl;
        }


@@ -358,11 +360,11 @@ yy::b4_parser_class_name::parse ()
     }
 
   n_ += ilooka_;
     }
 
   n_ += ilooka_;

-  if (n_ < 0 || last_ < n_ || check_[[n_]] != ilooka_)
+  if (n_ < 0 || last_ < n_ || check_[n_] != ilooka_)

     goto yydefault;
 
   /* Reduce or error.  */
     goto yydefault;
 
   /* Reduce or error.  */

-  n_ = table_[[n_]];
+  n_ = table_[n_];

   if (n_ < 0)
     {
       if (n_ == table_ninf_)
   if (n_ < 0)
     {
       if (n_ == table_ninf_)


@@ -382,7 +384,7 @@ yy::b4_parser_class_name::parse ()
 
   /* Shift the lookahead token.  */
   YYCDEBUG << "Shifting token " << looka_
 
   /* Shift the lookahead token.  */
   YYCDEBUG << "Shifting token " << looka_

-        << " (" << name_[[ilooka_]] << "), ";
+        << " (" << name_[ilooka_] << "), ";

 
   /* Discard the token being shifted unless it is eof.  */
   if (looka_ != eof_)
 
   /* Discard the token being shifted unless it is eof.  */
   if (looka_ != eof_)


@@ -401,34 +403,34 @@ yy::b4_parser_class_name::parse ()
 
   /* Default action.  */
  yydefault:
 
   /* Default action.  */
  yydefault:

-  n_ = defact_[[state_]];
+  n_ = defact_[state_];

   if (n_ == 0)
     goto yyerrlab;
   goto yyreduce;
 
   /* Reduce.  */
  yyreduce:
   if (n_ == 0)
     goto yyerrlab;
   goto yyreduce;
 
   /* Reduce.  */
  yyreduce:

-  len_ = r2_[[n_]];
+  len_ = r2_[n_];

   if (len_)
     {
   if (len_)
     {

-      yyval = semantic_stack_[[len_ - 1]];
-      yyloc = location_stack_[[len_ - 1]];
+      yyval = semantic_stack_[len_ - 1];
+      yyloc = location_stack_[len_ - 1];

     }
   else
     {
     }
   else
     {

-      yyval = semantic_stack_[[0]];
-      yyloc = location_stack_[[0]];
+      yyval = semantic_stack_[0];
+      yyloc = location_stack_[0];

     }
 
 #if YYDEBUG
   if (debug_)
     {
       YYCDEBUG << "Reducing via rule " << n_ - 1
     }
 
 #if YYDEBUG
   if (debug_)
     {
       YYCDEBUG << "Reducing via rule " << n_ - 1

-            << " (line " << rline_[[n_]] << "), ";
-      for (b4_int_type_for([b4_prhs]) i = prhs_[[n_]];
-          0 <= rhs_[[i]]; ++i)
-       YYCDEBUG << name_[[rhs_[i]]] << ' ';
-      YYCDEBUG << "-> " << name_[[r1_[n_]]] << std::endl;
+            << " (line " << rline_[n_] << "), ";
+      for (]b4_int_type_for([b4_prhs])[ i = prhs_[n_];
+          0 <= rhs_[i]; ++i)
+       YYCDEBUG << name_[rhs_[i]] << ' ';
+      YYCDEBUG << "-> " << name_[r1_[n_]] << std::endl;

     }
 #endif
 
     }
 #endif
 


@@ -440,11 +442,11 @@ yy::b4_parser_class_name::parse ()
 
   switch (n_)
     {
 
   switch (n_)
     {

-      b4_actions
+      ]b4_actions[

     }
 
     }
 

-/* Line __line__ of __file__.  */
-b4_syncline([@oline@], [@ofile@])
+]/* Line __line__ of __file__.  */
+b4_syncline([@oline@], [@ofile@])[

 
   state_stack_.pop (len_);
   semantic_stack_.pop (len_);
 
   state_stack_.pop (len_);
   semantic_stack_.pop (len_);


@@ -465,12 +467,12 @@ b4_syncline([@oline@], [@ofile@])
   location_stack_.push (yyloc);
 
   /* Shift the result of the reduction.  */
   location_stack_.push (yyloc);
 
   /* Shift the result of the reduction.  */

-  n_ = r1_[[n_]];
-  state_ = pgoto_[[n_ - ntokens_]] + state_stack_[[0]];
-  if (0 <= state_ && state_ <= last_ && check_[[state_]] == state_stack_[[0]])
-    state_ = table_[[state_]];
+  n_ = r1_[n_];
+  state_ = pgoto_[n_ - ntokens_] + state_stack_[0];
+  if (0 <= state_ && state_ <= last_ && check_[state_] == state_stack_[0])
+    state_ = table_[state_];

   else
   else

-    state_ = defgoto_[[n_ - ntokens_]];
+    state_ = defgoto_[n_ - ntokens_];

   goto yynewstate;
 
   /* Report and recover from errors.  This is very incomplete.  */
   goto yynewstate;
 
   /* Report and recover from errors.  This is very incomplete.  */


@@ -481,24 +483,24 @@ b4_syncline([@oline@], [@ofile@])
       ++nerrs;
 
 #if YYERROR_VERBOSE
       ++nerrs;
 
 #if YYERROR_VERBOSE

-      n_ = pact_[[state_]];
+      n_ = pact_[state_];

       if (pact_ninf_ < n_ && n_ < last_)
        {
          message = "syntax error, unexpected ";
       if (pact_ninf_ < n_ && n_ < last_)
        {
          message = "syntax error, unexpected ";

-         message += name_[[ilooka_]];
+         message += name_[ilooka_];

          {
            int count = 0;
            for (int x = (n_ < 0 ? -n_ : 0); x < ntokens_ + nnts_; ++x)
          {
            int count = 0;
            for (int x = (n_ < 0 ? -n_ : 0); x < ntokens_ + nnts_; ++x)

-             if (check_[[x + n_]] == x && x != terror_)
+             if (check_[x + n_] == x && x != terror_)

                ++count;
            if (count < 5)
              {
                count = 0;
                for (int x = (n_ < 0 ? -n_ : 0); x < ntokens_ + nnts_; ++x)
                ++count;
            if (count < 5)
              {
                count = 0;
                for (int x = (n_ < 0 ? -n_ : 0); x < ntokens_ + nnts_; ++x)

-                 if (check_[[x + n_]] == x && x != terror_)
+                 if (check_[x + n_] == x && x != terror_)

                    {
                      message += (!count++) ? ", expecting " : " or ";
                    {
                      message += (!count++) ? ", expecting " : " or ";

-                     message += name_[[x]];
+                     message += name_[x];

                    }
              }
          }
                    }
              }
          }


@@ -521,7 +523,7 @@ b4_syncline([@oline@], [@ofile@])
       if (looka_ == eof_)
        goto yyabortlab;
       YYCDEBUG << "Discarding token " << looka_
       if (looka_ == eof_)
        goto yyabortlab;
       YYCDEBUG << "Discarding token " << looka_

-            << " (" << name_[[ilooka_]] << ")." << std::endl;
+            << " (" << name_[ilooka_] << ")." << std::endl;

       looka_ = empty_;
     }
 
       looka_ = empty_;
     }
 


@@ -532,13 +534,13 @@ b4_syncline([@oline@], [@ofile@])
 
   for (;;)
     {
 
   for (;;)
     {

-      n_ = pact_[[state_]];
+      n_ = pact_[state_];

       if (n_ != pact_ninf_)
        {
          n_ += terror_;
       if (n_ != pact_ninf_)
        {
          n_ += terror_;

-         if (0 <= n_ && n_ <= last_ && check_[[n_]] == terror_)
+         if (0 <= n_ && n_ <= last_ && check_[n_] == terror_)

            {
            {

-             n_ = table_[[n_]];
+             n_ = table_[n_];

              if (0 < n_)
                break;
            }
              if (0 < n_)
                break;
            }


@@ -551,13 +553,13 @@ b4_syncline([@oline@], [@ofile@])
 #if YYDEBUG
       if (debug_)
        {
 #if YYDEBUG
       if (debug_)
        {

-         if (stos_[[state_]] < ntokens_)
+         if (stos_[state_] < ntokens_)

            {
              YYCDEBUG << "Error: popping token "
            {
              YYCDEBUG << "Error: popping token "

-                    << token_number_[[stos_[state_]]]
-                    << " (" << name_[[stos_[state_]]];
+                    << token_number_[stos_[state_]]
+                    << " (" << name_[stos_[state_]];

 # ifdef YYPRINT
 # ifdef YYPRINT

-             YYPRINT (stderr, token_number_[[stos_[state_]]],
+             YYPRINT (stderr, token_number_[stos_[state_]],

                       semantic_stack_.top ());
 # endif
              YYCDEBUG << ')' << std::endl;
                       semantic_stack_.top ());
 # endif
              YYCDEBUG << ')' << std::endl;


@@ -565,12 +567,12 @@ b4_syncline([@oline@], [@ofile@])
          else
            {
              YYCDEBUG << "Error: popping nonterminal ("
          else
            {
              YYCDEBUG << "Error: popping nonterminal ("

-                    << name_[[stos_[state_]]] << ')' << std::endl;
+                    << name_[stos_[state_]] << ')' << std::endl;

            }
        }
 #endif
 
            }
        }
 #endif
 

-      state_ = (state_stack_.pop (), state_stack_[[0]]);
+      state_ = (state_stack_.pop (), state_stack_[0]);

       semantic_stack_.pop ();
       location_stack_.pop ();;
 
       semantic_stack_.pop ();
       location_stack_.pop ();;
 


@@ -607,7 +609,7 @@ b4_syncline([@oline@], [@ofile@])
 }
 
 void
 }
 
 void

-yy::b4_parser_class_name::lex_ ()
+yy::]b4_parser_class_name[::lex_ ()

 {
 #if YYLSP_NEEDED
   looka_ = yylex (&value, &location);
 {
 #if YYLSP_NEEDED
   looka_ = yylex (&value, &location);


@@ -616,154 +618,154 @@ yy::b4_parser_class_name::lex_ ()
 #endif
 }
 
 #endif
 }
 

-/* YYPACT[[STATE-NUM]] -- Index in YYTABLE of the portion describing
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing

    STATE-NUM.  */
    STATE-NUM.  */

-const b4_int_type_for([b4_pact]) yy::b4_parser_class_name::pact_ninf_ = b4_pact_ninf;
-const b4_int_type_for([b4_pact])
-yy::b4_parser_class_name::pact_[[]] =
+const ]b4_int_type_for([b4_pact]) yy::b4_parser_class_name::pact_ninf_ = b4_pact_ninf[;
+const ]b4_int_type_for([b4_pact])[
+yy::]b4_parser_class_name[::pact_[] =

 {
 {

-  b4_pact
+  ]b4_pact[

 };
 
 };
 

-/* YYDEFACT[[S]] -- default rule to reduce with in state S when YYTABLE
+/* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE

    doesn't specify something else to do.  Zero means the default is an
    error.  */
    doesn't specify something else to do.  Zero means the default is an
    error.  */

-const b4_int_type_for([b4_defact])
-yy::b4_parser_class_name::defact_[[]] =
+const ]b4_int_type_for([b4_defact])[
+yy::]b4_parser_class_name[::defact_[] =

 {
 {

-  b4_defact
+  ]b4_defact[

 };
 
 };
 

-/* YYPGOTO[[NTERM-NUM]].  */
-const b4_int_type_for([b4_pgoto])
-yy::b4_parser_class_name::pgoto_[[]] =
+/* YYPGOTO[NTERM-NUM].  */
+const ]b4_int_type_for([b4_pgoto])[
+yy::]b4_parser_class_name[::pgoto_[] =

 {
 {

-  b4_pgoto
+  ]b4_pgoto[

 };
 
 };
 

-/* YYDEFGOTO[[NTERM-NUM]].  */
-const b4_int_type_for([b4_defgoto])
-yy::b4_parser_class_name::defgoto_[[]] =
+/* YYDEFGOTO[NTERM-NUM].  */
+const ]b4_int_type_for([b4_defgoto])[
+yy::]b4_parser_class_name[::defgoto_[] =

 {
 {

-  b4_defgoto
+  ]b4_defgoto[

 };
 
 };
 

-/* YYTABLE[[YYPACT[STATE-NUM]]].  What to do in state STATE-NUM.  If
+/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If

    positive, shift that token.  If negative, reduce the rule which
    number is the opposite.  If zero, do what YYDEFACT says.  */
    positive, shift that token.  If negative, reduce the rule which
    number is the opposite.  If zero, do what YYDEFACT says.  */

-const b4_int_type_for([b4_table]) yy::b4_parser_class_name::table_ninf_ = b4_table_ninf;
-const b4_int_type_for([b4_table])
-yy::b4_parser_class_name::table_[[]] =
+const ]b4_int_type_for([b4_table]) yy::b4_parser_class_name::table_ninf_ = b4_table_ninf[;
+const ]b4_int_type_for([b4_table])[
+yy::]b4_parser_class_name[::table_[] =

 {
 {

-  b4_table
+  ]b4_table[

 };
 
 /* YYCHECK.  */
 };
 
 /* YYCHECK.  */

-const b4_int_type_for([b4_check])
-yy::b4_parser_class_name::check_[[]] =
+const ]b4_int_type_for([b4_check])[
+yy::]b4_parser_class_name[::check_[] =

 {
 {

-  b4_check
+  ]b4_check[

 };
 
 #if YYDEBUG
 };
 
 #if YYDEBUG

-/* STOS_[[STATE-NUM]] -- The (internal number of the) accessing
+/* STOS_[STATE-NUM] -- The (internal number of the) accessing

    symbol of state STATE-NUM.  */
    symbol of state STATE-NUM.  */

-const b4_int_type_for([b4_stos])
-yy::b4_parser_class_name::stos_[[]] =
+const ]b4_int_type_for([b4_stos])[
+yy::]b4_parser_class_name[::stos_[] =

 {
 {

-  b4_stos
+  ]b4_stos[

 };
 
 };
 

-/* TOKEN_NUMBER_[[YYLEX-NUM]] -- Internal token number corresponding
+/* TOKEN_NUMBER_[YYLEX-NUM] -- Internal token number corresponding

    to YYLEX-NUM.  */
    to YYLEX-NUM.  */

-const b4_int_type_for([b4_toknum])
-yy::b4_parser_class_name::token_number_[[]] =
+const ]b4_int_type_for([b4_toknum])[
+yy::]b4_parser_class_name[::token_number_[] =

 {
 {

-  b4_toknum
+  ]b4_toknum[

 };
 #endif
 
 };
 #endif
 

-/* YYR1[[YYN]] -- Symbol number of symbol that rule YYN derives.  */
-const b4_int_type_for([b4_r1])
-yy::b4_parser_class_name::r1_[[]] =
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+const ]b4_int_type_for([b4_r1])[
+yy::]b4_parser_class_name[::r1_[] =

 {
 {

-  b4_r1
+  ]b4_r1[

 };
 
 };
 

-/* YYR2[[YYN]] -- Number of symbols composing right hand side of rule YYN.  */
-const b4_int_type_for([b4_r2])
-yy::b4_parser_class_name::r2_[[]] =
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
+const ]b4_int_type_for([b4_r2])[
+yy::]b4_parser_class_name[::r2_[] =

 {
 {

-  b4_r2
+  ]b4_r2[

 };
 
 #if YYDEBUG || YYERROR_VERBOSE
 };
 
 #if YYDEBUG || YYERROR_VERBOSE

-/* YYTNAME[[SYMBOL-NUM]] -- String name of the symbol SYMBOL-NUM.
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.

    First, the terminals, then, starting at YYNTOKENS, nonterminals. */
 const char*
    First, the terminals, then, starting at YYNTOKENS, nonterminals. */
 const char*

-const yy::b4_parser_class_name::name_[[]] =
+const yy::]b4_parser_class_name[::name_[] =

 {
 {

-  b4_tname
+  ]b4_tname[

 };
 #endif
 
 #if YYDEBUG
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */
 };
 #endif
 
 #if YYDEBUG
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */

-const yy::b4_parser_class_name::RhsNumberType
-yy::b4_parser_class_name::rhs_[[]] =
+const yy::]b4_parser_class_name[::RhsNumberType
+yy::]b4_parser_class_name[::rhs_[] =

 {
 {

-  b4_rhs
+  ]b4_rhs[

 };
 
 };
 

-/* YYPRHS[[YYN]] -- Index of the first RHS symbol of rule number YYN in
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in

    YYRHS.  */
    YYRHS.  */

-const b4_int_type_for([b4_prhs])
-yy::b4_parser_class_name::prhs_[[]] =
+const ]b4_int_type_for([b4_prhs])[
+yy::]b4_parser_class_name[::prhs_[] =

 {
 {

-  b4_prhs
+  ]b4_prhs[

 };
 
 };
 

-/* YYRLINE[[YYN]] -- source line where rule number YYN was defined.  */
-const b4_int_type_for([b4_rline])
-yy::b4_parser_class_name::rline_[[]] =
+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+const ]b4_int_type_for([b4_rline])[
+yy::]b4_parser_class_name[::rline_[] =

 {
 {

-  b4_rline
+  ]b4_rline[

 };
 #endif
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 };
 #endif
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */

-yy::b4_parser_class_name::TokenNumberType
-yy::b4_parser_class_name::translate_ (int token)
+yy::]b4_parser_class_name[::TokenNumberType
+yy::]b4_parser_class_name[::translate_ (int token)

 {
   static
   const TokenNumberType
 {
   static
   const TokenNumberType

-  translate_[[]] =
+  translate_[] =

   {
   {

-    b4_translate
+    ]b4_translate[

   };
   if ((unsigned) token <= user_token_number_max_)
   };
   if ((unsigned) token <= user_token_number_max_)

-    return translate_[[token]];
+    return translate_[token];

   else
     return undef_token_;
 }
 
   else
     return undef_token_;
 }
 

-const int yy::b4_parser_class_name::eof_ = 0;
-const int yy::b4_parser_class_name::last_ = b4_last;
-const int yy::b4_parser_class_name::nnts_ = b4_nterms_number;
-const int yy::b4_parser_class_name::empty_ = -2;
-const int yy::b4_parser_class_name::final_ = b4_final_state_number;
-const int yy::b4_parser_class_name::terror_ = 1;
-const int yy::b4_parser_class_name::errcode_ = 256;
-const int yy::b4_parser_class_name::ntokens_ = b4_tokens_number;
-const int yy::b4_parser_class_name::initdepth_ = b4_stack_depth_init;
+const int yy::]b4_parser_class_name[::eof_ = 0;
+const int yy::]b4_parser_class_name[::last_ = ]b4_last[;
+const int yy::]b4_parser_class_name[::nnts_ = ]b4_nterms_number[;
+const int yy::]b4_parser_class_name[::empty_ = -2;
+const int yy::]b4_parser_class_name[::final_ = ]b4_final_state_number[;
+const int yy::]b4_parser_class_name[::terror_ = 1;
+const int yy::]b4_parser_class_name[::errcode_ = 256;
+const int yy::]b4_parser_class_name[::ntokens_ = ]b4_tokens_number[;
+const int yy::]b4_parser_class_name[::initdepth_ = ]b4_stack_depth_init[;

 
 

-const unsigned yy::b4_parser_class_name::user_token_number_max_ = b4_user_token_number_max;
-const yy::b4_parser_class_name::TokenNumberType yy::b4_parser_class_name::undef_token_ = b4_undef_token_number;
+const unsigned yy::]b4_parser_class_name[::user_token_number_max_ = ]b4_user_token_number_max[;
+const yy::]b4_parser_class_name[::TokenNumberType yy::]b4_parser_class_name[::undef_token_ = ]b4_undef_token_number[;

 
 

-b4_epilogue
+]b4_epilogue

 dnl
 @output stack.hh
 dnl
 @output stack.hh

-b4_copyright([2002])
+b4_copyright([2002])[

 
 #ifndef BISON_STACK_HH
 # define BISON_STACK_HH
 
 #ifndef BISON_STACK_HH
 # define BISON_STACK_HH


@@ -790,16 +792,16 @@ namespace yy
 
     inline
     T&
 
     inline
     T&

-    operator [[]] (unsigned index)
+    operator [] (unsigned index)

     {
     {

-      return seq_[[index]];
+      return seq_[index];

     }
 
     inline
     const T&
     }
 
     inline
     const T&

-    operator [[]] (unsigned index) const
+    operator [] (unsigned index) const

     {
     {

-      return seq_[[index]];
+      return seq_[index];

     }
 
     inline
     }
 
     inline


@@ -845,9 +847,9 @@ namespace yy
 
     inline
     const T&
 
     inline
     const T&

-    operator [[]] (unsigned index) const
+    operator [] (unsigned index) const

     {
     {

-      return stack_[[range_ - index]];
+      return stack_[range_ - index];

     }
 
   private:
     }
 
   private:


@@ -857,10 +859,10 @@ namespace yy
   };
 }
 
   };
 }
 

-#endif // not BISON_STACK_HH
+#endif // not BISON_STACK_HH]

 dnl
 @output location.hh
 dnl
 @output location.hh

-b4_copyright([2002])
+b4_copyright([2002])[

 
 #ifndef BISON_LOCATION_HH
 # define BISON_LOCATION_HH
 
 #ifndef BISON_LOCATION_HH
 # define BISON_LOCATION_HH


@@ -880,4 +882,4 @@ namespace yy
   };
 }
 
   };
 }
 

-#endif // not BISON_LOCATION_HH
+#endif // not BISON_LOCATION_HH]

diff --git a/data/yacc.c b/data/yacc.c
index c798521ffeb9e9a8c61bda6f517879322859059c..0e30d1d8bbeeafef98e6be5d1c6e16ea1fe82ff6 100644 (file)
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -340,108 +340,108 @@ union yyalloc
 /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
 static const ]b4_int_type_for([b4_translate])[ yytranslate[] =
 {
 /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
 static const ]b4_int_type_for([b4_translate])[ yytranslate[] =
 {

-  ]b4_translate
+  ]b4_translate[

 };
 
 #if YYDEBUG
 };
 
 #if YYDEBUG

-/* YYPRHS[[YYN]] -- Index of the first RHS symbol of rule number YYN in
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in

    YYRHS.  */
    YYRHS.  */

-static const b4_int_type_for([b4_prhs]) yyprhs[[]] =
+static const ]b4_int_type_for([b4_prhs])[ yyprhs[] =

 {
 {

-  b4_prhs
+  ]b4_prhs[

 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */

-static const b4_int_type_for([b4_rhs]) yyrhs[[]] =
+static const ]b4_int_type_for([b4_rhs])[ yyrhs[] =

 {
 {

-  b4_rhs
+  ]b4_rhs[

 };
 
 };
 

-/* YYRLINE[[YYN]] -- source line where rule number YYN was defined.  */
-static const b4_int_type_for([b4_rline]) yyrline[[]] =
+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+static const ]b4_int_type_for([b4_rline])[ yyrline[] =

 {
 {

-  b4_rline
+  ]b4_rline[

 };
 #endif
 
 #if YYDEBUG || YYERROR_VERBOSE
 };
 #endif
 
 #if YYDEBUG || YYERROR_VERBOSE

-/* YYTNME[[SYMBOL-NUM]] -- String name of the symbol SYMBOL-NUM.
+/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.

    First, the terminals, then, starting at YYNTOKENS, nonterminals. */
    First, the terminals, then, starting at YYNTOKENS, nonterminals. */

-static const char *const yytname[[]] =
+static const char *const yytname[] =

 {
 {

-  b4_tname
+  ]b4_tname[

 };
 #endif
 
 # ifdef YYPRINT
 };
 #endif
 
 # ifdef YYPRINT

-/* YYTOKNUM[[YYLEX-NUM]] -- Internal token number corresponding to
+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to

    token YYLEX-NUM.  */
    token YYLEX-NUM.  */

-static const b4_int_type_for([b4_toknum]) yytoknum[[]] =
+static const ]b4_int_type_for([b4_toknum])[ yytoknum[] =

 {
 {

-  b4_toknum
+  ]b4_toknum[

 };
 # endif
 
 };
 # endif
 

-/* YYR1[[YYN]] -- Symbol number of symbol that rule YYN derives.  */
-static const b4_int_type_for([b4_r1]) yyr1[[]] =
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const ]b4_int_type_for([b4_r1])[ yyr1[] =

 {
 {

-  b4_r1
+  ]b4_r1[

 };
 
 };
 

-/* YYR2[[YYN]] -- Number of symbols composing right hand side of rule YYN.  */
-static const b4_int_type_for([b4_r2]) yyr2[[]] =
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
+static const ]b4_int_type_for([b4_r2])[ yyr2[] =

 {
 {

-  b4_r2
+  ]b4_r2[

 };
 
 };
 

-/* YYDEFACT[[STATE-NAME]] -- Default rule to reduce with in state
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state

    STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
    means the default is an error.  */
    STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
    means the default is an error.  */

-static const b4_int_type_for([b4_defact]) yydefact[[]] =
+static const ]b4_int_type_for([b4_defact])[ yydefact[] =

 {
 {

-  b4_defact
+  ]b4_defact[

 };
 
 };
 

-/* YYDEFGOTO[[NTERM-NUM]]. */
-static const b4_int_type_for([b4_defgoto]) yydefgoto[[]] =
+/* YYDEFGOTO[NTERM-NUM]. */
+static const ]b4_int_type_for([b4_defgoto])[ yydefgoto[] =

 {
 {

-  b4_defgoto
+  ]b4_defgoto[

 };
 
 };
 

-/* YYPACT[[STATE-NUM]] -- Index in YYTABLE of the portion describing
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing

    STATE-NUM.  */
    STATE-NUM.  */

-#define YYPACT_NINF b4_pact_ninf
-static const b4_int_type_for([b4_pact]) yypact[[]] =
+#define YYPACT_NINF ]b4_pact_ninf[
+static const ]b4_int_type_for([b4_pact])[ yypact[] =

 {
 {

-  b4_pact
+  ]b4_pact[

 };
 
 };
 

-/* YYPGOTO[[NTERM-NUM]].  */
-static const b4_int_type_for([b4_pgoto]) yypgoto[[]] =
+/* YYPGOTO[NTERM-NUM].  */
+static const ]b4_int_type_for([b4_pgoto])[ yypgoto[] =

 {
 {

-  b4_pgoto
+  ]b4_pgoto[

 };
 
 };
 

-/* YYTABLE[[YYPACT[STATE-NUM]]].  What to do in state STATE-NUM.  If
+/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If

    positive, shift that token.  If negative, reduce the rule which
    number is the opposite.  If zero, do what YYDEFACT says.
    If YYTABLE_NINF, syntax error.  */
    positive, shift that token.  If negative, reduce the rule which
    number is the opposite.  If zero, do what YYDEFACT says.
    If YYTABLE_NINF, syntax error.  */

-#define YYTABLE_NINF b4_table_ninf
-static const b4_int_type_for([b4_table]) yytable[[]] =
+#define YYTABLE_NINF ]b4_table_ninf[
+static const ]b4_int_type_for([b4_table])[ yytable[] =

 {
 {

-  b4_table
+  ]b4_table[

 };
 
 };
 

-static const b4_int_type_for([b4_check]) yycheck[[]] =
+static const ]b4_int_type_for([b4_check])[ yycheck[] =

 {
 {

-  b4_check
+  ]b4_check[

 };
 
 };
 

-/* YYSTOS[[STATE-NUM]] -- The (internal number of the) accessing
+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing

    symbol of state STATE-NUM.  */
    symbol of state STATE-NUM.  */

-static const b4_int_type_for([b4_stos]) yystos[[]] =
+static const ]b4_int_type_for([b4_stos])[ yystos[] =

 {
 {

-  b4_stos[
+  ]b4_stos[

 };
 
 #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
 };
 
 #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)


@@ -529,11 +529,13 @@ do {                                              \
   if (yydebug)                                 \
     YYFPRINTF Args;                            \
 } while (0)
   if (yydebug)                                 \
     YYFPRINTF Args;                            \
 } while (0)

+

 # define YYDSYMPRINT(Args)                     \
 do {                                           \
   if (yydebug)                                 \
     yysymprint Args;                           \
 } while (0)
 # define YYDSYMPRINT(Args)                     \
 do {                                           \
   if (yydebug)                                 \
     yysymprint Args;                           \
 } while (0)

+

 # define YYDSYMPRINTF(Title, Token, Value, Location)           \
 do {                                                           \
   if (yydebug)                                                 \
 # define YYDSYMPRINTF(Title, Token, Value, Location)           \
 do {                                                           \
   if (yydebug)                                                 \


@@ -633,7 +635,7 @@ yystpcpy (yydest, yysrc)
 
 #if YYDEBUG
 ]b4_yysymprint_generate([b4_c_function_def])[
 
 #if YYDEBUG
 ]b4_yysymprint_generate([b4_c_function_def])[

-#endif /* YYDEBUG. */
+#endif /* ! YYDEBUG */

 ]b4_yydestruct_generate([b4_c_function_def])
 \f
 
 ]b4_yydestruct_generate([b4_c_function_def])
 \f
 


@@ -647,7 +649,7 @@ int yyparse ();
 # endif
 #else /* ! YYPARSE_PARAM */
 b4_c_function_decl([yyparse], [int], b4_parse_param)
 # endif
 #else /* ! YYPARSE_PARAM */
 b4_c_function_decl([yyparse], [int], b4_parse_param)

-#endif
+#endif /* ! YYPARSE_PARAM */

 
 
 m4_divert_push([KILL])# ======================== M4 code.
 
 
 m4_divert_push([KILL])# ======================== M4 code.

diff --git a/src/getargs.c b/src/getargs.c
index 92e9ef4ea3bd701c2e1178c8699adfc02db12d33..0113f3370f5e877773394d0cf35bf0bf8b5e2a1e 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -54,15 +54,16 @@ static const char * const trace_args[] =
   /* In a series of synonyms, present the most meaningful first, so
      that argmatch_valid be more readable.  */
   "none       - no report",
   /* In a series of synonyms, present the most meaningful first, so
      that argmatch_valid be more readable.  */
   "none       - no report",

-  "scan       - scanner traces",
-  "parse      - parser traces",
+  "scan       - grammar scanner traces",
+  "parse      - grammar parser traces",

   "automaton  - contruction of the automaton",
   "bitsets    - use of bitsets",
   "grammar    - reading, reducing of the grammar",
   "resource   - memory consumption (where available)",
   "sets       - grammar sets: firsts, nullable etc.",
   "automaton  - contruction of the automaton",
   "bitsets    - use of bitsets",
   "grammar    - reading, reducing of the grammar",
   "resource   - memory consumption (where available)",
   "sets       - grammar sets: firsts, nullable etc.",

-  "time       - time consumption",

   "tools      - m4 invocation and preserve the temporary file",
   "tools      - m4 invocation and preserve the temporary file",

+  "skeleton   - skeleton postprocessing",
+  "time       - time consumption",

   "all        - all of the above",
   0
 };
   "all        - all of the above",
   0
 };


@@ -77,8 +78,9 @@ static const int trace_types[] =
   trace_grammar,
   trace_resource,
   trace_sets,
   trace_grammar,
   trace_resource,
   trace_sets,

-  trace_time,

   trace_tools,
   trace_tools,

+  trace_skeleton,
+  trace_time,

   trace_all
 };
 
   trace_all
 };
 

diff --git a/src/getargs.h b/src/getargs.h
index 2384231e5db56b9fe68b0cd13ce1cb2471572fee..8917177e4090bf2fafebf3321a3fd50f7de544ad 100644 (file)
--- a/src/getargs.h
+++ b/src/getargs.h
@@ -48,6 +48,7 @@ enum trace_e
     trace_automaton = 1 << 6,
     trace_grammar   = 1 << 7,
     trace_time      = 1 << 8,
     trace_automaton = 1 << 6,
     trace_grammar   = 1 << 7,
     trace_time      = 1 << 8,

+    trace_skeleton  = 1 << 9,

     trace_all       = ~0
   };
 extern int trace_flag;
     trace_all       = ~0
   };
 extern int trace_flag;

diff --git a/src/scan-skel.l b/src/scan-skel.l
index 0d7114a7b7f26434dea9f4b5b8c5b34a3c89d61b..e7f5b708bf541042536956029741c63e67159ad1 100644 (file)
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -18,7 +18,7 @@
    Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 
    Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 

-%option nodefault noyywrap nounput never-interactive
+%option nodefault noyywrap nounput never-interactive debug

 %option prefix="skel_" outfile="lex.yy.c"
 
 %{
 %option prefix="skel_" outfile="lex.yy.c"
 
 %{


@@ -30,6 +30,9 @@
 
 int skel_lex (void);
 
 
 int skel_lex (void);
 

+#define QPUTS(String) \
+   fputs (quotearg_style (c_quoting_style, (String)), yyout);
+

 %}
 %%
 
 %}
 %%
 


@@ -63,11 +66,13 @@ int skel_lex (void);
 "@}"      fputc (']', yyout);
 
 "@oline@"  fprintf (yyout, "%d", lineno);
 "@}"      fputc (']', yyout);
 
 "@oline@"  fprintf (yyout, "%d", lineno);

-"@ofile@"  fputs (quotearg_style (c_quoting_style, outname), yyout);
+"@ofile@"  QPUTS (outname);
+"@output_parser_name@" QPUTS (parser_file_name);
+"@output_header_name@"  QPUTS (spec_defines_file);

 
 "@"       abort ();
 \n        lineno++; ECHO;
 
 "@"       abort ();
 \n        lineno++; ECHO;

-.         ECHO;
+[^@\n]+           ECHO;

 
 <<EOF>>           xfclose (yyout); free (outname); return EOF;
 %%
 
 <<EOF>>           xfclose (yyout); free (outname); return EOF;
 %%


@@ -82,8 +87,8 @@ void
 scan_skel (FILE *in)
 {
   skel_in = in;
 scan_skel (FILE *in)
 {
   skel_in = in;

+  skel__flex_debug = trace_flag & trace_skeleton;

   skel_lex ();
   skel_lex ();

-

   /* Reclaim Flex's buffers.  */
   yy_delete_buffer (YY_CURRENT_BUFFER);
 }
   /* Reclaim Flex's buffers.  */
   yy_delete_buffer (YY_CURRENT_BUFFER);
 }