diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-08-21 16:10:48 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-08-21 16:10:48 +0000 |
| commit | 751c8b1c4cc3282117b49f3c0f712f2233ee9fde (patch) | |
| tree | ffc98bb97b2dc214bd20600e4eca67bfa5d24d38 | |
| parent | d6590b3ded72d575ea19071311f2efc251227b7a (diff) | |
| download | ATCD-751c8b1c4cc3282117b49f3c0f712f2233ee9fde.tar.gz | |
ChangeLogTag: Fri Aug 21 16:07:29 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | modules/TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | modules/TAO/TAO_IDL/fe/idl.yy | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/modules/TAO/ChangeLog b/modules/TAO/ChangeLog index ff2a254c362..3091f17a805 100644 --- a/modules/TAO/ChangeLog +++ b/modules/TAO/ChangeLog @@ -1,3 +1,10 @@ +Fri Aug 21 16:07:29 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/fe/idl.yy: + + Added code to set the member of the big parsing union with + the pointer to an instantiated connector, once it's created. + Fri Aug 21 13:51:19 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/ast/ast_instantiated_connector.cpp: diff --git a/modules/TAO/TAO_IDL/fe/idl.yy b/modules/TAO/TAO_IDL/fe/idl.yy index 99aef7c9680..b19ef42278c 100644 --- a/modules/TAO/TAO_IDL/fe/idl.yy +++ b/modules/TAO/TAO_IDL/fe/idl.yy @@ -286,7 +286,7 @@ AST_Decl *tao_enum_constant_decl = 0; %type <dcval> template_type_spec sequence_type_spec string_type_spec %type <dcval> struct_type enum_type switch_type_spec union_type %type <dcval> array_declarator op_type_spec seq_head wstring_type_spec -%type <dcval> param_type_spec +%type <dcval> param_type_spec connector_inst_spec %type <idlist> scoped_name interface_type component_inheritance_spec %type <idlist> home_inheritance_spec primary_key_spec @@ -6845,6 +6845,7 @@ connector_inst_spec { // connector_inst_spec : template_inst UTL_Scope *s = idl_global->scopes ().top_non_null (); + $$ = 0; AST_Decl *d = s->lookup_by_name ($1->name_, true); @@ -6873,13 +6874,11 @@ connector_inst_spec Identifier id ("connector"); UTL_ScopedName sn (&id, 0); - AST_Instantiated_Connector *ic = + $$ = idl_global->gen ()->create_instantiated_connector ( &sn, c, args); - - (void) s->fe_add_instantiated_connector (ic); } } } |