1998-09-06 11:36:06 -04:00
|
|
|
/* Utility macros to read Java(TM) .class files and byte codes.
|
|
|
|
|
|
1999-02-01 02:00:40 -05:00
|
|
|
Copyright (C) 1996, 97-98, 1999 Free Software Foundation, Inc.
|
1998-09-06 11:36:06 -04:00
|
|
|
|
|
|
|
|
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, 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 GNU CC; see the file COPYING. If not, write to
|
|
|
|
|
the Free Software Foundation, 59 Temple Place - Suite 330,
|
|
|
|
|
Boston, MA 02111-1307, USA.
|
|
|
|
|
|
|
|
|
|
Java and all Java-based marks are trademarks or registered trademarks
|
|
|
|
|
of Sun Microsystems, Inc. in the United States and other countries.
|
|
|
|
|
The Free Software Foundation is independent of Sun Microsystems, Inc. */
|
|
|
|
|
|
|
|
|
|
/* Written by Per Bothner <bothner@cygnus.com>, February 1996. */
|
|
|
|
|
|
|
|
|
|
#ifndef JCF_H
|
|
|
|
|
#define JCF_H
|
|
|
|
|
#include "javaop.h"
|
|
|
|
|
#ifndef DEFUN
|
|
|
|
|
#if defined (__STDC__)
|
|
|
|
|
#define AND ,
|
|
|
|
|
#define PTR void *
|
|
|
|
|
#define DEFUN(name, arglist, args) name(args)
|
|
|
|
|
#else
|
|
|
|
|
#define PTR char *
|
|
|
|
|
#define AND ;
|
|
|
|
|
#define DEFUN(name, arglist, args) name arglist args;
|
|
|
|
|
#endif
|
|
|
|
|
#endif /* !DEFUN */
|
|
|
|
|
|
|
|
|
|
#ifndef PROTO
|
|
|
|
|
#if defined (__STDC__)
|
|
|
|
|
#define PROTO(paramlist) paramlist
|
|
|
|
|
#else
|
|
|
|
|
#define PROTO(paramlist) ()
|
|
|
|
|
#endif
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#ifndef JCF_u4
|
|
|
|
|
#define JCF_u4 unsigned long
|
|
|
|
|
#endif
|
|
|
|
|
#ifndef JCF_u2
|
|
|
|
|
#define JCF_u2 unsigned short
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#define ALLOC (void*)malloc
|
|
|
|
|
#define REALLOC (void*)realloc
|
|
|
|
|
#ifndef FREE
|
|
|
|
|
#define FREE(PTR) free(PTR)
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#ifdef JCF_word
|
|
|
|
|
#define JCF_word JCF_u4
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#define JCF_ZIP 1
|
|
|
|
|
#define JCF_CLASS 2
|
|
|
|
|
#define JCF_SOURCE 3
|
|
|
|
|
|
|
|
|
|
struct JCF;
|
|
|
|
|
typedef int (*jcf_filbuf_t) PROTO ((struct JCF*, int needed));
|
|
|
|
|
|
|
|
|
|
typedef struct CPool {
|
|
|
|
|
/* Available number of elements in the constants array, before it
|
|
|
|
|
must be re-allocated. */
|
|
|
|
|
int capacity;
|
|
|
|
|
|
|
|
|
|
/* The constant_pool_count. */
|
|
|
|
|
int count;
|
|
|
|
|
|
|
|
|
|
uint8* tags;
|
|
|
|
|
|
|
|
|
|
jword* data;
|
|
|
|
|
} CPool;
|
|
|
|
|
|
|
|
|
|
/* JCF encapsulates the state of reading a Java Class File. */
|
|
|
|
|
|
|
|
|
|
typedef struct JCF {
|
|
|
|
|
unsigned char *buffer;
|
|
|
|
|
unsigned char *buffer_end;
|
|
|
|
|
unsigned char *read_ptr;
|
|
|
|
|
unsigned char *read_end;
|
|
|
|
|
int seen_in_zip;
|
|
|
|
|
int java_source;
|
|
|
|
|
int outofsynch; /* Found a class file out of synch
|
|
|
|
|
with the matching source file. */
|
|
|
|
|
long zip_offset;
|
|
|
|
|
jcf_filbuf_t filbuf;
|
|
|
|
|
void *read_state;
|
|
|
|
|
char *filename;
|
|
|
|
|
char *classname;
|
|
|
|
|
void *zipd; /* Directory entry where it was found */
|
|
|
|
|
JCF_u2 access_flags, this_class, super_class;
|
|
|
|
|
CPool cpool;
|
|
|
|
|
} JCF;
|
|
|
|
|
/*typedef JCF* JCF_FILE;*/
|
|
|
|
|
|
|
|
|
|
/* The CPOOL macros take a (pointer to a) CPool.
|
|
|
|
|
The JPOOL macros take a (pointer to a) JCF.
|
|
|
|
|
Some of the latter should perhaps be deprecated or removed. */
|
|
|
|
|
|
|
|
|
|
#define CPOOL_COUNT(CPOOL) ((CPOOL)->count)
|
|
|
|
|
#define JPOOL_SIZE(JCF) CPOOL_COUNT(&(JCF)->cpool)
|
|
|
|
|
#define JPOOL_TAG(JCF, INDEX) ((JCF)->cpool.tags[INDEX])
|
|
|
|
|
/* The INDEX'th constant pool entry as a JCF_u4. */
|
|
|
|
|
#define CPOOL_UINT(CPOOL, INDEX) ((CPOOL)->data[INDEX])
|
|
|
|
|
#define JPOOL_UINT(JCF, INDEX) CPOOL_UINT(&(JCF)->cpool, INDEX) /*deprecated*/
|
|
|
|
|
/* The first uint16 of the INDEX'th constant pool entry. */
|
|
|
|
|
#define CPOOL_USHORT1(CPOOL, INDEX) ((CPOOL)->data[INDEX] & 0xFFFF)
|
|
|
|
|
#define JPOOL_USHORT1(JCF, INDEX) CPOOL_USHORT1(&(JCF)->cpool, INDEX)
|
|
|
|
|
/* The second uint16 of the INDEX'th constant pool entry. */
|
|
|
|
|
#define CPOOL_USHORT2(CPOOL, INDEX) ((CPOOL)->data[INDEX] >> 16)
|
|
|
|
|
#define JPOOL_USHORT2(JCF, INDEX) CPOOL_USHORT2(&(JCF)->cpool, INDEX)
|
|
|
|
|
#define JPOOL_LONG(JCF, INDEX) \
|
|
|
|
|
WORDS_TO_LONG (JPOOL_UINT(JCF, INDEX), JPOOL_UINT(JCF, (INDEX)+1))
|
|
|
|
|
#define JPOOL_DOUBLE(JCF, INDEX) \
|
|
|
|
|
WORDS_TO_DOUBLE (JPOOL_UINT(JCF, INDEX), JPOOL_UINT(JCF, (INDEX)+1))
|
|
|
|
|
#ifndef JPOOL_UTF_LENGTH
|
|
|
|
|
#define JPOOL_UTF_LENGTH(JCF, INDEX) \
|
|
|
|
|
GET_u2 ((JCF)->buffer+JPOOL_UINT(JCF, INDEX))
|
|
|
|
|
#endif
|
|
|
|
|
#ifndef JPOOL_UTF_DATA
|
|
|
|
|
#define JPOOL_UTF_DATA(JCF, INDEX) \
|
|
|
|
|
((JCF)->buffer+JPOOL_UINT(JCF, INDEX)+2)
|
|
|
|
|
#endif
|
|
|
|
|
#define JPOOL_INT(JCF, INDEX) ((jint) JPOOL_UINT (JCF, INDEX))
|
|
|
|
|
#define JPOOL_FLOAT(JCF, INDEX) WORD_TO_FLOAT (JPOOL_UINT (JCF, INDEX))
|
|
|
|
|
|
|
|
|
|
#define CPOOL_INDEX_IN_RANGE(CPOOL, INDEX) \
|
|
|
|
|
((INDEX) > 0 && (INDEX) < CPOOL_COUNT(CPOOL))
|
|
|
|
|
|
|
|
|
|
#define CPOOL_FINISH(CPOOL) { \
|
|
|
|
|
if ((CPOOL)->tags) FREE ((CPOOL)->tags); \
|
|
|
|
|
if ((CPOOL)->data) FREE ((CPOOL)->data); }
|
|
|
|
|
|
|
|
|
|
#define JCF_FINISH(JCF) { \
|
|
|
|
|
CPOOL_FINISH(&(JCF)->cpool); \
|
|
|
|
|
if ((JCF)->buffer) FREE ((JCF)->buffer); \
|
|
|
|
|
if ((JCF)->filename) FREE ((JCF)->filename); \
|
|
|
|
|
if ((JCF)->classname) FREE ((JCF)->classname); }
|
|
|
|
|
|
|
|
|
|
#define CPOOL_INIT(CPOOL) \
|
|
|
|
|
((CPOOL)->capacity = 0, (CPOOL)->count = 0, (CPOOL)->tags = 0, (CPOOL)->data = 0)
|
|
|
|
|
|
|
|
|
|
#define CPOOL_REINIT(CPOOL) ((CPOOL)->count = 0)
|
|
|
|
|
|
|
|
|
|
#define JCF_ZERO(JCF) \
|
|
|
|
|
((JCF)->buffer = (JCF)->buffer_end = (JCF)->read_ptr = (JCF)->read_end = 0,\
|
|
|
|
|
(JCF)->read_state = 0, (JCF)->filename = (JCF)->classname = 0, \
|
|
|
|
|
CPOOL_INIT(&(JCF)->cpool), (JCF)->java_source = 0)
|
|
|
|
|
|
|
|
|
|
/* Given that PTR points to a 2-byte unsigned integer in network
|
|
|
|
|
(big-endian) byte-order, return that integer. */
|
|
|
|
|
#define GET_u2(PTR) (((PTR)[0] << 8) | ((PTR)[1]))
|
|
|
|
|
/* Like GET_u2, but for little-endian format. */
|
|
|
|
|
#define GET_u2_le(PTR) (((PTR)[1] << 8) | ((PTR)[0]))
|
|
|
|
|
|
|
|
|
|
/* Given that PTR points to a 4-byte unsigned integer in network
|
|
|
|
|
(big-endian) byte-order, return that integer. */
|
|
|
|
|
#define GET_u4(PTR) (((JCF_u4)(PTR)[0] << 24) | ((JCF_u4)(PTR)[1] << 16) \
|
|
|
|
|
| ((JCF_u4)(PTR)[2] << 8) | ((JCF_u4)(PTR)[3]))
|
|
|
|
|
/* Like GET_u4, but for little-endian order. */
|
|
|
|
|
#define GET_u4_le(PTR) (((JCF_u4)(PTR)[3] << 24) | ((JCF_u4)(PTR)[2] << 16) \
|
|
|
|
|
| ((JCF_u4)(PTR)[1] << 8) | ((JCF_u4)(PTR)[0]))
|
|
|
|
|
|
|
|
|
|
/* Make sure there are COUNT bytes readable. */
|
|
|
|
|
#define JCF_FILL(JCF, COUNT) \
|
|
|
|
|
((JCF)->read_end-(JCF)->read_ptr >= (COUNT) ? 0 : (*(JCF)->filbuf)(JCF, COUNT))
|
|
|
|
|
#define JCF_GETC(JCF) (JCF_FILL(JCF, 1) ? -1 : *(JCF)->read_ptr++)
|
|
|
|
|
#define JCF_READ(JCF, BUFFER, N) \
|
|
|
|
|
(memcpy (BUFFER, (JCF)->read_ptr, N), (JCF)->read_ptr += (N))
|
|
|
|
|
#define JCF_SKIP(JCF,N) ((JCF)->read_ptr += (N))
|
|
|
|
|
#define JCF_readu(JCF) (*(JCF)->read_ptr++)
|
|
|
|
|
|
|
|
|
|
/* Reads an unsigned 2-byte integer in network (big-endian) byte-order
|
|
|
|
|
from JCF. Returns that integer.
|
|
|
|
|
Does not check for EOF (make sure to call JCF_FILL before-hand). */
|
|
|
|
|
#define JCF_readu2(JCF) ((JCF)->read_ptr += 2, GET_u2 ((JCF)->read_ptr-2))
|
|
|
|
|
#define JCF_readu2_le(JCF) ((JCF)->read_ptr += 2, GET_u2_le((JCF)->read_ptr-2))
|
|
|
|
|
|
|
|
|
|
/* Like JCF_readu2, but read a 4-byte unsigned integer. */
|
|
|
|
|
#define JCF_readu4(JCF) ((JCF)->read_ptr += 4, GET_u4 ((JCF)->read_ptr-4))
|
|
|
|
|
#define JCF_readu4_le(JCF) ((JCF)->read_ptr += 4, GET_u4_le((JCF)->read_ptr-4))
|
|
|
|
|
|
|
|
|
|
#define JCF_TELL(JCF) ((JCF)->read_ptr - (JCF)->buffer)
|
|
|
|
|
#define JCF_SEEK(JCF, POS) ((JCF)->read_ptr = (JCF)->buffer + (POS))
|
|
|
|
|
|
|
|
|
|
#define ACC_PUBLIC 0x0001
|
|
|
|
|
#define ACC_PRIVATE 0x0002
|
|
|
|
|
#define ACC_PROTECTED 0x0004
|
|
|
|
|
#define ACC_STATIC 0x0008
|
|
|
|
|
#define ACC_FINAL 0x0010
|
|
|
|
|
#define ACC_SYNCHRONIZED 0x0020
|
|
|
|
|
#define ACC_SUPER 0x0020
|
|
|
|
|
#define ACC_VOLATILE 0x0040
|
|
|
|
|
#define ACC_TRANSIENT 0x0080
|
|
|
|
|
#define ACC_NATIVE 0x0100
|
|
|
|
|
#define ACC_INTERFACE 0x0200
|
|
|
|
|
#define ACC_ABSTRACT 0x0400
|
|
|
|
|
|
|
|
|
|
#define CONSTANT_Class 7
|
|
|
|
|
#define CONSTANT_Fieldref 9
|
|
|
|
|
#define CONSTANT_Methodref 10
|
|
|
|
|
#define CONSTANT_InterfaceMethodref 11
|
|
|
|
|
#define CONSTANT_String 8
|
|
|
|
|
#define CONSTANT_Integer 3
|
|
|
|
|
#define CONSTANT_Float 4
|
|
|
|
|
#define CONSTANT_Long 5
|
|
|
|
|
#define CONSTANT_Double 6
|
|
|
|
|
#define CONSTANT_NameAndType 12
|
|
|
|
|
#define CONSTANT_Utf8 1
|
|
|
|
|
#define CONSTANT_Unicode 2
|
|
|
|
|
|
|
|
|
|
#define DEFAULT_CLASS_PATH "."
|
|
|
|
|
|
|
|
|
|
extern char *find_class PROTO ((const char *, int, JCF*, int));
|
1998-10-14 08:54:59 -04:00
|
|
|
extern char *find_classfile PROTO ((char *, JCF*, char *));
|
1998-09-06 11:36:06 -04:00
|
|
|
extern int jcf_filbuf_from_stdio PROTO ((JCF *jcf, int count));
|
|
|
|
|
extern void jcf_out_of_synch PROTO((JCF *));
|
|
|
|
|
extern int jcf_unexpected_eof PROTO ((JCF*, int));
|
|
|
|
|
|
|
|
|
|
/* Extract a character from a Java-style Utf8 string.
|
|
|
|
|
* PTR points to the current character.
|
|
|
|
|
* LIMIT points to the end of the Utf8 string.
|
|
|
|
|
* PTR is incremented to point after the character thta gets returns.
|
|
|
|
|
* On an error, -1 is returned. */
|
|
|
|
|
#define UTF8_GET(PTR, LIMIT) \
|
|
|
|
|
((PTR) >= (LIMIT) ? -1 \
|
|
|
|
|
: *(PTR) < 128 ? *(PTR)++ \
|
|
|
|
|
: (*(PTR)&0xE0) == 0xC0 && ((PTR)+=2)<=(LIMIT) && ((PTR)[-1]&0xC0) == 0x80 \
|
|
|
|
|
? (((PTR)[-2] & 0x1F) << 6) + ((PTR)[-1] & 0x3F) \
|
|
|
|
|
: (*(PTR) & 0xF0) == 0xE0 && ((PTR) += 3) <= (LIMIT) \
|
|
|
|
|
&& ((PTR)[-2] & 0xC0) == 0x80 && ((PTR)[-1] & 0xC0) == 0x80 \
|
|
|
|
|
? (((PTR)[-3]&0x1F) << 12) + (((PTR)[-2]&0x3F) << 6) + ((PTR)[-1]&0x3F) \
|
|
|
|
|
: ((PTR)++, -1))
|
|
|
|
|
|
1998-11-13 09:09:53 -05:00
|
|
|
extern char *jcf_write_base_directory;
|
|
|
|
|
|
1998-09-06 11:36:06 -04:00
|
|
|
/* Debug macros, for the front end */
|
|
|
|
|
|
|
|
|
|
extern int quiet_flag;
|
class.c (is_compiled_class): Call safe_layout_class for class compiled from source.
Tue Nov 10 12:34:03 1998 Alexandre Petit-Bianco <apbianco@cygnus.com>
* class.c (is_compiled_class): Call safe_layout_class for class
compiled from source.
* conver.h (convert_to_integer, convert_to_real,
convert_to_pointer): Added prototypes.
* decl.c (init_decl_processing): Non longer push the decls of
`methodtable', `constants', `Class', `Field', `dispatchTable'
`jexception' and `Method'.
* expr.c (build_invokeinterface): New function.
(expand_invoke): static variable CLASS_IDENT now in
build_invokeinterface. Use build_invokeinterface.
(expand_java_field_op): Moved code to inline
java.lang.PRIMTYPE.TYPE into a function.
(build_primtype_type_ref): New function.
* java-tree.def (INSTANCEOF_EXPR): New tree code.
* java-tree.h (CLASS_METHOD_CHECKED_P, METHOD_DEPRECATED,
FIELD_DEPRECATED, CLASS_DEPRECATED): New flag macros.
(DECL_CONSTRUCTOR_P): Fixed typo in comment.
(DECL_LOCAL_STATIC_VALUE): New macro.
(build_invokeinterface, build_primtype_type_ref): New function
prototypes.
(java_parse_abort_on_error): Macro rewritten.
* jcf-parse.c (current_method): Add comment to declaration.
(parse_zip_file_entries, process_zip_dir, void parse_source_file):
Function prototypes fixed.
(jcf_parse_source): push/pop parser context. save/restore global.
(parse_source_file): Fixed leading comment. Now take a
IDENTIFIER_NODE as an argument. Doesn't check methods, layout
classes and pop the parser context anymore.
(yyparse): Push parser context, save globals, parse the source
file, restore globals and pop the parser context when processing a
source file.
* jcf.h (VERBOSE_SKELETON): Replaces SOURCE_FRONTEND_DEBUG define.
* lex.c (java_parse_doc_section): New function.
(java_lex): Call java_parse_doc_section when appropriate. Build an
operator around INSTANCEOF_TK.
* lex.h (java_lineterminator, java_sprint_unicode,
java_unicode_2_utf8, java_lex_error, java_store_unicode):
Prototypes rewritten.
(java_parse_escape_sequence, java_letter_or_digit_p,
java_parse_doc_section, java_parse_end_comment, java_get_unicode,
java_read_unicode, java_store_unicode, java_read_char,
java_allocate_new_line, java_unget_unicode, java_sneak_unicode):
Added function prototypes.
* parse.h (VERBOSE_SKELETON): Replaces SOURCE_FRONTEND_DEBUG
define.
(JNULLP_TYPE_P, CHECK_METHODS, CHECK_DEPRECATED, REGISTER_IMPORT):
New macros
(struct parser_ctxt): New fields: deprecated,
current_parsed_class_un, gclass_list.
(fix_method_argument_names, issue_warning_error_from_context,
resolve_package, lookup_package_type): New function prototypes.
(resolve_expression_name): Fixed function prototype.
(find_applicable_accessible_methods_list): Fixed indentation, added
extra argument in prototype.
(check_final_assignment, build_null_of_type, check_deprecation,
check_method_redefinition, reset_method_name,
java_check_regular_methods, java_check_abstract_methods,
maybe_build_primttype_type_ref): New function prototype.
* parse.y (conver.h): Include.
(INSTANCEOF_TK): Tagged <operator>.
(single_type_import_declaration): Use REGISTER_IMPORT macro.
(relational_expression:): Build binop for instanceof.
(java_push_parser_context): Remember ctxp->gclass_list across
contexts.
(java_pop_parser_context): Simply return if no context
exists. Remember gclass_list across contexts.
(issue_warning_error_from_context): New function.
(parse_error_context): Don't setup ctxp->elc here. Call
issue_warning_error_from_context instead.
(parse_warning_context): Likewise.
(maybe_create_class_interface_decl): Removed DECL_ARTIFICIAL
setup. Link new class/interface to ctxp->gclass_list.
(add_superinterfaces): Register interface as incomplete if not
loaded.
(create_class): Remember class unqualified name in
ctxp->current_parsed_class_un. Check class deprecation.
(register_fields): Check field deprecation. Remember static final
field value in DECL_LOCAL_STATIC_VALUE. Changed comment in part
processing INIT.
(method_header): New local variable ORIG_ARG. Use unqualified
current class name for check on constructor errors. Promote return
type if of record type. Argument list fix moved in
fix_method_argument_names, called here. Check method deprecation.
(fix_method_argument_names): New function.
(method_declarator): Promote record typed arguments.
(safe_layout_class): Check class methods before layout.
(java_complete_class): Compute field layout when patched.
(do_resolve_class): Try to load class after having it renamed
after the package name.
(get_printable_method_name): Use DECL_CONTEXT.
(reset_method_name): New function.
(check_method_redefinition): Use reset_method_name.
(java_check_regular_methods): New local variable
SAVED_FOUND_WFL. Temporarily reinstall overriding/hiding method
names for error report. Check for compile-time error when method
found has default (package) access.
(java_check_abstract_methods): Now takes an interface DECL node as
an argument. Also reinstall real name on unchecked
overriding/hiding methods for error report.
(java_check_methods): Fixed leading comment. Get classes to verify
from ctxp->gclass_list. Use CHECK_METHODS macro and set
CLASS_METHOD_CHECKED_P on class verification.
(lookup_java_method2): Get real method name if necessary.
(find_in_imports): Don't check package class access here.
(resolve_package, lookup_package_type): New functions.
(java_layout_classes): Fixed leading comment. Take classes to be
laid out from ctxp->gclass_list.
(java_complete_expand_methods): Don't expand native and abstract
methods.
(java_expand_classes): New function.
(resolve_expression_name): Use additional argument ORIG. Retrieve
values of static final field of primitive types.
(resolve_field_access): Handles static final field of promotive
type.
(resolve_qualified_expression_name): Handle STRING_CST as
primaries and package name resolution. Check deprecation on found
decls. Set where_found and type_found on non static field resolved
during qualification. Layout non primitive field decl types.
(check_deprecation): New function.
(maybe_access_field): Simplified.
(patch_method_invocation_stmt): Local variable CLASS_TYPE
removed. Reverse method's argument when primary is a type. Don't
use CLASS_TYPE to report problems, use IDENTIFIER_WFL
instead. Include abstract class in the list of class searchable
for constructors. Use DECL_CONTEXT of found method for access
checks. Check method deprecation.
(patch_invoke): Pay extra care to NEW_CLASS_EXPR type call when
converting arguments. Handle INVOKE_INTERFACE.
(lookup_method_invoke): Search constructor using existing
infrastructure (don't rely on lookup_java_constructor anymore).
(find_applicable_accessible_methods_list): Extra argument flag
LC. Now include constructor in the search.
(qualify_ambiguous_name): Conditional expression are primaries.
(not_initialized_as_it_should_p): static final are always
initialized.
(java_complete_tree): Pass extra NULL argument to
resolve_expression_name. Stricter test to carry on patching
assignments. New case for INSTANCEOF_EXPR.
(complete_function_arguments): Inline PRIMTYPE.TYPE read access.
(check_final_assignment, maybe_build_primttype_type_ref): New
functions.
(patch_assignment): Detect resolved static finals and carry normal
assignment error check on them. Inline PRIMTYPE.TYPE read access.
(try_builtin_assignconv): Access constant 0 on all primitive
types.
(valid_builtin_assignconv_identity_widening_p): Accept identical
types. Accept all promoted type on int type.
(valid_ref_assignconv_cast_p): Accept a null pointer to be
assigned to a reference.
(valid_method_invocation_conversion_p): Accept to check null
pointers.
(build_binop): Merge declaration and initialization of local
variable BINOP.
(patch_binop): New case for INSTANCEOF_EXPR. NE_EXPR to accept all
numeric types. Improved validity test for qualify operators on
references.
(patch_unaryop): Broadened rejection test for PREDECREMENT_EXPR
and PREINCREMENT_EXPR. Also detect resolved static finals of a
primitive type and issue the appropriate error message.
(resolve_type_during_patch): Mark class loaded when resolved.
(patch_cast): Allow null to be cased to reference types.
(build_null_of_type): New function.
(patch_array_ref): Handle array on references correctly.
(patch_return): Removed unused local variable MODIFY. Force
boolean to be returned as integers. Allows null to be returned by
a function returning a reference.
* typeck.c (convert_to_integer, convert_to_real,
convert_to_pointer): Prototypes moved to convert.h
(lookup_argument_method): Use method real name, if necessary.
This improves method checking, gets rid of a cross file type
dependency bug and does a more robust job at laying out classes when
necessary. It unifies the regular methods and constructors lookup. It
implements the `instanceof' operator and interface method
invocations. It also fixes random bugs.
From-SVN: r23599
1998-11-10 13:04:25 -05:00
|
|
|
#ifdef VERBOSE_SKELETON
|
1998-09-06 11:36:06 -04:00
|
|
|
#undef SOURCE_FRONTEND_DEBUG
|
|
|
|
|
#define SOURCE_FRONTEND_DEBUG(X) \
|
|
|
|
|
{if (!quiet_flag) {printf ("* "); printf X; putchar ('\n');} }
|
|
|
|
|
#else
|
|
|
|
|
#define SOURCE_FRONTEND_DEBUG(X)
|
|
|
|
|
#endif
|
|
|
|
|
|
1998-10-14 08:54:59 -04:00
|
|
|
/* Declarations for dependency code. */
|
|
|
|
|
extern void jcf_dependency_reset PROTO ((void));
|
|
|
|
|
extern void jcf_dependency_set_target PROTO ((char *));
|
|
|
|
|
extern void jcf_dependency_add_target PROTO ((char *));
|
1998-10-22 08:06:05 -04:00
|
|
|
extern void jcf_dependency_set_dep_file PROTO ((const char *));
|
1998-10-14 08:54:59 -04:00
|
|
|
extern void jcf_dependency_add_file PROTO ((const char *, int));
|
|
|
|
|
extern void jcf_dependency_write PROTO ((void));
|
|
|
|
|
extern void jcf_dependency_init PROTO ((int));
|
|
|
|
|
|
1998-10-22 08:06:05 -04:00
|
|
|
/* Declarations for path handling code. */
|
|
|
|
|
extern void jcf_path_init PROTO ((void));
|
|
|
|
|
extern void jcf_path_classpath_arg PROTO ((char *));
|
|
|
|
|
extern void jcf_path_CLASSPATH_arg PROTO ((char *));
|
|
|
|
|
extern void jcf_path_include_arg PROTO ((char *));
|
|
|
|
|
extern void jcf_path_seal PROTO ((void));
|
|
|
|
|
extern void *jcf_path_start PROTO ((void));
|
|
|
|
|
extern void *jcf_path_next PROTO ((void *));
|
|
|
|
|
extern char *jcf_path_name PROTO ((void *));
|
|
|
|
|
extern int jcf_path_is_zipfile PROTO ((void *));
|
|
|
|
|
extern int jcf_path_is_system PROTO ((void *));
|
|
|
|
|
extern int jcf_path_max_len PROTO ((void));
|
|
|
|
|
|
1998-09-06 11:36:06 -04:00
|
|
|
#endif
|
