#include "ctf-scanner.h"
#include "ctf-parser.h"
#include "ctf-ast.h"
+#include "objstack.h"
BT_HIDDEN
int yydebug;
BT_HIDDEN
char *yyget_text(yyscan_t yyscanner);
-struct gc_string {
- struct bt_list_head gc;
- size_t alloclen;
- char s[];
-};
-
static const char *node_type_to_str[] = {
#define ENTRY(S) [S] = #S,
FOREACH_CTF_NODES(ENTRY)
return NULL;
}
-static struct gc_string *gc_string_alloc(struct ctf_scanner *scanner,
- size_t len)
-{
- 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);
- bt_list_add(&gstr->gc, &scanner->allocated_strings);
- gstr->alloclen = alloclen;
- return gstr;
-}
-
void setstring(struct ctf_scanner *scanner, YYSTYPE *lvalp, const char *src)
{
- lvalp->gs = gc_string_alloc(scanner, strlen(src) + 1);
- strcpy(lvalp->gs->s, src);
+ lvalp->s = objstack_alloc(scanner->objstack, strlen(src) + 1);
+ strcpy(lvalp->s, src);
}
static
}
if (str_check(len, dpos, 1))
return -1;
- lvalp->gs->s[dpos++] = c;
+ lvalp->s[dpos++] = c;
}
if (str_check(len, dpos, 1))
return -1;
- lvalp->gs->s[dpos++] = '\0';
+ lvalp->s[dpos++] = '\0';
if (str_check(len, pos, 1))
return -1;
size_t len;
len = strlen(src) + 1;
- lvalp->gs = gc_string_alloc(scanner, len);
+ lvalp->s = objstack_alloc(scanner->objstack, len);
if (src[0] == 'L') {
// TODO: import wide string
printfl_error(yyget_lineno(scanner),
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_debug("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,
YYERROR; \
} while (0)
-static void free_strings(struct bt_list_head *list)
-{
- struct gc_string *gstr, *tmp;
-
- bt_list_for_each_entry_safe(gstr, tmp, list, gc)
- free(gstr);
-}
-
static struct ctf_ast *ctf_ast_alloc(void)
{
struct ctf_ast *ast;
scanner->ast = ctf_ast_alloc();
if (!scanner->ast)
goto cleanup_lexer;
+ scanner->objstack = objstack_create();
+ if (!scanner->objstack)
+ goto cleanup_ast;
init_scope(&scanner->root_scope, NULL);
scanner->cs = &scanner->root_scope;
- BT_INIT_LIST_HEAD(&scanner->allocated_strings);
if (yydebug)
fprintf(stdout, "Scanner input is a%s.\n",
return scanner;
+cleanup_ast:
+ ctf_ast_free(scanner->ast);
cleanup_lexer:
ret = yylex_destroy(scanner->scanner);
if (!ret)
int ret;
finalize_scope(&scanner->root_scope);
- free_strings(&scanner->allocated_strings);
+ objstack_destroy(scanner->objstack);
ctf_ast_free(scanner->ast);
ret = yylex_destroy(scanner->scanner);
if (ret)
%expect 2
%start file
%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 <gs> IDENTIFIER ID_TYPE
+%token <s> 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 <gs> STRING_LITERAL CHARACTER_LITERAL
+%type <s> STRING_LITERAL CHARACTER_LITERAL
-%type <gs> keywords
+%type <s> keywords
%type <ull> INTEGER_LITERAL
%type <n> postfix_expression unary_expression unary_expression_or_range
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.gs; }
+ { $$ = 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.gs; }
+ { $$ = yylval.s; }
| TRACE
- { $$ = yylval.gs; }
+ { $$ = yylval.s; }
| CLOCK
- { $$ = yylval.gs; }
+ { $$ = yylval.s; }
| CALLSITE
- { $$ = yylval.gs; }
+ { $$ = yylval.s; }
| TOK_ALIGN
- { $$ = yylval.gs; }
+ { $$ = yylval.s; }
;
{
$$ = 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;
}
| INTEGER_LITERAL
{
{
$$ = make_node(scanner, NODE_UNARY_EXPRESSION);
$$->u.unary_expression.type = UNARY_STRING;
- $$->u.unary_expression.u.string = $1->s;
+ $$->u.unary_expression.u.string = $1;
}
| CHARACTER_LITERAL
{
$$ = make_node(scanner, NODE_UNARY_EXPRESSION);
$$->u.unary_expression.type = UNARY_STRING;
- $$->u.unary_expression.u.string = $1->s;
+ $$->u.unary_expression.u.string = $1;
}
| LPAREN unary_expression RPAREN
{
{
$$ = 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;
bt_list_splice(&($1)->tmp_head, &($$)->tmp_head);
bt_list_add_tail(&($$)->siblings, &($$)->tmp_head);
{
$$ = 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;
bt_list_splice(&($1)->tmp_head, &($$)->tmp_head);
bt_list_add_tail(&($$)->siblings, &($$)->tmp_head);
{
$$ = 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;
bt_list_splice(&($1)->tmp_head, &($$)->tmp_head);
bt_list_add_tail(&($$)->siblings, &($$)->tmp_head);
{
$$ = 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;
bt_list_splice(&($1)->tmp_head, &($$)->tmp_head);
bt_list_add_tail(&($$)->siblings, &($$)->tmp_head);
{
$$ = 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;
}
| INTEGER LBRAC RBRAC
{
{
$$ = 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_STRUCT);
$$->u._struct.has_body = 1;
- $$->u._struct.name = $1->s;
+ $$->u._struct.name = $1;
if ($3 && set_parent_node($3, $$))
reparent_error(scanner, "struct reparent error");
}
{
$$ = make_node(scanner, NODE_STRUCT);
$$->u._struct.has_body = 1;
- $$->u._struct.name = $1->s;
+ $$->u._struct.name = $1;
if ($3 && set_parent_node($3, $$))
reparent_error(scanner, "struct reparent error");
}
{
$$ = make_node(scanner, NODE_STRUCT);
$$->u._struct.has_body = 0;
- $$->u._struct.name = $1->s;
+ $$->u._struct.name = $1;
}
| ID_TYPE
{
$$ = make_node(scanner, NODE_STRUCT);
$$->u._struct.has_body = 0;
- $$->u._struct.name = $1->s;
+ $$->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;
- $$->u._struct.name = $1->s;
+ $$->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");
{
$$ = make_node(scanner, NODE_STRUCT);
$$->u._struct.has_body = 1;
- $$->u._struct.name = $1->s;
+ $$->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");
{
$$ = make_node(scanner, NODE_VARIANT);
$$->u.variant.has_body = 1;
- $$->u.variant.choice = $2->s;
+ $$->u.variant.choice = $2;
if ($5 && set_parent_node($5, $$))
reparent_error(scanner, "variant reparent error");
}
{
$$ = make_node(scanner, NODE_VARIANT);
$$->u.variant.has_body = 1;
- $$->u.variant.choice = $2->s;
+ $$->u.variant.choice = $2;
if ($5 && set_parent_node($5, $$))
reparent_error(scanner, "variant reparent error");
}
{
$$ = make_node(scanner, NODE_VARIANT);
$$->u.variant.has_body = 1;
- $$->u.variant.name = $1->s;
+ $$->u.variant.name = $1;
if ($3 && set_parent_node($3, $$))
reparent_error(scanner, "variant reparent error");
}
{
$$ = make_node(scanner, NODE_VARIANT);
$$->u.variant.has_body = 1;
- $$->u.variant.name = $1->s;
- $$->u.variant.choice = $3->s;
+ $$->u.variant.name = $1;
+ $$->u.variant.choice = $3;
if ($6 && set_parent_node($6, $$))
reparent_error(scanner, "variant reparent error");
}
{
$$ = make_node(scanner, NODE_VARIANT);
$$->u.variant.has_body = 0;
- $$->u.variant.name = $1->s;
- $$->u.variant.choice = $3->s;
+ $$->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.has_body = 1;
- $$->u.variant.name = $1->s;
- $$->u.variant.choice = $3->s;
+ $$->u.variant.name = $1;
+ $$->u.variant.choice = $3;
if ($6 && set_parent_node($6, $$))
reparent_error(scanner, "variant reparent error");
}
{
$$ = make_node(scanner, NODE_VARIANT);
$$->u.variant.has_body = 0;
- $$->u.variant.name = $1->s;
- $$->u.variant.choice = $3->s;
+ $$->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.has_body = 1;
- $$->u.variant.name = $1->s;
+ $$->u.variant.name = $1;
if ($3 && set_parent_node($3, $$))
reparent_error(scanner, "variant reparent error");
}
{
$$ = make_node(scanner, NODE_VARIANT);
$$->u.variant.has_body = 1;
- $$->u.variant.name = $1->s;
- $$->u.variant.choice = $3->s;
+ $$->u.variant.name = $1;
+ $$->u.variant.choice = $3;
if ($6 && set_parent_node($6, $$))
reparent_error(scanner, "variant reparent error");
}
{
$$ = make_node(scanner, NODE_VARIANT);
$$->u.variant.has_body = 0;
- $$->u.variant.name = $1->s;
- $$->u.variant.choice = $3->s;
+ $$->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.has_body = 1;
- $$->u.variant.name = $1->s;
- $$->u.variant.choice = $3->s;
+ $$->u.variant.name = $1;
+ $$->u.variant.choice = $3;
if ($6 && set_parent_node($6, $$))
reparent_error(scanner, "variant reparent error");
}
{
$$ = make_node(scanner, NODE_VARIANT);
$$->u.variant.has_body = 0;
- $$->u.variant.name = $1->s;
- $$->u.variant.choice = $3->s;
+ $$->u.variant.name = $1;
+ $$->u.variant.choice = $3;
}
;
{
$$ = make_node(scanner, NODE_ENUM);
$$->u._enum.has_body = 1;
- $$->u._enum.enum_id = $1->s;
+ $$->u._enum.enum_id = $1;
_bt_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.enumerator_list);
}
| IDENTIFIER COLON integer_declaration_specifiers LBRAC enumerator_list RBRAC
{
$$ = make_node(scanner, NODE_ENUM);
$$->u._enum.has_body = 1;
- $$->u._enum.enum_id = $1->s;
+ $$->u._enum.enum_id = $1;
($$)->u._enum.container_type = $3;
_bt_list_splice_tail(&($5)->tmp_head, &($$)->u._enum.enumerator_list);
}
{
$$ = make_node(scanner, NODE_ENUM);
$$->u._enum.has_body = 1;
- $$->u._enum.enum_id = $1->s;
+ $$->u._enum.enum_id = $1;
_bt_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.enumerator_list);
}
| ID_TYPE COLON integer_declaration_specifiers LBRAC enumerator_list RBRAC
{
$$ = make_node(scanner, NODE_ENUM);
$$->u._enum.has_body = 1;
- $$->u._enum.enum_id = $1->s;
+ $$->u._enum.enum_id = $1;
($$)->u._enum.container_type = $3;
_bt_list_splice_tail(&($5)->tmp_head, &($$)->u._enum.enumerator_list);
}
{
$$ = make_node(scanner, NODE_ENUM);
$$->u._enum.has_body = 1;
- $$->u._enum.enum_id = $1->s;
+ $$->u._enum.enum_id = $1;
_bt_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.enumerator_list);
}
| IDENTIFIER COLON integer_declaration_specifiers LBRAC enumerator_list COMMA RBRAC
{
$$ = make_node(scanner, NODE_ENUM);
$$->u._enum.has_body = 1;
- $$->u._enum.enum_id = $1->s;
+ $$->u._enum.enum_id = $1;
($$)->u._enum.container_type = $3;
_bt_list_splice_tail(&($5)->tmp_head, &($$)->u._enum.enumerator_list);
}
{
$$ = make_node(scanner, NODE_ENUM);
$$->u._enum.has_body = 0;
- $$->u._enum.enum_id = $1->s;
+ $$->u._enum.enum_id = $1;
}
| ID_TYPE LBRAC enumerator_list COMMA RBRAC
{
$$ = make_node(scanner, NODE_ENUM);
$$->u._enum.has_body = 1;
- $$->u._enum.enum_id = $1->s;
+ $$->u._enum.enum_id = $1;
_bt_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.enumerator_list);
}
| ID_TYPE COLON integer_declaration_specifiers LBRAC enumerator_list COMMA RBRAC
{
$$ = make_node(scanner, NODE_ENUM);
$$->u._enum.has_body = 1;
- $$->u._enum.enum_id = $1->s;
+ $$->u._enum.enum_id = $1;
($$)->u._enum.container_type = $3;
_bt_list_splice_tail(&($5)->tmp_head, &($$)->u._enum.enumerator_list);
}
{
$$ = make_node(scanner, NODE_ENUM);
$$->u._enum.has_body = 0;
- $$->u._enum.enum_id = $1->s;
+ $$->u._enum.enum_id = $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.gs->s;
+ node->u.type_specifier.id_type = yylval.s;
bt_list_add_tail(&node->siblings, &($$)->u.type_specifier_list.head);
}
| alias_declaration_specifiers CONST
$$ = $1;
node = make_node(scanner, NODE_TYPE_SPECIFIER);
node->u.type_specifier.type = TYPESPEC_ID_TYPE;
- node->u.type_specifier.id_type = yylval.gs->s;
+ node->u.type_specifier.id_type = yylval.s;
bt_list_add_tail(&node->siblings, &($$)->u.type_specifier_list.head);
}
;
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
{
$$ = make_node(scanner, NODE_ENUMERATOR);
- $$->u.enumerator.id = $1->s;
+ $$->u.enumerator.id = $1;
}
| IDENTIFIER EQUAL unary_expression_or_range
{
$$ = make_node(scanner, NODE_ENUMERATOR);
- $$->u.enumerator.id = $1->s;
+ $$->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;
+ $$->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;
+ $$->u.enumerator.id = $1;
bt_list_splice(&($3)->tmp_head, &($$)->u.enumerator.values);
}
| STRING_LITERAL EQUAL unary_expression_or_range
{
$$ = make_node(scanner, NODE_ENUMERATOR);
- $$->u.enumerator.id = $1->s;
+ $$->u.enumerator.id = $1;
bt_list_splice(&($3)->tmp_head, &($$)->u.enumerator.values);
}
;
{
$$ = 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
{
{
$$ = 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 declarator RPAREN
{
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
{