Re: [java]source location patch

[Zack Weinberg <zack at codesourcery dot com>]

Nathan Sidwell <nathan@codesourcery.com> writes:

> Hi,
> Although not necessary for the input_location change patch, this turns out
> to be useful in canonicalizing location_t usage. I was updating
> java to use location_t and input_location, and tripped over this bit of
> missing change.
>
> built & tested on i686-pc-linux-gnu, ok?

Looks good to me, but wait 24 hours in case one of the Java
maintainers has an objection.  (Java patches should be cc:ed to
java-patches@gcc.gnu.org; I've added them to the list and quoted the
complete patch for reference.)

zw

>
> nathan
> -- 
> Nathan Sidwell    ::   http://www.codesourcery.com   ::     CodeSourcery LLC
>           The voices in my head said this was stupid too
> nathan@codesourcery.com    ::     http://www.planetfall.pwp.blueyonder.co.uk
>
> 2003-05-03  Nathan Sidwell  <nathan@codesourcery.com>
>
> 	* Make-lang.in (java/parse.o, java/parse-scan.o): Depend on input.h.
> 	* lex.h: #include input.h.
> 	* jv-scan.c (input_filename): Remove.
>
> Index: java/Make-lang.in
> ===================================================================
> RCS file: /cvs/gcc/gcc/gcc/java/Make-lang.in,v
> retrieving revision 1.107
> diff -c -3 -p -r1.107 Make-lang.in
> *** java/Make-lang.in	10 Apr 2003 18:24:42 -0000	1.107
> --- java/Make-lang.in	3 May 2003 16:47:23 -0000
> *************** JAVA_LEX_C = java/lex.c java/keyword.h j
> *** 271,277 ****
>   
>   java/parse.o: $(parsedir)/java/parse.c java/jcf-reader.c $(CONFIG_H) $(SYSTEM_H) \
>     coretypes.h $(TM_H) function.h $(JAVA_TREE_H) $(JAVA_LEX_C) java/parse.h \
> !   java/lex.h $(GGC_H) debug.h gt-java-parse.h gtype-java.h
>   java/jcf-dump.o: $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(JAVA_TREE_H) \
>     java/jcf-dump.c java/jcf-reader.c java/jcf.h java/javaop.h java/javaop.def \
>     version.h $(GGC_H)
> --- 271,277 ----
>   
>   java/parse.o: $(parsedir)/java/parse.c java/jcf-reader.c $(CONFIG_H) $(SYSTEM_H) \
>     coretypes.h $(TM_H) function.h $(JAVA_TREE_H) $(JAVA_LEX_C) java/parse.h \
> !   java/lex.h input.h $(GGC_H) debug.h gt-java-parse.h gtype-java.h
>   java/jcf-dump.o: $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(JAVA_TREE_H) \
>     java/jcf-dump.c java/jcf-reader.c java/jcf.h java/javaop.h java/javaop.def \
>     version.h $(GGC_H)
> *************** java/mangle.o: java/mangle.c $(CONFIG_H)
> *** 328,334 ****
>   java/mangle_name.o: java/mangle_name.c $(CONFIG_H) java/jcf.h $(JAVA_TREE_H) \
>     $(SYSTEM_H) coretypes.h $(TM_H) toplev.h $(GGC_H)
>   java/parse-scan.o: $(parsedir)/java/parse-scan.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) toplev.h \
> !   $(JAVA_LEX_C) java/parse.h java/lex.h
>   java/resource.o: java/resource.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
>     $(JAVA_TREE_H) $(RTL_H) java/jcf.h java/parse.h toplev.h output.h $(GGC_H) \
>     $(TARGET_H) function.h gt-java-resource.h
> --- 328,334 ----
>   java/mangle_name.o: java/mangle_name.c $(CONFIG_H) java/jcf.h $(JAVA_TREE_H) \
>     $(SYSTEM_H) coretypes.h $(TM_H) toplev.h $(GGC_H)
>   java/parse-scan.o: $(parsedir)/java/parse-scan.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) toplev.h \
> !   $(JAVA_LEX_C) java/parse.h java/lex.h input.h
>   java/resource.o: java/resource.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
>     $(JAVA_TREE_H) $(RTL_H) java/jcf.h java/parse.h toplev.h output.h $(GGC_H) \
>     $(TARGET_H) function.h gt-java-resource.h
> Index: java/jv-scan.c
> ===================================================================
> RCS file: /cvs/gcc/gcc/gcc/java/jv-scan.c,v
> retrieving revision 1.39
> diff -c -3 -p -r1.39 jv-scan.c
> *** java/jv-scan.c	6 Apr 2003 21:44:09 -0000	1.39
> --- java/jv-scan.c	3 May 2003 16:47:44 -0000
> *************** static void version (void) ATTRIBUTE_NOR
> *** 55,63 ****
>   /* Current input file and output file IO streams.  */
>   FILE *finput, *out;
>   
> - /* Current input filename.  */
> - char *input_filename;
> - 
>   /* Executable name.  */
>   char *exec_name;
>   
> --- 55,60 ----
> Index: java/lex.h
> ===================================================================
> RCS file: /cvs/gcc/gcc/gcc/java/lex.h,v
> retrieving revision 1.34
> diff -c -3 -p -r1.34 lex.h
> *** java/lex.h	2 May 2003 11:33:06 -0000	1.34
> --- java/lex.h	3 May 2003 16:47:47 -0000
> *************** The Free Software Foundation is independ
> *** 27,32 ****
> --- 27,34 ----
>   #ifndef GCC_JAVA_LEX_H
>   #define GCC_JAVA_LEX_H
>   
> + #include "input.h"
> + 
>   /* Extern global variables declarations  */
>   extern FILE *finput;
>