kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

When outputting parse errors, give the correct line number - how did this whole offset thing happen anyway? 

SVN revision: 12004
This commit is contained in:
xcomputerman 2004-10-24 06:43:45 +00:00 committed by xcomputerman
parent ceb2210f85
commit a1c90bfe7d
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
legacy/edje/src/bin/edje_cc_parse.c
View File

@ -81,7 +81,7 @@ new_object(void)
if (!handled)
{
fprintf(stderr, "%s: Error. %s:%i unhandled keyword %s\n",
progname, file_in, line,
progname, file_in, line - 1,
(char *)evas_list_data(evas_list_last(stack)));
exit(-1);
}
@ -111,7 +111,7 @@ new_statement(void)
if (!handled)
{
fprintf(stderr, "%s: Error. %s:%i unhandled keyword %s\n",
progname, file_in, line,
progname, file_in, line - 1,
(char *)evas_list_data(evas_list_last(stack)));
exit(-1);
}
@ -193,7 +193,7 @@ next_token(char *p, char *end, char **new_p, int *delim)
if (!tmpstr)
{
fprintf(stderr, "%s: Error. %s:%i malloc %i bytes failed\n",
progname, file_in, line, l + 1);
progname, file_in, line - 1, l + 1);
exit(-1);
}
strncpy(tmpstr, p, l);
@ -328,7 +328,7 @@ stack_chop_top(void)
else
{
fprintf(stderr, "%s: Error. parse error %s:%i. } marker without matching { marker\n",
progname, file_in, line);
progname, file_in, line - 1);
exit(-1);
}
}
@ -356,7 +356,7 @@ parse(char *data, off_t size)
if (do_params && delim && *token != ';')
{
fprintf(stderr, "%s: Error. parse error %s:%i. %c marker before ; marker\n",
progname, file_in, line, *token);
progname, file_in, line - 1, *token);
exit(-1);
}
else if (delim)
@ -367,7 +367,7 @@ parse(char *data, off_t size)
if (do_params)
{
fprintf(stderr, "%s: Error. parse error %s:%i. } marker before ; marker\n",
progname, file_in, line);
progname, file_in, line - 1);
exit(-1);
}
else
@ -394,7 +394,7 @@ parse(char *data, off_t size)
if (do_params)
{
fprintf(stderr, "%s: Error. parse error %s:%i. { marker before ; marker\n",
progname, file_in, line);
progname, file_in, line - 1);
exit(-1);
}
}
@ -477,7 +477,7 @@ parse(char *data, off_t size)
else
{
fprintf(stderr, "%s: Error. parse error %s:%i. { marker does not have matching } marker\n",
progname, file_in, line);
progname, file_in, line - 1);
exit(-1);
}
new_object();
@ -614,7 +614,7 @@ is_num(int n)
if (!str)
{
fprintf(stderr, "%s: Error. %s:%i no parameter supplied as argument %i\n",
progname, file_in, line, n + 1);
progname, file_in, line - 1, n + 1);
exit(-1);
}
if (str[0] == 0) return 0;
@ -634,7 +634,7 @@ parse_str(int n)
if (!str)
{
fprintf(stderr, "%s: Error. %s:%i no parameter supplied as argument %i\n",
progname, file_in, line, n + 1);
progname, file_in, line - 1, n + 1);
exit(-1);
}
s = mem_strdup(str);
@ -651,7 +651,7 @@ parse_enum(int n, ...)
if (!str)
{
fprintf(stderr, "%s: Error. %s:%i no parameter supplied as argument %i\n",
progname, file_in, line, n + 1);
progname, file_in, line - 1, n + 1);
exit(-1);
}
va_start(va, n);
@ -664,7 +664,7 @@ parse_enum(int n, ...)
if (!s)
{
fprintf(stderr, "%s: Error. %s:%i token %s not one of:",
progname, file_in, line, str);
progname, file_in, line - 1, str);
va_start(va, n);
s = va_arg(va, char *);
while (s)
@ -699,7 +699,7 @@ parse_int(int n)
if (!str)
{
fprintf(stderr, "%s: Error. %s:%i no parameter supplied as argument %i\n",
progname, file_in, line, n + 1);
progname, file_in, line - 1, n + 1);
exit(-1);
}
i = my_atoi(str);
@ -716,14 +716,14 @@ parse_int_range(int n, int f, int t)
if (!str)
{
fprintf(stderr, "%s: Error. %s:%i no parameter supplied as argument %i\n",
progname, file_in, line, n + 1);
progname, file_in, line - 1, n + 1);
exit(-1);
}
i = my_atoi(str);
if ((i < f) || (i > t))
{
fprintf(stderr, "%s: Error. %s:%i integer %i out of range of %i to %i inclusive\n",
progname, file_in, line, i, f, t);
progname, file_in, line - 1, i, f, t);
exit(-1);
}
return i;
@ -739,14 +739,14 @@ parse_bool(int n)
if (!str)
{
fprintf(stderr, "%s: Error. %s:%i no parameter supplied as argument %i\n",
progname, file_in, line, n + 1);
progname, file_in, line - 1, n + 1);
exit(-1);
}
if (!strstrip(str, buf, sizeof (buf)))
{
fprintf(stderr, "%s: Error. %s:%i expression is too long\n",
progname, file_in, line);
progname, file_in, line - 1);
return 0;
}
@ -759,7 +759,7 @@ parse_bool(int n)
if ((i < 0) || (i > 1))
{
fprintf(stderr, "%s: Error. %s:%i integer %i out of range of 0 to 1 inclusive\n",
progname, file_in, line, i);
progname, file_in, line - 1, i);
exit(-1);
}
return i;
@ -775,7 +775,7 @@ parse_float(int n)
if (!str)
{
fprintf(stderr, "%s: Error. %s:%i no parameter supplied as argument %i\n",
progname, file_in, line, n + 1);
progname, file_in, line - 1, n + 1);
exit(-1);
}
i = my_atof(str);
@ -792,14 +792,14 @@ parse_float_range(int n, double f, double t)
if (!str)
{
fprintf(stderr, "%s: Error. %s:%i no parameter supplied as argument %i\n",
progname, file_in, line, n + 1);
progname, file_in, line - 1, n + 1);
exit(-1);
}
i = my_atof(str);
if ((i < f) || (i > t))
{
fprintf(stderr, "%s: Error. %s:%i float %3.3f out of range of %3.3f to %3.3f inclusive\n",
progname, file_in, line, i, f, t);
progname, file_in, line - 1, i, f, t);
exit(-1);
}
return i;
@ -813,7 +813,7 @@ check_arg_count(int required_args)
if (num_args != required_args)
{
fprintf(stderr, "%s: Error. %s:%i got %i arguments, but expected %i\n",
progname, file_in, line, num_args, required_args);
progname, file_in, line - 1, num_args, required_args);
exit(-1);
}
}
@ -842,7 +842,7 @@ my_atoi(const char * s)
if (!strstrip(s, buf, sizeof (buf)))
{
fprintf(stderr, "%s: Error. %s:%i expression is too long\n",
progname, file_in, line);
progname, file_in, line - 1);
return 0;
}
@ -858,7 +858,7 @@ _deltai(char *s, int * val)
if ('(' != s[0])
{
fprintf(stderr, "%s: Error. %s:%i unexpected character at %s\n",
progname, file_in, line, s);
progname, file_in, line - 1, s);
return s;
}
else
@ -889,7 +889,7 @@ _gammai(char *s, int * val)
}
else
fprintf(stderr, "%s: Error. %s:%i unexpected character at %s\n",
progname, file_in, line, s);
progname, file_in, line - 1, s);
return s;
}
@ -1012,14 +1012,14 @@ _calci(char op, int a, int b)
a /= b;
else
fprintf(stderr, "%s: Error. %s:%i divide by zero\n",
progname, file_in, line);
progname, file_in, line - 1);
return a;
case '*':
a *= b;
return a;
default:
fprintf(stderr, "%s: Error. %s:%i unexpected character '%c'\n",
progname, file_in, line, op);
progname, file_in, line - 1, op);
return a;
}
}
@ -1038,7 +1038,7 @@ my_atof(const char * s)
if (!strstrip(s, buf, sizeof (buf)))
{
fprintf(stderr, "%s: Error. %s:%i expression is too long\n",
progname, file_in, line);
progname, file_in, line - 1);
return 0;
}
@ -1054,7 +1054,7 @@ _deltaf(char *s, double * val)
if ('(' != s[0])
{
fprintf(stderr, "%s: Error. %s:%i unexpected character at %s\n",
progname, file_in, line, s);
progname, file_in, line - 1, s);
return s;
}
else
@ -1085,7 +1085,7 @@ _gammaf(char *s, double * val)
}
else
fprintf(stderr, "%s: Error. %s:%i unexpected character at %s\n",
progname, file_in, line, s);
progname, file_in, line - 1, s);
return s;
}
@ -1212,14 +1212,14 @@ _calcf(char op, double a, double b)
if (b != 0) a /= b;
else
fprintf(stderr, "%s: Error. %s:%i divide by zero\n",
progname, file_in, line);
progname, file_in, line - 1);
return a;
case '*':
a *= b;
return a;
default:
fprintf(stderr, "%s: Error. %s:%i unexpected character '%c'\n",
progname, file_in, line, op);
progname, file_in, line - 1, op);
return a;
}
}
@ -1230,7 +1230,7 @@ strstrip(const char *in, char *out, size_t size)
if ((size -1 ) < strlen(in))
{
fprintf(stderr, "%s: Error. %s:%i expression is too long\n",
progname, file_in, line);
progname, file_in, line - 1);
return 0;
}