Reformat elfedit.c

[binutils.git] / binutils / defparse.y

diff --git a/binutils/defparse.y b/binutils/defparse.y
index 5718d4614430662470e9dfd59e458fbf4b14b4b7..c05254a0557497b37febb2f526ec972e28e7899e 100644 (file)
--- a/binutils/defparse.y
+++ b/binutils/defparse.y
@@ -1,25 +1,28 @@
 %{ /* defparse.y - parser for .def files */
 
-/*   Copyright (C) 1995, 1997, 1998, 1999 Free Software Foundation, Inc.
-
-This file is part of GNU Binutils.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
+/* Copyright 1995, 1997, 1998, 1999, 2001, 2004, 2005, 2007
+   Free Software Foundation, Inc.
+   
+   This file is part of GNU Binutils.
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
 #include "bfd.h"
-#include "bucomm.h"
+#include "libiberty.h"
 #include "dlltool.h"
 %}
 
@@ -28,15 +31,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
   int number;
 };
 
-%token NAME, LIBRARY, DESCRIPTION, STACKSIZE, HEAPSIZE, CODE, DATA
-%token SECTIONS, EXPORTS, IMPORTS, VERSIONK, BASE, CONSTANT
-%token READ WRITE EXECUTE SHARED NONSHARED NONAME
+%token NAME LIBRARY DESCRIPTION STACKSIZE HEAPSIZE CODE DATA
+%token SECTIONS EXPORTS IMPORTS VERSIONK BASE CONSTANT
+%token READ WRITE EXECUTE SHARED NONSHARED NONAME PRIVATE
 %token SINGLE MULTIPLE INITINSTANCE INITGLOBAL TERMINSTANCE TERMGLOBAL
+%token EQUAL
 %token <id> ID
 %token <number> NUMBER
-%type  <number> opt_base opt_ordinal opt_NONAME opt_CONSTANT opt_DATA
+%type  <number> opt_base opt_ordinal opt_NONAME opt_CONSTANT opt_DATA opt_PRIVATE
 %type  <number> attr attr_list opt_number
-%type  <id> opt_name opt_equal_name 
+%type  <id> opt_name opt_equal_name opt_import_name
 
 %%
 
@@ -66,8 +70,9 @@ explist:
        ;
 
 expline:
-               ID opt_equal_name opt_ordinal opt_NONAME opt_CONSTANT opt_DATA
-                       { def_exports ($1, $2, $3, $4, $5, $6);}
+               ID opt_equal_name opt_ordinal opt_NONAME opt_CONSTANT opt_DATA opt_PRIVATE
+               opt_import_name
+                       { def_exports ($1, $2, $3, $4, $5, $6, $7, $8);}
        ;
 implist:       
                implist impline
@@ -75,14 +80,22 @@ implist:
        ;
 
 impline:
-               ID '=' ID '.' ID '.' ID     { def_import ($1,$3,$5,$7, 0); }
-       |       ID '=' ID '.' ID '.' NUMBER { def_import ($1,$3,$5, 0,$7); }
-       |       ID '=' ID '.' ID            { def_import ($1,$3, 0,$5, 0); }
-       |       ID '=' ID '.' NUMBER        { def_import ($1,$3, 0, 0,$5); }
-       |       ID '.' ID '.' ID            { def_import ( 0,$1,$3,$5, 0); }
-       |       ID '.' ID '.' NUMBER        { def_import ( 0,$1,$3, 0,$5); }
-       |       ID '.' ID                   { def_import ( 0,$1, 0,$3, 0); }
-       |       ID '.' NUMBER               { def_import ( 0,$1, 0, 0,$3); }
+               ID '=' ID '.' ID '.' ID opt_import_name
+                { def_import ($1,$3,$5,$7, 0, $8); }
+       |       ID '=' ID '.' ID '.' NUMBER opt_import_name
+                { def_import ($1,$3,$5, 0,$7, $8); }
+       |       ID '=' ID '.' ID opt_import_name
+                { def_import ($1,$3, 0,$5, 0, $6); }
+       |       ID '=' ID '.' NUMBER opt_import_name
+                { def_import ($1,$3, 0, 0,$5, $6); }
+       |       ID '.' ID '.' ID opt_import_name
+                { def_import ( 0,$1,$3,$5, 0, $6); }
+       |       ID '.' ID '.' NUMBER opt_import_name
+                { def_import ( 0,$1,$3, 0,$5, $6); }
+       |       ID '.' ID opt_import_name
+                { def_import ( 0,$1, 0,$3, 0, $4); }
+       |       ID '.' NUMBER opt_import_name
+                { def_import ( 0,$1, 0, 0,$3, $4); }
 ;
 
 seclist:
@@ -132,6 +145,11 @@ opt_DATA:
        |            { $$ = 0; }
        ;
 
+opt_PRIVATE:
+               PRIVATE { $$ = 1; }
+       |               { $$ = 0; }
+       ;
+
 opt_name: ID           { $$ =$1; }
        | ID '.' ID     
          { 
@@ -147,8 +165,19 @@ opt_ordinal:
        |                { $$=-1;}
        ;
 
+opt_import_name:
+         EQUAL ID      { $$ = $2; }
+       |               { $$ = 0; }
+       ;
+
 opt_equal_name:
           '=' ID       { $$ = $2; }
+       | '=' ID '.' ID 
+         { 
+           char *name = xmalloc (strlen ($2) + 1 + strlen ($4) + 1);
+           sprintf (name, "%s.%s", $2, $4);
+           $$ = name;
+         }
         |              { $$ =  0; }                     
        ;