java-tree.h: Remove JTI_INTEGER_NEGATIVE_ONE_NODE.

* java-tree.h: Remove JTI_INTEGER_NEGATIVE_ONE_NODE.
	* decl.c (init_decl_processing): Use integer_minus_one_node, not
	integer_negative_one_node.
	* expr.c (build_java_binop): Likewise.

From-SVN: r39337
This commit is contained in:
Bryce McKinlay 2001-01-30 00:37:21 +00:00 committed by Bryce McKinlay
parent 9c7c6e6c1c
commit eb59e54788
4 changed files with 11 additions and 7 deletions

View File

@ -1,3 +1,10 @@
2000-01-30 Bryce McKinlay <bryce@albatross.co.nz>
* java-tree.h: Remove JTI_INTEGER_NEGATIVE_ONE_NODE.
* decl.c (init_decl_processing): Use integer_minus_one_node, not
integer_negative_one_node.
* expr.c (build_java_binop): Likewise.
2000-01-24 Jeff Sturm <jeff.sturm@commerceone.com>
* zextract.c (read_zip_archive): Read file_offset before writing

View File

@ -473,7 +473,7 @@ init_decl_processing ()
integer_one_node = build_int_2 (1, 0);
integer_two_node = build_int_2 (2, 0);
integer_four_node = build_int_2 (4, 0);
integer_negative_one_node = build_int_2 (-1, 0);
integer_minus_one_node = build_int_2 (-1, -1);
size_zero_node = size_int (0);
size_one_node = size_int (1);

View File

@ -1299,11 +1299,11 @@ build_java_binop (op, type, arg1, arg2)
tree second_compare = fold (build (COND_EXPR, int_type_node,
ifexp2, integer_zero_node,
op == COMPARE_L_EXPR
? integer_negative_one_node
? integer_minus_one_node
: integer_one_node));
return fold (build (COND_EXPR, int_type_node, ifexp1,
op == COMPARE_L_EXPR ? integer_one_node
: integer_negative_one_node,
: integer_minus_one_node,
second_compare));
}
case COMPARE_EXPR:
@ -1315,7 +1315,7 @@ build_java_binop (op, type, arg1, arg2)
ifexp2, integer_one_node,
integer_zero_node));
return fold (build (COND_EXPR, int_type_node,
ifexp1, integer_negative_one_node, second_compare));
ifexp1, integer_minus_one_node, second_compare));
}
case TRUNC_DIV_EXPR:
case TRUNC_MOD_EXPR:

View File

@ -280,7 +280,6 @@ enum java_tree_index
JTI_LONG_ZERO_NODE,
JTI_FLOAT_ZERO_NODE,
JTI_DOUBLE_ZERO_NODE,
JTI_INTEGER_NEGATIVE_ONE_NODE,
JTI_INTEGER_TWO_NODE,
JTI_INTEGER_FOUR_NODE,
JTI_EMPTY_STMT_NODE,
@ -480,8 +479,6 @@ extern tree java_global_trees[JTI_MAX];
java_global_trees[JTI_FLOAT_ZERO_NODE]
#define double_zero_node \
java_global_trees[JTI_DOUBLE_ZERO_NODE]
#define integer_negative_one_node \
java_global_trees[JTI_INTEGER_NEGATIVE_ONE_NODE]
#define integer_two_node \
java_global_trees[JTI_INTEGER_TWO_NODE]
#define integer_four_node \