qi-hardware/eda-tools
1
0
Fork 0
mirror of git://projects.qi-hardware.com/eda-tools.git synced 2024-09-28 23:42:54 +03:00
Code

b2/: rename "name" field in struct value to more generic "s", for better sharing

Browse Source
This commit is contained in:
Werner Almesberger 2012-05-21 14:44:33 -03:00
parent fdac542592
commit 061e8f5872
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
b2/chr.c
View File

@ -70,7 +70,7 @@ struct condition *new_condition(enum relop relop, const char *word)
struct condition *cond;
cond = alloc_type(struct condition);
cond->value.u.name = word;
cond->value.u.s = word;
cond->relop = relop;
cond->next = NULL;
return cond;
@ -84,7 +84,7 @@ void field_finalize(struct field *field)
for (sel = field->sel; sel; sel = sel->next)
for (cond = sel->cond; cond; cond = cond->next)
if (!evaluate(field->fmt, cond->value.u.name,
if (!evaluate(field->fmt, cond->value.u.s,
&cond->value))
yyerrorf("invalid value in selection");
/* @@@ indicate exact location */

2
b2/comp.c
View File

@ -40,7 +40,7 @@ static int do_comp_name(const char *a, enum relop relop, const char *b)
int comp_name(const struct value *a, enum relop relop, const struct value *b)
{
return do_comp_name(a->u.name, relop, b->u.name);
return do_comp_name(a->u.s, relop, b->u.s);
}

2
b2/db.c
View File

@ -110,7 +110,7 @@ static void convert_params(struct param **params,
/* convert parameter */
prm->u.field = f;
if (!evaluate(f->fmt, prm->value.u.name, &prm->value))
if (!evaluate(f->fmt, prm->value.u.s, &prm->value))
yyerrorf("invalid value for %s", f->name);
/* add to result list */

2
b2/dump.c
View File

@ -18,7 +18,7 @@
void dump_name(FILE *file, const struct format *fmt, const struct value *v)
{
fprintf(file, "%s", v->u.name);
fprintf(file, "%s", v->u.s);
}

2
b2/eval.c
View File

@ -20,7 +20,7 @@
int eval_name(const struct format *fmt, const char *s, struct value *res)
{
res->u.name = s;
res->u.s = s;
return 1;
}

2
b2/lang.y
View File

@ -425,7 +425,7 @@ param:
$$ = alloc_type(struct param);
$$->u.name = $1;
$$->op = rel_eq;
$$->value.u.name = $3;
$$->value.u.s = $3;
}
;

2
b2/param.h
View File

@ -52,7 +52,7 @@ struct format {
struct value {
union {
const char *name;
const char *s;
struct bitset set;
double abs;
struct rel_value {