summaryrefslogtreecommitdiffstats
path: root/filter/config.Y
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2000-05-16 16:24:33 +0200
committerPavel Machek <pavel@ucw.cz>2000-05-16 16:24:33 +0200
commit60de3356ab9b1996a84e3ba2865176a078b6d0ca (patch)
tree75334091f707d3ad949150b427e741aa0735f3f9 /filter/config.Y
parente2f4f275646d21de363c32ff3c8fb4f492f07c04 (diff)
downloadbird-60de3356ab9b1996a84e3ba2865176a078b6d0ca.tar
bird-60de3356ab9b1996a84e3ba2865176a078b6d0ca.zip
Resolved shift/reduce conflict
Diffstat (limited to 'filter/config.Y')
-rw-r--r--filter/config.Y4
1 files changed, 2 insertions, 2 deletions
diff --git a/filter/config.Y b/filter/config.Y
index a99e4a5..accf318 100644
--- a/filter/config.Y
+++ b/filter/config.Y
@@ -211,7 +211,7 @@ pair:
* Complex types, their bison value is struct f_val
*/
fprefix_s:
- IPA '/' NUM {
+ IPA '/' NUM %prec '/' {
if (!ip_is_prefix($1, $3)) cf_error("Invalid network prefix: %I/%d", $1, $3);
$$.type = T_PREFIX; $$.val.px.ip = $1; $$.val.px.len = $3;
}
@@ -225,7 +225,7 @@ fprefix:
;
fipa:
- IPA { $$.type = T_IP; $$.val.px.ip = $1; }
+ IPA %prec PREFIX_DUMMY { $$.type = T_IP; $$.val.px.ip = $1; }
;
set_atom: