This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
egcs, warning patches for ch/ dir part 2/3
- To: egcs-patches at cygnus dot com
- Subject: egcs, warning patches for ch/ dir part 2/3
- From: "Kaveh R. Ghazi" <ghazi at caip dot rutgers dot edu>
- Date: Fri, 18 Sep 1998 17:27:10 -0400 (EDT)
This is part 2/3. Okay to install?
Fri Sep 18 14:59:26 1998 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* expr.c: Include system.h and toplev.h. Don't define NULL.
Remove redundant prototypes.
(internal_build_compound_expr): Mark parameter `first_p' with
ATTRIBUTE_UNUSED.
(build_allocate_getstack): Remove unused variable `init'.
(build_chill_pred_or_succ): Likewise for variable `limit'.
(varying_to_slice): Likewise for variable `doamin' [sic].
(finish_chill_binary_op): Likewise for variables `code0' and
`code1'. Remove unused label `finish'. Add explicit braces to
avoid ambiguous `else'.
(build_chill_addr_expr): Remove extra parameter in call to `error'.
(build_chill_unary_op): Remove unused variables `class' and `type0'.
(powersetlen): Remove unused variables `domain' and `temp'.
* grant.c: Include system.h, toplev.h and output.h. Don't handle
strchr/strrchr. Remove redundant prototypes.
(decode_constant_selective): Remove unused variables `op' and `wrk'.
(push_granted): Mark parameters `name' and `decl' with
ATTRIBUTE_UNUSED.
* inout.c: Include system.h and toplev.h. Remove redundant
prototypes.
(textlocation_mode): Use &&, not &, when comparing two truth
values.
(scanformcont): Remove unused label `do_the_action'.
* lang.c: Include system.h and toplev.h. Remove redundant
prototypes.
(lookup_interface): Mark parameter `arg' with ATTRIBUTE_UNUSED.
(maybe_objc_comptypes): Likewise for parameters `lhs' and `rhs'.
(lang_print_xnode): Likewise for parameters `file', `node' and
`indent'.
(lang_decode_option): Explicitly declare `explicit_ignore_case'.
(incomplete_type_error): Mark parameters `value' and `type' with
ATTRIBUTE_UNUSED.
* lex.c: Include system.h and toplev.h. Remove redundant
prototypes. Don't handle strchr/strrchr. Use CAPITALIZED
versions of ctype macros from system.h. Cast ctype arguments to
unsigned char when necessary.
(last_token, RETURN_TOKEN): Hide definition.
(push_back): Remove unused function.
(readstring): Change variable `i' to unsigned.
(yywrap): Remove unused variable `node'.
* loop.c: Include system.h and toplev.h. Remove redundant
prototypes.
(chill_unsigned_type): Hide prototype and definition.
(begin_loop_scope): Remove unused variable `firstp'.
(nonvalue_begin_loop_scope): Likewise.
diff -rup orig/egcs-CVS19980918/gcc/ch/expr.c egcs-CVS19980918/gcc/ch/expr.c
--- orig/egcs-CVS19980918/gcc/ch/expr.c Fri Sep 18 16:40:42 1998
+++ egcs-CVS19980918/gcc/ch/expr.c Fri Sep 18 17:07:49 1998
@@ -20,7 +20,7 @@ the Free Software Foundation, 675 Mass A
#include "config.h"
-#include <stdio.h>
+#include "system.h"
#include "rtl.h"
#include "tree.h"
#include "flags.h"
@@ -29,10 +29,7 @@ the Free Software Foundation, 675 Mass A
#include "assert.h"
#include "lex.h"
#include "convert.h"
-
-#ifndef NULL
-#define NULL 0
-#endif
+#include "toplev.h"
extern char **boolean_code_name;
extern int flag_old_strings;
@@ -40,15 +37,6 @@ extern tree long_unsigned_type_node;
extern int ignore_case;
extern int special_UC;
-extern void check_for_full_enumeration_handling PROTO((tree));
-extern void chill_handle_case_default PROTO((void));
-extern void error PROTO((char *, ...));
-extern void error_with_decl PROTO((tree, char *, ...));
-extern void fatal PROTO((char *, ...));
-extern void sorry PROTO((char *, ...));
-extern tree stabilize_reference PROTO((tree));
-extern void warning PROTO((char *, ...));
-
/* definitions for duration built-ins */
#define MILLISECS_MULTIPLIER 1
#define SECS_MULTIPLIER MILLISECS_MULTIPLIER * 1000
@@ -557,7 +545,6 @@ chill_expand_expr (exp, target, tmode, m
case SET_IN_EXPR:
{
- extern tree lookup_name PROTO((tree));
tree set = TREE_OPERAND (exp, 1);
tree pos = convert (long_unsigned_type_node, TREE_OPERAND (exp, 0));
tree set_type = TREE_TYPE (set);
@@ -602,7 +589,6 @@ chill_expand_expr (exp, target, tmode, m
case PACKED_ARRAY_REF:
{
- extern tree lookup_name PROTO((tree));
tree array = TREE_OPERAND (exp, 0);
tree pos = save_expr (TREE_OPERAND (exp, 1));
tree array_type = TREE_TYPE (array);
@@ -679,7 +665,7 @@ check_arglist_length (args, min_length,
static tree
internal_build_compound_expr (list, first_p)
tree list;
- int first_p;
+ int first_p ATTRIBUTE_UNUSED;
{
register tree rest;
@@ -1564,7 +1550,7 @@ build_allocate_getstack (mode, value, ch
{
tree type, result;
tree expr = NULL_TREE;
- tree args, tmpvar, fncall, ptr, init, outlist = NULL_TREE;
+ tree args, tmpvar, fncall, ptr, outlist = NULL_TREE;
if (mode == NULL_TREE || TREE_CODE (mode) == ERROR_MARK)
return error_mark_node;
@@ -2125,7 +2111,6 @@ build_chill_pred_or_succ (expr, op)
{
struct ch_class class;
tree etype, cond;
- tree limit;
if (pass == 1)
return NULL_TREE;
@@ -3241,7 +3226,7 @@ varying_to_slice (exp)
if (!chill_varying_type_p (TREE_TYPE (exp)))
return exp;
else
- { tree size, data, data_domain, doamin, min;
+ { tree size, data, data_domain, min;
tree novelty = CH_NOVELTY (TREE_TYPE (exp));
exp = save_if_needed (exp);
size = build_component_ref (exp, var_length_id);
@@ -3732,8 +3717,6 @@ finish_chill_binary_op (node)
tree op1 = check_have_mode (TREE_OPERAND (node, 1), "binary expression");
tree type0 = TREE_TYPE (op0);
tree type1 = TREE_TYPE (op1);
- enum tree_code code0;
- enum tree_code code1;
tree folded;
if (TREE_CODE (op0) == ERROR_MARK || TREE_CODE (op1) == ERROR_MARK)
@@ -3902,8 +3885,6 @@ finish_chill_binary_op (node)
return error_mark_node;
}
-
- finish:
if (TREE_TYPE (node) == NULL_TREE)
{
struct ch_class class;
@@ -3922,23 +3903,26 @@ finish_chill_binary_op (node)
TREE_CONSTANT (folded) = TREE_CONSTANT (op0) & TREE_CONSTANT (op1);
#endif
if (TREE_CODE (node) == TRUNC_DIV_EXPR)
- if (TREE_CONSTANT (op1))
- {
- if (tree_int_cst_equal (op1, integer_zero_node))
- {
- error ("division by zero");
- return integer_zero_node;
- }
- }
- else if (range_checking)
- {
+ {
+ if (TREE_CONSTANT (op1))
+ {
+ if (tree_int_cst_equal (op1, integer_zero_node))
+ {
+ error ("division by zero");
+ return integer_zero_node;
+ }
+ }
+ else if (range_checking)
+ {
#if 0
- tree test = build (EQ_EXPR, boolean_type_node, op1, integer_zero_node);
- /* Should this be overflow? */
- folded = check_expression (folded, test,
- ridpointers[(int) RID_RANGEFAIL]);
+ tree test =
+ build (EQ_EXPR, boolean_type_node, op1, integer_zero_node);
+ /* Should this be overflow? */
+ folded = check_expression (folded, test,
+ ridpointers[(int) RID_RANGEFAIL]);
#endif
- }
+ }
+ }
return folded;
}
@@ -4035,7 +4019,7 @@ build_chill_addr_expr (ref, errormsg)
if (! CH_LOCATION_P (ref)
&& TREE_CODE (TREE_TYPE (ref)) != FUNCTION_TYPE)
{
- error ("ADDR parameter must be a LOCATION", errormsg);
+ error ("ADDR parameter must be a LOCATION");
return error_mark_node;
}
ref = build_chill_arrow_expr (ref, 1);
@@ -4358,8 +4342,6 @@ build_chill_unary_op (code, op0)
tree op0;
{
register tree result = NULL_TREE;
- struct ch_class class;
- tree type0 = TREE_TYPE (op0);
if (op0 == NULL_TREE || TREE_CODE (op0) == ERROR_MARK)
return error_mark_node;
@@ -4482,8 +4464,6 @@ tree
powersetlen (powerset)
tree powerset;
{
- tree domain, temp;
-
if (powerset == NULL_TREE || TREE_CODE (powerset) == ERROR_MARK)
return error_mark_node;
diff -rup orig/egcs-CVS19980918/gcc/ch/grant.c egcs-CVS19980918/gcc/ch/grant.c
--- orig/egcs-CVS19980918/gcc/ch/grant.c Fri Sep 18 16:40:42 1998
+++ egcs-CVS19980918/gcc/ch/grant.c Fri Sep 18 17:07:49 1998
@@ -17,24 +17,18 @@ You should have received a copy of the G
along with GNU CC; see the file COPYING. If not, write to
the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
-#include <stdio.h>
-#include <string.h>
-#include <limits.h>
#include "config.h"
+#include "system.h"
#include "tree.h"
#include "ch-tree.h"
#include "lex.h"
#include "flags.h"
#include "actions.h"
#include "input.h"
-#include "errno.h"
#include "rtl.h"
#include "tasking.h"
-
-/* Disable possible macro over-rides, so the externs parse
- portably. */
-#undef strchr
-#undef strrchr
+#include "toplev.h"
+#include "output.h"
#define APPEND(X,Y) X = append (X, Y)
#define PREPEND(X,Y) X = prepend (X, Y);
@@ -49,16 +43,7 @@ do
APPEND (X, ";\n"); \
} while (0)
-extern void assemble_constructor PROTO((char *));
-extern void assemble_name PROTO((FILE *, char *));
-extern void error PROTO((char *, ...));
-extern tree tasking_list;
-extern void tasking_registry PROTO((void));
-extern void tasking_setup PROTO((void));
-extern void build_enum_tables PROTO((void));
extern tree process_type;
-extern void warning PROTO((char *, ...));
-extern tree get_file_function_name PROTO((int));
extern char *asm_file_name;
extern char *dump_base_name;
@@ -1988,8 +1973,6 @@ decode_constant_selective (init, all_dec
MYSTRING *tmp_string;
tree type = TREE_TYPE (init);
tree val = init;
- char *op;
- char wrk[256];
MYSTRING *mode_string;
switch ((enum chill_tree_code)TREE_CODE (val))
@@ -2650,7 +2633,6 @@ write_grant_file ()
p = gstring->str;
while (*p)
{
- extern char* strchr ();
p1 = strchr (p, '\n');
c = *++p1;
*p1 = '\0';
@@ -2677,8 +2659,6 @@ write_grant_file ()
void
set_default_grant_file ()
{
-#undef strrchr
- extern char *strrchr ();
char *p, *tmp, *fname;
if (dump_base_name)
@@ -2721,7 +2701,7 @@ set_default_grant_file ()
void
push_granted (name, decl)
- tree name, decl;
+ tree name ATTRIBUTE_UNUSED, decl ATTRIBUTE_UNUSED;
{
#if 0
IDENTIFIER_GRANTED_VALUE (name) = decl;
diff -rup orig/egcs-CVS19980918/gcc/ch/inout.c egcs-CVS19980918/gcc/ch/inout.c
--- orig/egcs-CVS19980918/gcc/ch/inout.c Fri Sep 18 16:40:42 1998
+++ egcs-CVS19980918/gcc/ch/inout.c Fri Sep 18 17:07:49 1998
@@ -17,10 +17,8 @@
along with GNU CC; see the file COPYING. If not, write to
the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
-#include <stdio.h>
-#include <string.h>
-#include <limits.h>
#include "config.h"
+#include "system.h"
#include "tree.h"
#include "ch-tree.h"
#include "rtl.h"
@@ -28,6 +26,7 @@
#include "flags.h"
#include "input.h"
#include "assert.h"
+#include "toplev.h"
/* set non-zero if input text is forced to lowercase */
extern int ignore_case;
@@ -35,12 +34,6 @@ extern int ignore_case;
/* set non-zero if special words are to be entered in uppercase */
extern int special_UC;
-extern void error PROTO((char *, ...));
-extern void sorry PROTO((char *, ...));
-extern void warning PROTO((char *, ...));
-
-extern tree build_chill_compound_expr PROTO((tree));
-
static int intsize_of_charsexpr PROTO((tree));
/* association mode */
@@ -1722,7 +1715,7 @@ textlocation_mode (text)
field = TYPE_FIELDS (text);
for ( ; field != NULL_TREE; field = TREE_CHAIN (field))
{
- if (TREE_CODE (field) == FIELD_DECL &
+ if (TREE_CODE (field) == FIELD_DECL &&
DECL_NAME (field) == get_identifier ("tloc"))
return TREE_TYPE (field);
}
@@ -4161,7 +4154,6 @@ scanformcont (fcs, len, fcsptr, lenptr,
break;
}
- do_the_action: ;
state = FormatText;
break;
diff -rup orig/egcs-CVS19980918/gcc/ch/lang.c egcs-CVS19980918/gcc/ch/lang.c
--- orig/egcs-CVS19980918/gcc/ch/lang.c Fri Sep 18 16:40:42 1998
+++ egcs-CVS19980918/gcc/ch/lang.c Fri Sep 18 17:07:49 1998
@@ -19,11 +19,12 @@ the Free Software Foundation, 675 Mass A
#include "config.h"
+#include "system.h"
#include "tree.h"
#include "ch-tree.h"
#include "lex.h"
-#include <stdio.h>
#include "input.h"
+#include "toplev.h"
/* Type node for boolean types. */
@@ -49,14 +50,6 @@ char* chill_real_input_filename;
extern FILE* finput;
extern int maximum_field_alignment;
-
-extern void error PROTO((char *, ...));
-extern void error_with_decl PROTO((tree, char *, ...));
-extern void fatal PROTO((char *, ...));
-extern int floor_log2_wide PROTO((unsigned HOST_WIDE_INT));
-extern void pedwarn_with_decl PROTO((tree, char *, ...));
-extern void sorry PROTO((char *, ...));
-extern int type_hash_list PROTO((tree));
/* return 1 if the expression tree given has all
constant nodes as its leaves; return 0 otherwise. */
@@ -111,14 +104,14 @@ const_expr (exp)
/* Used by c-lex.c, but only for objc. */
tree
lookup_interface (arg)
- tree arg;
+ tree arg ATTRIBUTE_UNUSED;
{
return 0;
}
int
maybe_objc_comptypes (lhs, rhs)
- tree lhs, rhs;
+ tree lhs ATTRIBUTE_UNUSED, rhs ATTRIBUTE_UNUSED;
{
return -1;
}
@@ -144,9 +137,9 @@ lang_init_options ()
void
lang_print_xnode (file, node, indent)
- FILE *file;
- tree node;
- int indent;
+ FILE *file ATTRIBUTE_UNUSED;
+ tree node ATTRIBUTE_UNUSED;
+ int indent ATTRIBUTE_UNUSED;
{
}
@@ -171,7 +164,7 @@ lang_decode_option (argc, argv)
char **argv;
{
char *p = argv[0];
- static explicit_ignore_case = 0;
+ static int explicit_ignore_case = 0;
if (!strcmp(p, "-lang-chill"))
; /* do nothing */
else if (!strcmp (p, "-fruntime-checking"))
@@ -280,8 +273,8 @@ chill_print_error_function (file)
void
incomplete_type_error (value, type)
- tree value;
- tree type;
+ tree value ATTRIBUTE_UNUSED;
+ tree type ATTRIBUTE_UNUSED;
{
error ("internal error - use of undefined type");
}
diff -rup orig/egcs-CVS19980918/gcc/ch/lex.c egcs-CVS19980918/gcc/ch/lex.c
--- orig/egcs-CVS19980918/gcc/ch/lex.c Fri Sep 18 16:40:43 1998
+++ egcs-CVS19980918/gcc/ch/lex.c Fri Sep 18 17:07:49 1998
@@ -17,14 +17,11 @@ You should have received a copy of the G
along with GNU CC; see the file COPYING. If not, write to
the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
-#include <stdio.h>
-#include <errno.h>
+#include "config.h"
+#include "system.h"
#include <setjmp.h>
-#include <ctype.h>
-#include <sys/types.h>
#include <sys/stat.h>
-#include "config.h"
#include "tree.h"
#include "input.h"
@@ -33,24 +30,24 @@ the Free Software Foundation, 675 Mass A
#include "flags.h"
#include "parse.h"
#include "obstack.h"
+#include "toplev.h"
#ifdef MULTIBYTE_CHARS
-#include <stdlib.h>
#include <locale.h>
#endif
/* include the keyword recognizers */
#include "hash.h"
-#undef strchr
-
FILE* finput;
+#if 0
static int last_token = 0;
/* Sun's C compiler warns about the safer sequence
do { .. } while 0
when there's a 'return' inside the braces, so don't use it */
#define RETURN_TOKEN(X) { last_token = X; return (X); }
+#endif
/* This is set non-zero to force incoming tokens to lowercase. */
extern int ignore_case;
@@ -64,23 +61,6 @@ extern int special_UC;
extern struct obstack permanent_obstack;
extern struct obstack temporary_obstack;
-#ifndef errno
-extern int errno;
-#endif
-
-extern tree build_string_type PROTO((tree, tree));
-extern void error PROTO((char *, ...));
-extern void error_with_file_and_line PROTO((char *, int, char *, ...));
-extern void grant_use_seizefile PROTO((char *));
-extern void pedwarn PROTO((char *, ...));
-extern void pfatal_with_name PROTO((char *));
-extern void push_obstacks PROTO((struct obstack *, struct obstack *));
-extern void set_identifier_size PROTO((int));
-extern void sorry PROTO((char *, ...));
-extern int target_isinf PROTO((REAL_VALUE_TYPE));
-extern int tolower PROTO((int));
-extern void warning PROTO((char *, ...));
-
/* forward declarations */
static void close_input_file PROTO((char *));
static tree convert_bitstring PROTO((char *));
@@ -90,7 +70,6 @@ static int maybe_number PRO
static tree equal_number PROTO((void));
static void handle_use_seizefile_directive PROTO((int));
static int handle_name PROTO((tree));
-static void push_back PROTO((int));
static char *readstring PROTO((int, int *));
static void read_directive PROTO((void));
static tree read_identifier PROTO((int));
@@ -508,7 +487,7 @@ yylex ()
break;
if (ch == '_')
continue;
- if (!isxdigit (ch)) /* error on non-hex digit */
+ if (!ISXDIGIT (ch)) /* error on non-hex digit */
{
if (pass == 1)
error ("invalid C'xx' ");
@@ -544,7 +523,7 @@ yylex ()
for (;;)
{
ch = input ();
- if (isalnum (ch))
+ if (ISALNUM (ch))
obstack_1grow (&temporary_obstack, ch);
else if (ch != '_')
break;
@@ -594,7 +573,7 @@ yylex ()
case '.':
nextc = input ();
unput (nextc);
- if (isdigit (nextc)) /* || nextc == '_') we don't start numbers with '_' */
+ if (ISDIGIT (nextc)) /* || nextc == '_') we don't start numbers with '_' */
goto number;
return DOT;
case '0': case '1': case '2': case '3': case '4':
@@ -637,7 +616,7 @@ read_identifier (first)
first = input ();
if (first == EOF)
break;
- if (! isalnum (first) && first != '_')
+ if (! ISALNUM (first) && first != '_')
{
unput (first);
break;
@@ -661,7 +640,7 @@ handle_name (id)
struct resword *tp;
tp = in_word_set (IDENTIFIER_POINTER (id), IDENTIFIER_LENGTH (id));
if (tp != NULL
- && special_UC == isupper (tp->name[0])
+ && special_UC == ISUPPER ((unsigned char) tp->name[0])
&& (tp->flags == RESERVED || tp->flags == PREDEF))
{
if (tp->rid != NORID)
@@ -686,7 +665,7 @@ read_number (ch)
if (ch != '_')
obstack_1grow (&temporary_obstack, ch);
ch = input ();
- if (! isdigit (ch) && ch != '_')
+ if (! ISDIGIT (ch) && ch != '_')
break;
}
if (ch == '.')
@@ -696,7 +675,7 @@ read_number (ch)
if (ch != '_')
obstack_1grow (&temporary_obstack, ch);
ch = input ();
- } while (isdigit (ch) || ch == '_');
+ } while (ISDIGIT (ch) || ch == '_');
is_float++;
}
if (ch == 'd' || ch == 'D' || ch == 'e' || ch == 'E')
@@ -709,14 +688,14 @@ read_number (ch)
obstack_1grow (&temporary_obstack, ch);
ch = input ();
}
- if (isdigit (ch) || ch == '_')
+ if (ISDIGIT (ch) || ch == '_')
{
do
{
if (ch != '_')
obstack_1grow (&temporary_obstack, ch);
ch = input ();
- } while (isdigit (ch) || ch == '_');
+ } while (ISDIGIT (ch) || ch == '_');
}
else
{
@@ -779,7 +758,7 @@ read_directive ()
struct resword *tp;
tree id;
int ch = skip_whitespace();
- if (isalpha (ch) || ch == '_')
+ if (ISALPHA (ch) || ch == '_')
id = read_identifier (ch);
else if (ch == EOF)
{
@@ -794,7 +773,7 @@ read_directive ()
return;
}
tp = in_word_set (IDENTIFIER_POINTER (id), IDENTIFIER_LENGTH (id));
- if (tp == NULL || special_UC != isupper (tp->name[0]))
+ if (tp == NULL || special_UC != ISUPPER ((unsigned char) tp->name[0]))
{
if (pass == 1)
warning ("unrecognized compiler directive `%s'",
@@ -897,7 +876,7 @@ maybe_downcase (str)
return;
while (*str)
{
- if (isupper (*str))
+ if (ISUPPER ((unsigned char) *str))
*str = tolower (*str);
str++;
}
@@ -938,7 +917,7 @@ maybe_number (s)
break;
case 'h':
case 'H':
- if (!isxdigit (*s))
+ if (!ISXDIGIT ((unsigned char) *s))
return 0;
break;
case 'b':
@@ -958,15 +937,6 @@ maybe_number (s)
}
return 1;
}
-
-static void
-push_back (c)
-char c;
-{
- if (c == '\n')
- lineno--;
- unput (c);
-}
static char *
readstring (terminator, len)
@@ -976,7 +946,7 @@ readstring (terminator, len)
int c;
unsigned allocated = 1024;
char *tmp = xmalloc (allocated);
- int i = 0;
+ unsigned i = 0;
for (;;)
{
@@ -1110,14 +1080,14 @@ readstring (terminator, len)
}
else if (base == 10)
{
- if (! isdigit (cc))
+ if (! ISDIGIT (cc))
cc = -1;
else
cc -= '0';
}
else if (base == 16)
{
- if (!isxdigit (cc))
+ if (!ISXDIGIT (cc))
cc = -1;
else
{
@@ -1212,7 +1182,7 @@ convert_integer (intchars)
base = 2;
break;
default:
- if (!isdigit (*p)) /* this test is for equal_number () */
+ if (!ISDIGIT (*p)) /* this test is for equal_number () */
{
obstack_free (&temporary_obstack, intchars);
return 0;
@@ -1380,7 +1350,6 @@ same_file (filename1, filename2)
struct stat s[2];
char *fn_input[2];
int i, stat_status;
- extern char *strchr();
if (grant_only_flag)
/* do nothing in this case */
@@ -1490,7 +1459,7 @@ getlc (file)
register int c;
c = getc (file);
- if (isupper (c) && ignore_case)
+ if (ISUPPER (c) && ignore_case)
c = tolower (c);
return c;
}
@@ -1554,7 +1523,7 @@ check_newline ()
it and ignore it; otherwise, ignore the line, with an error
if the word isn't `pragma', `ident', `define', or `undef'. */
- if (isupper (c) && ignore_case)
+ if (ISUPPER (c) && ignore_case)
c = tolower (c);
if (c >= 'a' && c <= 'z')
@@ -1566,14 +1535,14 @@ check_newline ()
&& getlc (finput) == 'g'
&& getlc (finput) == 'm'
&& getlc (finput) == 'a'
- && (isspace (c = getlc (finput))))
+ && (c = getlc (finput), ISSPACE (c)))
{
#ifdef HANDLE_PRAGMA
static char buffer [128];
char * buff = buffer;
/* Read the pragma name into a buffer. */
- while (isspace (c = getlc (finput)))
+ while (c = getlc (finput), ISSPACE (c))
continue;
do
@@ -1581,7 +1550,7 @@ check_newline ()
* buff ++ = c;
c = getlc (finput);
}
- while (c != EOF && ! isspace (c) && c != '\n'
+ while (c != EOF && ! ISSPACE (c) && c != '\n'
&& buff < buffer + 128);
pragma_ungetc (c);
@@ -1601,7 +1570,7 @@ check_newline ()
&& getlc (finput) == 'i'
&& getlc (finput) == 'n'
&& getlc (finput) == 'e'
- && (isspace (c = getlc (finput))))
+ && (c = getlc (finput), ISSPACE (c)))
{
#if 0 /*def DWARF_DEBUGGING_INFO*/
if (c != '\n'
@@ -1618,7 +1587,7 @@ check_newline ()
&& getlc (finput) == 'd'
&& getlc (finput) == 'e'
&& getlc (finput) == 'f'
- && (isspace (c = getlc (finput))))
+ && (c = getlc (finput), ISSPACE (c)))
{
#if 0 /*def DWARF_DEBUGGING_INFO*/
if (c != '\n'
@@ -1699,7 +1668,7 @@ linenum:
/* Something follows the #; read a token. */
- if (isdigit(c))
+ if (ISDIGIT(c))
{
int old_lineno = lineno;
int used_up = 0;
@@ -1710,7 +1679,7 @@ linenum:
{
l = l * 10 + (c - '0'); /* FIXME Not portable */
c = getlc(finput);
- } while (isdigit(c));
+ } while (ISDIGIT(c));
/* subtract one, because it is the following line that
gets the specified number */
@@ -1777,7 +1746,7 @@ linenum:
/* `1' after file name means entering new file.
`2' after file name means just left a file. */
- if (isdigit (c))
+ if (ISDIGIT (c))
{
if (c == '1')
{
@@ -1976,7 +1945,7 @@ equal_number ()
/* collect token into tokenbuf for later analysis */
while (TRUE)
{
- if (isspace (c) || c == '<')
+ if (ISSPACE (c) || c == '<')
break;
obstack_1grow (&temporary_obstack, c);
c = input ();
@@ -2017,7 +1986,7 @@ equal_number ()
{
cursor = tokenbuf;
c = *cursor;
- if (!isalpha (c) && c != '_')
+ if (!ISALPHA (c) && c != '_')
{
if (pass == 1)
error ("invalid value follows `=' in compiler directive");
@@ -2025,7 +1994,8 @@ equal_number ()
}
for (cursor = &tokenbuf[1]; *cursor != '\0'; cursor++)
- if (isalpha (*cursor) || *cursor == '_' || isdigit (*cursor))
+ if (ISALPHA ((unsigned char) *cursor) || *cursor == '_' ||
+ ISDIGIT (*cursor))
continue;
else
{
@@ -2117,9 +2087,7 @@ mark_use_seizefile_written (name)
static int
yywrap ()
{
- extern char *strchr ();
extern char *chill_real_input_filename;
- tree node;
close_input_file (input_filename);
diff -rup orig/egcs-CVS19980918/gcc/ch/loop.c egcs-CVS19980918/gcc/ch/loop.c
--- orig/egcs-CVS19980918/gcc/ch/loop.c Fri Sep 18 16:40:43 1998
+++ egcs-CVS19980918/gcc/ch/loop.c Fri Sep 18 17:07:49 1998
@@ -17,9 +17,8 @@ You should have received a copy of the G
along with GNU CC; see the file COPYING. If not, write to
the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
-#include <stdio.h>
-#include <limits.h>
#include "config.h"
+#include "system.h"
#include "tree.h"
#include "ch-tree.h"
#include "lex.h"
@@ -29,19 +28,12 @@ the Free Software Foundation, 675 Mass A
#include "obstack.h"
#include "assert.h"
#include "rtl.h"
+#include "toplev.h"
/* if the user codes '-flocal-loop-counter' on the command line,
ch-actions.c (lang_decode_option) will set this flag. */
int flag_local_loop_counter = 1;
-extern rtx emit_line_note PROTO((char *, int));
-extern void error PROTO((char *, ...));
-extern rtx expand_assignment PROTO((tree, tree, int, int));
-extern void save_expr_under_name PROTO((tree, tree));
-extern void stamp_nesting_label PROTO((tree));
-extern int int_fits_type_p PROTO((tree, tree));
-extern void warning PROTO((char *, ...));
-
/* forward declarations */
static int declare_temps PROTO((void));
static int initialize_iter_var PROTO((void));
@@ -50,7 +42,9 @@ static int bottom_loop_end_check PRO
static int increment_temps PROTO((void));
static tree build_temporary_variable PROTO((char *, tree));
static tree maybe_make_for_temp PROTO((tree, char *, tree));
+#if 0
static tree chill_unsigned_type PROTO((tree));
+#endif
/* In terms of the parameters passed to build_loop_iterator,
* there are several types of loops. They are encoded by
@@ -377,8 +371,6 @@ pop_loop_block ()
void
begin_loop_scope ()
{
- ITERATOR *firstp = loopstack->iter_list;
-
pushlevel (1);
if (pass >= 2)
@@ -417,8 +409,6 @@ end_loop_scope (opt_label)
void
nonvalue_begin_loop_scope ()
{
- ITERATOR *firstp = loopstack->iter_list;
-
pushlevel (0); /* this happens only in pass 2 */
declare_temps ();
@@ -1221,7 +1211,7 @@ maybe_make_for_temp (exp, temp_name, exp
return result;
}
-
+#if 0
/*
* Adapt the C unsigned_type function to CHILL - we need to
* account for any CHILL-specific integer types here. So far,
@@ -1239,3 +1229,4 @@ chill_unsigned_type (type)
else
return unsigned_type (type);
}
+#endif