- variant->p.index = index;
- variant->scope = new_definition_scope(parent_scope, field_name);
- variant->enum_tag = lookup_definition(variant->scope->scope_path,
- variant_declaration->tag_name,
- parent_scope);
+ /*
+ * Use INT_MAX order to ensure that all fields of the parent
+ * scope are seen as being prior to this scope.
+ */
+ variant->p.index = root_name ? INT_MAX : index;
+ variant->p.name = field_name;
+ variant->p.path = new_definition_path(parent_scope, field_name, root_name);
+ variant->p.scope = new_definition_scope(parent_scope, field_name, root_name);
+
+ ret = register_field_definition(field_name, &variant->p,
+ parent_scope);
+ assert(!ret);
+
+ variant->enum_tag = lookup_path_definition(variant->p.scope->scope_path,
+ variant_declaration->tag_name,
+ parent_scope);