Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

New type variable 'V' defined in filters. This type is checked

Browse source 
only for name, never for value in function filter_same()
This commit is contained in:
Ondrej Filip 2009-05-29 23:08:28 +02:00
parent 43de796b8a
commit 9be1086d29
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
filter/config.Y
View file

@ -397,8 +397,9 @@ term:
case SYM_VARIABLE | T_PATH: case SYM_VARIABLE | T_PATH:
case SYM_VARIABLE | T_PATH_MASK: case SYM_VARIABLE | T_PATH_MASK:
case SYM_VARIABLE | T_CLIST: case SYM_VARIABLE | T_CLIST:
$$->code = 'C'; $$->code = 'V';
$$->a1.p = $1->def; $$->a1.p = $1->def;
$$->a2.p = $1->name;
break; break;
default: default:
cf_error("%s: variable expected.", $1->name ); cf_error("%s: variable expected.", $1->name );

7
filter/filter.c
View file

@ -489,6 +489,7 @@ interpret(struct f_inst *what)
else else
res.val.i = what->a2.i; res.val.i = what->a2.i;
break; break;
case 'V':
case 'C': case 'C':
res = * ((struct f_val *) what->a1.p); res = * ((struct f_val *) what->a1.p);
break; break;
@ -855,10 +856,12 @@ i_same(struct f_inst *f1, struct f_inst *f2)
case T_PREFIX_SET: case T_PREFIX_SET:
if (!trie_same(f1->a2.p, f2->a2.p)) if (!trie_same(f1->a2.p, f2->a2.p))
return 0; return 0;
break;
case T_SET: case T_SET:
if (!same_tree(f1->a2.p, f2->a2.p)) if (!same_tree(f1->a2.p, f2->a2.p))
return 0; return 0;
break;
case T_STRING: case T_STRING:
if (strcmp(f1->a2.p, f2->a2.p)) if (strcmp(f1->a2.p, f2->a2.p))
@ -873,6 +876,10 @@ i_same(struct f_inst *f1, struct f_inst *f2)
if (val_compare(* (struct f_val *) f1->a1.p, * (struct f_val *) f2->a1.p)) if (val_compare(* (struct f_val *) f1->a1.p, * (struct f_val *) f2->a1.p))
return 0; return 0;
break; break;
case 'V':
if (strcmp((char *) f1->a2.p, (char *) f2->a2.p))
return 0;
break;
case 'p': case 'L': ONEARG; break; case 'p': case 'L': ONEARG; break;
case '?': TWOARGS; break; case '?': TWOARGS; break;
case '0': case 'E': break; case '0': case 'E': break;