diff options
| author | Vincent Sanders <vincent.sanders@collabora.co.uk> | 2012-09-27 19:11:35 +0100 |
|---|---|---|
| committer | Vincent Sanders <vincent.sanders@collabora.co.uk> | 2012-09-27 19:11:35 +0100 |
| commit | 35f2b9fc8120776bbd5e6f2aa3ddf68ddb46bf33 (patch) | |
| tree | fd27c6e4ce2df7ac07fc9ccc7b8594b54e1ab06a /src/genjsbind-parser.y | |
| parent | 1186c51cc953d95ffb0d1029d735ae7ff269d7a2 (diff) | |
| download | nsgenbind-35f2b9fc8120776bbd5e6f2aa3ddf68ddb46bf33.tar.gz nsgenbind-35f2b9fc8120776bbd5e6f2aa3ddf68ddb46bf33.tar.bz2 | |
fix private data geenration and use
Diffstat (limited to 'src/genjsbind-parser.y')
| -rw-r--r-- | src/genjsbind-parser.y | 41 |
1 files changed, 9 insertions, 32 deletions
diff --git a/src/genjsbind-parser.y b/src/genjsbind-parser.y index de2bd10..3177c87 100644 --- a/src/genjsbind-parser.y +++ b/src/genjsbind-parser.y @@ -45,8 +45,7 @@ char *errtxt; %token TOK_BINDING %token TOK_INTERFACE %token TOK_TYPE -%token TOK_EXTRA -%token TOK_NODE +%token TOK_PRIVATE %token <text> TOK_IDENTIFIER %token <text> TOK_STRING_LITERAL @@ -64,10 +63,8 @@ char *errtxt; %type <node> BindingArgs %type <node> BindingArg %type <node> Type -%type <node> TypeArgs -%type <node> Extra +%type <node> Private %type <node> Interface -%type <node> Node %% @@ -180,44 +177,24 @@ BindingArg : Type | - Extra + Private | Interface ; Type : - TOK_TYPE TOK_IDENTIFIER '{' TypeArgs '}' ';' + TOK_TYPE TOK_IDENTIFIER ';' { - $$ = genbind_new_node(GENBIND_NODE_TYPE_TYPE, - NULL, - genbind_new_node(GENBIND_NODE_TYPE_IDENT, $4, $2)); - } - ; - -TypeArgs - : - /* empty */ - { - $$ = NULL; - } - | - Node - ; - -Node - : - TOK_NODE TOK_IDENTIFIER ';' - { - $$ = genbind_new_node(GENBIND_NODE_TYPE_TYPE_NODE, NULL, $2); + $$ = genbind_new_node(GENBIND_NODE_TYPE_BINDING_TYPE, NULL, $2); } ; -Extra +Private : - TOK_EXTRA Strings ';' + TOK_PRIVATE Strings ';' { - $$ = genbind_new_node(GENBIND_NODE_TYPE_TYPE_EXTRA, NULL, $2); + $$ = genbind_new_node(GENBIND_NODE_TYPE_BINDING_PRIVATE, NULL, $2); } ; @@ -225,7 +202,7 @@ Interface : TOK_INTERFACE TOK_IDENTIFIER ';' { - $$ = genbind_new_node(GENBIND_NODE_TYPE_TYPE_INTERFACE, NULL, $2); + $$ = genbind_new_node(GENBIND_NODE_TYPE_BINDING_INTERFACE, NULL, $2); } ; |