* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
-#include <ctype.h>
#include <string.h>
#include <stdlib.h>
"return",
"const"
};
-static size_t num_keywords_qc = sizeof(keywords_qc) / sizeof(keywords_qc[0]);
-
/* For fte/gmgqcc */
static const char *keywords_fg[] = {
"switch", "case", "default",
"__builtin_debug_printtype"
};
-static size_t num_keywords_fg = sizeof(keywords_fg) / sizeof(keywords_fg[0]);
/*
* Lexer code
*/
-
static char* *lex_filenames;
static void lexerror(lex_file *lex, const char *fmt, ...)
static bool lexwarn(lex_file *lex, int warntype, const char *fmt, ...)
{
- bool r;
- lex_ctx ctx;
- va_list ap;
+ bool r;
+ lex_ctx_t ctx;
+ va_list ap;
- ctx.file = lex->name;
- ctx.line = lex->sline;
+ ctx.file = lex->name;
+ ctx.line = lex->sline;
+ ctx.column = lex->column;
va_start(ap, fmt);
r = vcompile_warning(ctx, warntype, fmt, ap);
#else
if (lex->tok.value)
vec_shrinkto(lex->tok.value, 0);
-
+
lex->tok.constval.t = 0;
lex->tok.ctx.line = lex->sline;
lex->tok.ctx.file = lex->name;
lex->line++;
lex->column = 0;
}
-
+
if (c2 != '?') {
lex_ungetch(lex, c2);
return old;
lex->line++;
lex->column = 0;
}
-
+
switch (c3) {
case '=': return '#';
case '/': return '\\';
if (lex->peekpos) {
lex->peekpos--;
- if (!lex->push_line && lex->peek[lex->peekpos] == '\n')
+ if (!lex->push_line && lex->peek[lex->peekpos] == '\n') {
lex->line++;
+ lex->column = 0;
+ }
return lex->peek[lex->peekpos];
}
ch = lex_fgetc(lex);
- if (!lex->push_line && ch == '\n')
+ if (!lex->push_line && ch == '\n') {
lex->line++;
+ lex->column = 0;
+ }
else if (ch == '?')
return lex_try_trigraph(lex, ch);
else if (!lex->flags.nodigraphs && (ch == '<' || ch == ':' || ch == '%'))
/* Idents are alphanumberic, but they start with alpha or _ */
static bool isident_start(int ch)
{
- return isalpha(ch) || ch == '_';
+ return util_isalpha(ch) || ch == '_';
}
static bool isident(int ch)
{
- return isident_start(ch) || isdigit(ch);
+ return isident_start(ch) || util_isdigit(ch);
}
/* isxdigit_only is used when we already know it's not a digit
do
{
ch = lex_getch(lex);
- while (ch != EOF && isspace(ch)) {
+ while (ch != EOF && util_isspace(ch)) {
if (ch == '\n') {
if (lex_try_pragma(lex))
continue;
ch = '/';
break;
}
- } while (ch != EOF && isspace(ch));
+ } while (ch != EOF && util_isspace(ch));
if (haswhite) {
lex_endtoken(lex);
lex_token_new(lex);
ch = lex_getch(lex);
- while (ch != EOF && ch != '\n' && isspace(ch))
+ while (ch != EOF && ch != '\n' && util_isspace(ch))
ch = lex_getch(lex);
if (ch == '\n')
lex_tokench(lex, ch);
ch = lex_getch(lex);
- if (ch != '.' && !isdigit(ch))
+ if (ch != '.' && !util_isdigit(ch))
{
if (lastch != '0' || ch != 'x')
{
{
lex_tokench(lex, ch);
ch = lex_getch(lex);
- while (isdigit(ch) || (ishex && isxdigit_only(ch)))
+ while (util_isdigit(ch) || (ishex && isxdigit_only(ch)))
{
lex_tokench(lex, ch);
ch = lex_getch(lex);
/* continue digits-only */
ch = lex_getch(lex);
- while (isdigit(ch))
+ while (util_isdigit(ch))
{
lex_tokench(lex, ch);
ch = lex_getch(lex);
if (!strcmp(v, "framevalue"))
{
ch = lex_getch(lex);
- while (ch != EOF && isspace(ch) && ch != '\n')
+ while (ch != EOF && util_isspace(ch) && ch != '\n')
ch = lex_getch(lex);
- if (!isdigit(ch)) {
+ if (!util_isdigit(ch)) {
lexerror(lex, "$framevalue requires an integer parameter");
return lex_do(lex);
}
if (ch == '.') {
nextch = lex_getch(lex);
/* digits starting with a dot */
- if (isdigit(nextch)) {
+ if (util_isdigit(nextch)) {
lex_ungetch(lex, nextch);
lex->tok.ttype = lex_finish_digit(lex, ch);
lex_endtoken(lex);
}
if (ch == '+' || ch == '-' || /* ++, --, +=, -= and -> as well! */
- ch == '>' || ch == '<' || /* <<, >>, <=, >= */
+ ch == '>' || ch == '<' || /* <<, >>, <=, >= and >< as well! */
ch == '=' || ch == '!' || /* <=>, ==, != */
ch == '&' || ch == '|' || /* &&, ||, &=, |= */
- ch == '~' /* ~=, ~ */
+ ch == '~' || ch == '^' /* ~=, ~, ^ */
) {
lex_tokench(lex, ch);
nextch = lex_getch(lex);
- if ((nextch == '=' && ch != '<') || (nextch == ch && ch != '!')) {
+ if ((nextch == '=' && ch != '<') ||
+ (nextch == ch && ch != '!') ||
+ (nextch == '<' && ch == '>')) {
lex_tokench(lex, nextch);
} else if (ch == '<' && nextch == '=') {
lex_tokench(lex, nextch);
}
}
else if (lex->flags.preprocessing &&
- ch == '-' && isdigit(nextch))
+ ch == '-' && util_isdigit(nextch))
{
lex->tok.ttype = lex_finish_digit(lex, nextch);
if (lex->tok.ttype == TOKEN_INTCONST)
lex->tok.constval.t = TYPE_VECTOR;
} else {
size_t kw;
- for (kw = 0; kw < num_keywords_qc; ++kw) {
+ for (kw = 0; kw < GMQCC_ARRAY_COUNT(keywords_qc); ++kw) {
if (!strcmp(v, keywords_qc[kw]))
return (lex->tok.ttype = TOKEN_KEYWORD);
}
if (OPTS_OPTION_U32(OPTION_STANDARD) != COMPILER_QCC) {
- for (kw = 0; kw < num_keywords_fg; ++kw) {
+ for (kw = 0; kw < GMQCC_ARRAY_COUNT(keywords_fg); ++kw) {
if (!strcmp(v, keywords_fg[kw]))
return (lex->tok.ttype = TOKEN_KEYWORD);
}
return lex->tok.ttype;
}
- if (isdigit(ch))
+ if (util_isdigit(ch))
{
lex->tok.ttype = lex_finish_digit(lex, ch);
lex_endtoken(lex);
return (lex->tok.ttype = ch);
}
- lexerror(lex, "unknown token: `%s`", lex->tok.value);
+ lexerror(lex, "unknown token: `%c`", ch);
return (lex->tok.ttype = TOKEN_ERROR);
}