* removed some clashes between ifdefs and regular tokens

git-svn-id: trunk@9289 -
This commit is contained in:
Jonas Maebe 2007-11-18 19:33:00 +00:00
parent de08321368
commit 4b8643f73b

View File

@ -50,7 +50,7 @@ static const struct idf reserved[] = {
{"else", NORM('e')}, {"else", NORM('e')},
{"end", NORM('}')}, {"end", NORM('}')},
{"extern", CTRL('E')}, {"extern", CTRL('E')},
{"except", META('E')}, {"except", MTCT('E')},
{"file", NORM('F')}, {"file", NORM('F')},
{"finally", META('F')}, {"finally", META('F')},
{"for", NORM('f')}, {"for", NORM('f')},
@ -58,8 +58,8 @@ static const struct idf reserved[] = {
{"goto", NORM('g')}, {"goto", NORM('g')},
{"if", NORM('i')}, {"if", NORM('i')},
{"in", NORM('I')}, {"in", NORM('I')},
{"inherited", META('i')}, {"inherited", CTRL('I')},
{"is", META('I')}, {"is", NORM('j')},
{"label", NORM('l')}, {"label", NORM('l')},
{"mod", NORM('%')}, {"mod", NORM('%')},
{"nil", NORM('n')}, {"nil", NORM('n')},
@ -135,7 +135,7 @@ const TOKEN NonFinals[] = {
NORM('f'), /* for */ NORM('f'), /* for */
NORM('g'), /* goto */ NORM('g'), /* goto */
NORM('i'), /* if */ NORM('i'), /* if */
META('i'), /* inherited */ CTRL('I'), /* inherited */
NORM('l'), /* label */ NORM('l'), /* label */
NORM('O'), /* object */ NORM('O'), /* object */
NORM('P'), /* packed */ NORM('P'), /* packed */