X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=binutils%2Farparse.y;h=113c5483b914aa780ef2649c4b2b14ed64e1f2f9;hb=bfb6c1ab1ed502faa7c3764722a1f1661f6d44e8;hp=dccdf8e3633d26df26aafd900212843fba7b35a1;hpb=e98fe4f7b54cbdf29aef9287bbb1bea8801dd05a;p=deliverable%2Fbinutils-gdb.git

diff --git a/binutils/arparse.y b/binutils/arparse.y
index dccdf8e363..113c5483b9 100644
--- a/binutils/arparse.y
+++ b/binutils/arparse.y
@@ -1,23 +1,25 @@
 %{
 /* arparse.y - Stange script language parser */
 
-/*   Copyright (C) 1992 Free Software Foundation, Inc.
+/* Copyright 1992, 1993, 1995, 1997, 1999, 2002, 2003, 2005, 2007
+   Free Software Foundation, Inc.
 
-This file is part of GNU Binutils.
+   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 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.
+   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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   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.  */
 
 
 /* Contributed by Steve Chamberlain
@@ -25,14 +27,12 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 */
 #define DONTDECLARE_MALLOC
+#include "sysdep.h"
 #include "bfd.h"
-#include <sysdep.h>
 #include "arsup.h"
-extern int interactive;
-extern bfd *inarch;
 extern int verbose;
-void (*command)();
-FILE *listing;
+extern int yylex (void);
+static int yyerror (const char *);
 %}
 
 %union {
@@ -76,6 +76,7 @@ session:
 
 command_line:
 		command NEWLINE { prompt(); }
+	;
 
 command:
 		open_command	
@@ -86,15 +87,22 @@ command:
 	|	clear_command
 	|	addmod_command
 	| 	save_command
+        |       extract_command
 	|	replace_command
 	|	delete_command
 	|	list_command
-	| 	END	 { return 0; }
+	| 	END	 { ar_end(); return 0; }
 	| 	error
+	|       FILENAME { yyerror("foo"); }
 	|
 	;
 
 
+extract_command:
+                EXTRACT modulename
+		{ ar_extract($2); }
+	;
+
 replace_command:	
 		REPLACE modulename
 		{ ar_replace($2); }
@@ -186,12 +194,11 @@ verbose_command:
 
 %%
 
-
-int
-yyerror(x)
-char *x;
+static int
+yyerror (const char *x ATTRIBUTE_UNUSED)
 {
   extern int linenumber;
-  printf("Synax error in archive script, line %d\n", linenumber + 1);
+
+  printf (_("Syntax error in archive script, line %d\n"), linenumber + 1);
   return 0;
 }