summaryrefslogtreecommitdiff
path: root/nest/config.Y
diff options
context:
space:
mode:
authorMaria Matejka <mq@ucw.cz>2023-06-13 10:51:03 +0200
committerOndrej Zajicek <santiago@crfreenet.org>2023-09-12 15:36:46 +0200
commit51f2e7afaf069508685281e8c1b8bb1ceda79d8f (patch)
tree1e6c2fbb1bfa49b543033193adca354c04247e21 /nest/config.Y
parent5951dfbd5ed21d973e7627740c069d6612d7b899 (diff)
Conf: Symbol manipulation gets its context explicitly
Diffstat (limited to 'nest/config.Y')
-rw-r--r--nest/config.Y8
1 files changed, 4 insertions, 4 deletions
diff --git a/nest/config.Y b/nest/config.Y
index 8aaf0128..82f63783 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -255,19 +255,19 @@ proto_start:
proto_name:
/* EMPTY */ {
- struct symbol *s = cf_default_name(this_proto->protocol->template, &this_proto->protocol->name_counter);
+ struct symbol *s = cf_default_name(new_config, this_proto->protocol->template, &this_proto->protocol->name_counter);
s->class = this_proto->class;
s->proto = this_proto;
this_proto->name = s->name;
}
| symbol {
- cf_define_symbol($1, this_proto->class, proto, this_proto);
+ cf_define_symbol(new_config, $1, this_proto->class, proto, this_proto);
this_proto->name = $1->name;
}
| FROM CF_SYM_KNOWN {
if (($2->class != SYM_TEMPLATE) && ($2->class != SYM_PROTO)) cf_error("Template or protocol name expected");
- struct symbol *s = cf_default_name(this_proto->protocol->template, &this_proto->protocol->name_counter);
+ struct symbol *s = cf_default_name(new_config, this_proto->protocol->template, &this_proto->protocol->name_counter);
s->class = this_proto->class;
s->proto = this_proto;
this_proto->name = s->name;
@@ -277,7 +277,7 @@ proto_name:
| symbol FROM CF_SYM_KNOWN {
if (($3->class != SYM_TEMPLATE) && ($3->class != SYM_PROTO)) cf_error("Template or protocol name expected");
- cf_define_symbol($1, this_proto->class, proto, this_proto);
+ cf_define_symbol(new_config, $1, this_proto->class, proto, this_proto);
this_proto->name = $1->name;
proto_copy_config(this_proto, $3->proto);