diff --git a/sh.h b/sh.h index 3e6c8e8..3e8ab21 100644 --- a/sh.h +++ b/sh.h @@ -157,7 +157,7 @@ #endif #ifdef EXTERN -__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.574 2012/07/22 15:56:51 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.575 2012/07/30 17:04:30 tg Exp $"); #endif #define MKSH_VERSION "R40 2012/07/21" @@ -667,7 +667,6 @@ extern struct env { /* # indicates env has valid jbuf (see unwind()) */ /* struct env.flag values */ -#define EF_FUNC_PARSE BIT(0) /* function being parsed */ #define EF_BRKCONT_PASS BIT(1) /* set if E_LOOP must pass break/continue on */ #define EF_FAKE_SIGDIE BIT(2) /* hack to get info from unwind to quitenv */ diff --git a/syn.c b/syn.c index 2155439..12a9867 100644 --- a/syn.c +++ b/syn.c @@ -23,7 +23,7 @@ #include "sh.h" -__RCSID("$MirOS: src/bin/mksh/syn.c,v 1.77 2012/07/01 15:38:08 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/syn.c,v 1.78 2012/07/30 17:04:31 tg Exp $"); extern short subshell_nesting_level; extern void yyskiputf8bom(void); @@ -656,7 +656,6 @@ function_body(char *name, { char *sname, *p; struct op *t; - bool old_func_parse; sname = wdstrip(name, 0); /*- @@ -678,7 +677,7 @@ function_body(char *name, */ if (ksh_func) { if (tpeek(CONTIN|KEYWORD|sALIAS) == '(' /*)*/) { - /* function foo () { */ + /* function foo () { //}*/ ACCEPT; musthave(')', 0); /* degrade to POSIX function */ @@ -693,8 +692,6 @@ function_body(char *name, t->u.ksh_func = tobool(ksh_func); t->lineno = source->line; - old_func_parse = e->flags & EF_FUNC_PARSE; - e->flags |= EF_FUNC_PARSE; if ((t->left = get_command(CONTIN)) == NULL) { char *tv; /* @@ -715,8 +712,6 @@ function_body(char *name, t->left->vars[0] = NULL; t->left->lineno = 1; } - if (!old_func_parse) - e->flags &= ~EF_FUNC_PARSE; return (t); }