Change sources over to using GPLv3

[thirdparty/binutils-gdb.git] / binutils / deflex.l

diff --git a/binutils/deflex.l b/binutils/deflex.l
index ab49e19d715ace4d9ba907e9c3d559aa97f6c871..bd8fbdc8f290361ee3cae73d17b1e5c68b3eaa72 100644 (file)
--- a/binutils/deflex.l
+++ b/binutils/deflex.l
@@ -1,33 +1,35 @@
 %{/* deflex.l - Lexer for .def files */
 
-/*   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
+/* Copyright 1995, 1997, 1998, 1999, 2002, 2003, 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.  */
 
-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.
+/* Contributed by Steve Chamberlain: sac@cygnus.com  */
 
-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.  */
-
-
-/* Contributed by Steve Chamberlain
-                 sac@cygnus.com
-
-*/
 #define DONTDECLARE_MALLOC
 #include "libiberty.h"
 #include "defparse.h"
 #include "dlltool.h"
 
+#define YY_NO_UNPUT
+
 int linenumber;
 
 %}
@@ -46,15 +48,23 @@ int linenumber;
 "BASE"         { return BASE;}
 "CONSTANT"     { return CONSTANT; }
 "NONAME"       { return NONAME; }
+"PRIVATE"      { return PRIVATE; }
 "READ"         { return READ;}
 "WRITE"                { return WRITE;}
 "EXECUTE"      { return EXECUTE;}
 "SHARED"       { return SHARED;}
+"NONSHARED"    { return NONSHARED;}
+"SINGLE"       { return SINGLE;}
+"MULTIPLE"     { return MULTIPLE;}
+"INITINSTANCE" { return INITINSTANCE;}
+"INITGLOBAL"   { return INITGLOBAL;}
+"TERMINSTANCE" { return TERMINSTANCE;}
+"TERMGLOBAL"   { return TERMGLOBAL;}
 
 [0-9][x0-9A-Fa-f]* { yylval.number = strtol (yytext,0,0); 
                return NUMBER; }
 
-[A-Za-z$:\-\_?][A-Za-z0-9/$:\-\_@?]+ {         
+(@)?[A-Za-z$:\-\_?][A-Za-z0-9/$:\-\_@?]* {     
                yylval.id =  xstrdup (yytext);
                return ID;
                }
@@ -74,6 +84,7 @@ int linenumber;
 ";".*          { }
 " "            { }
 "\t"           { }
+"\r"           { }
 "\n"           { linenumber ++ ;}
 "="            { return '=';}
 "."            { return '.';}
@@ -82,5 +93,5 @@ int linenumber;
 %%
 #ifndef yywrap
 /* Needed for lex, though not flex. */
-int yywrap() { return 1; }
+int yywrap(void) { return 1; }
 #endif