Merge branch 'master' of https://github.com/rheit/zdoom into zscript

This commit is contained in:
Christoph Oelckers 2016-10-14 09:11:54 +02:00
commit b8a2059aa9
3 changed files with 245 additions and 154 deletions

View file

@ -79,7 +79,7 @@ static void SetNodeLine(ZCC_TreeNode *name, int line)
FString unexpected, expecting;
int i;
int stateno = yypParser->yystack[yypParser->yyidx].stateno;
int stateno = yypParser->yytos->stateno;
unexpected << "Unexpected " << ZCCTokenName(yymajor);