diff options
| author | Tom Tromey <tromey@cygnus.com> | 1998-10-22 12:06:05 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 1998-10-22 12:06:05 +0000 |
| commit | 8603f9c5b022356e3993539be8c70358d935c710 (patch) | |
| tree | 9b6b5425af73b8159f8c9b6dcf195daebe2e6914 /gcc/java/parse.c | |
| parent | 8a829fd982378e9ae9f603e2df8d157e1f7c3d83 (diff) | |
| download | gcc-8603f9c5b022356e3993539be8c70358d935c710.zip gcc-8603f9c5b022356e3993539be8c70358d935c710.tar.gz gcc-8603f9c5b022356e3993539be8c70358d935c710.tar.bz2 | |
jcf-io.c (find_class): Use saw_java_source to determine when to look for `.java' file.
* jcf-io.c (find_class): Use saw_java_source to determine when to
look for `.java' file.
* jcf-parse.c (saw_java_source): New global.
(yyparse): Set it if `.java' file seen.
* Make-lang.in (JAVA_SRCS): Added jcf-path.c.
(GCJH_SOURCES): Likewise.
* Makefile.in (datadir): New macro.
(libjava_zip): Likewise.
(JAVA_OBJS): Added jcf-path.o.
(../jcf-dump$(exeext)): Depend on and link with jcf-depend.o.
(../gcjh$(exeext)): Likewise.
(jcf-path.o): New target.
* java-tree.h (fix_classpath): Removed decl.
* jcf-parse.c (fix_classpath): Removed.
(load_class): Don't call fix_classpath.
* parse.y (read_import_dir): Don't call fix_classpath.
* lex.h: Don't mention classpath.
* lex.c (java_init_lex): Don't initialize classpath.
* jcf-io.c (classpath): Removed global.
(find_class): Use jcf_path iteration functions. Correctly search
class path for .java file.
(open_in_zip): New argument `is_system'.
* jcf-dump.c (main): Call jcf_path_init. Recognize all new
classpath-related options.
* lang.c (lang_decode_option): Handle -fclasspath, -fCLASSPATH,
and -I.
(lang_init): Call jcf_path_init.
* lang-options.h: Mention -I, -fclasspath, and -fCLASSPATH.
* lang-specs.h: Handle -I. Minor cleanup to -M options.
Correctly put braces around second string in each entry.
* gjavah.c (main): Call jcf_path_init. Recognize all the new
classpath-related options.
(help): Updated for new options.
* jcf.h: Declare functions from jcf-path.c. Don't mention
`classpath' global.
* jcf-path.c: New file.
* jcf-depend.c: Include jcf.h.
* jcf-write.c (localvar_alloc): Returns `void'.
(localvar_free): Removed unused variable.
* lang.c (OBJECT_SUFFIX): Define if not already defined.
(init_parse): Use OBJECT_SUFFIX, not ".o".
From-SVN: r23219
Diffstat (limited to 'gcc/java/parse.c')
| -rw-r--r-- | gcc/java/parse.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gcc/java/parse.c b/gcc/java/parse.c index cd66dd0..0d0f964 100644 --- a/gcc/java/parse.c +++ b/gcc/java/parse.c @@ -2068,7 +2068,7 @@ static const short yycheck[] = { 3, #define YYPURE 1 /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ -#line 3 "bison.simple" +#line 3 "/x1/java-install/share/bison.simple" /* Skeleton output parser for bison, Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc. @@ -2261,7 +2261,7 @@ __yy_memcpy (char *to, char *from, int count) #endif #endif -#line 196 "bison.simple" +#line 196 "/x1/java-install/share/bison.simple" /* The user can define YYPARSE_PARAM as the name of an argument to be passed into yyparse. The argument should have type void *. @@ -4462,7 +4462,7 @@ case 492: break;} } /* the action file gets copied in in place of this dollarsign */ -#line 498 "bison.simple" +#line 498 "/x1/java-install/share/bison.simple" yyvsp -= yylen; yyssp -= yylen; @@ -6928,8 +6928,6 @@ read_import_dir (wfl) char *founddirname, *d_name; jcf = &jcfr; - if (!classpath) - fix_classpath (); if (!(founddirname = find_class (name, name_len, jcf, 0))) fatal ("Can't import `%s'", name); if (jcf->outofsynch) |