* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
-#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
-#include <stdarg.h>
+#include <stdlib.h>
#include "gmqcc.h"
#include "lexer.h"
-
/*
* List of Keywords
*/
lex_ctx 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 '\\';
/* 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);
ch == '>' || ch == '<' || /* <<, >>, <=, >= */
ch == '=' || ch == '!' || /* <=>, ==, != */
ch == '&' || ch == '|' || /* &&, ||, &=, |= */
- ch == '~' /* ~=, ~ */
+ ch == '~' || ch == '^' /* ~=, ~, ^ */
) {
lex_tokench(lex, ch);
}
}
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)
return lex->tok.ttype;
}
- if (isdigit(ch))
+ if (util_isdigit(ch))
{
lex->tok.ttype = lex_finish_digit(lex, ch);
lex_endtoken(lex);