- array->p.index = index;
- array->scope = new_definition_scope(parent_scope, field_name);
- array->current_element.definition =
- array_declaration->elem->definition_new(array_declaration->elem,
- parent_scope,
- g_quark_from_static_string("[]"),
- 0);
+ /*
+ * Use INT_MAX order to ensure that all fields of the parent
+ * scope are seen as being prior to this scope.
+ */
+ array->p.index = root_name ? INT_MAX : index;
+ array->p.name = field_name;
+ array->p.path = new_definition_path(parent_scope, field_name, root_name);
+ array->p.scope = new_definition_scope(parent_scope, field_name, root_name);
+ ret = register_field_definition(field_name, &array->p,
+ parent_scope);
+ assert(!ret);
+ array->string = NULL;
+ array->elems = NULL;
+
+ if (array_declaration->elem->id == CTF_TYPE_INTEGER) {
+ struct declaration_integer *integer_declaration =
+ container_of(array_declaration->elem, struct declaration_integer, p);
+
+ if (integer_declaration->encoding == CTF_STRING_UTF8
+ || integer_declaration->encoding == CTF_STRING_ASCII) {
+
+ array->string = g_string_new("");
+
+ if (integer_declaration->len == CHAR_BIT
+ && integer_declaration->p.alignment == CHAR_BIT) {
+ return &array->p;
+ }
+ }
+ }
+
+ array->elems = g_ptr_array_sized_new(array_declaration->len);
+ g_ptr_array_set_size(array->elems, array_declaration->len);
+ for (i = 0; i < array_declaration->len; i++) {
+ struct definition **field;
+ GString *str;
+ GQuark name;
+
+ str = g_string_new("");
+ g_string_printf(str, "[%u]", (unsigned int) i);
+ name = g_quark_from_string(str->str);
+ (void) g_string_free(str, TRUE);
+
+ field = (struct definition **) &g_ptr_array_index(array->elems, i);
+ *field = array_declaration->elem->definition_new(array_declaration->elem,
+ array->p.scope,
+ name, i, NULL);
+ if (!*field)
+ goto error;
+ }
+