2003-01-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

[pf3gnuchains/gcc-fork.git] / gcc / gengtype-yacc.y

diff --git a/gcc/gengtype-yacc.y b/gcc/gengtype-yacc.y
index 3ff92d3..c705315 100644 (file)
--- a/gcc/gengtype-yacc.y
+++ b/gcc/gengtype-yacc.y
@@ -20,8 +20,10 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.  */
 
 %{
-#include "hconfig.h"
+#include "bconfig.h"
 #include "system.h"
+#include "coretypes.h"
+#include "tm.h"
 #include "gengtype.h"
 #define YYERROR_VERBOSE
 %}
@@ -42,7 +44,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 %token STRUCT "struct"
 %token ENUM "enum"
 %token ALIAS "ptr_alias"
-%token PARAM_IS "param_is"
+%token <s>PARAM_IS
 %token NUM
 %token PERCENTPERCENT "%%"
 %token <t>SCALAR
@@ -174,8 +176,7 @@ yacc_ids: /* empty */
          p->opt = xmalloc (sizeof (*(p->opt)));
          p->opt->name = "tag";
          p->opt->next = NULL;
-         p->opt->info = xmalloc (3 + strlen ($2));
-         sprintf (p->opt->info, "'%s'", $2);
+         p->opt->info = xasprintf ("'%s'", $2);
          $$ = p;
        }
      ;
@@ -215,6 +216,7 @@ struct_fields: { $$ = NULL; }
 
 bitfieldopt: /* empty */
             | ':' NUM
+            | ':' ID
             ;
 
 type: SCALAR
@@ -263,14 +265,14 @@ options: GTY_TOKEN '(' '(' optionseqopt ')' ')'
 type_option : ALIAS
                { $$ = "ptr_alias"; }
              | PARAM_IS
-               { $$ = "param_is"; }
+               { $$ = $1; }
              ;
 
 option:        type_option '(' type ')'
           {
             options_p o = xmalloc (sizeof (*o));
             o->name = $1;
-            o->info = $3;
+            o->info = adjust_field_type ($3, NULL);
             $$ = o;
           }
        | ID '(' STRING ')'