return lex;
}
+lex_file* lex_open_string(const char *str, size_t len, const char *name)
+{
+ lex_file *lex;
+
+ lex = (lex_file*)mem_a(sizeof(*lex));
+ if (!lex) {
+ lexerror(NULL, "out of memory\n");
+ return NULL;
+ }
+
+ memset(lex, 0, sizeof(*lex));
+
+ lex->file = NULL;
+ lex->open_string = str;
+ lex->open_string_length = len;
+ lex->open_string_pos = 0;
+
+ lex->name = util_strdup(name ? name : "<string-source>");
+ lex->line = 1; /* we start counting at 1 */
+
+ lex->peekpos = 0;
+ lex->eof = false;
+
+ lex_filenames_add(lex->name);
+
+ return lex;
+}
+
void lex_cleanup(void)
{
size_t i;
mem_d(lex);
}
+static int lex_fgetc(lex_file *lex)
+{
+ if (lex->file)
+ return fgetc(lex->file);
+ if (lex->open_string) {
+ if (lex->open_string_pos >= lex->open_string_length)
+ return EOF;
+ return lex->open_string[lex->open_string_pos++];
+ }
+ return EOF;
+}
+
/* Get or put-back data
* The following to functions do NOT understand what kind of data they
* are working on.
static int lex_try_trigraph(lex_file *lex, int old)
{
int c2, c3;
- c2 = fgetc(lex->file);
+ c2 = lex_fgetc(lex);
if (c2 != '?') {
lex_ungetch(lex, c2);
return old;
}
- c3 = fgetc(lex->file);
+ c3 = lex_fgetc(lex);
switch (c3) {
case '=': return '#';
case '/': return '\\';
static int lex_try_digraph(lex_file *lex, int ch)
{
int c2;
- c2 = fgetc(lex->file);
+ c2 = lex_fgetc(lex);
if (ch == '<' && c2 == ':')
return '[';
else if (ch == ':' && c2 == '>')
return lex->peek[lex->peekpos];
}
- ch = fgetc(lex->file);
+ ch = lex_fgetc(lex);
if (ch == '\n')
lex->line++;
else if (ch == '?')
if (ch == '/')
{
/* one line comment */
- haswhite = true;
ch = lex_getch(lex);
if (lex->flags.preprocessing) {
- if (!lex_tokench(lex, ' ') ||
- !lex_tokench(lex, ' '))
+ haswhite = true;
+ if (!lex_tokench(lex, '/') ||
+ !lex_tokench(lex, '/'))
{
return TOKEN_FATAL;
}
}
while (ch != EOF && ch != '\n') {
- ch = lex_getch(lex);
- if (lex->flags.preprocessing && !lex_tokench(lex, ' '))
+ if (lex->flags.preprocessing && !lex_tokench(lex, ch))
return TOKEN_FATAL;
+ ch = lex_getch(lex);
}
if (lex->flags.preprocessing) {
lex_ungetch(lex, '\n');
if (ch == '*')
{
/* multiline comment */
- haswhite = true;
if (lex->flags.preprocessing) {
- if (!lex_tokench(lex, ' ') ||
- !lex_tokench(lex, ' '))
+ haswhite = true;
+ if (!lex_tokench(lex, '/') ||
+ !lex_tokench(lex, '*'))
{
return TOKEN_FATAL;
}
ch = lex_getch(lex);
if (ch == '/') {
if (lex->flags.preprocessing) {
- if (!lex_tokench(lex, ' ') ||
- !lex_tokench(lex, ' '))
+ if (!lex_tokench(lex, '*') ||
+ !lex_tokench(lex, '/'))
{
return TOKEN_FATAL;
}
}
}
if (lex->flags.preprocessing) {
- if (ch != '\n')
- ch = ' ';
if (!lex_tokench(lex, ch))
return TOKEN_FATAL;
}
if (ch == quote)
return TOKEN_STRINGCONST;
- if (ch == '\\') {
+ if (!lex->flags.preprocessing && ch == '\\') {
ch = lex_getch(lex);
if (ch == EOF) {
lexerror(lex, "unexpected end of file");
if (ch == '"')
{
lex->flags.nodigraphs = true;
+ if (lex->flags.preprocessing && !lex_tokench(lex, ch))
+ return TOKEN_FATAL;
lex->tok.ttype = lex_finish_string(lex, '"');
- while (lex->tok.ttype == TOKEN_STRINGCONST)
+ if (lex->flags.preprocessing && !lex_tokench(lex, ch))
+ return TOKEN_FATAL;
+ while (!lex->flags.preprocessing && lex->tok.ttype == TOKEN_STRINGCONST)
{
/* Allow c style "string" "continuation" */
ch = lex_skipwhite(lex);
* Likewise actual unescaping has to be done by the parser.
* The difference is we don't allow 'char' 'continuation'.
*/
- lex->tok.ttype = lex_finish_string(lex, '\'');
- if (!lex_endtoken(lex))
- return (lex->tok.ttype = TOKEN_FATAL);
+ if (lex->flags.preprocessing && !lex_tokench(lex, ch))
+ return TOKEN_FATAL;
+ lex->tok.ttype = lex_finish_string(lex, '\'');
+ if (lex->flags.preprocessing && !lex_tokench(lex, ch))
+ return TOKEN_FATAL;
+ if (!lex_endtoken(lex))
+ return (lex->tok.ttype = TOKEN_FATAL);
/* It's a vector if we can successfully scan 3 floats */
#ifdef WIN32
- if (sscanf_s(lex->tok.value, " %f %f %f ",
- &lex->tok.constval.v.x, &lex->tok.constval.v.y, &lex->tok.constval.v.z) == 3)
+ if (sscanf_s(lex->tok.value, " %f %f %f ",
+ &lex->tok.constval.v.x, &lex->tok.constval.v.y, &lex->tok.constval.v.z) == 3)
#else
- if (sscanf(lex->tok.value, " %f %f %f ",
- &lex->tok.constval.v.x, &lex->tok.constval.v.y, &lex->tok.constval.v.z) == 3)
+ if (sscanf(lex->tok.value, " %f %f %f ",
+ &lex->tok.constval.v.x, &lex->tok.constval.v.y, &lex->tok.constval.v.z) == 3)
#endif
- {
- lex->tok.ttype = TOKEN_VECTORCONST;
- }
- return lex->tok.ttype;
+ {
+ lex->tok.ttype = TOKEN_VECTORCONST;
+ }
+
+ return lex->tok.ttype;
}
if (isdigit(ch))