qi-hardware/eda-tools
1
0
Fork 0
mirror of git://projects.qi-hardware.com/eda-tools.git synced 2024-09-30 01:43:15 +03:00
Code

eeshow/kicad/pl-parse.c: indicate where warnings and errors come from

Browse Source
This commit is contained in:
Werner Almesberger 2016-08-22 05:09:33 -03:00
parent b5a29b85da
commit 4711107d7e
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
eeshow/kicad/pl-parse.c
View File

@ -32,8 +32,11 @@ static bool get_coord(const struct expr *e,
*dx = -1; *dx = -1;
*dy = -1; *dy = -1;
for (; e; e = e->next) { for (; e; e = e->next) {
if (e->e) if (e->e) {
warning("coord: ignoring list");
continue; continue;
}
if (!strcmp(e->s, "ltcorner")) { if (!strcmp(e->s, "ltcorner")) {
*dx = *dy = 1; *dx = *dy = 1;
} else if (!strcmp(e->s, "lbcorner")) { } else if (!strcmp(e->s, "lbcorner")) {
@ -49,7 +52,7 @@ static bool get_coord(const struct expr *e,
float f = strtof(e->s, &end); float f = strtof(e->s, &end);
if (*end) { if (*end) {
error("no a number \"%s\"", e->s); error("coord: no a number \"%s\"", e->s);
return 0; return 0;
} }
if (n++) if (n++)
@ -62,12 +65,12 @@ static bool get_coord(const struct expr *e,
switch (n) { switch (n) {
case 0: case 0:
case 1: case 1:
error("no enough coordinates"); error("coord: no enough coordinates");
return 0; return 0;
case 2: case 2:
return 1; return 1;
default: default:
error("too many coordinates"); error("coord: too many coordinates");
return 0; return 0;
} }
} }
@ -81,12 +84,14 @@ static bool get_size(const struct expr *e, float *x, float *y)
char *end; char *end;
float f; float f;
if (e->e) if (e->e) {
warning("size: ignoring list");
continue; continue;
}
f = strtof(e->s, &end); f = strtof(e->s, &end);
if (*end) { if (*end) {
error("no a number \"%s\"", e->s); error("size: no a number \"%s\"", e->s);
return 0; return 0;
} }
if (n++) if (n++)
@ -98,12 +103,12 @@ static bool get_size(const struct expr *e, float *x, float *y)
switch (n) { switch (n) {
case 0: case 0:
case 1: case 1:
error("no enough coordinates"); error("size: no enough coordinates");
return 0; return 0;
case 2: case 2:
return 1; return 1;
default: default:
error("too many coordinates"); error("size: too many coordinates");
return 0; return 0;
} }
} }
@ -141,7 +146,7 @@ static bool process_setup(struct pl_ctx *pl, const struct expr *e)
for (; e; e = e->next) { for (; e; e = e->next) {
if (!e->e) { if (!e->e) {
warning("ignoring non-list"); warning("setup: ignoring non-list");
continue; continue;
} }
@ -171,7 +176,7 @@ static bool process_setup(struct pl_ctx *pl, const struct expr *e)
if (!get_float(next, &pl->b)) if (!get_float(next, &pl->b))
return 0; return 0;
} else { } else {
warning("ignoring \"%s\"", s); warning("setup: ignoring \"%s\"", s);
} }
} }
return 1; return 1;
@ -190,12 +195,12 @@ static bool process_font(struct pl_obj *obj, const struct expr *e)
else if (!strcmp(e->s, "italic")) else if (!strcmp(e->s, "italic"))
obj->font |= font_italic; obj->font |= font_italic;
else else
warning("ignoring \"%s\"", e->s); warning("font: ignoring \"%s\"", e->s);
continue; continue;
} }
if (!e->e) { if (!e->e) {
warning("ignoring empty list"); warning("font: ignoring empty list");
continue; continue;
} }
s = e->e->s; s = e->e->s;
@ -208,7 +213,7 @@ static bool process_font(struct pl_obj *obj, const struct expr *e)
if (!get_size(next, &obj->ex, &obj->ey)) if (!get_size(next, &obj->ex, &obj->ey))
return 0; return 0;
} else { } else {
warning("ignoring \"%s\"", s); warning("font: ignoring \"%s\"", s);
} }
} }
return 1; return 1;
@ -219,7 +224,7 @@ static bool process_justify(struct pl_obj *obj, const struct expr *e)
{ {
for (; e; e = e->next) { for (; e; e = e->next) {
if (e->e) { if (e->e) {
warning("ignoring list"); warning("justify: ignoring list");
continue; continue;
} }
@ -234,7 +239,7 @@ static bool process_justify(struct pl_obj *obj, const struct expr *e)
else if (!strcmp(e->s, "bottom")) else if (!strcmp(e->s, "bottom"))
obj->vert = text_min; obj->vert = text_min;
else else
warning("ignoring \"%s\"", e->s); warning("justify: ignoring \"%s\"", e->s);
} }
return 1; return 1;
} }
@ -263,14 +268,14 @@ static bool process_obj(struct pl_ctx *pl, const struct expr *e,
for (; e; e = e->next) { for (; e; e = e->next) {
if (e->s) { if (e->s) {
if (obj->s) { if (obj->s) {
error("multiple strings"); error("pl_obj: multiple strings");
return 0; return 0;
} }
obj->s = stralloc(e->s); obj->s = stralloc(e->s);
continue; continue;
} }
if (!e->e) { if (!e->e) {
warning("ignoring empty list"); warning("pl_obj: ignoring empty list");
continue; continue;
} }
@ -311,7 +316,7 @@ static bool process_obj(struct pl_ctx *pl, const struct expr *e,
if (!process_justify(obj, next)) if (!process_justify(obj, next))
return 0; return 0;
} else } else
warning("ignoring \"%s\"", s); warning("pl_obj: ignoring \"%s\"", s);
} }
obj->next = pl->objs; obj->next = pl->objs;
@ -328,7 +333,7 @@ static bool process_layout(struct pl_ctx *pl, const struct expr *e)
for (; e; e = e->next) { for (; e; e = e->next) {
if (!e->e) { if (!e->e) {
warning("ignoring non-list"); warning("layout: ignoring non-list");
continue; continue;
} }
@ -350,7 +355,7 @@ static bool process_layout(struct pl_ctx *pl, const struct expr *e)
if (!process_obj(pl, next, pl_obj_text)) if (!process_obj(pl, next, pl_obj_text))
return 0; return 0;
} else { } else {
warning("ignoring \"%s\"", s); warning("layout: ignoring \"%s\"", s);
} }
} }
return 1; return 1;