diff options
| -rw-r--r-- | mh/mh_fmtgram.y | 10 | ||||
| -rw-r--r-- | mh/mh_format.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mh/mh_fmtgram.y b/mh/mh_fmtgram.y index 04a890e3d..4a51d481a 100644 --- a/mh/mh_fmtgram.y +++ b/mh/mh_fmtgram.y @@ -218,7 +218,7 @@ component : COMPONENT funcall : function argument EOFN { ctx_pop (); - if ($1->optarg & MHA_VOID) /*FIXME*/ + if ($1->flags & MHA_VOID) /*FIXME*/ { $2->noprint = 1; $$ = $2; @@ -236,7 +236,7 @@ funcall : function argument EOFN } else if (arg == NULL) { - if ($1->optarg & MHA_OPTARG_NIL) + if ($1->flags & MHA_OPTARG_NIL) { switch ($1->argtype) { @@ -254,7 +254,7 @@ funcall : function argument EOFN abort (); } } - else if ($1->optarg & MHA_OPTARG) + else if ($1->flags & MHA_OPTARG) { /* ok - ignore */; } @@ -264,7 +264,7 @@ funcall : function argument EOFN YYABORT; } } - else if ($1->optarg & MHA_LITERAL) + else if ($1->flags & MHA_LITERAL) { if (!(arg->nodetype == fmtnode_literal || arg->nodetype == fmtnode_number)) @@ -1345,7 +1345,7 @@ emit_funcall (struct mh_format *fmt, mh_builtin_t *builtin, struct node *arg) { if (arg) { - if (builtin->optarg & MHA_LITERAL) + if (builtin->flags & MHA_LITERAL) { switch (arg->nodetype) { diff --git a/mh/mh_format.h b/mh/mh_format.h index 8e2578683..3c9021785 100644 --- a/mh/mh_format.h +++ b/mh/mh_format.h @@ -140,7 +140,7 @@ struct mh_builtin mh_builtin_fp fun; enum mh_type type; enum mh_type argtype; - int optarg; + int flags; }; struct mh_string |