Back out the last change.

Per request by Jason R. Thorpe after he fixed <alpha/cpu.h>.
This commit is contained in:
veego 1999-08-17 19:35:11 +00:00
parent fcf48304c2
commit 48d983aa59
3 changed files with 9 additions and 9 deletions

2
gnu/dist/gawk/awk.h vendored
View File

@ -425,7 +425,7 @@ typedef struct exp_node {
#define param sub.nodep.l.param_name
#define subnode lnode
#define awkproc sub.nodep.r.pptr
#define proc sub.nodep.r.pptr
#define re_reg sub.nodep.r.preg
#define re_flags sub.nodep.reflags

14
gnu/dist/gawk/awk.y vendored
View File

@ -1905,7 +1905,7 @@ NODE *subn;
fatal("%s() cannot have %d argument%c",
tokentab[idx].operator, nexp, nexp == 1 ? ' ' : 's');
r->awkproc = tokentab[idx].ptr;
r->proc = tokentab[idx].ptr;
/* special case processing for a few builtins */
/*
@ -1913,14 +1913,14 @@ NODE *subn;
* here is really right. Move anything that's not into
* the corresponding routine.
*/
if (nexp == 0 && r->awkproc == do_length) {
if (nexp == 0 && r->proc == do_length) {
subn = node(node(make_number(0.0), Node_field_spec, (NODE *) NULL),
Node_expression_list,
(NODE *) NULL);
} else if (r->awkproc == do_match) {
} else if (r->proc == do_match) {
if (subn->rnode->lnode->type != Node_regex)
subn->rnode->lnode = mk_rexp(subn->rnode->lnode);
} else if (r->awkproc == do_sub || r->awkproc == do_gsub) {
} else if (r->proc == do_sub || r->proc == do_gsub) {
if (subn->lnode->type != Node_regex)
subn->lnode = mk_rexp(subn->lnode);
if (nexp == 2)
@ -1934,8 +1934,8 @@ NODE *subn;
warning("string literal as last arg of substitute");
} else if (! isassignable(subn->rnode->rnode->lnode))
yyerror("%s third parameter is not a changeable object",
r->awkproc == do_sub ? "sub" : "gsub");
} else if (r->awkproc == do_gensub) {
r->proc == do_sub ? "sub" : "gsub");
} else if (r->proc == do_gensub) {
if (subn->lnode->type != Node_regex)
subn->lnode = mk_rexp(subn->lnode);
if (nexp == 3)
@ -1944,7 +1944,7 @@ NODE *subn;
(NODE *) NULL),
Node_expression_list,
(NODE *) NULL));
} else if (r->awkproc == do_split) {
} else if (r->proc == do_split) {
if (nexp == 2)
append_right(subn,
node(FS_node, Node_expression_list, (NODE *) NULL));

View File

@ -673,7 +673,7 @@ int iscond;
/* Builtins */
case Node_builtin:
return (*tree->awkproc)(tree->subnode);
return (*tree->proc)(tree->subnode);
case Node_K_getline:
return (do_getline(tree));