X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-parser.y;h=821f0f7469b351cff47707e8be85d7fd3d165b12;hp=cedac20fe47dfcbf9d55c510f04d7954bcff4094;hb=3f4bae2a85a43606999ca7e701dcc9a493352ed3;hpb=fe41395a55903f52ae9c6abf1d95c2a903a97ce0 diff --git a/formats/ctf/metadata/ctf-parser.y b/formats/ctf/metadata/ctf-parser.y index cedac20f..821f0f74 100644 --- a/formats/ctf/metadata/ctf-parser.y +++ b/formats/ctf/metadata/ctf-parser.y @@ -15,23 +15,38 @@ * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. */ #include +#include #include #include #include #include #include #include +#include #include +#include #include "ctf-scanner.h" #include "ctf-parser.h" #include "ctf-ast.h" +#include "objstack.h" + +BT_HIDDEN +int yydebug; /* Join two lists, put "add" at the end of "head". */ static inline void -_cds_list_splice_tail (struct cds_list_head *add, struct cds_list_head *head) +_bt_list_splice_tail (struct bt_list_head *add, struct bt_list_head *head) { /* Do nothing if the list which gets added is empty. */ if (add != add->next) { @@ -42,77 +57,239 @@ _cds_list_splice_tail (struct cds_list_head *add, struct cds_list_head *head) } } -#define printf_dbg(fmt, args...) fprintf(stderr, "%s: " fmt, __func__, ## args) - -int yyparse(struct ctf_scanner *scanner); -int yylex(union YYSTYPE *yyval, struct ctf_scanner *scanner); +BT_HIDDEN +int yyparse(struct ctf_scanner *scanner, yyscan_t yyscanner); +BT_HIDDEN +int yylex(union YYSTYPE *yyval, yyscan_t yyscanner); +BT_HIDDEN int yylex_init_extra(struct ctf_scanner *scanner, yyscan_t * ptr_yy_globals); -int yylex_destroy(yyscan_t yyscanner) ; -void yyset_in(FILE * in_str, yyscan_t scanner); - -int yydebug; +BT_HIDDEN +int yylex_destroy(yyscan_t yyscanner); +BT_HIDDEN +void yyrestart(FILE * in_str, yyscan_t yyscanner); +BT_HIDDEN +int yyget_lineno(yyscan_t yyscanner); +BT_HIDDEN +char *yyget_text(yyscan_t yyscanner); + +static const char *node_type_to_str[] = { +#define ENTRY(S) [S] = #S, + FOREACH_CTF_NODES(ENTRY) +#undef ENTRY +}; -struct gc_string { - struct cds_list_head gc; - size_t alloclen; - char s[]; +/* + * Static node for out of memory errors. Only "type" is used. lineno is + * always left at 0. The rest of the node content can be overwritten, + * but is never used. + */ +static struct ctf_node error_node = { + .type = NODE_ERROR, }; -static struct gc_string *gc_string_alloc(struct ctf_scanner *scanner, - size_t len) +BT_HIDDEN +const char *node_type(struct ctf_node *node) { - struct gc_string *gstr; - size_t alloclen; - - /* TODO: could be faster with find first bit or glib Gstring */ - /* sizeof long to account for malloc header (int or long ?) */ - for (alloclen = 8; alloclen < sizeof(long) + sizeof(*gstr) + len; - alloclen *= 2); - - gstr = malloc(alloclen); - cds_list_add(&gstr->gc, &scanner->allocated_strings); - gstr->alloclen = alloclen; - return gstr; + if (node->type < NR_NODE_TYPES) + return node_type_to_str[node->type]; + else + return NULL; } -/* - * note: never use gc_string_append on a string that has external references. - * gsrc will be garbage collected immediately, and gstr might be. - * Should only be used to append characters to a string literal or constant. - */ -struct gc_string *gc_string_append(struct ctf_scanner *scanner, - struct gc_string *gstr, - struct gc_string *gsrc) +void setstring(struct ctf_scanner *scanner, YYSTYPE *lvalp, const char *src) { - size_t newlen = strlen(gsrc->s) + strlen(gstr->s) + 1; - size_t alloclen; - - /* TODO: could be faster with find first bit or glib Gstring */ - /* sizeof long to account for malloc header (int or long ?) */ - for (alloclen = 8; alloclen < sizeof(long) + sizeof(*gstr) + newlen; - alloclen *= 2); - - if (alloclen > gstr->alloclen) { - struct gc_string *newgstr; - - newgstr = gc_string_alloc(scanner, newlen); - strcpy(newgstr->s, gstr->s); - strcat(newgstr->s, gsrc->s); - cds_list_del(&gstr->gc); - free(gstr); - gstr = newgstr; - } else { - strcat(gstr->s, gsrc->s); + lvalp->s = objstack_alloc(scanner->objstack, strlen(src) + 1); + strcpy(lvalp->s, src); +} + +static +int str_check(size_t str_len, size_t offset, size_t len) +{ + /* check overflow */ + if (offset + len < offset) + return -1; + if (offset + len > str_len) + return -1; + return 0; +} + +static +int bt_isodigit(int c) +{ + switch (c) { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + return 1; + default: + return 0; } - cds_list_del(&gsrc->gc); - free(gsrc); - return gstr; } -void setstring(struct ctf_scanner *scanner, YYSTYPE *lvalp, const char *src) +static +int parse_base_sequence(const char *src, size_t len, size_t pos, + char *buffer, size_t *buf_len, int base) +{ + const size_t max_char = 3; + int nr_char = 0; + + while (!str_check(len, pos, 1) && nr_char < max_char) { + char c = src[pos++]; + + if (base == 8) { + if (bt_isodigit(c)) + buffer[nr_char++] = c; + else + break; + } else if (base == 16) { + if (isxdigit(c)) + buffer[nr_char++] = c; + else + break; + + } else { + /* Unsupported base */ + return -1; + } + } + assert(nr_char > 0); + buffer[nr_char] = '\0'; + *buf_len = nr_char; + return 0; +} + +static +int import_basic_string(struct ctf_scanner *scanner, YYSTYPE *lvalp, + size_t len, const char *src, char delim) +{ + size_t pos = 0, dpos = 0; + + if (str_check(len, pos, 1)) + return -1; + if (src[pos++] != delim) + return -1; + + while (src[pos] != delim) { + char c; + + if (str_check(len, pos, 1)) + return -1; + c = src[pos++]; + if (c == '\\') { + if (str_check(len, pos, 1)) + return -1; + c = src[pos++]; + + switch (c) { + case 'a': + c = '\a'; + break; + case 'b': + c = '\b'; + break; + case 'f': + c = '\f'; + break; + case 'n': + c = '\n'; + break; + case 'r': + c = '\r'; + break; + case 't': + c = '\t'; + break; + case 'v': + c = '\v'; + break; + case '\\': + c = '\\'; + break; + case '\'': + c = '\''; + break; + case '\"': + c = '\"'; + break; + case '?': + c = '?'; + break; + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + { + char oct_buffer[4]; + size_t oct_len; + + if (parse_base_sequence(src, len, pos - 1, + oct_buffer, &oct_len, 8)) + return -1; + c = strtoul(&oct_buffer[0], NULL, 8); + pos += oct_len - 1; + break; + } + case 'x': + { + char hex_buffer[4]; + size_t hex_len; + + if (parse_base_sequence(src, len, pos, + hex_buffer, &hex_len, 16)) + return -1; + c = strtoul(&hex_buffer[0], NULL, 16); + pos += hex_len; + break; + } + default: + return -1; + } + } + if (str_check(len, dpos, 1)) + return -1; + lvalp->s[dpos++] = c; + } + + if (str_check(len, dpos, 1)) + return -1; + lvalp->s[dpos++] = '\0'; + + if (str_check(len, pos, 1)) + return -1; + if (src[pos++] != delim) + return -1; + + if (str_check(len, pos, 1)) + return -1; + if (src[pos] != '\0') + return -1; + return 0; +} + +int import_string(struct ctf_scanner *scanner, YYSTYPE *lvalp, + const char *src, char delim) { - lvalp->gs = gc_string_alloc(scanner, strlen(src) + 1); - strcpy(lvalp->gs->s, src); + size_t len; + + len = strlen(src) + 1; + lvalp->s = objstack_alloc(scanner->objstack, len); + if (src[0] == 'L') { + // TODO: import wide string + printfl_error(yyget_lineno(scanner), + "Wide string not supported yet."); + return -1; + } else { + return import_basic_string(scanner, lvalp, len, src, delim); + } } static void init_scope(struct ctf_scanner_scope *scope, @@ -132,7 +309,7 @@ static void push_scope(struct ctf_scanner *scanner) { struct ctf_scanner_scope *ns; - printf_dbg("push scope\n"); + printf_debug("push scope\n"); ns = malloc(sizeof(struct ctf_scanner_scope)); init_scope(ns, scanner->cs); scanner->cs = ns; @@ -142,7 +319,7 @@ static void pop_scope(struct ctf_scanner *scanner) { struct ctf_scanner_scope *os; - printf_dbg("pop scope\n"); + printf_debug("pop scope\n"); os = scanner->cs; scanner->cs = os->parent; finalize_scope(os); @@ -153,11 +330,12 @@ static int lookup_type(struct ctf_scanner_scope *s, const char *id) { int ret; - ret = (int) g_hash_table_lookup(s->types, id); - printf_dbg("lookup %p %s %d\n", s, id, ret); + ret = (int) (long) g_hash_table_lookup(s->types, id); + printf_debug("lookup %p %s %d\n", s, id, ret); return ret; } +BT_HIDDEN int is_type(struct ctf_scanner *scanner, const char *id) { struct ctf_scanner_scope *it; @@ -169,108 +347,118 @@ int is_type(struct ctf_scanner *scanner, const char *id) break; } } - printf_dbg("is type %s %d\n", id, ret); + printf_debug("is type %s %d\n", id, ret); return ret; } -static void add_type(struct ctf_scanner *scanner, struct gc_string *id) +static void add_type(struct ctf_scanner *scanner, char *id) { - printf_dbg("add type %s\n", id->s); - if (lookup_type(scanner->cs, id->s)) + printf_debug("add type %s\n", id); + if (lookup_type(scanner->cs, id)) return; - g_hash_table_insert(scanner->cs->types, id->s, id->s); + g_hash_table_insert(scanner->cs->types, id, id); } static struct ctf_node *make_node(struct ctf_scanner *scanner, enum node_type type) { - struct ctf_ast *ast = ctf_scanner_get_ast(scanner); struct ctf_node *node; - node = malloc(sizeof(*node)); - if (!node) - return NULL; - memset(node, 0, sizeof(*node)); + node = objstack_alloc(scanner->objstack, sizeof(*node)); + if (!node) { + printfl_fatal(yyget_lineno(scanner->scanner), "out of memory"); + return &error_node; + } node->type = type; - CDS_INIT_LIST_HEAD(&node->tmp_head); - cds_list_add(&node->gc, &ast->allocated_nodes); - cds_list_add(&node->siblings, &node->tmp_head); + node->lineno = yyget_lineno(scanner->scanner); + BT_INIT_LIST_HEAD(&node->tmp_head); + bt_list_add(&node->siblings, &node->tmp_head); switch (type) { case NODE_ROOT: - fprintf(stderr, "[error] %s: trying to create root node\n", __func__); + node->type = NODE_ERROR; + printfn_fatal(node, "trying to create root node"); break; case NODE_EVENT: - CDS_INIT_LIST_HEAD(&node->u.event.declaration_list); + BT_INIT_LIST_HEAD(&node->u.event.declaration_list); break; case NODE_STREAM: - CDS_INIT_LIST_HEAD(&node->u.stream.declaration_list); + BT_INIT_LIST_HEAD(&node->u.stream.declaration_list); + break; + case NODE_ENV: + BT_INIT_LIST_HEAD(&node->u.env.declaration_list); break; case NODE_TRACE: - CDS_INIT_LIST_HEAD(&node->u.trace.declaration_list); + BT_INIT_LIST_HEAD(&node->u.trace.declaration_list); + break; + case NODE_CLOCK: + BT_INIT_LIST_HEAD(&node->u.clock.declaration_list); + break; + case NODE_CALLSITE: + BT_INIT_LIST_HEAD(&node->u.callsite.declaration_list); break; case NODE_CTF_EXPRESSION: - CDS_INIT_LIST_HEAD(&node->u.ctf_expression.left); - CDS_INIT_LIST_HEAD(&node->u.ctf_expression.right); + BT_INIT_LIST_HEAD(&node->u.ctf_expression.left); + BT_INIT_LIST_HEAD(&node->u.ctf_expression.right); break; case NODE_UNARY_EXPRESSION: break; case NODE_TYPEDEF: - CDS_INIT_LIST_HEAD(&node->u._typedef.declaration_specifier); - CDS_INIT_LIST_HEAD(&node->u._typedef.type_declarators); + BT_INIT_LIST_HEAD(&node->u._typedef.type_declarators); break; case NODE_TYPEALIAS_TARGET: - CDS_INIT_LIST_HEAD(&node->u.typealias_target.declaration_specifier); - CDS_INIT_LIST_HEAD(&node->u.typealias_target.type_declarators); + BT_INIT_LIST_HEAD(&node->u.typealias_target.type_declarators); break; case NODE_TYPEALIAS_ALIAS: - CDS_INIT_LIST_HEAD(&node->u.typealias_alias.declaration_specifier); - CDS_INIT_LIST_HEAD(&node->u.typealias_alias.type_declarators); + BT_INIT_LIST_HEAD(&node->u.typealias_alias.type_declarators); break; case NODE_TYPEALIAS: break; case NODE_TYPE_SPECIFIER: break; + case NODE_TYPE_SPECIFIER_LIST: + BT_INIT_LIST_HEAD(&node->u.type_specifier_list.head); + break; case NODE_POINTER: break; case NODE_TYPE_DECLARATOR: - CDS_INIT_LIST_HEAD(&node->u.type_declarator.pointers); + BT_INIT_LIST_HEAD(&node->u.type_declarator.pointers); break; case NODE_FLOATING_POINT: - CDS_INIT_LIST_HEAD(&node->u.floating_point.expressions); + BT_INIT_LIST_HEAD(&node->u.floating_point.expressions); break; case NODE_INTEGER: - CDS_INIT_LIST_HEAD(&node->u.integer.expressions); + BT_INIT_LIST_HEAD(&node->u.integer.expressions); break; case NODE_STRING: - CDS_INIT_LIST_HEAD(&node->u.string.expressions); + BT_INIT_LIST_HEAD(&node->u.string.expressions); break; case NODE_ENUMERATOR: - CDS_INIT_LIST_HEAD(&node->u.enumerator.values); + BT_INIT_LIST_HEAD(&node->u.enumerator.values); break; case NODE_ENUM: - CDS_INIT_LIST_HEAD(&node->u._enum.enumerator_list); + BT_INIT_LIST_HEAD(&node->u._enum.enumerator_list); break; case NODE_STRUCT_OR_VARIANT_DECLARATION: - CDS_INIT_LIST_HEAD(&node->u.struct_or_variant_declaration.declaration_specifier); - CDS_INIT_LIST_HEAD(&node->u.struct_or_variant_declaration.type_declarators); + BT_INIT_LIST_HEAD(&node->u.struct_or_variant_declaration.type_declarators); break; case NODE_VARIANT: - CDS_INIT_LIST_HEAD(&node->u.variant.declaration_list); + BT_INIT_LIST_HEAD(&node->u.variant.declaration_list); break; case NODE_STRUCT: - CDS_INIT_LIST_HEAD(&node->u._struct.declaration_list); + BT_INIT_LIST_HEAD(&node->u._struct.declaration_list); + BT_INIT_LIST_HEAD(&node->u._struct.min_align); break; case NODE_UNKNOWN: default: - fprintf(stderr, "[error] %s: unknown node type %d\n", __func__, - (int) type); + node->type = NODE_ERROR; + printfn_fatal(node, "unknown node type '%d'", (int) type); break; } @@ -282,22 +470,31 @@ static int reparent_ctf_expression(struct ctf_node *node, { switch (parent->type) { case NODE_EVENT: - _cds_list_splice_tail(&node->tmp_head, &parent->u.event.declaration_list); + _bt_list_splice_tail(&node->tmp_head, &parent->u.event.declaration_list); break; case NODE_STREAM: - _cds_list_splice_tail(&node->tmp_head, &parent->u.stream.declaration_list); + _bt_list_splice_tail(&node->tmp_head, &parent->u.stream.declaration_list); + break; + case NODE_ENV: + _bt_list_splice_tail(&node->tmp_head, &parent->u.env.declaration_list); break; case NODE_TRACE: - _cds_list_splice_tail(&node->tmp_head, &parent->u.trace.declaration_list); + _bt_list_splice_tail(&node->tmp_head, &parent->u.trace.declaration_list); + break; + case NODE_CLOCK: + _bt_list_splice_tail(&node->tmp_head, &parent->u.clock.declaration_list); + break; + case NODE_CALLSITE: + _bt_list_splice_tail(&node->tmp_head, &parent->u.callsite.declaration_list); break; case NODE_FLOATING_POINT: - _cds_list_splice_tail(&node->tmp_head, &parent->u.floating_point.expressions); + _bt_list_splice_tail(&node->tmp_head, &parent->u.floating_point.expressions); break; case NODE_INTEGER: - _cds_list_splice_tail(&node->tmp_head, &parent->u.integer.expressions); + _bt_list_splice_tail(&node->tmp_head, &parent->u.integer.expressions); break; case NODE_STRING: - _cds_list_splice_tail(&node->tmp_head, &parent->u.string.expressions); + _bt_list_splice_tail(&node->tmp_head, &parent->u.string.expressions); break; case NODE_ROOT: @@ -307,6 +504,7 @@ static int reparent_ctf_expression(struct ctf_node *node, case NODE_TYPEALIAS_ALIAS: case NODE_TYPEALIAS: case NODE_TYPE_SPECIFIER: + case NODE_TYPE_SPECIFIER_LIST: case NODE_POINTER: case NODE_TYPE_DECLARATOR: case NODE_ENUMERATOR: @@ -319,8 +517,7 @@ static int reparent_ctf_expression(struct ctf_node *node, case NODE_UNKNOWN: default: - fprintf(stderr, "[error] %s: unknown node type %d\n", __func__, - (int) parent->type); + printfn_fatal(node, "unknown node type '%d'", (int) parent->type); return -EINVAL; } return 0; @@ -330,22 +527,31 @@ static int reparent_typedef(struct ctf_node *node, struct ctf_node *parent) { switch (parent->type) { case NODE_ROOT: - _cds_list_splice_tail(&node->tmp_head, &parent->u.root._typedef); + _bt_list_splice_tail(&node->tmp_head, &parent->u.root.declaration_list); break; case NODE_EVENT: - _cds_list_splice_tail(&node->tmp_head, &parent->u.event.declaration_list); + _bt_list_splice_tail(&node->tmp_head, &parent->u.event.declaration_list); break; case NODE_STREAM: - _cds_list_splice_tail(&node->tmp_head, &parent->u.stream.declaration_list); + _bt_list_splice_tail(&node->tmp_head, &parent->u.stream.declaration_list); + break; + case NODE_ENV: + _bt_list_splice_tail(&node->tmp_head, &parent->u.env.declaration_list); break; case NODE_TRACE: - _cds_list_splice_tail(&node->tmp_head, &parent->u.trace.declaration_list); + _bt_list_splice_tail(&node->tmp_head, &parent->u.trace.declaration_list); + break; + case NODE_CLOCK: + _bt_list_splice_tail(&node->tmp_head, &parent->u.clock.declaration_list); + break; + case NODE_CALLSITE: + _bt_list_splice_tail(&node->tmp_head, &parent->u.callsite.declaration_list); break; case NODE_VARIANT: - _cds_list_splice_tail(&node->tmp_head, &parent->u.variant.declaration_list); + _bt_list_splice_tail(&node->tmp_head, &parent->u.variant.declaration_list); break; case NODE_STRUCT: - _cds_list_splice_tail(&node->tmp_head, &parent->u._struct.declaration_list); + _bt_list_splice_tail(&node->tmp_head, &parent->u._struct.declaration_list); break; case NODE_FLOATING_POINT: @@ -357,6 +563,7 @@ static int reparent_typedef(struct ctf_node *node, struct ctf_node *parent) case NODE_TYPEALIAS_ALIAS: case NODE_TYPEALIAS: case NODE_TYPE_SPECIFIER: + case NODE_TYPE_SPECIFIER_LIST: case NODE_POINTER: case NODE_TYPE_DECLARATOR: case NODE_ENUMERATOR: @@ -367,8 +574,7 @@ static int reparent_typedef(struct ctf_node *node, struct ctf_node *parent) case NODE_UNKNOWN: default: - fprintf(stderr, "[error] %s: unknown node type %d\n", __func__, - (int) parent->type); + printfn_fatal(node, "unknown node type %d", parent->type); return -EINVAL; } return 0; @@ -378,22 +584,31 @@ static int reparent_typealias(struct ctf_node *node, struct ctf_node *parent) { switch (parent->type) { case NODE_ROOT: - _cds_list_splice_tail(&node->tmp_head, &parent->u.root.typealias); + _bt_list_splice_tail(&node->tmp_head, &parent->u.root.declaration_list); break; case NODE_EVENT: - _cds_list_splice_tail(&node->tmp_head, &parent->u.event.declaration_list); + _bt_list_splice_tail(&node->tmp_head, &parent->u.event.declaration_list); break; case NODE_STREAM: - _cds_list_splice_tail(&node->tmp_head, &parent->u.stream.declaration_list); + _bt_list_splice_tail(&node->tmp_head, &parent->u.stream.declaration_list); + break; + case NODE_ENV: + _bt_list_splice_tail(&node->tmp_head, &parent->u.env.declaration_list); break; case NODE_TRACE: - _cds_list_splice_tail(&node->tmp_head, &parent->u.trace.declaration_list); + _bt_list_splice_tail(&node->tmp_head, &parent->u.trace.declaration_list); + break; + case NODE_CLOCK: + _bt_list_splice_tail(&node->tmp_head, &parent->u.clock.declaration_list); + break; + case NODE_CALLSITE: + _bt_list_splice_tail(&node->tmp_head, &parent->u.callsite.declaration_list); break; case NODE_VARIANT: - _cds_list_splice_tail(&node->tmp_head, &parent->u.variant.declaration_list); + _bt_list_splice_tail(&node->tmp_head, &parent->u.variant.declaration_list); break; case NODE_STRUCT: - _cds_list_splice_tail(&node->tmp_head, &parent->u._struct.declaration_list); + _bt_list_splice_tail(&node->tmp_head, &parent->u._struct.declaration_list); break; case NODE_FLOATING_POINT: @@ -405,6 +620,7 @@ static int reparent_typealias(struct ctf_node *node, struct ctf_node *parent) case NODE_TYPEALIAS_ALIAS: case NODE_TYPEALIAS: case NODE_TYPE_SPECIFIER: + case NODE_TYPE_SPECIFIER_LIST: case NODE_POINTER: case NODE_TYPE_DECLARATOR: case NODE_ENUMERATOR: @@ -415,8 +631,7 @@ static int reparent_typealias(struct ctf_node *node, struct ctf_node *parent) case NODE_UNKNOWN: default: - fprintf(stderr, "[error] %s: unknown node type %d\n", __func__, - (int) parent->type); + printfn_fatal(node, "unknown node type '%d'", (int) parent->type); return -EINVAL; } return 0; @@ -424,51 +639,98 @@ static int reparent_typealias(struct ctf_node *node, struct ctf_node *parent) static int reparent_type_specifier(struct ctf_node *node, struct ctf_node *parent) +{ + switch (parent->type) { + case NODE_TYPE_SPECIFIER_LIST: + _bt_list_splice_tail(&node->tmp_head, &parent->u.type_specifier_list.head); + break; + + case NODE_TYPE_SPECIFIER: + case NODE_EVENT: + case NODE_STREAM: + case NODE_ENV: + case NODE_TRACE: + case NODE_CLOCK: + case NODE_CALLSITE: + case NODE_VARIANT: + case NODE_STRUCT: + case NODE_TYPEDEF: + case NODE_TYPEALIAS_TARGET: + case NODE_TYPEALIAS_ALIAS: + case NODE_TYPE_DECLARATOR: + case NODE_ENUM: + case NODE_STRUCT_OR_VARIANT_DECLARATION: + case NODE_TYPEALIAS: + case NODE_FLOATING_POINT: + case NODE_INTEGER: + case NODE_STRING: + case NODE_CTF_EXPRESSION: + case NODE_POINTER: + case NODE_ENUMERATOR: + case NODE_UNARY_EXPRESSION: + return -EPERM; + + case NODE_UNKNOWN: + default: + printfn_fatal(node, "unknown node type '%d'", (int) parent->type); + return -EINVAL; + } + return 0; +} + +static int reparent_type_specifier_list(struct ctf_node *node, + struct ctf_node *parent) { switch (parent->type) { case NODE_ROOT: - _cds_list_splice_tail(&node->tmp_head, &parent->u.root.declaration_specifier); + bt_list_add_tail(&node->siblings, &parent->u.root.declaration_list); break; case NODE_EVENT: - _cds_list_splice_tail(&node->tmp_head, &parent->u.event.declaration_list); + bt_list_add_tail(&node->siblings, &parent->u.event.declaration_list); break; case NODE_STREAM: - _cds_list_splice_tail(&node->tmp_head, &parent->u.stream.declaration_list); + bt_list_add_tail(&node->siblings, &parent->u.stream.declaration_list); + break; + case NODE_ENV: + bt_list_add_tail(&node->siblings, &parent->u.env.declaration_list); break; case NODE_TRACE: - _cds_list_splice_tail(&node->tmp_head, &parent->u.trace.declaration_list); + bt_list_add_tail(&node->siblings, &parent->u.trace.declaration_list); + break; + case NODE_CLOCK: + bt_list_add_tail(&node->siblings, &parent->u.clock.declaration_list); + break; + case NODE_CALLSITE: + bt_list_add_tail(&node->siblings, &parent->u.callsite.declaration_list); break; case NODE_VARIANT: - _cds_list_splice_tail(&node->tmp_head, &parent->u.variant.declaration_list); + bt_list_add_tail(&node->siblings, &parent->u.variant.declaration_list); break; case NODE_STRUCT: - _cds_list_splice_tail(&node->tmp_head, &parent->u._struct.declaration_list); + bt_list_add_tail(&node->siblings, &parent->u._struct.declaration_list); break; case NODE_TYPEDEF: - _cds_list_splice_tail(&node->tmp_head, &parent->u._typedef.declaration_specifier); + parent->u._typedef.type_specifier_list = node; break; case NODE_TYPEALIAS_TARGET: - _cds_list_splice_tail(&node->tmp_head, &parent->u.typealias_target.declaration_specifier); + parent->u.typealias_target.type_specifier_list = node; break; case NODE_TYPEALIAS_ALIAS: - _cds_list_splice_tail(&node->tmp_head, &parent->u.typealias_alias.declaration_specifier); - break; - case NODE_TYPE_DECLARATOR: - parent->u.type_declarator.type = TYPEDEC_NESTED; - parent->u.type_declarator.u.nested.length = node; + parent->u.typealias_alias.type_specifier_list = node; break; case NODE_ENUM: parent->u._enum.container_type = node; break; case NODE_STRUCT_OR_VARIANT_DECLARATION: - _cds_list_splice_tail(&node->tmp_head, &parent->u.struct_or_variant_declaration.declaration_specifier); + parent->u.struct_or_variant_declaration.type_specifier_list = node; break; + case NODE_TYPE_DECLARATOR: + case NODE_TYPE_SPECIFIER: case NODE_TYPEALIAS: case NODE_FLOATING_POINT: case NODE_INTEGER: case NODE_STRING: case NODE_CTF_EXPRESSION: - case NODE_TYPE_SPECIFIER: case NODE_POINTER: case NODE_ENUMERATOR: case NODE_UNARY_EXPRESSION: @@ -476,8 +738,7 @@ static int reparent_type_specifier(struct ctf_node *node, case NODE_UNKNOWN: default: - fprintf(stderr, "[error] %s: unknown node type %d\n", __func__, - (int) parent->type); + printfn_fatal(node, "unknown node type '%d'", (int) parent->type); return -EINVAL; } return 0; @@ -492,22 +753,25 @@ static int reparent_type_declarator(struct ctf_node *node, parent->u.type_declarator.u.nested.type_declarator = node; break; case NODE_STRUCT_OR_VARIANT_DECLARATION: - _cds_list_splice_tail(&node->tmp_head, &parent->u.struct_or_variant_declaration.type_declarators); + _bt_list_splice_tail(&node->tmp_head, &parent->u.struct_or_variant_declaration.type_declarators); break; case NODE_TYPEDEF: - _cds_list_splice_tail(&node->tmp_head, &parent->u._typedef.type_declarators); + _bt_list_splice_tail(&node->tmp_head, &parent->u._typedef.type_declarators); break; case NODE_TYPEALIAS_TARGET: - _cds_list_splice_tail(&node->tmp_head, &parent->u.typealias_target.type_declarators); + _bt_list_splice_tail(&node->tmp_head, &parent->u.typealias_target.type_declarators); break; case NODE_TYPEALIAS_ALIAS: - _cds_list_splice_tail(&node->tmp_head, &parent->u.typealias_alias.type_declarators); + _bt_list_splice_tail(&node->tmp_head, &parent->u.typealias_alias.type_declarators); break; case NODE_ROOT: case NODE_EVENT: case NODE_STREAM: + case NODE_ENV: case NODE_TRACE: + case NODE_CLOCK: + case NODE_CALLSITE: case NODE_VARIANT: case NODE_STRUCT: case NODE_TYPEALIAS: @@ -517,6 +781,7 @@ static int reparent_type_declarator(struct ctf_node *node, case NODE_STRING: case NODE_CTF_EXPRESSION: case NODE_TYPE_SPECIFIER: + case NODE_TYPE_SPECIFIER_LIST: case NODE_POINTER: case NODE_ENUMERATOR: case NODE_UNARY_EXPRESSION: @@ -524,8 +789,7 @@ static int reparent_type_declarator(struct ctf_node *node, case NODE_UNKNOWN: default: - fprintf(stderr, "[error] %s: unknown node type %d\n", __func__, - (int) parent->type); + printfn_fatal(node, "unknown node type '%d'", (int) parent->type); return -EINVAL; } return 0; @@ -548,26 +812,50 @@ static int set_parent_node(struct ctf_node *node, switch (node->type) { case NODE_ROOT: - fprintf(stderr, "[error] %s: trying to reparent root node\n", __func__); + printfn_fatal(node, "trying to reparent root node"); return -EINVAL; case NODE_EVENT: if (parent->type == NODE_ROOT) { - _cds_list_splice_tail(&node->tmp_head, &parent->u.root.event); - } else + _bt_list_splice_tail(&node->tmp_head, &parent->u.root.event); + } else { return -EPERM; + } break; case NODE_STREAM: if (parent->type == NODE_ROOT) { - _cds_list_splice_tail(&node->tmp_head, &parent->u.root.stream); - } else + _bt_list_splice_tail(&node->tmp_head, &parent->u.root.stream); + } else { + return -EPERM; + } + break; + case NODE_ENV: + if (parent->type == NODE_ROOT) { + _bt_list_splice_tail(&node->tmp_head, &parent->u.root.env); + } else { return -EPERM; + } break; case NODE_TRACE: if (parent->type == NODE_ROOT) { - _cds_list_splice_tail(&node->tmp_head, &parent->u.root.trace); - } else + _bt_list_splice_tail(&node->tmp_head, &parent->u.root.trace); + } else { return -EPERM; + } + break; + case NODE_CLOCK: + if (parent->type == NODE_ROOT) { + _bt_list_splice_tail(&node->tmp_head, &parent->u.root.clock); + } else { + return -EPERM; + } + break; + case NODE_CALLSITE: + if (parent->type == NODE_ROOT) { + _bt_list_splice_tail(&node->tmp_head, &parent->u.root.callsite); + } else { + return -EPERM; + } break; case NODE_CTF_EXPRESSION: @@ -596,35 +884,41 @@ static int set_parent_node(struct ctf_node *node, case NODE_POINTER: if (parent->type == NODE_TYPE_DECLARATOR) { - _cds_list_splice_tail(&node->tmp_head, &parent->u.type_declarator.pointers); + _bt_list_splice_tail(&node->tmp_head, &parent->u.type_declarator.pointers); } else return -EPERM; break; case NODE_TYPE_DECLARATOR: return reparent_type_declarator(node, parent); + case NODE_TYPE_SPECIFIER_LIST: + return reparent_type_specifier_list(node, parent); + case NODE_TYPE_SPECIFIER: + return reparent_type_specifier(node, parent); + case NODE_FLOATING_POINT: case NODE_INTEGER: case NODE_STRING: case NODE_ENUM: case NODE_VARIANT: case NODE_STRUCT: - return reparent_type_specifier(node, parent); + return -EINVAL; /* Dealt with internally within grammar */ case NODE_ENUMERATOR: if (parent->type == NODE_ENUM) { - _cds_list_splice_tail(&node->tmp_head, &parent->u._enum.enumerator_list); - } else + _bt_list_splice_tail(&node->tmp_head, &parent->u._enum.enumerator_list); + } else { return -EPERM; + } break; case NODE_STRUCT_OR_VARIANT_DECLARATION: switch (parent->type) { case NODE_STRUCT: - _cds_list_splice_tail(&node->tmp_head, &parent->u._struct.declaration_list); + _bt_list_splice_tail(&node->tmp_head, &parent->u._struct.declaration_list); break; case NODE_VARIANT: - _cds_list_splice_tail(&node->tmp_head, &parent->u.variant.declaration_list); + _bt_list_splice_tail(&node->tmp_head, &parent->u.variant.declaration_list); break; default: return -EINVAL; @@ -633,18 +927,21 @@ static int set_parent_node(struct ctf_node *node, case NODE_UNKNOWN: default: - fprintf(stderr, "[error] %s: unknown node type %d\n", __func__, - (int) parent->type); + printfn_fatal(node, "unknown node type '%d'", (int) parent->type); return -EINVAL; } return 0; } -void yyerror(struct ctf_scanner *scanner, const char *str) +BT_HIDDEN +void yyerror(struct ctf_scanner *scanner, yyscan_t yyscanner, const char *str) { - fprintf(stderr, "error %s\n", str); + printfl_error(yyget_lineno(scanner->scanner), + "token \"%s\": %s\n", + yyget_text(scanner->scanner), str); } +BT_HIDDEN int yywrap(void) { return 1; @@ -652,81 +949,73 @@ int yywrap(void) #define reparent_error(scanner, str) \ do { \ - yyerror(scanner, YY_("reparent_error: " str "\n")); \ + yyerror(scanner, scanner->scanner, YY_("reparent_error: " str)); \ YYERROR; \ } while (0) -static void free_strings(struct cds_list_head *list) -{ - struct gc_string *gstr, *tmp; - - cds_list_for_each_entry_safe(gstr, tmp, list, gc) - free(gstr); -} - -static struct ctf_ast *ctf_ast_alloc(void) +static struct ctf_ast *ctf_ast_alloc(struct ctf_scanner *scanner) { struct ctf_ast *ast; - ast = malloc(sizeof(*ast)); + ast = objstack_alloc(scanner->objstack, sizeof(*ast)); if (!ast) return NULL; - memset(ast, 0, sizeof(*ast)); - CDS_INIT_LIST_HEAD(&ast->allocated_nodes); ast->root.type = NODE_ROOT; - CDS_INIT_LIST_HEAD(&ast->root.tmp_head); - CDS_INIT_LIST_HEAD(&ast->root.u.root._typedef); - CDS_INIT_LIST_HEAD(&ast->root.u.root.typealias); - CDS_INIT_LIST_HEAD(&ast->root.u.root.declaration_specifier); - CDS_INIT_LIST_HEAD(&ast->root.u.root.trace); - CDS_INIT_LIST_HEAD(&ast->root.u.root.stream); - CDS_INIT_LIST_HEAD(&ast->root.u.root.event); + BT_INIT_LIST_HEAD(&ast->root.tmp_head); + BT_INIT_LIST_HEAD(&ast->root.u.root.declaration_list); + BT_INIT_LIST_HEAD(&ast->root.u.root.trace); + BT_INIT_LIST_HEAD(&ast->root.u.root.env); + BT_INIT_LIST_HEAD(&ast->root.u.root.stream); + BT_INIT_LIST_HEAD(&ast->root.u.root.event); + BT_INIT_LIST_HEAD(&ast->root.u.root.clock); + BT_INIT_LIST_HEAD(&ast->root.u.root.callsite); return ast; } -static void ctf_ast_free(struct ctf_ast *ast) -{ - struct ctf_node *node, *tmp; - - cds_list_for_each_entry_safe(node, tmp, &ast->allocated_nodes, gc) - free(node); -} - -int ctf_scanner_append_ast(struct ctf_scanner *scanner) +int ctf_scanner_append_ast(struct ctf_scanner *scanner, FILE *input) { - return yyparse(scanner); + /* Start processing new stream */ + yyrestart(input, scanner->scanner); + if (yydebug) + fprintf(stdout, "Scanner input is a%s.\n", + isatty(fileno(input)) ? "n interactive tty" : + " noninteractive file"); + return yyparse(scanner, scanner->scanner); } -struct ctf_scanner *ctf_scanner_alloc(FILE *input) +struct ctf_scanner *ctf_scanner_alloc(void) { struct ctf_scanner *scanner; int ret; + yydebug = babeltrace_debug; + scanner = malloc(sizeof(*scanner)); if (!scanner) return NULL; memset(scanner, 0, sizeof(*scanner)); - ret = yylex_init_extra(scanner, &scanner->scanner); if (ret) { - fprintf(stderr, "yylex_init error\n"); + printf_fatal("yylex_init error"); goto cleanup_scanner; } - yyset_in(input, scanner); - - scanner->ast = ctf_ast_alloc(); - if (!scanner->ast) + scanner->objstack = objstack_create(); + if (!scanner->objstack) goto cleanup_lexer; + scanner->ast = ctf_ast_alloc(scanner); + if (!scanner->ast) + goto cleanup_objstack; init_scope(&scanner->root_scope, NULL); scanner->cs = &scanner->root_scope; - CDS_INIT_LIST_HEAD(&scanner->allocated_strings); return scanner; +cleanup_objstack: + objstack_destroy(scanner->objstack); cleanup_lexer: ret = yylex_destroy(scanner->scanner); if (!ret) - fprintf(stderr, "yylex_destroy error\n"); + printf_fatal("yylex_destroy error"); cleanup_scanner: free(scanner); return NULL; @@ -736,12 +1025,13 @@ void ctf_scanner_free(struct ctf_scanner *scanner) { int ret; + if (!scanner) + return; finalize_scope(&scanner->root_scope); - free_strings(&scanner->allocated_strings); - ctf_ast_free(scanner->ast); + objstack_destroy(scanner->objstack); ret = yylex_destroy(scanner->scanner); if (ret) - fprintf(stderr, "yylex_destroy error\n"); + printf_error("yylex_destroy error"); free(scanner); } @@ -749,41 +1039,58 @@ void ctf_scanner_free(struct ctf_scanner *scanner) %define api.pure /* %locations */ +%error-verbose %parse-param {struct ctf_scanner *scanner} -%lex-param {struct ctf_scanner *scanner} +%parse-param {yyscan_t yyscanner} +%lex-param {yyscan_t yyscanner} +/* + * Expect two shift-reduce conflicts. Caused by enum name-opt : type {} + * vs struct { int :value; } (unnamed bit-field). The default is to + * shift, so whenever we encounter an enumeration, we are doing the + * proper thing (shift). It is illegal to declare an enumeration + * "bit-field", so it is OK if this situation ends up in a parsing + * error. + */ +%expect 2 %start file -%token CHARACTER_CONSTANT_START SQUOTE STRING_LITERAL_START DQUOTE ESCSEQ CHAR_STRING_TOKEN LSBRAC RSBRAC LPAREN RPAREN LBRAC RBRAC RARROW STAR PLUS MINUS LT GT TYPEASSIGN COLON SEMICOLON DOTDOTDOT DOT EQUAL COMMA CONST CHAR DOUBLE ENUM EVENT FLOATING_POINT FLOAT INTEGER INT LONG SHORT SIGNED STREAM STRING STRUCT TRACE TYPEALIAS TYPEDEF UNSIGNED VARIANT VOID _BOOL _COMPLEX _IMAGINARY DECIMAL_CONSTANT OCTAL_CONSTANT HEXADECIMAL_CONSTANT -%token IDENTIFIER ID_TYPE +%token INTEGER_LITERAL STRING_LITERAL CHARACTER_LITERAL LSBRAC RSBRAC LPAREN RPAREN LBRAC RBRAC RARROW STAR PLUS MINUS LT GT TYPEASSIGN COLON SEMICOLON DOTDOTDOT DOT EQUAL COMMA CONST CHAR DOUBLE ENUM ENV EVENT FLOATING_POINT FLOAT INTEGER INT LONG SHORT SIGNED STREAM STRING STRUCT TRACE CALLSITE CLOCK TYPEALIAS TYPEDEF UNSIGNED VARIANT VOID _BOOL _COMPLEX _IMAGINARY TOK_ALIGN +%token IDENTIFIER ID_TYPE %token ERROR %union { long long ll; + unsigned long long ull; char c; - struct gc_string *gs; + char *s; struct ctf_node *n; } -%type keywords -%type s_char s_char_sequence c_char c_char_sequence +%type STRING_LITERAL CHARACTER_LITERAL + +%type keywords +%type INTEGER_LITERAL %type postfix_expression unary_expression unary_expression_or_range %type declaration %type event_declaration %type stream_declaration +%type env_declaration %type trace_declaration +%type clock_declaration +%type callsite_declaration +%type integer_declaration_specifiers %type declaration_specifiers +%type alias_declaration_specifiers %type type_declarator_list -%type abstract_type_declarator_list +%type integer_type_specifier %type type_specifier %type struct_type_specifier %type variant_type_specifier -%type type_specifier_or_integer_constant %type enum_type_specifier %type struct_or_variant_declaration_list %type struct_or_variant_declaration -%type specifier_qualifier_list %type struct_or_variant_declarator_list %type struct_or_variant_declarator %type enumerator_list @@ -791,12 +1098,13 @@ void ctf_scanner_free(struct ctf_scanner *scanner) %type abstract_declarator_list %type abstract_declarator %type direct_abstract_declarator +%type alias_abstract_declarator_list +%type alias_abstract_declarator +%type direct_alias_abstract_declarator %type declarator %type direct_declarator %type type_declarator %type direct_type_declarator -%type abstract_type_declarator -%type direct_abstract_type_declarator %type pointer %type ctf_assignment_expression_list %type ctf_assignment_expression @@ -818,86 +1126,61 @@ file: keywords: VOID - { $$ = yylval.gs; } + { $$ = yylval.s; } | CHAR - { $$ = yylval.gs; } + { $$ = yylval.s; } | SHORT - { $$ = yylval.gs; } + { $$ = yylval.s; } | INT - { $$ = yylval.gs; } + { $$ = yylval.s; } | LONG - { $$ = yylval.gs; } + { $$ = yylval.s; } | FLOAT - { $$ = yylval.gs; } + { $$ = yylval.s; } | DOUBLE - { $$ = yylval.gs; } + { $$ = yylval.s; } | SIGNED - { $$ = yylval.gs; } + { $$ = yylval.s; } | UNSIGNED - { $$ = yylval.gs; } + { $$ = yylval.s; } | _BOOL - { $$ = yylval.gs; } + { $$ = yylval.s; } | _COMPLEX - { $$ = yylval.gs; } + { $$ = yylval.s; } + | _IMAGINARY + { $$ = yylval.s; } | FLOATING_POINT - { $$ = yylval.gs; } + { $$ = yylval.s; } | INTEGER - { $$ = yylval.gs; } + { $$ = yylval.s; } | STRING - { $$ = yylval.gs; } + { $$ = yylval.s; } | ENUM - { $$ = yylval.gs; } + { $$ = yylval.s; } | VARIANT - { $$ = yylval.gs; } + { $$ = yylval.s; } | STRUCT - { $$ = yylval.gs; } + { $$ = yylval.s; } | CONST - { $$ = yylval.gs; } + { $$ = yylval.s; } | TYPEDEF - { $$ = yylval.gs; } + { $$ = yylval.s; } | EVENT - { $$ = yylval.gs; } + { $$ = yylval.s; } | STREAM - { $$ = yylval.gs; } + { $$ = yylval.s; } + | ENV + { $$ = yylval.s; } | TRACE - { $$ = yylval.gs; } - ; - -/* 1.5 Constants */ - -c_char_sequence: - c_char - { $$ = $1; } - | c_char_sequence c_char - { $$ = gc_string_append(scanner, $1, $2); } + { $$ = yylval.s; } + | CLOCK + { $$ = yylval.s; } + | CALLSITE + { $$ = yylval.s; } + | TOK_ALIGN + { $$ = yylval.s; } ; -c_char: - CHAR_STRING_TOKEN - { $$ = yylval.gs; } - | ESCSEQ - { - reparent_error(scanner, "escape sequences not supported yet"); - } - ; - -/* 1.6 String literals */ - -s_char_sequence: - s_char - { $$ = $1; } - | s_char_sequence s_char - { $$ = gc_string_append(scanner, $1, $2); } - ; - -s_char: - CHAR_STRING_TOKEN - { $$ = yylval.gs; } - | ESCSEQ - { - reparent_error(scanner, "escape sequences not supported yet"); - } - ; /* 2: Phrase structure grammar */ @@ -906,109 +1189,94 @@ postfix_expression: { $$ = make_node(scanner, NODE_UNARY_EXPRESSION); $$->u.unary_expression.type = UNARY_STRING; - $$->u.unary_expression.u.string = yylval.gs->s; + $$->u.unary_expression.u.string = yylval.s; } | ID_TYPE { $$ = make_node(scanner, NODE_UNARY_EXPRESSION); $$->u.unary_expression.type = UNARY_STRING; - $$->u.unary_expression.u.string = yylval.gs->s; + $$->u.unary_expression.u.string = yylval.s; } | keywords { $$ = make_node(scanner, NODE_UNARY_EXPRESSION); $$->u.unary_expression.type = UNARY_STRING; - $$->u.unary_expression.u.string = yylval.gs->s; + $$->u.unary_expression.u.string = yylval.s; } - - | DECIMAL_CONSTANT - { - $$ = make_node(scanner, NODE_UNARY_EXPRESSION); - $$->u.unary_expression.type = UNARY_UNSIGNED_CONSTANT; - sscanf(yylval.gs->s, "%llu", - &$$->u.unary_expression.u.unsigned_constant); - } - | OCTAL_CONSTANT - { - $$ = make_node(scanner, NODE_UNARY_EXPRESSION); - $$->u.unary_expression.type = UNARY_UNSIGNED_CONSTANT; - sscanf(yylval.gs->s, "0%llo", - &$$->u.unary_expression.u.unsigned_constant); - } - | HEXADECIMAL_CONSTANT + | INTEGER_LITERAL { $$ = make_node(scanner, NODE_UNARY_EXPRESSION); $$->u.unary_expression.type = UNARY_UNSIGNED_CONSTANT; - sscanf(yylval.gs->s, "0x%llx", - &$$->u.unary_expression.u.unsigned_constant); - } - | STRING_LITERAL_START DQUOTE - { - $$ = make_node(scanner, NODE_UNARY_EXPRESSION); - $$->u.unary_expression.type = UNARY_STRING; - $$->u.unary_expression.u.string = ""; + $$->u.unary_expression.u.unsigned_constant = $1; } - | STRING_LITERAL_START s_char_sequence DQUOTE + | STRING_LITERAL { $$ = make_node(scanner, NODE_UNARY_EXPRESSION); $$->u.unary_expression.type = UNARY_STRING; - $$->u.unary_expression.u.string = $2->s; + $$->u.unary_expression.u.string = $1; } - | CHARACTER_CONSTANT_START c_char_sequence SQUOTE + | CHARACTER_LITERAL { $$ = make_node(scanner, NODE_UNARY_EXPRESSION); $$->u.unary_expression.type = UNARY_STRING; - $$->u.unary_expression.u.string = $2->s; + $$->u.unary_expression.u.string = $1; } | LPAREN unary_expression RPAREN { - $$ = make_node(scanner, NODE_UNARY_EXPRESSION); - $$->u.unary_expression.type = UNARY_NESTED; - $$->u.unary_expression.u.nested_exp = $2; + $$ = $2; } | postfix_expression LSBRAC unary_expression RSBRAC { $$ = make_node(scanner, NODE_UNARY_EXPRESSION); $$->u.unary_expression.type = UNARY_SBRAC; $$->u.unary_expression.u.sbrac_exp = $3; - cds_list_splice(&($1)->tmp_head, &($$)->tmp_head); - cds_list_add_tail(&($$)->siblings, &($$)->tmp_head); + bt_list_splice(&($1)->tmp_head, &($$)->tmp_head); + bt_list_add_tail(&($$)->siblings, &($$)->tmp_head); } | postfix_expression DOT IDENTIFIER { $$ = make_node(scanner, NODE_UNARY_EXPRESSION); $$->u.unary_expression.type = UNARY_STRING; - $$->u.unary_expression.u.string = yylval.gs->s; + $$->u.unary_expression.u.string = yylval.s; $$->u.unary_expression.link = UNARY_DOTLINK; - cds_list_splice(&($1)->tmp_head, &($$)->tmp_head); - cds_list_add_tail(&($$)->siblings, &($$)->tmp_head); + bt_list_splice(&($1)->tmp_head, &($$)->tmp_head); + bt_list_add_tail(&($$)->siblings, &($$)->tmp_head); } | postfix_expression DOT ID_TYPE { $$ = make_node(scanner, NODE_UNARY_EXPRESSION); $$->u.unary_expression.type = UNARY_STRING; - $$->u.unary_expression.u.string = yylval.gs->s; + $$->u.unary_expression.u.string = yylval.s; $$->u.unary_expression.link = UNARY_DOTLINK; - cds_list_splice(&($1)->tmp_head, &($$)->tmp_head); - cds_list_add_tail(&($$)->siblings, &($$)->tmp_head); + bt_list_splice(&($1)->tmp_head, &($$)->tmp_head); + bt_list_add_tail(&($$)->siblings, &($$)->tmp_head); + } + | postfix_expression DOT keywords + { + $$ = make_node(scanner, NODE_UNARY_EXPRESSION); + $$->u.unary_expression.type = UNARY_STRING; + $$->u.unary_expression.u.string = yylval.s; + $$->u.unary_expression.link = UNARY_DOTLINK; + bt_list_splice(&($1)->tmp_head, &($$)->tmp_head); + bt_list_add_tail(&($$)->siblings, &($$)->tmp_head); } | postfix_expression RARROW IDENTIFIER { $$ = make_node(scanner, NODE_UNARY_EXPRESSION); $$->u.unary_expression.type = UNARY_STRING; - $$->u.unary_expression.u.string = yylval.gs->s; + $$->u.unary_expression.u.string = yylval.s; $$->u.unary_expression.link = UNARY_ARROWLINK; - cds_list_splice(&($1)->tmp_head, &($$)->tmp_head); - cds_list_add_tail(&($$)->siblings, &($$)->tmp_head); + bt_list_splice(&($1)->tmp_head, &($$)->tmp_head); + bt_list_add_tail(&($$)->siblings, &($$)->tmp_head); } | postfix_expression RARROW ID_TYPE { $$ = make_node(scanner, NODE_UNARY_EXPRESSION); $$->u.unary_expression.type = UNARY_STRING; - $$->u.unary_expression.u.string = yylval.gs->s; + $$->u.unary_expression.u.string = yylval.s; $$->u.unary_expression.link = UNARY_ARROWLINK; - cds_list_splice(&($1)->tmp_head, &($$)->tmp_head); - cds_list_add_tail(&($$)->siblings, &($$)->tmp_head); + bt_list_splice(&($1)->tmp_head, &($$)->tmp_head); + bt_list_add_tail(&($$)->siblings, &($$)->tmp_head); } ; @@ -1016,21 +1284,25 @@ unary_expression: postfix_expression { $$ = $1; } | PLUS postfix_expression - { $$ = $2; } - | MINUS postfix_expression { $$ = $2; - if ($$->u.unary_expression.type != UNARY_SIGNED_CONSTANT - && $$->u.unary_expression.type != UNARY_UNSIGNED_CONSTANT) + if ($$->u.unary_expression.type != UNARY_UNSIGNED_CONSTANT + && $$->u.unary_expression.type != UNARY_SIGNED_CONSTANT) { reparent_error(scanner, "expecting numeric constant"); - + } + } + | MINUS postfix_expression + { + $$ = $2; if ($$->u.unary_expression.type == UNARY_UNSIGNED_CONSTANT) { $$->u.unary_expression.type = UNARY_SIGNED_CONSTANT; $$->u.unary_expression.u.signed_constant = -($$->u.unary_expression.u.unsigned_constant); - } else { + } else if ($$->u.unary_expression.type == UNARY_UNSIGNED_CONSTANT) { $$->u.unary_expression.u.signed_constant = -($$->u.unary_expression.u.signed_constant); + } else { + reparent_error(scanner, "expecting numeric constant"); } } ; @@ -1039,7 +1311,7 @@ unary_expression_or_range: unary_expression DOTDOTDOT unary_expression { $$ = $1; - _cds_list_splice_tail(&($3)->tmp_head, &($$)->tmp_head); + _bt_list_splice_tail(&($3)->tmp_head, &($$)->tmp_head); $3->u.unary_expression.link = UNARY_DOTDOTDOT; } | unary_expression @@ -1055,45 +1327,62 @@ declaration: { $$ = $1; } | stream_declaration { $$ = $1; } + | env_declaration + { $$ = $1; } | trace_declaration { $$ = $1; } + | clock_declaration + { $$ = $1; } + | callsite_declaration + { $$ = $1; } | declaration_specifiers TYPEDEF declaration_specifiers type_declarator_list SEMICOLON { + struct ctf_node *list; + $$ = make_node(scanner, NODE_TYPEDEF); - _cds_list_splice_tail(&($1)->tmp_head, &($$)->u._typedef.declaration_specifier); - _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.declaration_specifier); - _cds_list_splice_tail(&($4)->tmp_head, &($$)->u._typedef.type_declarators); + list = make_node(scanner, NODE_TYPE_SPECIFIER_LIST); + $$->u._typedef.type_specifier_list = list; + _bt_list_splice_tail(&($1)->u.type_specifier_list.head, &list->u.type_specifier_list.head); + _bt_list_splice_tail(&($3)->u.type_specifier_list.head, &list->u.type_specifier_list.head); + _bt_list_splice_tail(&($4)->tmp_head, &($$)->u._typedef.type_declarators); } | TYPEDEF declaration_specifiers type_declarator_list SEMICOLON { + struct ctf_node *list; + $$ = make_node(scanner, NODE_TYPEDEF); - _cds_list_splice_tail(&($2)->tmp_head, &($$)->u._typedef.declaration_specifier); - _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.type_declarators); + list = make_node(scanner, NODE_TYPE_SPECIFIER_LIST); + $$->u._typedef.type_specifier_list = list; + _bt_list_splice_tail(&($2)->u.type_specifier_list.head, &list->u.type_specifier_list.head); + _bt_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.type_declarators); } | declaration_specifiers TYPEDEF type_declarator_list SEMICOLON { + struct ctf_node *list; + $$ = make_node(scanner, NODE_TYPEDEF); - _cds_list_splice_tail(&($1)->tmp_head, &($$)->u._typedef.declaration_specifier); - _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.type_declarators); - } - | TYPEALIAS declaration_specifiers abstract_declarator_list COLON declaration_specifiers abstract_type_declarator_list SEMICOLON - { - $$ = make_node(scanner, NODE_TYPEALIAS); - $$->u.typealias.target = make_node(scanner, NODE_TYPEALIAS_TARGET); - $$->u.typealias.alias = make_node(scanner, NODE_TYPEALIAS_ALIAS); - _cds_list_splice_tail(&($2)->tmp_head, &($$)->u.typealias.target->u.typealias_target.declaration_specifier); - _cds_list_splice_tail(&($3)->tmp_head, &($$)->u.typealias.target->u.typealias_target.type_declarators); - _cds_list_splice_tail(&($5)->tmp_head, &($$)->u.typealias.alias->u.typealias_alias.declaration_specifier); - _cds_list_splice_tail(&($6)->tmp_head, &($$)->u.typealias.alias->u.typealias_alias.type_declarators); + list = make_node(scanner, NODE_TYPE_SPECIFIER_LIST); + $$->u._typedef.type_specifier_list = list; + _bt_list_splice_tail(&($1)->u.type_specifier_list.head, &list->u.type_specifier_list.head); + _bt_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.type_declarators); } - | TYPEALIAS declaration_specifiers abstract_declarator_list COLON type_declarator_list SEMICOLON + | TYPEALIAS declaration_specifiers abstract_declarator_list TYPEASSIGN alias_declaration_specifiers alias_abstract_declarator_list SEMICOLON { + struct ctf_node *list; + $$ = make_node(scanner, NODE_TYPEALIAS); $$->u.typealias.target = make_node(scanner, NODE_TYPEALIAS_TARGET); $$->u.typealias.alias = make_node(scanner, NODE_TYPEALIAS_ALIAS); - _cds_list_splice_tail(&($2)->tmp_head, &($$)->u.typealias.target->u.typealias_target.declaration_specifier); - _cds_list_splice_tail(&($3)->tmp_head, &($$)->u.typealias.alias->u.typealias_alias.declaration_specifier); - _cds_list_splice_tail(&($5)->tmp_head, &($$)->u.typealias.alias->u.typealias_alias.type_declarators); + + list = make_node(scanner, NODE_TYPE_SPECIFIER_LIST); + $$->u.typealias.target->u.typealias_target.type_specifier_list = list; + _bt_list_splice_tail(&($2)->u.type_specifier_list.head, &list->u.type_specifier_list.head); + _bt_list_splice_tail(&($3)->tmp_head, &($$)->u.typealias.target->u.typealias_target.type_declarators); + + list = make_node(scanner, NODE_TYPE_SPECIFIER_LIST); + $$->u.typealias.alias->u.typealias_alias.type_specifier_list = list; + _bt_list_splice_tail(&($5)->u.type_specifier_list.head, &list->u.type_specifier_list.head); + _bt_list_splice_tail(&($6)->tmp_head, &($$)->u.typealias.alias->u.typealias_alias.type_declarators); } ; @@ -1144,6 +1433,28 @@ stream_declaration_end: { pop_scope(scanner); } ; +env_declaration: + env_declaration_begin env_declaration_end + { + $$ = make_node(scanner, NODE_ENV); + } + | env_declaration_begin ctf_assignment_expression_list env_declaration_end + { + $$ = make_node(scanner, NODE_ENV); + if (set_parent_node($2, $$)) + reparent_error(scanner, "env declaration"); + } + ; + +env_declaration_begin: + ENV LBRAC + { push_scope(scanner); } + ; + +env_declaration_end: + RBRAC SEMICOLON + { pop_scope(scanner); } + ; trace_declaration: trace_declaration_begin trace_declaration_end @@ -1168,14 +1479,104 @@ trace_declaration_end: { pop_scope(scanner); } ; +clock_declaration: + CLOCK clock_declaration_begin clock_declaration_end + { + $$ = make_node(scanner, NODE_CLOCK); + } + | CLOCK clock_declaration_begin ctf_assignment_expression_list clock_declaration_end + { + $$ = make_node(scanner, NODE_CLOCK); + if (set_parent_node($3, $$)) + reparent_error(scanner, "trace_declaration"); + } + ; + +clock_declaration_begin: + LBRAC + { push_scope(scanner); } + ; + +clock_declaration_end: + RBRAC SEMICOLON + { pop_scope(scanner); } + ; + +callsite_declaration: + CALLSITE callsite_declaration_begin callsite_declaration_end + { + $$ = make_node(scanner, NODE_CALLSITE); + } + | CALLSITE callsite_declaration_begin ctf_assignment_expression_list callsite_declaration_end + { + $$ = make_node(scanner, NODE_CALLSITE); + if (set_parent_node($3, $$)) + reparent_error(scanner, "trace_declaration"); + } + ; + +callsite_declaration_begin: + LBRAC + { push_scope(scanner); } + ; + +callsite_declaration_end: + RBRAC SEMICOLON + { pop_scope(scanner); } + ; + +integer_declaration_specifiers: + CONST + { + struct ctf_node *node; + + $$ = make_node(scanner, NODE_TYPE_SPECIFIER_LIST); + node = make_node(scanner, NODE_TYPE_SPECIFIER); + node->u.type_specifier.type = TYPESPEC_CONST; + bt_list_add_tail(&node->siblings, &($$)->u.type_specifier_list.head); + } + | integer_type_specifier + { + struct ctf_node *node; + + $$ = make_node(scanner, NODE_TYPE_SPECIFIER_LIST); + node = $1; + bt_list_add_tail(&node->siblings, &($$)->u.type_specifier_list.head); + } + | integer_declaration_specifiers CONST + { + struct ctf_node *node; + + $$ = $1; + node = make_node(scanner, NODE_TYPE_SPECIFIER); + node->u.type_specifier.type = TYPESPEC_CONST; + bt_list_add_tail(&node->siblings, &($$)->u.type_specifier_list.head); + } + | integer_declaration_specifiers integer_type_specifier + { + $$ = $1; + bt_list_add_tail(&($2)->siblings, &($$)->u.type_specifier_list.head); + } + ; + declaration_specifiers: CONST { - $$ = make_node(scanner, NODE_TYPE_SPECIFIER); - $$->u.type_specifier.type = TYPESPEC_CONST; + struct ctf_node *node; + + $$ = make_node(scanner, NODE_TYPE_SPECIFIER_LIST); + node = make_node(scanner, NODE_TYPE_SPECIFIER); + node->u.type_specifier.type = TYPESPEC_CONST; + bt_list_add_tail(&node->siblings, &($$)->u.type_specifier_list.head); } | type_specifier - { $$ = $1; } + { + struct ctf_node *node; + + $$ = make_node(scanner, NODE_TYPE_SPECIFIER_LIST); + node = $1; + bt_list_add_tail(&node->siblings, &($$)->u.type_specifier_list.head); + } | declaration_specifiers CONST { struct ctf_node *node; @@ -1183,12 +1584,12 @@ declaration_specifiers: $$ = $1; node = make_node(scanner, NODE_TYPE_SPECIFIER); node->u.type_specifier.type = TYPESPEC_CONST; - cds_list_add_tail(&node->siblings, &($$)->tmp_head); + bt_list_add_tail(&node->siblings, &($$)->u.type_specifier_list.head); } | declaration_specifiers type_specifier { $$ = $1; - cds_list_add_tail(&($2)->siblings, &($$)->tmp_head); + bt_list_add_tail(&($2)->siblings, &($$)->u.type_specifier_list.head); } ; @@ -1198,17 +1599,65 @@ type_declarator_list: | type_declarator_list COMMA type_declarator { $$ = $1; - cds_list_add_tail(&($3)->siblings, &($$)->tmp_head); + bt_list_add_tail(&($3)->siblings, &($$)->tmp_head); } ; -abstract_type_declarator_list: - abstract_type_declarator - { $$ = $1; } - | abstract_type_declarator_list COMMA abstract_type_declarator +integer_type_specifier: + CHAR { - $$ = $1; - cds_list_add_tail(&($3)->siblings, &($$)->tmp_head); + $$ = make_node(scanner, NODE_TYPE_SPECIFIER); + $$->u.type_specifier.type = TYPESPEC_CHAR; + } + | SHORT + { + $$ = make_node(scanner, NODE_TYPE_SPECIFIER); + $$->u.type_specifier.type = TYPESPEC_SHORT; + } + | INT + { + $$ = make_node(scanner, NODE_TYPE_SPECIFIER); + $$->u.type_specifier.type = TYPESPEC_INT; + } + | LONG + { + $$ = make_node(scanner, NODE_TYPE_SPECIFIER); + $$->u.type_specifier.type = TYPESPEC_LONG; + } + | SIGNED + { + $$ = make_node(scanner, NODE_TYPE_SPECIFIER); + $$->u.type_specifier.type = TYPESPEC_SIGNED; + } + | UNSIGNED + { + $$ = make_node(scanner, NODE_TYPE_SPECIFIER); + $$->u.type_specifier.type = TYPESPEC_UNSIGNED; + } + | _BOOL + { + $$ = make_node(scanner, NODE_TYPE_SPECIFIER); + $$->u.type_specifier.type = TYPESPEC_BOOL; + } + | ID_TYPE + { + $$ = make_node(scanner, NODE_TYPE_SPECIFIER); + $$->u.type_specifier.type = TYPESPEC_ID_TYPE; + $$->u.type_specifier.id_type = yylval.s; + } + | INTEGER LBRAC RBRAC + { + $$ = make_node(scanner, NODE_TYPE_SPECIFIER); + $$->u.type_specifier.type = TYPESPEC_INTEGER; + $$->u.type_specifier.node = make_node(scanner, NODE_INTEGER); + } + | INTEGER LBRAC ctf_assignment_expression_list RBRAC + { + $$ = make_node(scanner, NODE_TYPE_SPECIFIER); + $$->u.type_specifier.type = TYPESPEC_INTEGER; + $$->u.type_specifier.node = make_node(scanner, NODE_INTEGER); + if (set_parent_node($3, $$->u.type_specifier.node)) + reparent_error(scanner, "integer reparent error"); } ; @@ -1268,80 +1717,146 @@ type_specifier: $$ = make_node(scanner, NODE_TYPE_SPECIFIER); $$->u.type_specifier.type = TYPESPEC_COMPLEX; } + | _IMAGINARY + { + $$ = make_node(scanner, NODE_TYPE_SPECIFIER); + $$->u.type_specifier.type = TYPESPEC_IMAGINARY; + } | ID_TYPE { $$ = make_node(scanner, NODE_TYPE_SPECIFIER); $$->u.type_specifier.type = TYPESPEC_ID_TYPE; - $$->u.type_specifier.id_type = yylval.gs->s; + $$->u.type_specifier.id_type = yylval.s; } | FLOATING_POINT LBRAC RBRAC { - $$ = make_node(scanner, NODE_FLOATING_POINT); + $$ = make_node(scanner, NODE_TYPE_SPECIFIER); + $$->u.type_specifier.type = TYPESPEC_FLOATING_POINT; + $$->u.type_specifier.node = make_node(scanner, NODE_FLOATING_POINT); } | FLOATING_POINT LBRAC ctf_assignment_expression_list RBRAC { - $$ = make_node(scanner, NODE_FLOATING_POINT); - if (set_parent_node($3, $$)) + $$ = make_node(scanner, NODE_TYPE_SPECIFIER); + $$->u.type_specifier.type = TYPESPEC_FLOATING_POINT; + $$->u.type_specifier.node = make_node(scanner, NODE_FLOATING_POINT); + if (set_parent_node($3, $$->u.type_specifier.node)) reparent_error(scanner, "floating point reparent error"); } | INTEGER LBRAC RBRAC { - $$ = make_node(scanner, NODE_INTEGER); + $$ = make_node(scanner, NODE_TYPE_SPECIFIER); + $$->u.type_specifier.type = TYPESPEC_INTEGER; + $$->u.type_specifier.node = make_node(scanner, NODE_INTEGER); } | INTEGER LBRAC ctf_assignment_expression_list RBRAC { - $$ = make_node(scanner, NODE_INTEGER); - if (set_parent_node($3, $$)) + $$ = make_node(scanner, NODE_TYPE_SPECIFIER); + $$->u.type_specifier.type = TYPESPEC_INTEGER; + $$->u.type_specifier.node = make_node(scanner, NODE_INTEGER); + if (set_parent_node($3, $$->u.type_specifier.node)) reparent_error(scanner, "integer reparent error"); } + | STRING + { + $$ = make_node(scanner, NODE_TYPE_SPECIFIER); + $$->u.type_specifier.type = TYPESPEC_STRING; + $$->u.type_specifier.node = make_node(scanner, NODE_STRING); + } | STRING LBRAC RBRAC { - $$ = make_node(scanner, NODE_STRING); + $$ = make_node(scanner, NODE_TYPE_SPECIFIER); + $$->u.type_specifier.type = TYPESPEC_STRING; + $$->u.type_specifier.node = make_node(scanner, NODE_STRING); } | STRING LBRAC ctf_assignment_expression_list RBRAC { - $$ = make_node(scanner, NODE_STRING); - if (set_parent_node($3, $$)) + $$ = make_node(scanner, NODE_TYPE_SPECIFIER); + $$->u.type_specifier.type = TYPESPEC_STRING; + $$->u.type_specifier.node = make_node(scanner, NODE_STRING); + if (set_parent_node($3, $$->u.type_specifier.node)) reparent_error(scanner, "string reparent error"); } | ENUM enum_type_specifier - { $$ = $2; } + { + $$ = make_node(scanner, NODE_TYPE_SPECIFIER); + $$->u.type_specifier.type = TYPESPEC_ENUM; + $$->u.type_specifier.node = $2; + } | VARIANT variant_type_specifier - { $$ = $2; } + { + $$ = make_node(scanner, NODE_TYPE_SPECIFIER); + $$->u.type_specifier.type = TYPESPEC_VARIANT; + $$->u.type_specifier.node = $2; + } | STRUCT struct_type_specifier - { $$ = $2; } + { + $$ = make_node(scanner, NODE_TYPE_SPECIFIER); + $$->u.type_specifier.type = TYPESPEC_STRUCT; + $$->u.type_specifier.node = $2; + } ; struct_type_specifier: struct_declaration_begin struct_or_variant_declaration_list struct_declaration_end { $$ = make_node(scanner, NODE_STRUCT); - if (set_parent_node($2, $$)) + $$->u._struct.has_body = 1; + if ($2 && set_parent_node($2, $$)) reparent_error(scanner, "struct reparent error"); } | IDENTIFIER struct_declaration_begin struct_or_variant_declaration_list struct_declaration_end { $$ = make_node(scanner, NODE_STRUCT); - $$->u._struct.name = $1->s; - if (set_parent_node($3, $$)) + $$->u._struct.has_body = 1; + $$->u._struct.name = $1; + if ($3 && set_parent_node($3, $$)) reparent_error(scanner, "struct reparent error"); } | ID_TYPE struct_declaration_begin struct_or_variant_declaration_list struct_declaration_end { $$ = make_node(scanner, NODE_STRUCT); - $$->u._struct.name = $1->s; - if (set_parent_node($3, $$)) + $$->u._struct.has_body = 1; + $$->u._struct.name = $1; + if ($3 && set_parent_node($3, $$)) reparent_error(scanner, "struct reparent error"); } | IDENTIFIER { $$ = make_node(scanner, NODE_STRUCT); - $$->u._struct.name = $1->s; + $$->u._struct.has_body = 0; + $$->u._struct.name = $1; } | ID_TYPE { $$ = make_node(scanner, NODE_STRUCT); - $$->u._struct.name = $1->s; + $$->u._struct.has_body = 0; + $$->u._struct.name = $1; + } + | struct_declaration_begin struct_or_variant_declaration_list struct_declaration_end TOK_ALIGN LPAREN unary_expression RPAREN + { + $$ = make_node(scanner, NODE_STRUCT); + $$->u._struct.has_body = 1; + bt_list_add_tail(&($6)->siblings, &$$->u._struct.min_align); + if ($2 && set_parent_node($2, $$)) + reparent_error(scanner, "struct reparent error"); + } + | IDENTIFIER struct_declaration_begin struct_or_variant_declaration_list struct_declaration_end TOK_ALIGN LPAREN unary_expression RPAREN + { + $$ = make_node(scanner, NODE_STRUCT); + $$->u._struct.has_body = 1; + $$->u._struct.name = $1; + bt_list_add_tail(&($7)->siblings, &$$->u._struct.min_align); + if ($3 && set_parent_node($3, $$)) + reparent_error(scanner, "struct reparent error"); + } + | ID_TYPE struct_declaration_begin struct_or_variant_declaration_list struct_declaration_end TOK_ALIGN LPAREN unary_expression RPAREN + { + $$ = make_node(scanner, NODE_STRUCT); + $$->u._struct.has_body = 1; + $$->u._struct.name = $1; + bt_list_add_tail(&($7)->siblings, &$$->u._struct.min_align); + if ($3 && set_parent_node($3, $$)) + reparent_error(scanner, "struct reparent error"); } ; @@ -1359,92 +1874,105 @@ variant_type_specifier: variant_declaration_begin struct_or_variant_declaration_list variant_declaration_end { $$ = make_node(scanner, NODE_VARIANT); - if (set_parent_node($2, $$)) + $$->u.variant.has_body = 1; + if ($2 && set_parent_node($2, $$)) reparent_error(scanner, "variant reparent error"); } | LT IDENTIFIER GT variant_declaration_begin struct_or_variant_declaration_list variant_declaration_end { $$ = make_node(scanner, NODE_VARIANT); - $$->u.variant.choice = $2->s; - if (set_parent_node($5, $$)) + $$->u.variant.has_body = 1; + $$->u.variant.choice = $2; + if ($5 && set_parent_node($5, $$)) reparent_error(scanner, "variant reparent error"); } | LT ID_TYPE GT variant_declaration_begin struct_or_variant_declaration_list variant_declaration_end { $$ = make_node(scanner, NODE_VARIANT); - $$->u.variant.choice = $2->s; - if (set_parent_node($5, $$)) + $$->u.variant.has_body = 1; + $$->u.variant.choice = $2; + if ($5 && set_parent_node($5, $$)) reparent_error(scanner, "variant reparent error"); } | IDENTIFIER variant_declaration_begin struct_or_variant_declaration_list variant_declaration_end { $$ = make_node(scanner, NODE_VARIANT); - $$->u.variant.name = $1->s; - if (set_parent_node($3, $$)) + $$->u.variant.has_body = 1; + $$->u.variant.name = $1; + if ($3 && set_parent_node($3, $$)) reparent_error(scanner, "variant reparent error"); } | IDENTIFIER LT IDENTIFIER GT variant_declaration_begin struct_or_variant_declaration_list variant_declaration_end { $$ = make_node(scanner, NODE_VARIANT); - $$->u.variant.name = $1->s; - $$->u.variant.choice = $3->s; - if (set_parent_node($6, $$)) + $$->u.variant.has_body = 1; + $$->u.variant.name = $1; + $$->u.variant.choice = $3; + if ($6 && set_parent_node($6, $$)) reparent_error(scanner, "variant reparent error"); } | IDENTIFIER LT IDENTIFIER GT { $$ = make_node(scanner, NODE_VARIANT); - $$->u.variant.name = $1->s; - $$->u.variant.choice = $3->s; + $$->u.variant.has_body = 0; + $$->u.variant.name = $1; + $$->u.variant.choice = $3; } | IDENTIFIER LT ID_TYPE GT variant_declaration_begin struct_or_variant_declaration_list variant_declaration_end { $$ = make_node(scanner, NODE_VARIANT); - $$->u.variant.name = $1->s; - $$->u.variant.choice = $3->s; - if (set_parent_node($6, $$)) + $$->u.variant.has_body = 1; + $$->u.variant.name = $1; + $$->u.variant.choice = $3; + if ($6 && set_parent_node($6, $$)) reparent_error(scanner, "variant reparent error"); } | IDENTIFIER LT ID_TYPE GT { $$ = make_node(scanner, NODE_VARIANT); - $$->u.variant.name = $1->s; - $$->u.variant.choice = $3->s; + $$->u.variant.has_body = 0; + $$->u.variant.name = $1; + $$->u.variant.choice = $3; } | ID_TYPE variant_declaration_begin struct_or_variant_declaration_list variant_declaration_end { $$ = make_node(scanner, NODE_VARIANT); - $$->u.variant.name = $1->s; - if (set_parent_node($3, $$)) + $$->u.variant.has_body = 1; + $$->u.variant.name = $1; + if ($3 && set_parent_node($3, $$)) reparent_error(scanner, "variant reparent error"); } | ID_TYPE LT IDENTIFIER GT variant_declaration_begin struct_or_variant_declaration_list variant_declaration_end { $$ = make_node(scanner, NODE_VARIANT); - $$->u.variant.name = $1->s; - $$->u.variant.choice = $3->s; - if (set_parent_node($6, $$)) + $$->u.variant.has_body = 1; + $$->u.variant.name = $1; + $$->u.variant.choice = $3; + if ($6 && set_parent_node($6, $$)) reparent_error(scanner, "variant reparent error"); } | ID_TYPE LT IDENTIFIER GT { $$ = make_node(scanner, NODE_VARIANT); - $$->u.variant.name = $1->s; - $$->u.variant.choice = $3->s; + $$->u.variant.has_body = 0; + $$->u.variant.name = $1; + $$->u.variant.choice = $3; } | ID_TYPE LT ID_TYPE GT variant_declaration_begin struct_or_variant_declaration_list variant_declaration_end { $$ = make_node(scanner, NODE_VARIANT); - $$->u.variant.name = $1->s; - $$->u.variant.choice = $3->s; - if (set_parent_node($6, $$)) + $$->u.variant.has_body = 1; + $$->u.variant.name = $1; + $$->u.variant.choice = $3; + if ($6 && set_parent_node($6, $$)) reparent_error(scanner, "variant reparent error"); } | ID_TYPE LT ID_TYPE GT { $$ = make_node(scanner, NODE_VARIANT); - $$->u.variant.name = $1->s; - $$->u.variant.choice = $3->s; + $$->u.variant.has_body = 0; + $$->u.variant.name = $1; + $$->u.variant.choice = $3; } ; @@ -1458,128 +1986,104 @@ variant_declaration_end: { pop_scope(scanner); } ; -type_specifier_or_integer_constant: - declaration_specifiers - { $$ = $1; } - | DECIMAL_CONSTANT - { - $$ = make_node(scanner, NODE_UNARY_EXPRESSION); - $$->u.unary_expression.type = UNARY_UNSIGNED_CONSTANT; - sscanf(yylval.gs->s, "%llu", - &$$->u.unary_expression.u.unsigned_constant); - } - | OCTAL_CONSTANT - { - $$ = make_node(scanner, NODE_UNARY_EXPRESSION); - $$->u.unary_expression.type = UNARY_UNSIGNED_CONSTANT; - sscanf(yylval.gs->s, "0%llo", - &$$->u.unary_expression.u.unsigned_constant); - } - | HEXADECIMAL_CONSTANT - { - $$ = make_node(scanner, NODE_UNARY_EXPRESSION); - $$->u.unary_expression.type = UNARY_UNSIGNED_CONSTANT; - sscanf(yylval.gs->s, "0x%llx", - &$$->u.unary_expression.u.unsigned_constant); - } - ; - enum_type_specifier: LBRAC enumerator_list RBRAC { $$ = make_node(scanner, NODE_ENUM); - _cds_list_splice_tail(&($2)->tmp_head, &($$)->u._enum.enumerator_list); + $$->u._enum.has_body = 1; + _bt_list_splice_tail(&($2)->tmp_head, &($$)->u._enum.enumerator_list); } - | LT type_specifier_or_integer_constant GT LBRAC enumerator_list RBRAC + | COLON integer_declaration_specifiers LBRAC enumerator_list RBRAC { $$ = make_node(scanner, NODE_ENUM); - $$->u._enum.container_type = $2; - _cds_list_splice_tail(&($5)->tmp_head, &($$)->u._enum.enumerator_list); + $$->u._enum.has_body = 1; + ($$)->u._enum.container_type = $2; + _bt_list_splice_tail(&($4)->tmp_head, &($$)->u._enum.enumerator_list); } | IDENTIFIER LBRAC enumerator_list RBRAC { $$ = make_node(scanner, NODE_ENUM); - $$->u._enum.enum_id = $1->s; - _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.enumerator_list); + $$->u._enum.has_body = 1; + $$->u._enum.enum_id = $1; + _bt_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.enumerator_list); } - | IDENTIFIER LT type_specifier_or_integer_constant GT LBRAC enumerator_list RBRAC + | IDENTIFIER COLON integer_declaration_specifiers LBRAC enumerator_list RBRAC { $$ = make_node(scanner, NODE_ENUM); - $$->u._enum.enum_id = $1->s; - $$->u._enum.container_type = $3; - _cds_list_splice_tail(&($6)->tmp_head, &($$)->u._enum.enumerator_list); + $$->u._enum.has_body = 1; + $$->u._enum.enum_id = $1; + ($$)->u._enum.container_type = $3; + _bt_list_splice_tail(&($5)->tmp_head, &($$)->u._enum.enumerator_list); } | ID_TYPE LBRAC enumerator_list RBRAC { $$ = make_node(scanner, NODE_ENUM); - $$->u._enum.enum_id = $1->s; - _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.enumerator_list); + $$->u._enum.has_body = 1; + $$->u._enum.enum_id = $1; + _bt_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.enumerator_list); } - | ID_TYPE LT type_specifier_or_integer_constant GT LBRAC enumerator_list RBRAC + | ID_TYPE COLON integer_declaration_specifiers LBRAC enumerator_list RBRAC { $$ = make_node(scanner, NODE_ENUM); - $$->u._enum.enum_id = $1->s; - $$->u._enum.container_type = $3; - _cds_list_splice_tail(&($6)->tmp_head, &($$)->u._enum.enumerator_list); + $$->u._enum.has_body = 1; + $$->u._enum.enum_id = $1; + ($$)->u._enum.container_type = $3; + _bt_list_splice_tail(&($5)->tmp_head, &($$)->u._enum.enumerator_list); } | LBRAC enumerator_list COMMA RBRAC { $$ = make_node(scanner, NODE_ENUM); - _cds_list_splice_tail(&($2)->tmp_head, &($$)->u._enum.enumerator_list); + $$->u._enum.has_body = 1; + _bt_list_splice_tail(&($2)->tmp_head, &($$)->u._enum.enumerator_list); } - | LT type_specifier_or_integer_constant GT LBRAC enumerator_list COMMA RBRAC + | COLON integer_declaration_specifiers LBRAC enumerator_list COMMA RBRAC { $$ = make_node(scanner, NODE_ENUM); - $$->u._enum.container_type = $2; - _cds_list_splice_tail(&($5)->tmp_head, &($$)->u._enum.enumerator_list); + $$->u._enum.has_body = 1; + ($$)->u._enum.container_type = $2; + _bt_list_splice_tail(&($4)->tmp_head, &($$)->u._enum.enumerator_list); } | IDENTIFIER LBRAC enumerator_list COMMA RBRAC { $$ = make_node(scanner, NODE_ENUM); - $$->u._enum.enum_id = $1->s; - _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.enumerator_list); + $$->u._enum.has_body = 1; + $$->u._enum.enum_id = $1; + _bt_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.enumerator_list); } - | IDENTIFIER LT type_specifier_or_integer_constant GT LBRAC enumerator_list COMMA RBRAC + | IDENTIFIER COLON integer_declaration_specifiers LBRAC enumerator_list COMMA RBRAC { $$ = make_node(scanner, NODE_ENUM); - $$->u._enum.enum_id = $1->s; - $$->u._enum.container_type = $3; - _cds_list_splice_tail(&($6)->tmp_head, &($$)->u._enum.enumerator_list); + $$->u._enum.has_body = 1; + $$->u._enum.enum_id = $1; + ($$)->u._enum.container_type = $3; + _bt_list_splice_tail(&($5)->tmp_head, &($$)->u._enum.enumerator_list); } | IDENTIFIER { $$ = make_node(scanner, NODE_ENUM); - $$->u._enum.enum_id = $1->s; - } - | IDENTIFIER LT type_specifier_or_integer_constant GT - { - $$ = make_node(scanner, NODE_ENUM); - $$->u._enum.enum_id = $1->s; - $$->u._enum.container_type = $3; + $$->u._enum.has_body = 0; + $$->u._enum.enum_id = $1; } | ID_TYPE LBRAC enumerator_list COMMA RBRAC { $$ = make_node(scanner, NODE_ENUM); - $$->u._enum.enum_id = $1->s; - _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.enumerator_list); + $$->u._enum.has_body = 1; + $$->u._enum.enum_id = $1; + _bt_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.enumerator_list); } - | ID_TYPE LT type_specifier_or_integer_constant GT LBRAC enumerator_list COMMA RBRAC + | ID_TYPE COLON integer_declaration_specifiers LBRAC enumerator_list COMMA RBRAC { $$ = make_node(scanner, NODE_ENUM); - $$->u._enum.enum_id = $1->s; - $$->u._enum.container_type = $3; - _cds_list_splice_tail(&($6)->tmp_head, &($$)->u._enum.enumerator_list); + $$->u._enum.has_body = 1; + $$->u._enum.enum_id = $1; + ($$)->u._enum.container_type = $3; + _bt_list_splice_tail(&($5)->tmp_head, &($$)->u._enum.enumerator_list); } | ID_TYPE { $$ = make_node(scanner, NODE_ENUM); - $$->u._enum.enum_id = $1->s; - } - | ID_TYPE LT type_specifier_or_integer_constant GT - { - $$ = make_node(scanner, NODE_ENUM); - $$->u._enum.enum_id = $1->s; - $$->u._enum.container_type = $3; + $$->u._enum.has_body = 0; + $$->u._enum.enum_id = $1; } ; @@ -1590,82 +2094,129 @@ struct_or_variant_declaration_list: { if ($1) { $$ = $1; - cds_list_add_tail(&($2)->siblings, &($$)->tmp_head); + bt_list_add_tail(&($2)->siblings, &($$)->tmp_head); } else { $$ = $2; - cds_list_add_tail(&($$)->siblings, &($$)->tmp_head); + bt_list_add_tail(&($$)->siblings, &($$)->tmp_head); } } ; struct_or_variant_declaration: - specifier_qualifier_list struct_or_variant_declarator_list SEMICOLON + declaration_specifiers struct_or_variant_declarator_list SEMICOLON { + struct ctf_node *list; + + list = make_node(scanner, NODE_TYPE_SPECIFIER_LIST); + _bt_list_splice_tail(&($1)->u.type_specifier_list.head, &list->u.type_specifier_list.head); $$ = make_node(scanner, NODE_STRUCT_OR_VARIANT_DECLARATION); - _cds_list_splice_tail(&($1)->tmp_head, &($$)->u.struct_or_variant_declaration.declaration_specifier); - _cds_list_splice_tail(&($2)->tmp_head, &($$)->u.struct_or_variant_declaration.type_declarators); + ($$)->u.struct_or_variant_declaration.type_specifier_list = list; + _bt_list_splice_tail(&($2)->tmp_head, &($$)->u.struct_or_variant_declaration.type_declarators); } - | specifier_qualifier_list TYPEDEF specifier_qualifier_list type_declarator_list SEMICOLON + | declaration_specifiers TYPEDEF declaration_specifiers type_declarator_list SEMICOLON { + struct ctf_node *list; + $$ = make_node(scanner, NODE_TYPEDEF); - _cds_list_splice_tail(&($1)->tmp_head, &($$)->u._typedef.declaration_specifier); - _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.declaration_specifier); - _cds_list_splice_tail(&($4)->tmp_head, &($$)->u._typedef.type_declarators); + list = make_node(scanner, NODE_TYPE_SPECIFIER_LIST); + $$->u._typedef.type_specifier_list = list; + _bt_list_splice_tail(&($1)->u.type_specifier_list.head, &list->u.type_specifier_list.head); + _bt_list_splice_tail(&($3)->u.type_specifier_list.head, &list->u.type_specifier_list.head); + _bt_list_splice_tail(&($4)->tmp_head, &($$)->u._typedef.type_declarators); } - | TYPEDEF specifier_qualifier_list type_declarator_list SEMICOLON + | TYPEDEF declaration_specifiers type_declarator_list SEMICOLON { + struct ctf_node *list; + $$ = make_node(scanner, NODE_TYPEDEF); - _cds_list_splice_tail(&($2)->tmp_head, &($$)->u._typedef.declaration_specifier); - _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.type_declarators); + list = make_node(scanner, NODE_TYPE_SPECIFIER_LIST); + $$->u._typedef.type_specifier_list = list; + _bt_list_splice_tail(&($2)->u.type_specifier_list.head, &list->u.type_specifier_list.head); + _bt_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.type_declarators); } - | specifier_qualifier_list TYPEDEF type_declarator_list SEMICOLON + | declaration_specifiers TYPEDEF type_declarator_list SEMICOLON { + struct ctf_node *list; + + list = make_node(scanner, NODE_TYPE_SPECIFIER_LIST); + _bt_list_splice_tail(&($1)->u.type_specifier_list.head, &list->u.type_specifier_list.head); $$ = make_node(scanner, NODE_TYPEDEF); - _cds_list_splice_tail(&($1)->tmp_head, &($$)->u._typedef.declaration_specifier); - _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.type_declarators); + ($$)->u.struct_or_variant_declaration.type_specifier_list = list; + _bt_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.type_declarators); } - | TYPEALIAS specifier_qualifier_list abstract_declarator_list COLON specifier_qualifier_list abstract_type_declarator_list SEMICOLON - { - $$ = make_node(scanner, NODE_TYPEALIAS); - $$->u.typealias.target = make_node(scanner, NODE_TYPEALIAS_TARGET); - $$->u.typealias.alias = make_node(scanner, NODE_TYPEALIAS_ALIAS); - _cds_list_splice_tail(&($2)->tmp_head, &($$)->u.typealias.target->u.typealias_target.declaration_specifier); - _cds_list_splice_tail(&($3)->tmp_head, &($$)->u.typealias.target->u.typealias_target.type_declarators); - _cds_list_splice_tail(&($5)->tmp_head, &($$)->u.typealias.alias->u.typealias_alias.declaration_specifier); - _cds_list_splice_tail(&($6)->tmp_head, &($$)->u.typealias.alias->u.typealias_alias.type_declarators); - } - | TYPEALIAS specifier_qualifier_list abstract_declarator_list COLON type_declarator_list SEMICOLON + | TYPEALIAS declaration_specifiers abstract_declarator_list TYPEASSIGN alias_declaration_specifiers alias_abstract_declarator_list SEMICOLON { + struct ctf_node *list; + $$ = make_node(scanner, NODE_TYPEALIAS); $$->u.typealias.target = make_node(scanner, NODE_TYPEALIAS_TARGET); $$->u.typealias.alias = make_node(scanner, NODE_TYPEALIAS_ALIAS); - _cds_list_splice_tail(&($2)->tmp_head, &($$)->u.typealias.target->u.typealias_target.declaration_specifier); - _cds_list_splice_tail(&($3)->tmp_head, &($$)->u.typealias.alias->u.typealias_alias.declaration_specifier); - _cds_list_splice_tail(&($5)->tmp_head, &($$)->u.typealias.alias->u.typealias_alias.type_declarators); + + list = make_node(scanner, NODE_TYPE_SPECIFIER_LIST); + $$->u.typealias.target->u.typealias_target.type_specifier_list = list; + _bt_list_splice_tail(&($2)->u.type_specifier_list.head, &list->u.type_specifier_list.head); + _bt_list_splice_tail(&($3)->tmp_head, &($$)->u.typealias.target->u.typealias_target.type_declarators); + + list = make_node(scanner, NODE_TYPE_SPECIFIER_LIST); + $$->u.typealias.alias->u.typealias_alias.type_specifier_list = list; + _bt_list_splice_tail(&($5)->u.type_specifier_list.head, &list->u.type_specifier_list.head); + _bt_list_splice_tail(&($6)->tmp_head, &($$)->u.typealias.alias->u.typealias_alias.type_declarators); } ; -specifier_qualifier_list: +alias_declaration_specifiers: CONST { - $$ = make_node(scanner, NODE_TYPE_SPECIFIER); - $$->u.type_specifier.type = TYPESPEC_CONST; + struct ctf_node *node; + + $$ = make_node(scanner, NODE_TYPE_SPECIFIER_LIST); + node = make_node(scanner, NODE_TYPE_SPECIFIER); + node->u.type_specifier.type = TYPESPEC_CONST; + bt_list_add_tail(&node->siblings, &($$)->u.type_specifier_list.head); } | type_specifier - { $$ = $1; } - | specifier_qualifier_list CONST + { + struct ctf_node *node; + + $$ = make_node(scanner, NODE_TYPE_SPECIFIER_LIST); + node = $1; + bt_list_add_tail(&node->siblings, &($$)->u.type_specifier_list.head); + } + | IDENTIFIER + { + struct ctf_node *node; + + add_type(scanner, $1); + $$ = make_node(scanner, NODE_TYPE_SPECIFIER_LIST); + node = make_node(scanner, NODE_TYPE_SPECIFIER); + node->u.type_specifier.type = TYPESPEC_ID_TYPE; + node->u.type_specifier.id_type = yylval.s; + bt_list_add_tail(&node->siblings, &($$)->u.type_specifier_list.head); + } + | alias_declaration_specifiers CONST { struct ctf_node *node; $$ = $1; node = make_node(scanner, NODE_TYPE_SPECIFIER); node->u.type_specifier.type = TYPESPEC_CONST; - cds_list_add_tail(&node->siblings, &($$)->tmp_head); + bt_list_add_tail(&node->siblings, &($$)->u.type_specifier_list.head); + } + | alias_declaration_specifiers type_specifier + { + $$ = $1; + bt_list_add_tail(&($2)->siblings, &($$)->u.type_specifier_list.head); } - | specifier_qualifier_list type_specifier + | alias_declaration_specifiers IDENTIFIER { + struct ctf_node *node; + + add_type(scanner, $2); $$ = $1; - cds_list_add_tail(&($2)->siblings, &($$)->tmp_head); + node = make_node(scanner, NODE_TYPE_SPECIFIER); + node->u.type_specifier.type = TYPESPEC_ID_TYPE; + node->u.type_specifier.id_type = yylval.s; + bt_list_add_tail(&node->siblings, &($$)->u.type_specifier_list.head); } ; @@ -1675,7 +2226,7 @@ struct_or_variant_declarator_list: | struct_or_variant_declarator_list COMMA struct_or_variant_declarator { $$ = $1; - cds_list_add_tail(&($3)->siblings, &($$)->tmp_head); + bt_list_add_tail(&($3)->siblings, &($$)->tmp_head); } ; @@ -1698,7 +2249,7 @@ enumerator_list: | enumerator_list COMMA enumerator { $$ = $1; - cds_list_add_tail(&($3)->siblings, &($$)->tmp_head); + bt_list_add_tail(&($3)->siblings, &($$)->tmp_head); } ; @@ -1706,57 +2257,46 @@ enumerator: IDENTIFIER { $$ = make_node(scanner, NODE_ENUMERATOR); - $$->u.enumerator.id = $1->s; + $$->u.enumerator.id = $1; } | ID_TYPE { $$ = make_node(scanner, NODE_ENUMERATOR); - $$->u.enumerator.id = $1->s; + $$->u.enumerator.id = $1; } | keywords { $$ = make_node(scanner, NODE_ENUMERATOR); - $$->u.enumerator.id = $1->s; + $$->u.enumerator.id = $1; } - | STRING_LITERAL_START DQUOTE + | STRING_LITERAL { $$ = make_node(scanner, NODE_ENUMERATOR); - $$->u.enumerator.id = ""; - } - | STRING_LITERAL_START s_char_sequence DQUOTE - { - $$ = make_node(scanner, NODE_ENUMERATOR); - $$->u.enumerator.id = $2->s; + $$->u.enumerator.id = $1; } | IDENTIFIER EQUAL unary_expression_or_range { $$ = make_node(scanner, NODE_ENUMERATOR); - $$->u.enumerator.id = $1->s; - cds_list_splice(&($3)->tmp_head, &($$)->u.enumerator.values); + $$->u.enumerator.id = $1; + bt_list_splice(&($3)->tmp_head, &($$)->u.enumerator.values); } | ID_TYPE EQUAL unary_expression_or_range { $$ = make_node(scanner, NODE_ENUMERATOR); - $$->u.enumerator.id = $1->s; - cds_list_splice(&($3)->tmp_head, &($$)->u.enumerator.values); + $$->u.enumerator.id = $1; + bt_list_splice(&($3)->tmp_head, &($$)->u.enumerator.values); } | keywords EQUAL unary_expression_or_range { $$ = make_node(scanner, NODE_ENUMERATOR); - $$->u.enumerator.id = $1->s; - cds_list_splice(&($3)->tmp_head, &($$)->u.enumerator.values); + $$->u.enumerator.id = $1; + bt_list_splice(&($3)->tmp_head, &($$)->u.enumerator.values); } - | STRING_LITERAL_START DQUOTE EQUAL unary_expression_or_range + | STRING_LITERAL EQUAL unary_expression_or_range { $$ = make_node(scanner, NODE_ENUMERATOR); - $$->u.enumerator.id = ""; - cds_list_splice(&($4)->tmp_head, &($$)->u.enumerator.values); - } - | STRING_LITERAL_START s_char_sequence DQUOTE EQUAL unary_expression_or_range - { - $$ = make_node(scanner, NODE_ENUMERATOR); - $$->u.enumerator.id = $2->s; - cds_list_splice(&($5)->tmp_head, &($$)->u.enumerator.values); + $$->u.enumerator.id = $1; + bt_list_splice(&($3)->tmp_head, &($$)->u.enumerator.values); } ; @@ -1766,7 +2306,7 @@ abstract_declarator_list: | abstract_declarator_list COMMA abstract_declarator { $$ = $1; - cds_list_add_tail(&($3)->siblings, &($$)->tmp_head); + bt_list_add_tail(&($3)->siblings, &($$)->tmp_head); } ; @@ -1776,7 +2316,7 @@ abstract_declarator: | pointer direct_abstract_declarator { $$ = $2; - cds_list_splice(&($1)->tmp_head, &($$)->u.type_declarator.pointers); + bt_list_splice(&($1)->tmp_head, &($$)->u.type_declarator.pointers); } ; @@ -1791,7 +2331,7 @@ direct_abstract_declarator: { $$ = make_node(scanner, NODE_TYPE_DECLARATOR); $$->u.type_declarator.type = TYPEDEC_ID; - $$->u.type_declarator.u.id = $1->s; + $$->u.type_declarator.u.id = $1; } | LPAREN abstract_declarator RPAREN { @@ -1799,12 +2339,13 @@ direct_abstract_declarator: $$->u.type_declarator.type = TYPEDEC_NESTED; $$->u.type_declarator.u.nested.type_declarator = $2; } - | direct_abstract_declarator LSBRAC type_specifier_or_integer_constant RSBRAC + | direct_abstract_declarator LSBRAC unary_expression RSBRAC { $$ = make_node(scanner, NODE_TYPE_DECLARATOR); $$->u.type_declarator.type = TYPEDEC_NESTED; $$->u.type_declarator.u.nested.type_declarator = $1; - $$->u.type_declarator.u.nested.length = $3; + BT_INIT_LIST_HEAD(&($$)->u.type_declarator.u.nested.length); + _bt_list_splice_tail(&($3)->tmp_head, &($$)->u.type_declarator.u.nested.length); } | direct_abstract_declarator LSBRAC RSBRAC { @@ -1815,114 +2356,120 @@ direct_abstract_declarator: } ; -declarator: - direct_declarator +alias_abstract_declarator_list: + alias_abstract_declarator { $$ = $1; } - | pointer direct_declarator + | alias_abstract_declarator_list COMMA alias_abstract_declarator + { + $$ = $1; + bt_list_add_tail(&($3)->siblings, &($$)->tmp_head); + } + ; + +alias_abstract_declarator: + direct_alias_abstract_declarator + { $$ = $1; } + | pointer direct_alias_abstract_declarator { $$ = $2; - cds_list_splice(&($1)->tmp_head, &($$)->u.type_declarator.pointers); + bt_list_splice(&($1)->tmp_head, &($$)->u.type_declarator.pointers); } ; -direct_declarator: - IDENTIFIER +direct_alias_abstract_declarator: + /* empty */ { $$ = make_node(scanner, NODE_TYPE_DECLARATOR); - $$->u.type_declarator.type = TYPEDEC_ID; - $$->u.type_declarator.u.id = $1->s; + $$->u.type_declarator.type = TYPEDEC_ID; + /* id is NULL */ } - | LPAREN declarator RPAREN + | LPAREN alias_abstract_declarator RPAREN { $$ = make_node(scanner, NODE_TYPE_DECLARATOR); $$->u.type_declarator.type = TYPEDEC_NESTED; $$->u.type_declarator.u.nested.type_declarator = $2; } - | direct_declarator LSBRAC type_specifier_or_integer_constant RSBRAC + | direct_alias_abstract_declarator LSBRAC unary_expression RSBRAC { $$ = make_node(scanner, NODE_TYPE_DECLARATOR); $$->u.type_declarator.type = TYPEDEC_NESTED; $$->u.type_declarator.u.nested.type_declarator = $1; - $$->u.type_declarator.u.nested.length = $3; + BT_INIT_LIST_HEAD(&($$)->u.type_declarator.u.nested.length); + _bt_list_splice_tail(&($3)->tmp_head, &($$)->u.type_declarator.u.nested.length); + } + | direct_alias_abstract_declarator LSBRAC RSBRAC + { + $$ = make_node(scanner, NODE_TYPE_DECLARATOR); + $$->u.type_declarator.type = TYPEDEC_NESTED; + $$->u.type_declarator.u.nested.type_declarator = $1; + $$->u.type_declarator.u.nested.abstract_array = 1; } ; -type_declarator: - direct_type_declarator +declarator: + direct_declarator { $$ = $1; } - | pointer direct_type_declarator + | pointer direct_declarator { $$ = $2; - cds_list_splice(&($1)->tmp_head, &($$)->u.type_declarator.pointers); + bt_list_splice(&($1)->tmp_head, &($$)->u.type_declarator.pointers); } ; -direct_type_declarator: +direct_declarator: IDENTIFIER { - add_type(scanner, $1); $$ = make_node(scanner, NODE_TYPE_DECLARATOR); $$->u.type_declarator.type = TYPEDEC_ID; - $$->u.type_declarator.u.id = $1->s; + $$->u.type_declarator.u.id = $1; } - | LPAREN type_declarator RPAREN + | LPAREN declarator RPAREN { $$ = make_node(scanner, NODE_TYPE_DECLARATOR); $$->u.type_declarator.type = TYPEDEC_NESTED; $$->u.type_declarator.u.nested.type_declarator = $2; } - | direct_type_declarator LSBRAC type_specifier_or_integer_constant RSBRAC + | direct_declarator LSBRAC unary_expression RSBRAC { $$ = make_node(scanner, NODE_TYPE_DECLARATOR); $$->u.type_declarator.type = TYPEDEC_NESTED; $$->u.type_declarator.u.nested.type_declarator = $1; - $$->u.type_declarator.u.nested.length = $3; + BT_INIT_LIST_HEAD(&($$)->u.type_declarator.u.nested.length); + _bt_list_splice_tail(&($3)->tmp_head, &($$)->u.type_declarator.u.nested.length); } ; -abstract_type_declarator: - direct_abstract_type_declarator +type_declarator: + direct_type_declarator { $$ = $1; } - | pointer direct_abstract_type_declarator + | pointer direct_type_declarator { $$ = $2; - cds_list_splice(&($1)->tmp_head, &($$)->u.type_declarator.pointers); + bt_list_splice(&($1)->tmp_head, &($$)->u.type_declarator.pointers); } ; -direct_abstract_type_declarator: - /* empty */ - { - $$ = make_node(scanner, NODE_TYPE_DECLARATOR); - $$->u.type_declarator.type = TYPEDEC_ID; - /* id is NULL */ - } - | IDENTIFIER +direct_type_declarator: + IDENTIFIER { add_type(scanner, $1); $$ = make_node(scanner, NODE_TYPE_DECLARATOR); $$->u.type_declarator.type = TYPEDEC_ID; - $$->u.type_declarator.u.id = $1->s; + $$->u.type_declarator.u.id = $1; } - | LPAREN abstract_type_declarator RPAREN + | LPAREN type_declarator RPAREN { $$ = make_node(scanner, NODE_TYPE_DECLARATOR); $$->u.type_declarator.type = TYPEDEC_NESTED; $$->u.type_declarator.u.nested.type_declarator = $2; } - | direct_abstract_type_declarator LSBRAC type_specifier_or_integer_constant RSBRAC + | direct_type_declarator LSBRAC unary_expression RSBRAC { $$ = make_node(scanner, NODE_TYPE_DECLARATOR); $$->u.type_declarator.type = TYPEDEC_NESTED; $$->u.type_declarator.u.nested.type_declarator = $1; - $$->u.type_declarator.u.nested.length = $3; - } - | direct_abstract_type_declarator LSBRAC RSBRAC - { - $$ = make_node(scanner, NODE_TYPE_DECLARATOR); - $$->u.type_declarator.type = TYPEDEC_NESTED; - $$->u.type_declarator.u.nested.type_declarator = $1; - $$->u.type_declarator.u.nested.abstract_array = 1; + BT_INIT_LIST_HEAD(&($$)->u.type_declarator.u.nested.length); + _bt_list_splice_tail(&($3)->tmp_head, &($$)->u.type_declarator.u.nested.length); } ; @@ -1934,13 +2481,13 @@ pointer: | STAR pointer { $$ = make_node(scanner, NODE_POINTER); - cds_list_splice(&($2)->tmp_head, &($$)->tmp_head); + bt_list_splice(&($2)->tmp_head, &($$)->tmp_head); } | STAR type_qualifier_list pointer { $$ = make_node(scanner, NODE_POINTER); $$->u.pointer.const_qualifier = 1; - cds_list_splice(&($3)->tmp_head, &($$)->tmp_head); + bt_list_splice(&($3)->tmp_head, &($$)->tmp_head); } ; @@ -1958,7 +2505,7 @@ ctf_assignment_expression_list: | ctf_assignment_expression_list ctf_assignment_expression SEMICOLON { $$ = $1; - cds_list_add_tail(&($2)->siblings, &($$)->tmp_head); + bt_list_add_tail(&($2)->siblings, &($$)->tmp_head); } ; @@ -1970,60 +2517,70 @@ ctf_assignment_expression: * set_parent_node. */ $$ = make_node(scanner, NODE_CTF_EXPRESSION); - _cds_list_splice_tail(&($1)->tmp_head, &($$)->u.ctf_expression.left); + _bt_list_splice_tail(&($1)->tmp_head, &($$)->u.ctf_expression.left); if ($1->u.unary_expression.type != UNARY_STRING) reparent_error(scanner, "ctf_assignment_expression left expects string"); - _cds_list_splice_tail(&($3)->tmp_head, &($$)->u.ctf_expression.right); + _bt_list_splice_tail(&($3)->tmp_head, &($$)->u.ctf_expression.right); } - | unary_expression TYPEASSIGN type_specifier + | unary_expression TYPEASSIGN declaration_specifiers /* Only allow struct */ { /* * Because we have left and right, cannot use * set_parent_node. */ $$ = make_node(scanner, NODE_CTF_EXPRESSION); - _cds_list_splice_tail(&($1)->tmp_head, &($$)->u.ctf_expression.left); + _bt_list_splice_tail(&($1)->tmp_head, &($$)->u.ctf_expression.left); if ($1->u.unary_expression.type != UNARY_STRING) reparent_error(scanner, "ctf_assignment_expression left expects string"); - cds_list_add(&($3)->siblings, &($3)->tmp_head); - _cds_list_splice_tail(&($3)->tmp_head, &($$)->u.ctf_expression.right); + bt_list_add_tail(&($3)->siblings, &($$)->u.ctf_expression.right); } | declaration_specifiers TYPEDEF declaration_specifiers type_declarator_list { + struct ctf_node *list; + + list = make_node(scanner, NODE_TYPE_SPECIFIER_LIST); + _bt_list_splice_tail(&($1)->u.type_specifier_list.head, &list->u.type_specifier_list.head); + _bt_list_splice_tail(&($3)->u.type_specifier_list.head, &list->u.type_specifier_list.head); $$ = make_node(scanner, NODE_TYPEDEF); - _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.declaration_specifier); - _cds_list_splice_tail(&($1)->tmp_head, &($$)->u._typedef.declaration_specifier); - _cds_list_splice_tail(&($4)->tmp_head, &($$)->u._typedef.type_declarators); + ($$)->u.struct_or_variant_declaration.type_specifier_list = list; + _bt_list_splice_tail(&($4)->tmp_head, &($$)->u._typedef.type_declarators); } | TYPEDEF declaration_specifiers type_declarator_list { + struct ctf_node *list; + $$ = make_node(scanner, NODE_TYPEDEF); - _cds_list_splice_tail(&($2)->tmp_head, &($$)->u._typedef.declaration_specifier); - _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.type_declarators); + list = make_node(scanner, NODE_TYPE_SPECIFIER_LIST); + $$->u._typedef.type_specifier_list = list; + _bt_list_splice_tail(&($2)->u.type_specifier_list.head, &list->u.type_specifier_list.head); + _bt_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.type_declarators); } | declaration_specifiers TYPEDEF type_declarator_list { + struct ctf_node *list; + + list = make_node(scanner, NODE_TYPE_SPECIFIER_LIST); + _bt_list_splice_tail(&($1)->u.type_specifier_list.head, &list->u.type_specifier_list.head); $$ = make_node(scanner, NODE_TYPEDEF); - _cds_list_splice_tail(&($1)->tmp_head, &($$)->u._typedef.declaration_specifier); - _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.type_declarators); + ($$)->u.struct_or_variant_declaration.type_specifier_list = list; + _bt_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.type_declarators); } - | TYPEALIAS declaration_specifiers abstract_declarator_list COLON declaration_specifiers abstract_type_declarator_list - { - $$ = make_node(scanner, NODE_TYPEALIAS); - $$->u.typealias.target = make_node(scanner, NODE_TYPEALIAS_TARGET); - $$->u.typealias.alias = make_node(scanner, NODE_TYPEALIAS_ALIAS); - _cds_list_splice_tail(&($2)->tmp_head, &($$)->u.typealias.target->u.typealias_target.declaration_specifier); - _cds_list_splice_tail(&($3)->tmp_head, &($$)->u.typealias.target->u.typealias_target.type_declarators); - _cds_list_splice_tail(&($5)->tmp_head, &($$)->u.typealias.alias->u.typealias_alias.declaration_specifier); - _cds_list_splice_tail(&($6)->tmp_head, &($$)->u.typealias.alias->u.typealias_alias.type_declarators); - } - | TYPEALIAS declaration_specifiers abstract_declarator_list COLON type_declarator_list + | TYPEALIAS declaration_specifiers abstract_declarator_list TYPEASSIGN alias_declaration_specifiers alias_abstract_declarator_list { + struct ctf_node *list; + $$ = make_node(scanner, NODE_TYPEALIAS); $$->u.typealias.target = make_node(scanner, NODE_TYPEALIAS_TARGET); $$->u.typealias.alias = make_node(scanner, NODE_TYPEALIAS_ALIAS); - _cds_list_splice_tail(&($2)->tmp_head, &($$)->u.typealias.target->u.typealias_target.declaration_specifier); - _cds_list_splice_tail(&($3)->tmp_head, &($$)->u.typealias.alias->u.typealias_alias.declaration_specifier); - _cds_list_splice_tail(&($5)->tmp_head, &($$)->u.typealias.alias->u.typealias_alias.type_declarators); + + list = make_node(scanner, NODE_TYPE_SPECIFIER_LIST); + $$->u.typealias.target->u.typealias_target.type_specifier_list = list; + _bt_list_splice_tail(&($2)->u.type_specifier_list.head, &list->u.type_specifier_list.head); + _bt_list_splice_tail(&($3)->tmp_head, &($$)->u.typealias.target->u.typealias_target.type_declarators); + + list = make_node(scanner, NODE_TYPE_SPECIFIER_LIST); + $$->u.typealias.alias->u.typealias_alias.type_specifier_list = list; + _bt_list_splice_tail(&($5)->u.type_specifier_list.head, &list->u.type_specifier_list.head); + _bt_list_splice_tail(&($6)->tmp_head, &($$)->u.typealias.alias->u.typealias_alias.type_declarators); } ;