JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

this is a rather stupid diff: give ktsearch/ktenter the capability to

Browse Source 
return information needed to do a real ktremove instead of the pseudo
ktdelete operation which merely unsets the DEFINED flag to mark it as
eligible for texpand garbage collection (even worse, !DEFINED entries
are still counted)
This commit is contained in:
tg
2009-08-28 19:57:43 +00:00
parent cd7f3fd836
commit 7240c843ce
9 changed files with 95 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lex.c
View File

@ -22,7 +22,7 @@
#include "sh.h"
__RCSID("$MirOS: src/bin/mksh/lex.c,v 1.90 2009/08/28 18:53:58 tg Exp $");
__RCSID("$MirOS: src/bin/mksh/lex.c,v 1.91 2009/08/28 19:57:41 tg Exp $");
/*
* states while lexing word
@ -909,15 +909,17 @@ yylex(int cf)
if (*ident != '\0' && (cf&(KEYWORD|ALIAS))) {
struct tbl *p;
struct table_entry te;
uint32_t h = hash(ident);
/* { */
if ((cf & KEYWORD) && (p = ktsearch(&keywords, ident, h)) &&
if ((cf & KEYWORD) &&
(p = ktsearch(&keywords, ident, h, NULL)) &&
(!(cf & ESACONLY) || p->val.i == ESAC || p->val.i == '}')) {
afree(yylval.cp, ATEMP);
return (p->val.i);
}
if ((cf & ALIAS) && (p = ktsearch(&aliases, ident, h)) &&
if ((cf & ALIAS) && (p = ktsearch(&aliases, ident, h, &te)) &&
(p->flag & ISSET)) {
/*
* this still points to the same character as the
@ -944,7 +946,7 @@ yylex(int cf)
* delete alias upon encountering function
* definition
*/
ktdelete(p);
ktremove(&te);
else {
Source *s = source;