ubergames
/
rpgxef
mirror of https://github.com/UberGames/rpgxEF.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Modified lexer to automatically skip LMT_IGNORE

This commit is contained in:
Walter Julius Hennecke 2013-04-28 01:59:14 +02:00
parent fc9bfc84a8
commit 5c3773a902
3 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
code/game/bg_lex.lex
View File

@ -417,10 +417,21 @@ void bgLex_destroy(bgLex* lex) {
}
int bgLex_lex(bgLex* lex) {
int res;
if(lex->morphem->data.str != NULL) {
free(lex->morphem->data.str);
}
return yylex(lex->lex);
/* skip LMT_IGNORE */
while(1) {
res = yylex(lex->lex);
if(lex->morphem->type != LMT_IGNORE) {
break;
}
}
return res;
}
bgLexSymbol bgLex_textToSymbol(char* text) {

13
code/game/bg_lex.yy.c
View File

@ -2559,10 +2559,21 @@ void bgLex_destroy(bgLex* lex) {
}
int bgLex_lex(bgLex* lex) {
int res;
if(lex->morphem->data.str != NULL) {
free(lex->morphem->data.str);
}
return yylex(lex->lex);
/* skip LMT_IGNORE */
while(1) {
res = yylex(lex->lex);
if(lex->morphem->type != LMT_IGNORE) {
break;
}
}
return res;
}
bgLexSymbol bgLex_textToSymbol(char* text) {

12
code/game/g_main.c
View File

@ -935,9 +935,15 @@ static void G_LoadTimedMessages(void) {
}
trap_FS_Read(buffer, len, f);
trap_FS_FCloseFile(f);
lexer = bgLex_create(buffer);
if(lexer == NULL) {
G_Printf(S_COLOR_RED "ERROR: Could not create new bgLex to lex timed messages.\n");
free(buffer);
}
while(bgLex_lex(lexer)) {
if(lexer->morphem->type == LMT_IGNORE) {
continue;
@ -949,9 +955,9 @@ static void G_LoadTimedMessages(void) {
G_Printf(S_COLOR_YELLOW "WARNING: Unexpected token in timedmessages.cfg:%d:%d!\n", lexer->morphem->line, lexer->morphem->column);
}
}
G_Printf("Loaded %d timed messages.\n", level.timedMessages->length);
bgLex_destroy(lexer);
trap_FS_FCloseFile(f);
free(buffer);
}
@ -1095,9 +1101,11 @@ static void G_LoadServerChangeFile(void) {
file_len = trap_FS_FOpenFile(fileRoute, &f, FS_READ);
if(!file_len)
if(!file_len) {
return;
}
// TODO dynamic buffer size
buffer = (char *)malloc(32000 * sizeof(char));
if(!buffer) {
G_Printf(S_COLOR_RED "ERROR: Was unable to allocate %i bytes.\n", 32000 * sizeof(char) );