Commit e90c9dc0 by Andreas Jaeger Committed by Andreas Jaeger

lex.c (ffelex_file_fixed): Remove usage of REDUCE_CARD_SIZE_AFTER_BIGGY.


	* lex.c (ffelex_file_fixed): Remove usage of
	REDUCE_CARD_SIZE_AFTER_BIGGY.

	* expr.c (ffeexpr_exprstack_push_operand_): Remove code depenend
	on WEIRD_NONFORTRAN_RULES.

	* com.c (ffecom_arg_ptr_to_expr): Remove
	PASS_HOLLERITH_BY_DESCRIPTOR dependend code.
	(ffecom_const_expr): Remove usage of NEWCOMMON.
	(ffecom_expand_let_stmt): Remove MOVE_EXPR.

From-SVN: r67287
parent 1174a658
2003-06-01 Andreas Jaeger <aj@suse.de>
* lex.c (ffelex_file_fixed): Remove usage of
REDUCE_CARD_SIZE_AFTER_BIGGY.
* expr.c (ffeexpr_exprstack_push_operand_): Remove code depenend
on WEIRD_NONFORTRAN_RULES.
* com.c (ffecom_arg_ptr_to_expr): Remove
PASS_HOLLERITH_BY_DESCRIPTOR dependend code.
(ffecom_const_expr): Remove usage of NEWCOMMON.
(ffecom_expand_let_stmt): Remove MOVE_EXPR.
2003-05-31 Bud Davis <bdavis9659@comcast.net> 2003-05-31 Bud Davis <bdavis9659@comcast.net>
PR fortran/10843 PR fortran/10843
......
...@@ -10111,9 +10111,6 @@ ffecom_arg_ptr_to_expr (ffebld expr, tree *length) ...@@ -10111,9 +10111,6 @@ ffecom_arg_ptr_to_expr (ffebld expr, tree *length)
case FFEBLD_opPERCENT_DESCR: case FFEBLD_opPERCENT_DESCR:
switch (ffeinfo_basictype (ffebld_info (expr))) switch (ffeinfo_basictype (ffebld_info (expr)))
{ {
#ifdef PASS_HOLLERITH_BY_DESCRIPTOR
case FFEINFO_basictypeHOLLERITH:
#endif
case FFEINFO_basictypeCHARACTER: case FFEINFO_basictypeCHARACTER:
break; /* Passed by descriptor anyway. */ break; /* Passed by descriptor anyway. */
...@@ -10129,21 +10126,6 @@ ffecom_arg_ptr_to_expr (ffebld expr, tree *length) ...@@ -10129,21 +10126,6 @@ ffecom_arg_ptr_to_expr (ffebld expr, tree *length)
break; break;
} }
#ifdef PASS_HOLLERITH_BY_DESCRIPTOR
if ((ffeinfo_basictype (ffebld_info (expr)) == FFEINFO_basictypeHOLLERITH)
&& (length != NULL))
{ /* Pass Hollerith by descriptor. */
ffetargetHollerith h;
assert (ffebld_op (expr) == FFEBLD_opCONTER);
h = ffebld_cu_val_hollerith (ffebld_constant_union
(ffebld_conter (expr)));
*length
= build_int_2 (h.length, 0);
TREE_TYPE (*length) = ffecom_f2c_ftnlen_type_node;
}
#endif
if (ffeinfo_basictype (ffebld_info (expr)) != FFEINFO_basictypeCHARACTER) if (ffeinfo_basictype (ffebld_info (expr)) != FFEINFO_basictypeCHARACTER)
return ffecom_ptr_to_expr (expr); return ffecom_ptr_to_expr (expr);
...@@ -10695,10 +10677,6 @@ ffecom_const_expr (ffebld expr) ...@@ -10695,10 +10677,6 @@ ffecom_const_expr (ffebld expr)
if (ffebld_arity (expr) == 0 if (ffebld_arity (expr) == 0
&& (ffebld_op (expr) != FFEBLD_opSYMTER && (ffebld_op (expr) != FFEBLD_opSYMTER
#if NEWCOMMON
/* ~~Enable once common/equivalence is handled properly? */
|| ffebld_where (expr) == FFEINFO_whereCOMMON
#endif
|| ffebld_where (expr) == FFEINFO_whereGLOBAL || ffebld_where (expr) == FFEINFO_whereGLOBAL
|| ffebld_where (expr) == FFEINFO_whereINTRINSIC)) || ffebld_where (expr) == FFEINFO_whereINTRINSIC))
{ {
...@@ -10930,16 +10908,6 @@ ffecom_expand_let_stmt (ffebld dest, ffebld source) ...@@ -10930,16 +10908,6 @@ ffecom_expand_let_stmt (ffebld dest, ffebld source)
expr_tree = source_tree; expr_tree = source_tree;
else if (assign_temp) else if (assign_temp)
{ {
#ifdef MOVE_EXPR
/* The back end understands a conceptual move (evaluate source;
store into dest), so use that, in case it can determine
that it is going to use, say, two registers as temporaries
anyway. So don't use the temp (and someday avoid generating
it, once this code starts triggering regularly). */
expr_tree = ffecom_2s (MOVE_EXPR, void_type_node,
dest_tree,
source_tree);
#else
expr_tree = ffecom_2s (MODIFY_EXPR, void_type_node, expr_tree = ffecom_2s (MODIFY_EXPR, void_type_node,
assign_temp, assign_temp,
source_tree); source_tree);
...@@ -10947,7 +10915,6 @@ ffecom_expand_let_stmt (ffebld dest, ffebld source) ...@@ -10947,7 +10915,6 @@ ffecom_expand_let_stmt (ffebld dest, ffebld source)
expr_tree = ffecom_2s (MODIFY_EXPR, void_type_node, expr_tree = ffecom_2s (MODIFY_EXPR, void_type_node,
dest_tree, dest_tree,
assign_temp); assign_temp);
#endif
} }
else else
expr_tree = ffecom_2s (MODIFY_EXPR, void_type_node, expr_tree = ffecom_2s (MODIFY_EXPR, void_type_node,
......
/* expr.c -- Implementation File (module.c template V1.0) /* expr.c -- Implementation File (module.c template V1.0)
Copyright (C) 1995, 1996, 1997, 1998, 2001, 2002 Copyright (C) 1995, 1996, 1997, 1998, 2001, 2002, 2003
Free Software Foundation, Inc. Free Software Foundation, Inc.
Contributed by James Craig Burley. Contributed by James Craig Burley.
...@@ -9577,15 +9577,6 @@ static void ...@@ -9577,15 +9577,6 @@ static void
ffeexpr_exprstack_push_operand_ (ffeexprExpr_ e) ffeexpr_exprstack_push_operand_ (ffeexprExpr_ e)
{ {
ffeexpr_exprstack_push_ (e); ffeexpr_exprstack_push_ (e);
#ifdef WEIRD_NONFORTRAN_RULES
if ((ffeexpr_stack_->exprstack != NULL)
&& (ffeexpr_stack_->exprstack->expr->type == FFEEXPR_exprtypeBINARY_)
&& (ffeexpr_stack_->exprstack->expr->u.operator.prec
== FFEEXPR_operatorprecedenceHIGHEST_)
&& (ffeexpr_stack_->exprstack->expr->u.operator.as
== FFEEXPR_operatorassociativityL2R_))
ffeexpr_reduce_ ();
#endif
} }
/* ffeexpr_exprstack_push_unary_ -- Push a unary operator onto the stack /* ffeexpr_exprstack_push_unary_ -- Push a unary operator onto the stack
......
...@@ -1028,7 +1028,6 @@ ffelex_hash_ (FILE *finput) ...@@ -1028,7 +1028,6 @@ ffelex_hash_ (FILE *finput)
goto skipline; goto skipline;
} }
} }
else if (c == 'd') else if (c == 'd')
{ {
if (getc (finput) == 'e' if (getc (finput) == 'e'
...@@ -1450,9 +1449,6 @@ ffelex_include_ () ...@@ -1450,9 +1449,6 @@ ffelex_include_ ()
if (card_length != 0) if (card_length != 0)
{ {
#ifdef REDUCE_CARD_SIZE_AFTER_BIGGY /* Define if occasional large lines. */
#error "need to handle possible reduction of card size here!!"
#endif
assert (ffelex_card_size_ >= card_length); /* It shrunk?? */ assert (ffelex_card_size_ >= card_length); /* It shrunk?? */
memcpy (ffelex_card_image_, card_image, card_length); memcpy (ffelex_card_image_, card_image, card_length);
} }
...@@ -1756,18 +1752,6 @@ ffelex_file_fixed (ffewhereFile wf, FILE *f) ...@@ -1756,18 +1752,6 @@ ffelex_file_fixed (ffewhereFile wf, FILE *f)
beginning_of_line_again: /* :::::::::::::::::::: */ beginning_of_line_again: /* :::::::::::::::::::: */
#ifdef REDUCE_CARD_SIZE_AFTER_BIGGY /* Define if occasional large lines. */
if (ffelex_card_size_ != FFELEX_columnINITIAL_SIZE_)
{
ffelex_card_image_
= malloc_resize_ks (malloc_pool_image (),
ffelex_card_image_,
FFELEX_columnINITIAL_SIZE_ + 9,
ffelex_card_size_ + 9);
ffelex_card_size_ = FFELEX_columnINITIAL_SIZE_;
}
#endif
first_line: /* :::::::::::::::::::: */ first_line: /* :::::::::::::::::::: */
c = latest_char_in_file; c = latest_char_in_file;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment