GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-09 04:59:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

avoid using EOF in the expression parser

Browse Source
This commit is contained in:
krangelov
2021-10-12 18:47:04 +02:00
parent ead1160a75
commit a2e7d20b7a
2 changed files with 77 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
src/runtime/c/pgf/expr.cxx
View File

@@ -239,13 +239,15 @@ PgfExprParser::~PgfExprParser()
free(token_value);
}
uint32_t PgfExprParser::getc()
bool PgfExprParser::getc()
{
uint32_t ch = pgf_utf8_decode((const uint8_t **) &pos);
if (pos - ((const char*) &inp->text) > inp->size) {
ch = EOF;
}
return ch;
if (pos - ((const char*) &inp->text) >= inp->size) {
ch = ' ';
return false;
}
ch = pgf_utf8_decode((const uint8_t **) &pos);
return true;
}
void PgfExprParser::putc(uint32_t ucs)
@@ -313,10 +315,12 @@ pgf_is_normal_ident(PgfText *id)
return true;
}
void PgfExprParser::str_char()
bool PgfExprParser::str_char()
{
if (ch == '\\') {
ch = getc();
if (!getc())
return false;
switch (ch) {
case '\\':
putc('\\');
@@ -340,14 +344,14 @@ void PgfExprParser::str_char()
putc('\t');
break;
case '0':
puts("\0");
putc('\0');
default:
return;
return false;
}
} else {
putc(ch);
}
ch = getc();
return getc();
}
void PgfExprParser::token()
@@ -361,87 +365,91 @@ void PgfExprParser::token()
while (isspace(ch)) {
token_pos = pos;
ch = getc();
if (!getc()) {
token_tag = PGF_TOKEN_EOF;
return;
}
}
switch (ch) {
// TODO
// case EOF:
// token_tag = PGF_TOKEN_EOF;
// break;
case '(':
ch = getc();
getc();
token_tag = PGF_TOKEN_LPAR;
break;
case ')':
ch = getc();
getc();
token_tag = PGF_TOKEN_RPAR;
break;
case '{':
ch = getc();
getc();
token_tag = PGF_TOKEN_LCURLY;
break;
case '}':
ch = getc();
getc();
token_tag = PGF_TOKEN_RCURLY;
break;
case '<':
ch = getc();
getc();
token_tag = PGF_TOKEN_LTRIANGLE;
break;
case '>':
ch = getc();
getc();
token_tag = PGF_TOKEN_RTRIANGLE;
break;
case '?':
ch = getc();
getc();
token_tag = PGF_TOKEN_QUESTION;
break;
case '\\':
ch = getc();
getc();
token_tag = PGF_TOKEN_LAMBDA;
break;
case '-':
ch = getc();
if (ch == '>') {
ch = getc();
token_tag = PGF_TOKEN_RARROW;
} else if (isdigit(ch)) {
putc('-');
goto digit;
if (getc()) {
if (ch == '>') {
getc();
token_tag = PGF_TOKEN_RARROW;
} else if (isdigit(ch)) {
putc('-');
goto digit;
}
}
break;
case ',':
ch = getc();
getc();
token_tag = PGF_TOKEN_COMMA;
break;
case ':':
ch = getc();
getc();
token_tag = PGF_TOKEN_COLON;
break;
case ';':
ch = getc();
getc();
token_tag = PGF_TOKEN_SEMI;
break;
case '\'': {
ch = getc();
while (ch != '\'' && ch != EOF) {
str_char();
}
if (ch == '\'') {
ch = getc();
token_tag = PGF_TOKEN_IDENT;
}
if (getc()) {
while (ch != '\'') {
if (!str_char())
break;
}
if (ch == '\'') {
getc();
token_tag = PGF_TOKEN_IDENT;
}
}
break;
}
case '"': {
ch = getc();
while (ch != '"' && ch != EOF) {
str_char();
}
if (ch == '"') {
ch = getc();
token_tag = PGF_TOKEN_STR;
if (getc()) {
while (ch != '"') {
if (!str_char())
break;
}
if (ch == '"') {
getc();
token_tag = PGF_TOKEN_STR;
}
}
break;
}
@@ -449,28 +457,31 @@ void PgfExprParser::token()
if (pgf_is_ident_first(ch)) {
do {
putc(ch);
ch = getc();
if (!getc())
break;
} while (pgf_is_ident_rest(ch));
token_tag = PGF_TOKEN_IDENT;
} else if (isdigit(ch)) {
digit:
do {
putc(ch);
ch = getc();
if (!getc())
break;
} while (isdigit(ch));
if (ch == '.') {
putc(ch);
ch = getc();
while (isdigit(ch)) {
putc(ch);
ch = getc();
}
if (ch == '.') {
putc(ch);
if (getc()) {
while (isdigit(ch)) {
putc(ch);
if (!getc())
break;
}
}
token_tag = PGF_TOKEN_FLT;
} else {
token_tag = PGF_TOKEN_INT;
}
} else {
token_tag = PGF_TOKEN_INT;
}
}
break;
}
@@ -480,7 +491,8 @@ digit:
bool PgfExprParser::lookahead(int ch)
{
while (isspace(this->ch)) {
this->ch = getc();
if (!getc())
break;
}
return (this->ch == ch);

4
src/runtime/c/pgf/expr.h
View File

@@ -210,14 +210,14 @@ class PGF_INTERNAL_DECL PgfExprParser {
const char *token_pos, *pos;
uint32_t ch;
uint32_t getc();
bool getc();
void putc(uint32_t ch);
public:
PgfExprParser(PgfText* input, PgfUnmarshaller *unmarshaller);
~PgfExprParser();
void str_char();
bool str_char();
void token();
bool lookahead(int ch);