Make-lang.in (F77_OBJS, [...]): Update.

	* Make-lang.in (F77_OBJS, f77.mostlyclean, f/com.o): Update.
	(f/f-options.c, f/f-options.h): New.
	* com.c: Include opts.h and f-options.h.
	(ffecom_decode_include_option_): Remove.
	(LANG_HOOKS_HANDLE_OPTION): New.
	(LANG_HOOKS_DECODE_OPTION): Drop.
	(struct file_name_list, ffecom_decode_include_option,
	ffecom_open_include_): Constify.
	* com.h (ffecom_decode_include_option): Update.
	* lang.opt: New.
	* top.c: Include f-options.h, opts.h.
	(ffe_is_digit_string_): Constify.
	(ffe_decode_option): Transform to ffe_handle_option.
	* top.h (ffe_decode_option): Replace with ffe_handle_option.

From-SVN: r67628

gcc/f/ChangeLog

+Sun Jun  8 15:42:09 2003  Neil Booth  <neil@daikokuya.co.uk>
+
+	* Make-lang.in (F77_OBJS, f77.mostlyclean, f/com.o): Update.
+	(f/f-options.c, f/f-options.h): New.
+	* com.c: Include opts.h and f-options.h.
+	(ffecom_decode_include_option_): Remove.
+	(LANG_HOOKS_HANDLE_OPTION): New.
+	(LANG_HOOKS_DECODE_OPTION): Drop.
+	(struct file_name_list, ffecom_decode_include_option,
+	ffecom_open_include_): Constify.
+	* com.h (ffecom_decode_include_option): Update.
+	* lang.opt: New.
+	* top.c: Include f-options.h, opts.h.
+	(ffe_is_digit_string_): Constify.
+	(ffe_decode_option): Transform to ffe_handle_option.
+	* top.h (ffe_decode_option): Replace with ffe_handle_option.
+
 2003-06-08  Andreas Jaeger  <aj@suse.de>
 
 	* std.c: Remove #if 0'ed functions.

gcc/f/Make-lang.in

@@ -88,7 +88,7 @@ g77-cross$(exeext): g77$(exeext)
 
 F77_OBJS = f/bad.o f/bit.o f/bld.o f/com.o f/data.o f/equiv.o f/expr.o \
  f/global.o f/implic.o f/info.o f/intrin.o f/lab.o f/lex.o f/malloc.o \
- f/name.o f/parse.o f/src.o f/st.o f/sta.o f/stb.o f/stc.o \
+ f/name.o f/f-options.o f/parse.o f/src.o f/st.o f/sta.o f/stb.o f/stc.o \
  f/std.o f/ste.o f/storag.o f/stp.o f/str.o f/sts.o f/stt.o f/stu.o \
  f/stv.o f/stw.o f/symbol.o f/target.o f/top.o f/type.o f/where.o
 
@@ -320,6 +320,7 @@ f77.uninstall: installdirs
 f77.mostlyclean:
 	-rm -f f/*$(objext)
 	-rm -f f/*$(coverageexts)
+	-rm -f f/f-options.c f/f-options.h
 	-rm -f f/fini$(build_exeext) f/stamp-str f/str-*.h f/str-*.j
 	-rm -f f/intdoc$(build_exeext) f/ansify$(build_exeext) f/intdoc.h0
 	-rm -f g77.aux g77.cps g77.ky g77.toc g77.vr g77.fn g77.kys \
@@ -542,8 +543,14 @@ f/top.o: f/top.c f/proj.h $(CONFIG_H) $(SYSTEM_H) f/top.h f/malloc.h f/where.h \
  f/info-w.def f/target.h f/lex.h f/type.h f/lab.h f/storag.h \
  f/symbol.h f/symbol.def f/equiv.h f/global.h f/name.h f/intrin.h \
  f/intrin.def f/data.h f/expr.h f/implic.h f/src.h f/st.h flags.h \
- toplev.h coretypes.h $(TM_H) opts.h
+ toplev.h coretypes.h $(TM_H) opts.h f/f-options.h
 f/type.o: f/type.c f/proj.h $(CONFIG_H) $(SYSTEM_H) f/type.h f/malloc.h \
  coretypes.h $(TM_H)
 f/where.o: f/where.c f/proj.h $(CONFIG_H) $(SYSTEM_H) f/where.h glimits.h \
  f/top.h f/malloc.h f/lex.h $(GGC_H) gt-f-where.h coretypes.h $(TM_H)
+
+f/f-options.c: f/lang.opt opts.sh f/f-options.h
+
+f/f-options.h: f/lang.opt opts.sh
+	AWK=$(AWK) $(SHELL) $(srcdir)/opts.sh f/f-options.c \
+		f/f-options.h $(srcdir)/f/lang.opt

gcc/f/com.c

@@ -389,7 +389,6 @@ static tree start_decl (tree decl, bool is_top_level);
 static void start_function (tree name, tree type, int nested, int public);
 static void ffecom_file_ (const char *name);
 static void ffecom_close_include_ (FILE *f);
-static int ffecom_decode_include_option_ (char *spec);
 static FILE *ffecom_open_include_ (char *name, ffewhereLine l,
 				   ffewhereColumn c);
 
@@ -10697,12 +10696,6 @@ ffecom_close_include (FILE *f)
   ffecom_close_include_ (f);
 }
 
-int
-ffecom_decode_include_option (char *spec)
-{
-  return ffecom_decode_include_option_ (spec);
-}
-
 /* End a compound statement (block).  */
 
 tree
@@ -14148,8 +14141,8 @@ struct language_function GTY(())
 #define LANG_HOOKS_FINISH		ffe_finish
 #undef  LANG_HOOKS_INIT_OPTIONS
 #define LANG_HOOKS_INIT_OPTIONS		ffe_init_options
-#undef  LANG_HOOKS_DECODE_OPTION
-#define LANG_HOOKS_DECODE_OPTION	ffe_decode_option
+#undef  LANG_HOOKS_HANDLE_OPTION
+#define LANG_HOOKS_HANDLE_OPTION	ffe_handle_option
 #undef  LANG_HOOKS_POST_OPTIONS
 #define LANG_HOOKS_POST_OPTIONS		ffe_post_options
 #undef  LANG_HOOKS_PARSE_FILE
@@ -15119,7 +15112,7 @@ static int max_include_len = 0;
 struct file_name_list
   {
     struct file_name_list *next;
-    char *fname;
+    const char *fname;
     /* Mapping of file names for this directory.  */
     struct file_name_map *name_map;
     /* Nonzero if name_map is valid.  */
@@ -15486,26 +15479,20 @@ ffecom_close_include_ (FILE *f)
   ffewhere_column_kill (instack[indepth].column);
 }
 
-static int
-ffecom_decode_include_option_ (char *spec)
+void
+ffecom_decode_include_option (const char *dir)
 {
-  struct file_name_list *dirtmp;
-
-  if (! ignore_srcdir && !strcmp (spec, "-"))
+  if (! ignore_srcdir && !strcmp (dir, "-"))
     ignore_srcdir = 1;
   else
     {
-      dirtmp = (struct file_name_list *)
+      struct file_name_list *dirtmp = (struct file_name_list *)
 	xmalloc (sizeof (struct file_name_list));
       dirtmp->next = 0;		/* New one goes on the end */
-      dirtmp->fname = spec;
+      dirtmp->fname = dir;
       dirtmp->got_name_map = 0;
-      if (spec[0] == 0)
-	error ("directory name must immediately follow -I");
-      else
-	append_include_chain (dirtmp, dirtmp);
+      append_include_chain (dirtmp, dirtmp);
     }
-  return 1;
 }
 
 /* Open INCLUDEd file.  */
@@ -15560,9 +15547,10 @@ ffecom_open_include_ (char *name, ffewhereLine l, ffewhereColumn c)
 	      if (ep != NULL)
 		{
 		  n = ep - nam;
-		  dsp[0].fname = (char *) xmalloc (n + 1);
-		  strncpy (dsp[0].fname, nam, n);
-		  dsp[0].fname[n] = '\0';
+		  fname = xmalloc (n + 1);
+		  strncpy (fname, nam, n);
+		  fname[n] = '\0';
+		  dsp[0].fname = fname;
 		  if (n + INCLUDE_LEN_FUDGE > max_include_len)
 		    max_include_len = n + INCLUDE_LEN_FUDGE;
 		}
@@ -15670,7 +15658,7 @@ ffecom_open_include_ (char *name, ffewhereLine l, ffewhereColumn c)
     }
 
   if (dsp[0].fname != NULL)
-    free (dsp[0].fname);
+    free ((char *) dsp[0].fname);
 
   if (f == NULL)
     return NULL;

gcc/f/com.h

@@ -213,7 +213,7 @@ tree ffecom_const_expr (ffebld expr);
 tree ffecom_decl_field (tree context, tree prevfield, const char *name,
 			tree type);
 void ffecom_close_include (FILE *f);
-int ffecom_decode_include_option (char *spec);
+void ffecom_decode_include_option (const char *dir);
 tree ffecom_end_compstmt (void);
 void ffecom_end_transition (void);
 void ffecom_exec_transition (void);

gcc/f/lang.opt

+; Options for the Fortran 77 front end.
+; Copyright (C) 2003 Free Software Foundation, Inc.
+;
+; This file is part of GCC.
+;
+; GCC 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, or (at your option) any later
+; version.
+; 
+; GCC 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 GCC; see the file COPYING.  If not, write to the Free
+; Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+; 02111-1307, USA.
+
+
+; This file is processed by the script opts.sh.  It is a database of
+; command line options, with each record separated by a blank line,
+; and each field appearing on its own line.  The first field is the
+; command-line switch with the leading "-" removed.  All options
+; beginning with "f" or "W" are implicitly assumed to take a "no-"
+; form; this form should not be listed.  If you do not want this
+; negative form and you want it to be automatically rejected, add
+; RejectNegative to the second field.
+
+; The second field should contain "F77".  If the switch takes an
+; argument, then you should also specify "Joined" and/or "Separate" to
+; indicate where the argument can appear.
+
+; Comments can appear on their own line anwhere in the file, preceded
+; by a semicolon.  Whitespace is permitted before the semicolon.
+
+; For each switch XXX below, an enumeration constant is created by the
+; script opts.sh spelt OPT_XXX, but with all non-alphanumeric
+; characters replaced with an underscore.
+
+; Please try to keep this file in ASCII collating order.
+
+I
+F77 Joined
+
+Wall
+F77
+
+Wcomment
+F77
+
+Wcomments
+F77
+
+Wglobals
+F77
+
+Wimplicit
+F77
+
+Wimport
+F77
+
+Wsurprising
+F77
+
+Wtrigraphs
+F77
+
+fautomatic
+F77
+
+fbackslash
+F77
+
+fbadu77-intrinsics-delete
+F77 RejectNegative
+
+fbadu77-intrinsics-disable
+F77 RejectNegative
+
+fbadu77-intrinsics-enable
+F77 RejectNegative
+
+fbadu77-intrinsics-hide
+F77 RejectNegative
+
+fcase-initcap
+F77 RejectNegative
+
+fcase-lower
+F77 RejectNegative
+
+fcase-preserve
+F77 RejectNegative
+
+fcase-strict-lower
+F77 RejectNegative
+
+fcase-strict-upper
+F77 RejectNegative
+
+fcase-upper
+F77 RejectNegative
+
+fdebug-kludge
+F77
+
+fdollar-ok
+F77
+
+femulate-complex
+F77
+
+ff2c
+F77
+
+ff2c-intrinsics-delete
+F77 RejectNegative
+
+ff2c-intrinsics-disable
+F77 RejectNegative
+
+ff2c-intrinsics-enable
+F77 RejectNegative
+
+ff2c-intrinsics-hide
+F77 RejectNegative
+
+ff2c-library
+F77
+
+ff66
+F77
+
+ff77
+F77
+
+ff90
+F77
+
+ff90-intrinsics-delete
+F77 RejectNegative
+
+ff90-intrinsics-disable
+F77 RejectNegative
+
+ff90-intrinsics-enable
+F77 RejectNegative
+
+ff90-intrinsics-hide
+F77 RejectNegative
+
+ff90-not-vxt
+F77 RejectNegative
+
+ffixed-form
+F77
+
+ffixed-line-length-
+F77 Joined
+
+fflatten-arrays
+F77
+
+ffortran-bounds-check
+F77
+
+ffree-form
+F77
+
+fglobals
+F77
+
+fgnu-intrinsics-delete
+F77 RejectNegative
+
+fgnu-intrinsics-disable
+F77 RejectNegative
+
+fgnu-intrinsics-enable
+F77 RejectNegative
+
+fgnu-intrinsics-hide
+F77 RejectNegative
+
+finit-local-zero
+F77
+
+fintrin-case-any
+F77 RejectNegative
+
+fintrin-case-initcap
+F77 RejectNegative
+
+fintrin-case-lower
+F77 RejectNegative
+
+fintrin-case-upper
+F77 RejectNegative
+
+fmatch-case-any
+F77 RejectNegative
+
+fmatch-case-initcap
+F77 RejectNegative
+
+fmatch-case-lower
+F77 RejectNegative
+
+fmatch-case-upper
+F77 RejectNegative
+
+fmil-intrinsics-delete
+F77 RejectNegative
+
+fmil-intrinsics-disable
+F77 RejectNegative
+
+fmil-intrinsics-enable
+F77 RejectNegative
+
+fmil-intrinsics-hide
+F77 RejectNegative
+
+fonetrip
+F77
+
+fpedantic
+F77
+
+fsecond-underscore
+F77
+
+fsilent
+F77
+
+fsource-case-lower
+F77 RejectNegative
+
+fsource-case-preserve
+F77 RejectNegative
+
+fsource-case-upper
+F77 RejectNegative
+
+fsymbol-case-any
+F77 RejectNegative
+
+fsymbol-case-initcap
+F77 RejectNegative
+
+fsymbol-case-lower
+F77 RejectNegative
+
+fsymbol-case-upper
+F77 RejectNegative
+
+ftypeless-boz
+F77
+
+fugly
+F77
+
+fugly-args
+F77
+
+fugly-assign
+F77
+
+fugly-assumed
+F77
+
+fugly-comma
+F77
+
+fugly-complex
+F77
+
+fugly-init
+F77
+
+fugly-logint
+F77
+
+funderscoring
+F77
+
+funix-intrinsics-delete
+F77 RejectNegative
+
+funix-intrinsics-disable
+F77 RejectNegative
+
+funix-intrinsics-enable
+F77 RejectNegative
+
+funix-intrinsics-hide
+F77 RejectNegative
+
+fversion
+F77 RejectNegative
+
+fvxt
+F77
+
+fvxt-intrinsics-delete
+F77 RejectNegative
+
+fvxt-intrinsics-disable
+F77 RejectNegative
+
+fvxt-intrinsics-enable
+F77 RejectNegative
+
+fvxt-intrinsics-hide
+F77 RejectNegative
+
+fvxt-not-f90
+F77 RejectNegative
+
+fxyzzy
+F77
+
+fzeros
+F77
+
+; This comment is to ensure we retain the blank line above.

gcc/f/top.h

@@ -141,7 +141,7 @@ extern bool ffe_in_4;
 
 /* Declare functions with prototypes. */
 
-int ffe_decode_option (int argc, char **argv);
+int ffe_handle_option (size_t code, const char *arg, int on);
 void ffe_file (ffewhereFile wf, FILE *f);
 void ffe_init_0 (void);
 void ffe_init_1 (void);