X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=binutils%2Fdeflex.l;h=317f6becabb06af451cbd81e1562f511019f32a0;hb=1cd48f989ab2df1eaeef23607f46212d380822c5;hp=15a43c04f40df056d55b1b0f64b07f5dd3cd0d9e;hpb=dc9e099fc0eced486ae2b49455c9da113c11f4ff;p=deliverable%2Fbinutils-gdb.git

diff --git a/binutils/deflex.l b/binutils/deflex.l
index 15a43c04f4..317f6becab 100644
--- a/binutils/deflex.l
+++ b/binutils/deflex.l
@@ -1,33 +1,35 @@
 %{/* deflex.l - Lexer for .def files */
 
-/*   Copyright (C) 1995, 1997, 1998, 1999 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,6 +48,7 @@ int linenumber;
 "BASE"		{ return BASE;}
 "CONSTANT"	{ return CONSTANT; }
 "NONAME"	{ return NONAME; }
+"PRIVATE"	{ return PRIVATE; }
 "READ"		{ return READ;}
 "WRITE"		{ return WRITE;}
 "EXECUTE"	{ return EXECUTE;}
@@ -61,7 +64,7 @@ int linenumber;
 [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;
 		}
@@ -81,7 +84,9 @@ int linenumber;
 ";".* 		{ }
 " "		{ }
 "\t"		{ }
+"\r"		{ }
 "\n"	 	{ linenumber ++ ;}
+"=="		{ return EQUAL;}
 "=" 		{ return '=';}
 "." 		{ return '.';}
 "@"	 	{ return '@';}
@@ -89,5 +94,5 @@ int linenumber;
 %%
 #ifndef yywrap
 /* Needed for lex, though not flex. */
-int yywrap() { return 1; }
+int yywrap(void) { return 1; }
 #endif