diff options
| author | gokhale <gokhale@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-01-07 18:59:50 +0000 |
|---|---|---|
| committer | gokhale <gokhale@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-01-07 18:59:50 +0000 |
| commit | c0eb4c83293b94bef916bd8192fa066aaa5e67c1 (patch) | |
| tree | 3cd183d49f4ce39919bf9b5db9f8bbbc2693dc15 /TAO | |
| parent | 4403031effd291361b591fb13052e782bbc4fd3f (diff) | |
| download | ATCD-c0eb4c83293b94bef916bd8192fa066aaa5e67c1.tar.gz | |
*** empty log message ***
Diffstat (limited to 'TAO')
43 files changed, 3317 insertions, 1755 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index 0edb7fa055f..a553922e0e4 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,64 @@ +Wed Jan 7 12:00:14 1998 Aniruddha Gokhale <gokhale@mambo.cs.wustl.edu> + + * TAO/tao/corbacom.h: Added forward declarations for + CORBA_Object_var and CORBA_Object_out + + * TAO/tao/varout.h: some improvements. However, this file is not + used currently. + + * TAO_IDL/include/ast_native.h: New file that defines the "native" + type defined by the POA spec. + + * TAO_IDL/include/{ast, ast_interface, ast_module, ast_decl, + idl_fwd, idl_global, utl_scope}: + Added the create_native and fe_add_native methods for the newly + added "native" type. Added a enum value for native in + AST_Decl.h. Added an enum value for the current parse state in + idl_global.h. Added forward declarations in idl_fwd.h. Added the + "add_native" method in utl_scope.h + + * TAO_IDL/ast/{ast_generator, ast_interface, ast_module}.cpp: + Added the create_native and fe_add_native methods for the newly + added "native" type. + + * TAO_IDL/ast/ast_native.cpp: New file for native type + + * TAO_IDL/fe/idl.ll: Added a rule to recognize the "native" + keyword. + + * TAO_IDL/fe/idl.yy: Added a grammar rule for the "native" type. + + * TAO_IDL/util/utl_scope.cpp: Added add_native and fe_add_native + methods. + + * TAO_IDL/be_include/be_native.h: New file for the backend for + "native" type. + + * TAO_IDL/be/be_native.cpp: New file for backend implementation of + "native". + + * TAO_IDL/be/be_attribute.cpp: For the "set" method, we were + setting the paramdata structure of the get method. This has been + fixed. + + * TAO_IDL/be/be_generator.cpp: Added create_native method. + + * TAO_IDL/be/be_interface.cpp: + For a special case of a deeply nested inheritance graph and one + specific way of inheritance in which a node that was already + visited, but is not present in the queue, gets inserted at the + tail. This sitation arises when a node multiply inherits from two + or more interfaces in which the first parent is higher up in the + tree than the second parent. In addition, if the second parent + turns out to be a child of the first. Thanks to Carlos O'Ryan for + reporting the error. + + * TAO_IDL/be/be_type.cpp: We generate relative paths instead of + the ACE_NESTED_CLASS macro. However, I am going to make this an + IDL option at a later point. + + * TAO_IDL: Did "make depend" on all the Makefiles. + Tue Jan 6 19:48:45 1998 Sumedh Mungee <sumedh@cs.wustl.edu> * TAO/tests/Cubit/TAO/MT_Cubit/README: Updated README to explain diff --git a/TAO/TAO_IDL/ast/Makefile b/TAO/TAO_IDL/ast/Makefile index e8adb193ee1..9d123f3c831 100644 --- a/TAO/TAO_IDL/ast/Makefile +++ b/TAO/TAO_IDL/ast/Makefile @@ -27,6 +27,7 @@ AST_FILES = \ ast_interface \ ast_interface_fwd \ ast_module \ + ast_native \ ast_operation \ ast_predefined_type \ ast_root \ @@ -84,8 +85,11 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C .obj/ast_array.o .shobj/ast_array.so: ast_array.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -94,7 +98,6 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -112,20 +115,24 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/ast_argument.o .shobj/ast_argument.so: ast_argument.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -134,7 +141,6 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -152,20 +158,24 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/ast_attribute.o .shobj/ast_attribute.so: ast_attribute.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -174,7 +184,6 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -192,20 +201,24 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/ast_check.o .shobj/ast_check.so: ast_check.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -214,7 +227,6 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -232,20 +244,24 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/ast_concrete_type.o .shobj/ast_concrete_type.so: ast_concrete_type.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -254,7 +270,6 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -272,20 +287,24 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/ast_constant.o .shobj/ast_constant.so: ast_constant.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -294,7 +313,6 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -312,20 +330,24 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/ast_decl.o .shobj/ast_decl.so: ast_decl.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -334,7 +356,6 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -352,20 +373,24 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/ast_enum.o .shobj/ast_enum.so: ast_enum.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -374,7 +399,6 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -392,20 +416,24 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/ast_enum_val.o .shobj/ast_enum_val.so: ast_enum_val.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -414,7 +442,6 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -432,20 +459,24 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/ast_exception.o .shobj/ast_exception.so: ast_exception.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -454,7 +485,6 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -472,20 +502,24 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/ast_expression.o .shobj/ast_expression.so: ast_expression.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -494,7 +528,6 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -512,20 +545,24 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/ast_field.o .shobj/ast_field.so: ast_field.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -534,7 +571,6 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -552,20 +588,24 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/ast_interface.o .shobj/ast_interface.so: ast_interface.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -574,7 +614,6 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -592,20 +631,24 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/ast_interface_fwd.o .shobj/ast_interface_fwd.so: ast_interface_fwd.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -614,7 +657,6 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -632,20 +674,24 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/ast_module.o .shobj/ast_module.so: ast_module.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -654,7 +700,49 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ + ../include/intlmacros.h ../include/idl_narrow.h \ + ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ + ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ + ../include/utl_scoped_name.h ../include/ast_decl.h \ + ../include/ast_expression.h ../include/utl_scope.h \ + ../include/ast_type.h ../include/ast_concrete_type.h \ + ../include/ast_predefined_type.h ../include/ast_module.h \ + ../include/ast_root.h ../include/ast_interface.h \ + ../include/ast_interface_fwd.h ../include/ast_structure.h \ + ../include/ast_exception.h ../include/ast_enum.h \ + ../include/ast_operation.h ../include/utl_list.h \ + ../include/ast_field.h ../include/ast_argument.h \ + ../include/ast_attribute.h ../include/ast_union.h \ + ../include/ast_union_branch.h ../include/ast_union_label.h \ + ../include/ast_constant.h ../include/ast_enum_val.h \ + ../include/ast_array.h ../include/ast_sequence.h \ + ../include/ast_string.h ../include/ast_typedef.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h +.obj/ast_native.o .shobj/ast_native.so: ast_native.cpp ../include/idl.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Version.h \ + $(ACE_ROOT)/ace/ACE.i \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -672,20 +760,24 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/ast_operation.o .shobj/ast_operation.so: ast_operation.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -694,7 +786,6 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -712,20 +803,24 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/ast_predefined_type.o .shobj/ast_predefined_type.so: ast_predefined_type.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -734,7 +829,6 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -752,20 +846,24 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/ast_root.o .shobj/ast_root.so: ast_root.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -774,7 +872,6 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -792,20 +889,24 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/ast_sequence.o .shobj/ast_sequence.so: ast_sequence.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -814,7 +915,6 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -832,20 +932,24 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/ast_string.o .shobj/ast_string.so: ast_string.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -854,7 +958,6 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -872,20 +975,24 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/ast_structure.o .shobj/ast_structure.so: ast_structure.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -894,7 +1001,6 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -912,20 +1018,24 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/ast_type.o .shobj/ast_type.so: ast_type.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -934,7 +1044,6 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -952,20 +1061,24 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/ast_typedef.o .shobj/ast_typedef.so: ast_typedef.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -974,7 +1087,6 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -992,20 +1104,24 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/ast_union.o .shobj/ast_union.so: ast_union.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1014,7 +1130,6 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -1032,20 +1147,24 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/ast_union_branch.o .shobj/ast_union_branch.so: ast_union_branch.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1054,7 +1173,6 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -1072,20 +1190,24 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/ast_union_label.o .shobj/ast_union_label.so: ast_union_label.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1094,7 +1216,6 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -1112,20 +1233,24 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/ast_generator.o .shobj/ast_generator.so: ast_generator.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1134,7 +1259,6 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -1152,20 +1276,24 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/ast_redef.o .shobj/ast_redef.so: ast_redef.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1174,7 +1302,6 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -1192,20 +1319,24 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/ast_recursive.o .shobj/ast_recursive.so: ast_recursive.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1214,7 +1345,6 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -1232,14 +1362,15 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/TAO_IDL/ast/ast_generator.cpp b/TAO/TAO_IDL/ast/ast_generator.cpp index 56b8bc152fc..0c7af9f3dc5 100644 --- a/TAO/TAO_IDL/ast/ast_generator.cpp +++ b/TAO/TAO_IDL/ast/ast_generator.cpp @@ -51,8 +51,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -399,3 +399,13 @@ AST_Generator::create_typedef(AST_Type *bt, UTL_ScopedName *n, UTL_StrList *p) { return new AST_Typedef(bt, n, p); } + +/* + * Construct an AST_Native node + */ +AST_Native * +AST_Generator::create_native (UTL_ScopedName *n, + UTL_StrList *p) +{ + return new AST_Native (n, p); +} diff --git a/TAO/TAO_IDL/ast/ast_interface.cpp b/TAO/TAO_IDL/ast/ast_interface.cpp index 569173d7069..e0d1ecbc3de 100644 --- a/TAO/TAO_IDL/ast/ast_interface.cpp +++ b/TAO/TAO_IDL/ast/ast_interface.cpp @@ -51,8 +51,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -500,6 +500,49 @@ AST_Typedef *AST_Interface::fe_add_typedef(AST_Typedef *t) } /* + * Add an AST_Native (a native declaration) to this scope + */ +AST_Native *AST_Interface::fe_add_native (AST_Native *t) +{ + AST_Decl *d; + + /* + * Can't add to interface which was not yet defined + */ + if (!is_defined()) { + idl_global->err()->error2(UTL_Error::EIDL_DECL_NOT_DEFINED, this, t); + return NULL; + } + /* + * Already defined and cannot be redefined? Or already used? + */ + if ((d = lookup_for_add(t, I_FALSE)) != NULL) { + if (!can_be_redefined(d)) { + idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d); + return NULL; + } + if (referenced(d)) { + idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d); + return NULL; + } + if (t->has_ancestor(d)) { + idl_global->err()->redefinition_in_scope(t, d); + return NULL; + } + } + /* + * Add it to scope + */ + add_to_scope(t); + /* + * Add it to set of locally referenced symbols + */ + add_to_referenced(t, I_FALSE); + + return t; +} + +/* * Dump this AST_Interface node to the ostream o */ void diff --git a/TAO/TAO_IDL/ast/ast_module.cpp b/TAO/TAO_IDL/ast/ast_module.cpp index 582fa267668..52d1219a315 100644 --- a/TAO/TAO_IDL/ast/ast_module.cpp +++ b/TAO/TAO_IDL/ast/ast_module.cpp @@ -51,8 +51,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -191,7 +191,7 @@ AST_Interface *AST_Module::fe_add_interface(AST_Interface *t) if (fwd == NULL) return NULL; - + if (!fwd->is_defined()) { /* Forward declared and not defined yet */ if (fwd->defined_in() != this) { idl_global->err() @@ -248,7 +248,7 @@ AST_InterfaceFwd *AST_Module::fe_add_interface_fwd(AST_InterfaceFwd *i) itf = AST_Interface::narrow_from_decl(d); if (itf == NULL) return NULL; - + i->set_full_definition(itf); return i; } @@ -533,6 +533,42 @@ AST_Typedef *AST_Module::fe_add_typedef(AST_Typedef *t) } /* + * Add an AST_Native (a native declaration) to this scope + */ +AST_Native *AST_Module::fe_add_native (AST_Native *t) +{ + AST_Decl *d; + + /* + * Already defined and cannot be redefined? Or already used? + */ + if ((d = lookup_for_add(t, I_FALSE)) != NULL) { + if (!can_be_redefined(d)) { + idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d); + return NULL; + } + if (referenced(d)) { + idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d); + return NULL; + } + if (t->has_ancestor(d)) { + idl_global->err()->redefinition_in_scope(t, d); + return NULL; + } + } + /* + * Add it to scope + */ + add_to_scope(t); + /* + * Add it to set of locally referenced symbols + */ + add_to_referenced(t, I_FALSE); + + return t; +} + +/* * Dump this AST_Module node to the ostream o */ void diff --git a/TAO/TAO_IDL/be/Makefile b/TAO/TAO_IDL/be/Makefile index cdc19049fb1..7443c0d1e4b 100644 --- a/TAO/TAO_IDL/be/Makefile +++ b/TAO/TAO_IDL/be/Makefile @@ -24,6 +24,7 @@ BE_FILES = \ be_interface \ be_interface_fwd \ be_module \ + be_native \ be_operation \ be_predefined_type \ be_root \ @@ -103,8 +104,11 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ .obj/be_array.o .shobj/be_array.so: be_array.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -130,15 +134,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -169,13 +174,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_argument.o .shobj/be_argument.so: be_argument.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -201,15 +210,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -240,13 +250,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_attribute.o .shobj/be_attribute.so: be_attribute.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -272,15 +286,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -311,13 +326,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_constant.o .shobj/be_constant.so: be_constant.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -343,15 +362,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -382,13 +402,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_enum.o .shobj/be_enum.so: be_enum.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -414,15 +438,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -453,13 +478,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_enum_val.o .shobj/be_enum_val.so: be_enum_val.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -485,15 +514,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -524,13 +554,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_exception.o .shobj/be_exception.so: be_exception.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -556,15 +590,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -595,13 +630,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_expression.o .shobj/be_expression.so: be_expression.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -627,15 +666,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -666,13 +706,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_field.o .shobj/be_field.so: be_field.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -698,15 +742,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -737,13 +782,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_interface.o .shobj/be_interface.so: be_interface.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -769,15 +818,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -808,13 +858,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_interface_fwd.o .shobj/be_interface_fwd.so: be_interface_fwd.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -840,15 +894,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -879,13 +934,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_module.o .shobj/be_module.so: be_module.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -911,15 +970,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -950,13 +1010,93 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h +.obj/be_native.o .shobj/be_native.so: be_native.cpp ../include/idl.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Version.h \ + $(ACE_ROOT)/ace/ACE.i \ + ../include/intlmacros.h ../include/idl_narrow.h \ + ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ + ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ + ../include/utl_scoped_name.h ../include/ast_decl.h \ + ../include/ast_expression.h ../include/utl_scope.h \ + ../include/ast_type.h ../include/ast_concrete_type.h \ + ../include/ast_predefined_type.h ../include/ast_module.h \ + ../include/ast_root.h ../include/ast_interface.h \ + ../include/ast_interface_fwd.h ../include/ast_structure.h \ + ../include/ast_exception.h ../include/ast_enum.h \ + ../include/ast_operation.h ../include/utl_list.h \ + ../include/ast_field.h ../include/ast_argument.h \ + ../include/ast_attribute.h ../include/ast_union.h \ + ../include/ast_union_branch.h ../include/ast_union_label.h \ + ../include/ast_constant.h ../include/ast_enum_val.h \ + ../include/ast_array.h ../include/ast_sequence.h \ + ../include/ast_string.h ../include/ast_typedef.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + ../be_include/be_decl.h ../be_include/be_scope.h \ + ../be_include/be_generator.h ../be_include/be_type.h \ + ../be_include/be_predefined_type.h ../be_include/be_module.h \ + ../be_include/be_interface.h ../be_include/be_interface_fwd.h \ + ../be_include/be_structure.h ../be_include/be_exception.h \ + ../be_include/be_expression.h ../be_include/be_enum.h \ + ../be_include/be_operation.h ../be_include/be_field.h \ + ../be_include/be_argument.h ../be_include/be_attribute.h \ + ../be_include/be_union.h ../be_include/be_union_branch.h \ + ../be_include/be_union_label.h ../be_include/be_constant.h \ + ../be_include/be_enum_val.h ../be_include/be_array.h \ + ../be_include/be_sequence.h ../be_include/be_string.h \ + ../be_include/be_typedef.h ../be_include/be_root.h \ + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_operation.o .shobj/be_operation.so: be_operation.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -982,15 +1122,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -1021,13 +1162,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_predefined_type.o .shobj/be_predefined_type.so: be_predefined_type.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1053,15 +1198,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -1092,13 +1238,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_root.o .shobj/be_root.so: be_root.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1124,15 +1274,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -1163,13 +1314,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_sequence.o .shobj/be_sequence.so: be_sequence.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1195,15 +1350,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -1234,13 +1390,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_string.o .shobj/be_string.so: be_string.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1266,15 +1426,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -1305,13 +1466,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_structure.o .shobj/be_structure.so: be_structure.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1337,15 +1502,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -1376,13 +1542,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_type.o .shobj/be_type.so: be_type.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1408,15 +1578,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -1447,13 +1618,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_typedef.o .shobj/be_typedef.so: be_typedef.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1479,15 +1654,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -1518,13 +1694,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_union.o .shobj/be_union.so: be_union.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1550,15 +1730,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -1589,13 +1770,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_union_branch.o .shobj/be_union_branch.so: be_union_branch.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1621,15 +1806,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -1660,13 +1846,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_union_label.o .shobj/be_union_label.so: be_union_label.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1692,15 +1882,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -1731,13 +1922,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_generator.o .shobj/be_generator.so: be_generator.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1763,15 +1958,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -1802,13 +1998,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_init.o .shobj/be_init.so: be_init.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1834,15 +2034,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -1873,13 +2074,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_produce.o .shobj/be_produce.so: be_produce.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1905,15 +2110,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -1944,13 +2150,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_args.o .shobj/be_args.so: be_args.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1976,15 +2186,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -2015,13 +2226,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_helper.o .shobj/be_helper.so: be_helper.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -2047,15 +2262,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -2086,13 +2302,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_state.o .shobj/be_state.so: be_state.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -2118,15 +2338,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -2157,13 +2378,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_state_array.o .shobj/be_state_array.so: be_state_array.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -2189,15 +2414,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -2228,13 +2454,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_state_argument.o .shobj/be_state_argument.so: be_state_argument.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -2260,15 +2490,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -2299,13 +2530,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_state_attribute.o .shobj/be_state_attribute.so: be_state_attribute.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -2331,15 +2566,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -2370,13 +2606,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_state_exception.o .shobj/be_state_exception.so: be_state_exception.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -2402,15 +2642,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -2441,13 +2682,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_state_operation.o .shobj/be_state_operation.so: be_state_operation.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -2473,15 +2718,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -2512,13 +2758,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_state_sequence.o .shobj/be_state_sequence.so: be_state_sequence.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -2544,15 +2794,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -2583,13 +2834,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_state_structure.o .shobj/be_state_structure.so: be_state_structure.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -2615,15 +2870,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -2654,13 +2910,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_state_typedef.o .shobj/be_state_typedef.so: be_state_typedef.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -2686,15 +2946,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -2725,13 +2986,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_state_union.o .shobj/be_state_union.so: be_state_union.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -2757,15 +3022,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -2796,13 +3062,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_codegen.o .shobj/be_codegen.so: be_codegen.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -2828,15 +3098,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -2867,13 +3138,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_factory.o .shobj/be_factory.so: be_factory.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -2899,15 +3174,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -2938,14 +3214,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h \ - ../be_include/be_sunsoft.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h ../be_include/be_sunsoft.h .obj/be_sunsoft.o .shobj/be_sunsoft.so: be_sunsoft.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -2971,15 +3250,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -3010,14 +3290,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h \ - ../be_include/be_sunsoft.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h ../be_include/be_sunsoft.h .obj/be_decl.o .shobj/be_decl.so: be_decl.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -3043,15 +3326,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -3082,13 +3366,17 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h .obj/be_scope.o .shobj/be_scope.so: be_scope.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -3114,15 +3402,16 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../be_include/be.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -3153,7 +3442,8 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ ../be_include/be_enum_val.h ../be_include/be_array.h \ ../be_include/be_sequence.h ../be_include/be_string.h \ ../be_include/be_typedef.h ../be_include/be_root.h \ - ../be_include/be_helper.h ../be_include/be_state.h \ - ../be_include/be_codegen.h ../be_include/be_factory.h + ../be_include/be_native.h ../be_include/be_helper.h \ + ../be_include/be_state.h ../be_include/be_codegen.h \ + ../be_include/be_factory.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/TAO_IDL/be/be_attribute.cpp b/TAO/TAO_IDL/be/be_attribute.cpp index 5bdbd35ef74..575a6029260 100644 --- a/TAO/TAO_IDL/be/be_attribute.cpp +++ b/TAO/TAO_IDL/be/be_attribute.cpp @@ -310,7 +310,7 @@ be_attribute::gen_client_stubs (void) *cs << "1, "; // always a twoway call *cs << "2, "; // size is 2 // insert the address of the paramdata table - *cs << "_get_" << this->flatname () << "_paramdata, "; + *cs << "_set_" << this->flatname () << "_paramdata, "; // XXXASG - Exception list goes here (if it exists) - TODO *cs << "0, 0};\n\n"; diff --git a/TAO/TAO_IDL/be/be_generator.cpp b/TAO/TAO_IDL/be/be_generator.cpp index b93c92ea88a..2dbf692bf3c 100644 --- a/TAO/TAO_IDL/be/be_generator.cpp +++ b/TAO/TAO_IDL/be/be_generator.cpp @@ -51,8 +51,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -397,3 +397,13 @@ be_generator::create_typedef(AST_Type *bt, UTL_ScopedName *n, UTL_StrList *p) { return (AST_Typedef *) new be_typedef(bt, n, p); } + +/* + * Construct an AST_Native node + */ +AST_Native * +be_generator::create_native (UTL_ScopedName *n, + UTL_StrList *p) +{ + return (AST_Native *) new be_native (n, p); +} diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index 61e7f8aa155..6d22bdb1ebb 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -1452,6 +1452,17 @@ int be_interface::traverse_inheritance_graph (be_interface::tao_code_emitter gen ACE_Unbounded_Queue <be_interface*> queue; // Queue data structure needed for // breadth-first traversal of // inheritance tree + + // For a special case of a deeply nested inheritance graph and one specific + // way of inheritance in which a node that was already visited, but is not present in + // the queue, gets inserted at the tail. This sitation arises when a node + // multiply inherits from two or more interfaces in which the first parent is + // higher up in the tree than the second parent. In addition, if the second + // parent turns out to be a child of the first . + + ACE_Unbounded_Queue <be_interface*> del_queue; // queue of dequeued nodes to + // be searched for the above case + // insert ourselves in the Queue if (queue.enqueue_tail (this) == -1) { @@ -1478,6 +1489,13 @@ int be_interface::traverse_inheritance_graph (be_interface::tao_code_emitter gen "dequeue_head failed\n"), -1); } + // insert the dequeued element in the del_queue + if (del_queue.enqueue_tail (bi) == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_interface::gen_operation_table - " + "error generating entries\n"), -1); + } + // use the helper method to generate code for ourself using the // properties of the element dequeued. For the first iteration, the // element dequeued and "this" will be the same i.e., ourselves @@ -1523,6 +1541,25 @@ int be_interface::traverse_inheritance_graph (be_interface::tao_code_emitter gen break; (void) q_iter.advance (); } // end of while + + // initialize an iterator to search the del_queue for duplicates + ACE_Unbounded_Queue_Iterator<be_interface*> del_q_iter (del_queue); + + while (!found && !del_q_iter.done ()) + { + be_interface **temp; // queue element + + (void) del_q_iter.next (temp); + if (!ACE_OS::strcmp (parent->fullname (), (*temp)->fullname ())) + { + // we exist in this del_queue and cannot be inserted + found = 1; + } + if (found) + break; + (void) del_q_iter.advance (); + } // end of while + if (!found) { // insert the parent in the queue diff --git a/TAO/TAO_IDL/be/be_state_argument.cpp b/TAO/TAO_IDL/be/be_state_argument.cpp index ed428d30a66..514ff81188b 100644 --- a/TAO/TAO_IDL/be/be_state_argument.cpp +++ b/TAO/TAO_IDL/be/be_state_argument.cpp @@ -2207,6 +2207,29 @@ be_state_argument::gen_code (be_type *bt, be_decl *d, be_type *type) break; } // end switch direction break; + case AST_Decl::NT_native: + { + switch (cg->state ()) + { + case TAO_CodeGen::TAO_ARGUMENT_CH: + // to keep the MSVC++ compiler happy + *os << bt->nested_type_name (bif) << " " << arg->local_name () << + ", "; + break; + case TAO_CodeGen::TAO_ARGUMENT_CS: + case TAO_CodeGen::TAO_ARGUMENT_SH: + *os << bt->name () << arg->local_name () << ", "; + break; + case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS: + case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS: + *os << "env.exception (new CORBA::MARSHAL " << + "(CORBA::COMPLETED_NO));" << nl; + break; + default: + break; + } + } + break; case AST_Decl::NT_except: // type is an exception { // XXXASG TODO: is this allowed ??? diff --git a/TAO/TAO_IDL/be/be_type.cpp b/TAO/TAO_IDL/be/be_type.cpp index e498ac52bc1..bed5710a386 100644 --- a/TAO/TAO_IDL/be/be_type.cpp +++ b/TAO/TAO_IDL/be/be_type.cpp @@ -91,6 +91,10 @@ be_type::tc_name (void) return this->tc_name_; } +// XXXASG - This code works. However, whether we should generate the +// ACE_NESTED_CLASS macro or not should be based on an option to the +// compiler. In this version, we choose to generate a relative path. + // return the type name using the ACE_NESTED_CLASS macro char * be_type::nested_type_name (be_decl *use_scope, char *suffix) @@ -155,8 +159,8 @@ be_type::nested_type_name (be_decl *use_scope, char *suffix) // initial prefix matches i.e., they have a common root // start by initializing the macro - ACE_OS::sprintf (macro, "ACE_NESTED_CLASS ("); - ACE_OS::strcat (macro, def_curr); // initialize the first argument + //@@ ACE_OS::sprintf (macro, "ACE_NESTED_CLASS ("); + //@@ ACE_OS::strcat (macro, def_curr); // initialize the first argument def_curr = (def_next ? (def_next+2) : 0); // skip the :: use_curr = (use_next ? (use_next+2) : 0); // skip the :: @@ -176,8 +180,8 @@ be_type::nested_type_name (be_decl *use_scope, char *suffix) if (!ACE_OS::strcmp (def_curr, use_curr)) { // they have same prefix, append to arg1 - ACE_OS::strcat (macro, "::"); - ACE_OS::strcat (macro, def_curr); + //@@ ACE_OS::strcat (macro, "::"); + //@@ ACE_OS::strcat (macro, def_curr); def_curr = (def_next ? (def_next+2) : 0); // skip the :: use_curr = (use_next ? (use_next+2) : 0); // skip the :: } @@ -190,7 +194,7 @@ be_type::nested_type_name (be_decl *use_scope, char *suffix) } // start the 2nd argument of the macro - ACE_OS::strcat (macro, ", "); + //@@ ACE_OS::strcat (macro, ", "); // copy the remaining def_name (if any left) if (def_curr) @@ -200,7 +204,7 @@ be_type::nested_type_name (be_decl *use_scope, char *suffix) ACE_OS::strcat (macro, this->local_name ()->get_string ()); if (suffix) ACE_OS::strcat (macro, suffix); - ACE_OS::strcat (macro, ")"); + //@@ ACE_OS::strcat (macro, ")"); return macro; } // end of if the root prefixes match } diff --git a/TAO/TAO_IDL/be_include/be.h b/TAO/TAO_IDL/be_include/be.h index a1ec674be84..7741e92f2df 100644 --- a/TAO/TAO_IDL/be_include/be.h +++ b/TAO/TAO_IDL/be_include/be.h @@ -111,6 +111,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "be_string.h" // class BE_String #include "be_typedef.h" // class BE_Typedef #include "be_root.h" // class BE_Root +#include "be_native.h" // class BE_Native #include "be_helper.h" // helper functions #include "be_state.h" // code generation states diff --git a/TAO/TAO_IDL/be_include/be_generator.h b/TAO/TAO_IDL/be_include/be_generator.h index 2b8c91cabfa..3f4f38bca3f 100644 --- a/TAO/TAO_IDL/be_include/be_generator.h +++ b/TAO/TAO_IDL/be_include/be_generator.h @@ -51,8 +51,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -155,6 +155,10 @@ public: virtual AST_Typedef *create_typedef(AST_Type *bt, UTL_ScopedName *n, UTL_StrList *p); + // Create a node representing a native + virtual AST_Native *create_native (UTL_ScopedName *n, + UTL_StrList *p); + }; #endif // _BE_GENERATOR_BE_GENERATOR_HH diff --git a/TAO/TAO_IDL/driver/Makefile b/TAO/TAO_IDL/driver/Makefile index 5a195d0b437..1f414b5a0d2 100644 --- a/TAO/TAO_IDL/driver/Makefile +++ b/TAO/TAO_IDL/driver/Makefile @@ -66,8 +66,11 @@ $(LOBJS): $(LHDRS) .obj/drv_init.o .shobj/drv_init.so: drv_init.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -76,7 +79,6 @@ $(LOBJS): $(LHDRS) $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -94,21 +96,25 @@ $(LOBJS): $(LHDRS) ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h \ - ../include/drv_private.h ../include/drv_link.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../include/drv_private.h \ + ../include/drv_link.h .obj/drv_private.o .shobj/drv_private.so: drv_private.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -117,7 +123,6 @@ $(LOBJS): $(LHDRS) $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -135,21 +140,24 @@ $(LOBJS): $(LHDRS) ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h \ - ../include/drv_private.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../include/drv_private.h .obj/drv_main.o .shobj/drv_main.so: drv_main.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -158,7 +166,6 @@ $(LOBJS): $(LHDRS) $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -176,21 +183,25 @@ $(LOBJS): $(LHDRS) ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h \ - ../include/drv_private.h ../include/drv_link.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../include/drv_private.h \ + ../include/drv_link.h .obj/drv_args.o .shobj/drv_args.so: drv_args.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -199,7 +210,6 @@ $(LOBJS): $(LHDRS) $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -217,21 +227,25 @@ $(LOBJS): $(LHDRS) ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h \ - ../include/drv_private.h ../include/drv_link.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../include/drv_private.h \ + ../include/drv_link.h .obj/drv_fork.o .shobj/drv_fork.so: drv_fork.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -240,7 +254,6 @@ $(LOBJS): $(LHDRS) $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -258,16 +271,16 @@ $(LOBJS): $(LHDRS) ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h \ - ../include/drv_private.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../include/drv_private.h \ $(ACE_ROOT)/ace/Process_Manager.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -288,8 +301,11 @@ $(LOBJS): $(LHDRS) .obj/drv_link.o .shobj/drv_link.so: drv_link.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -298,7 +314,6 @@ $(LOBJS): $(LHDRS) $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -316,21 +331,25 @@ $(LOBJS): $(LHDRS) ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h \ - ../include/drv_private.h ../include/drv_link.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../include/drv_private.h \ + ../include/drv_link.h .obj/drv_preproc.o .shobj/drv_preproc.so: drv_preproc.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -339,7 +358,6 @@ $(LOBJS): $(LHDRS) $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -357,16 +375,17 @@ $(LOBJS): $(LHDRS) ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h \ - ../include/drv_private.h ../include/drv_link.h \ + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../include/drv_private.h \ + ../include/drv_link.h \ $(ACE_ROOT)/ace/Process_Manager.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ diff --git a/TAO/TAO_IDL/fe/Makefile b/TAO/TAO_IDL/fe/Makefile index c70d84010b5..dec1c87b205 100644 --- a/TAO/TAO_IDL/fe/Makefile +++ b/TAO/TAO_IDL/fe/Makefile @@ -81,8 +81,11 @@ lex.yy.cpp: idl.ll y.tab.h .obj/fe_declarator.o .shobj/fe_declarator.so: fe_declarator.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -91,7 +94,6 @@ lex.yy.cpp: idl.ll y.tab.h $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -109,22 +111,25 @@ lex.yy.cpp: idl.ll y.tab.h ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h \ - ../include/fe_private.h ../include/fe_interface_header.h \ - ../include/fe_declarator.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../include/fe_private.h \ + ../include/fe_interface_header.h ../include/fe_declarator.h .obj/fe_private.o .shobj/fe_private.so: fe_private.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -133,7 +138,6 @@ lex.yy.cpp: idl.ll y.tab.h $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -151,22 +155,25 @@ lex.yy.cpp: idl.ll y.tab.h ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h \ - ../include/fe_private.h ../include/fe_interface_header.h \ - ../include/fe_declarator.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../include/fe_private.h \ + ../include/fe_interface_header.h ../include/fe_declarator.h .obj/fe_init.o .shobj/fe_init.so: fe_init.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -175,7 +182,6 @@ lex.yy.cpp: idl.ll y.tab.h $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -193,22 +199,25 @@ lex.yy.cpp: idl.ll y.tab.h ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h \ - ../include/fe_private.h ../include/fe_interface_header.h \ - ../include/fe_declarator.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../include/fe_private.h \ + ../include/fe_interface_header.h ../include/fe_declarator.h .obj/fe_extern.o .shobj/fe_extern.so: fe_extern.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -217,7 +226,6 @@ lex.yy.cpp: idl.ll y.tab.h $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -235,22 +243,25 @@ lex.yy.cpp: idl.ll y.tab.h ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h \ - ../include/fe_private.h ../include/fe_interface_header.h \ - ../include/fe_declarator.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../include/fe_private.h \ + ../include/fe_interface_header.h ../include/fe_declarator.h .obj/fe_interface_header.o .shobj/fe_interface_header.so: fe_interface_header.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -259,7 +270,6 @@ lex.yy.cpp: idl.ll y.tab.h $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -277,22 +287,25 @@ lex.yy.cpp: idl.ll y.tab.h ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h \ - ../include/fe_private.h ../include/fe_interface_header.h \ - ../include/fe_declarator.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../include/fe_private.h \ + ../include/fe_interface_header.h ../include/fe_declarator.h .obj/y.tab.o .shobj/y.tab.so: y.tab.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -301,7 +314,6 @@ lex.yy.cpp: idl.ll y.tab.h $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -319,22 +331,25 @@ lex.yy.cpp: idl.ll y.tab.h ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h \ - ../include/fe_private.h ../include/fe_interface_header.h \ - ../include/fe_declarator.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../include/fe_private.h \ + ../include/fe_interface_header.h ../include/fe_declarator.h .obj/lex.yy.o .shobj/lex.yy.so: lex.yy.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -343,7 +358,6 @@ lex.yy.cpp: idl.ll y.tab.h $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -361,16 +375,16 @@ lex.yy.cpp: idl.ll y.tab.h ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h \ - ../include/fe_private.h ../include/fe_interface_header.h \ - ../include/fe_declarator.h y.tab.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h ../include/fe_private.h \ + ../include/fe_interface_header.h ../include/fe_declarator.h y.tab.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll index 9b41d547492..43f0cd0029b 100644 --- a/TAO/TAO_IDL/fe/idl.ll +++ b/TAO/TAO_IDL/fe/idl.ll @@ -128,6 +128,7 @@ wchar_t return IDL_WCHAR; boolean return IDL_BOOLEAN; octet return IDL_OCTET; void return IDL_VOID; +native return IDL_NATIVE; TRUE return IDL_TRUETOK; FALSE return IDL_FALSETOK; @@ -269,13 +270,13 @@ idl_parse_line_and_file(char *buf) UTL_String *nm; /* Skip initial '#' */ - if (*r != '#') + if (*r != '#') return; else r++; /* Check to see if we're running under the screwy Microsoft scheme */ - /* of putting #line num instead of #num. */ + /* of putting #line num instead of #num. */ if (ACE_OS::strncmp (r, "line", 4) == 0) r += 5; @@ -290,7 +291,7 @@ idl_parse_line_and_file(char *buf) idl_global->set_lineno(idl_atoi(h, 10)); /* Find file name, if present */ - for (; *r != '"'; r++) + for (; *r != '"'; r++) if (*r == '\n' || *r == '\0') return; diff --git a/TAO/TAO_IDL/fe/idl.yy b/TAO/TAO_IDL/fe/idl.yy index 63ef3e24b25..5e0869bebc5 100644 --- a/TAO/TAO_IDL/fe/idl.yy +++ b/TAO/TAO_IDL/fe/idl.yy @@ -161,6 +161,7 @@ extern int yyleng; %token IDL_INOUT %token IDL_RAISES %token IDL_CONTEXT +%token IDL_NATIVE %token <ival> IDL_INTEGER_LITERAL %token <sval> IDL_STRING_LITERAL @@ -870,6 +871,28 @@ type_dcl | struct_type { $$ = 0;} | union_type { $$ = 0;} | enum_type { $$ = 0;} + | IDL_NATIVE simple_declarator + { + UTL_Scope *s = idl_global->scopes()->top_non_null(); + AST_Native *node = NULL; + AST_Decl *v = NULL; + UTL_StrList *p = idl_global->pragmas(); + + ACE_UNUSED_ARG (v); + + idl_global->set_parse_state(IDL_GlobalData::PS_NativeSeen); + /* + * Create a node representing a Native and add it to its + * enclosing scope + */ + if (s != NULL) { + node = idl_global->gen()->create_native ($2->name (), p); + /* + * Add it to its defining scope + */ + (void) s->fe_add_native (node); + } + } ; type_declarator : @@ -886,7 +909,7 @@ type_declarator : AST_Decl *v = NULL; UTL_StrList *p = idl_global->pragmas(); - ACE_UNUSED_ARG (v); + ACE_UNUSED_ARG (v); idl_global->set_parse_state(IDL_GlobalData::PS_DeclaratorsSeen); /* diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp index ca89291620e..b1be52d007b 100644 --- a/TAO/TAO_IDL/fe/lex.yy.cpp +++ b/TAO/TAO_IDL/fe/lex.yy.cpp @@ -1,10 +1,12 @@ /* A lexical scanner generated by flex */ /* Scanner skeleton version: - * $Header: /home/daffy/u0/vern/flex/flex-2.4.7/RCS/flex.skl,v 1.2 94/08/03 11:13:24 vern Exp $ + * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $ */ #define FLEX_SCANNER +#define YY_FLEX_MAJOR_VERSION 2 +#define YY_FLEX_MINOR_VERSION 5 #include /**/ <stdio.h> @@ -30,7 +32,7 @@ #else /* ! __cplusplus */ -#ifdef __STDC__ +#if __STDC__ #define YY_USE_PROTOS #define YY_USE_CONST @@ -38,16 +40,19 @@ #endif /* __STDC__ */ #endif /* ! __cplusplus */ - #ifdef __TURBOC__ + #pragma warn -rch + #pragma warn -use +#include /**/ <io.h> +#include /**/ <stdlib.h> #define YY_USE_CONST +#define YY_USE_PROTOS #endif - -#ifndef YY_USE_CONST -#ifndef const -#define const -#endif +#ifdef YY_USE_CONST +#define yyconst const +#else +#define yyconst #endif @@ -74,16 +79,16 @@ #define BEGIN yy_start = 1 + 2 * /* Translate the current start state into a value that can be later handed - * to BEGIN to return to the state. + * to BEGIN to return to the state. The YYSTATE alias is for lex + * compatibility. */ #define YY_START ((yy_start - 1) / 2) +#define YYSTATE YY_START /* Action number for EOF rule of a given start state. */ #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) -/* Special action meaning "start processing a new file". Now included - * only for backward compatibility with previous versions of flex. - */ +/* Special action meaning "start processing a new file". */ #define YY_NEW_FILE yyrestart( yyin ) #define YY_END_OF_BUFFER_CHAR 0 @@ -96,14 +101,6 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE; extern int yyleng; extern FILE *yyin, *yyout; -#ifdef __cplusplus -extern "C" { -#endif - extern int yywrap YY_PROTO(( void )); -#ifdef __cplusplus - } -#endif - #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 @@ -129,6 +126,7 @@ extern "C" { { \ /* Undo effects of setting up yytext. */ \ *yy_cp = yy_hold_char; \ + YY_RESTORE_YY_MORE_OFFSET \ yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \ YY_DO_BEFORE_ACTION; /* set up yytext again */ \ } \ @@ -136,6 +134,12 @@ extern "C" { #define unput(c) yyunput( c, yytext_ptr ) +/* The following is because we cannot portably get our hands on size_t + * (without autoconf's help, which isn't available because we want + * flex-generated scanners to compile on their own). + */ +typedef unsigned int yy_size_t; + struct yy_buffer_state { @@ -147,13 +151,19 @@ struct yy_buffer_state /* Size of input buffer in bytes, not including room for EOB * characters. */ - int yy_buf_size; + yy_size_t yy_buf_size; /* Number of characters read into yy_ch_buf, not including EOB * characters. */ int yy_n_chars; + /* Whether we "own" the buffer - i.e., we know we created it, + * and can realloc() it to grow it, and should free() it to + * delete it. + */ + int yy_is_our_buffer; + /* Whether this is an "interactive" input source; if so, and * if we're using stdio for input, then we want to use getc() * instead of fread(), to make sure we stop fetching input after @@ -161,6 +171,12 @@ struct yy_buffer_state */ int yy_is_interactive; + /* Whether we're considered to be at the beginning of a line. + * If so, '^' rules will be active on the next match, otherwise + * not. + */ + int yy_at_bol; + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -209,55 +225,59 @@ static int yy_start = 0; /* start state number */ */ static int yy_did_buffer_switch_on_eof; -static void yyunput YY_PROTO(( int c, char *buf_ptr )); void yyrestart YY_PROTO(( FILE *input_file )); + void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer )); void yy_load_buffer_state YY_PROTO(( void )); YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size )); void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b )); void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file )); +void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b )); +#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer ) -static int yy_start_stack_ptr = 0; -static int yy_start_stack_depth = 0; -static int *yy_start_stack = 0; -static void yy_push_state YY_PROTO(( int new_state )); -static void yy_pop_state YY_PROTO(( void )); -static int yy_top_state YY_PROTO(( void )); +YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size )); +YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str )); +YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len )); -static void *yy_flex_alloc YY_PROTO(( unsigned int )); -static void *yy_flex_realloc YY_PROTO(( void *, unsigned int )); +static void *yy_flex_alloc YY_PROTO(( yy_size_t )); +static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )); static void yy_flex_free YY_PROTO(( void * )); #define yy_new_buffer yy_create_buffer -#define INITIAL 0 +#define yy_set_interactive(is_interactive) \ + { \ + if ( ! yy_current_buffer ) \ + yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \ + yy_current_buffer->yy_is_interactive = is_interactive; \ + } + +#define yy_set_bol(at_bol) \ + { \ + if ( ! yy_current_buffer ) \ + yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \ + yy_current_buffer->yy_at_bol = at_bol; \ + } + +#define YY_AT_BOL() (yy_current_buffer->yy_at_bol) + typedef unsigned char YY_CHAR; -typedef int yy_state_type; FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; +typedef int yy_state_type; extern char yytext[]; -#ifndef yytext_ptr -static void yy_flex_strncpy YY_PROTO(( char *, const char *, int )); -#endif - -#ifdef __cplusplus -static int yyinput YY_PROTO(( void )); -#else -static int input YY_PROTO(( void )); -#endif - static yy_state_type yy_get_previous_state YY_PROTO(( void )); static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state )); static int yy_get_next_buffer YY_PROTO(( void )); -static void yy_fatal_error YY_PROTO(( const char msg[] )); +static void yy_fatal_error YY_PROTO(( yyconst char msg[] )); /* Done after the current pattern has been matched and before the * corresponding action - sets up yytext. */ #define YY_DO_BEFORE_ACTION \ yytext_ptr = yy_bp; \ - yyleng = yy_cp - yy_bp; \ + yyleng = (int) (yy_cp - yy_bp); \ yy_hold_char = *yy_cp; \ *yy_cp = '\0'; \ if ( yyleng >= YYLMAX ) \ @@ -265,42 +285,44 @@ static void yy_fatal_error YY_PROTO(( const char msg[] )); yy_flex_strncpy( yytext, yytext_ptr, yyleng + 1 ); \ yy_c_buf_p = yy_cp; -#define YY_END_OF_BUFFER 61 -static const short int yy_accept[278] = +#define YY_NUM_RULES 61 +#define YY_END_OF_BUFFER 62 +static yyconst short int yy_accept[284] = { 0, - 57, 57, 61, 59, 57, 58, 59, 59, 59, 59, - 44, 42, 59, 59, 59, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 59, 57, 0, 45, 0, 0, - 44, 42, 56, 0, 40, 44, 0, 0, 0, 42, - 38, 36, 37, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 33, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 0, 53, 0, 0, 0, 0, - 0, 46, 0, 46, 0, 0, 55, 40, 0, 40, - - 0, 41, 43, 39, 39, 1, 39, 39, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 34, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 39, 0, 0, 0, 0, 0, - 48, 47, 0, 0, 40, 41, 39, 30, 39, 39, - 18, 25, 39, 39, 39, 39, 12, 39, 39, 39, - 39, 22, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 39, 29, 39, 39, 0, 0, - 0, 0, 0, 47, 0, 31, 39, 39, 9, 39, - 39, 39, 39, 20, 32, 39, 39, 28, 39, 39, - - 39, 39, 23, 39, 39, 39, 39, 16, 39, 39, - 39, 51, 0, 0, 0, 0, 39, 39, 39, 39, - 21, 39, 39, 2, 35, 3, 39, 39, 13, 11, - 17, 39, 39, 39, 39, 50, 0, 0, 0, 0, - 0, 0, 39, 27, 7, 19, 39, 39, 39, 39, - 10, 39, 26, 39, 0, 54, 0, 0, 0, 39, - 39, 39, 4, 15, 24, 39, 0, 0, 0, 5, - 6, 8, 14, 52, 0, 49, 0 + 58, 58, 62, 60, 58, 59, 60, 60, 60, 60, + 45, 43, 60, 60, 60, 40, 40, 40, 40, 40, + 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, + 40, 40, 40, 40, 40, 60, 58, 0, 46, 0, + 0, 45, 43, 57, 0, 41, 45, 0, 0, 0, + 43, 39, 37, 38, 40, 40, 40, 40, 40, 40, + 40, 40, 40, 40, 40, 40, 40, 40, 34, 40, + 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, + 40, 40, 40, 40, 40, 40, 0, 54, 0, 0, + 0, 0, 0, 47, 0, 47, 0, 0, 56, 41, + + 0, 41, 0, 42, 44, 40, 40, 1, 40, 40, + 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, + 40, 40, 40, 40, 40, 35, 40, 40, 40, 40, + 40, 40, 40, 40, 40, 40, 40, 40, 0, 0, + 0, 0, 0, 49, 48, 0, 0, 41, 42, 40, + 31, 40, 40, 18, 25, 40, 40, 40, 40, 12, + 40, 40, 40, 40, 22, 40, 40, 40, 40, 40, + 40, 40, 40, 40, 40, 40, 40, 40, 40, 29, + 40, 40, 0, 0, 0, 0, 0, 48, 0, 32, + 40, 40, 9, 40, 40, 40, 40, 20, 33, 40, + + 40, 40, 28, 40, 40, 40, 40, 23, 40, 40, + 40, 40, 16, 40, 40, 40, 52, 0, 0, 0, + 0, 40, 40, 40, 40, 21, 40, 40, 2, 30, + 36, 3, 40, 40, 13, 11, 17, 40, 40, 40, + 40, 51, 0, 0, 0, 0, 0, 0, 40, 27, + 7, 19, 40, 40, 40, 40, 10, 40, 26, 40, + 0, 55, 0, 0, 0, 40, 40, 40, 4, 15, + 24, 40, 0, 0, 0, 5, 6, 8, 14, 53, + 0, 50, 0 } ; -static const int yy_ec[256] = +static yyconst int yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -332,7 +354,7 @@ static const int yy_ec[256] = 1, 1, 1, 1, 1 } ; -static const int yy_meta[55] = +static yyconst int yy_meta[55] = { 0, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 3, 3, @@ -342,136 +364,141 @@ static const int yy_meta[55] = 4, 4, 4, 4 } ; -static const short int yy_base[288] = +static yyconst short int yy_base[294] = { 0, - 0, 439, 444, 446, 53, 446, 438, 412, 45, 53, - 53, 58, 425, 423, 421, 0, 419, 412, 13, 392, - 31, 40, 34, 394, 391, 389, 388, 47, 56, 44, - 377, 387, 385, 51, 105, 96, 423, 446, 420, 88, - 100, 111, 446, 423, 141, 128, 155, 170, 0, 160, - 446, 446, 446, 0, 401, 396, 369, 373, 377, 372, - 387, 375, 380, 366, 365, 380, 369, 42, 369, 376, - 361, 373, 359, 367, 374, 359, 360, 356, 362, 356, - 64, 360, 360, 349, 184, 446, 111, 189, 362, 356, - 348, 446, 387, 386, 120, 389, 446, 0, 196, 446, - - 144, 199, 0, 365, 369, 0, 342, 347, 351, 339, - 82, 353, 351, 341, 346, 349, 330, 343, 340, 327, - 340, 323, 0, 326, 338, 322, 324, 88, 321, 333, - 324, 327, 331, 333, 317, 358, 357, 325, 317, 327, - 446, 446, 187, 202, 213, 446, 337, 0, 317, 320, - 0, 0, 306, 318, 303, 311, 0, 306, 301, 300, - 301, 0, 306, 297, 313, 308, 299, 306, 292, 297, - 305, 304, 302, 293, 297, 0, 287, 293, 327, 157, - 288, 294, 291, 446, 321, 0, 294, 294, 0, 272, - 283, 287, 273, 0, 0, 284, 284, 0, 265, 270, - - 274, 273, 0, 277, 265, 274, 276, 0, 268, 279, - 266, 446, 205, 259, 228, 265, 256, 262, 255, 254, - 0, 262, 269, 0, 0, 0, 237, 238, 0, 0, - 0, 220, 215, 199, 201, 446, 231, 235, 245, 251, - 248, 201, 182, 0, 0, 0, 181, 188, 153, 159, - 0, 155, 0, 158, 169, 446, 162, 146, 101, 112, - 101, 104, 0, 0, 0, 88, 130, 120, 114, 0, - 0, 0, 0, 446, 107, 446, 446, 266, 270, 272, - 276, 280, 75, 284, 288, 292, 296 + 0, 444, 449, 451, 53, 451, 443, 417, 45, 53, + 53, 58, 430, 428, 426, 0, 424, 417, 13, 397, + 31, 40, 34, 399, 396, 394, 393, 404, 47, 56, + 44, 381, 391, 389, 51, 105, 96, 427, 451, 424, + 88, 100, 111, 451, 427, 141, 128, 155, 170, 0, + 160, 451, 451, 451, 0, 405, 400, 373, 377, 381, + 376, 391, 379, 384, 370, 369, 384, 373, 42, 373, + 380, 365, 364, 376, 362, 370, 377, 362, 363, 359, + 365, 359, 64, 363, 363, 352, 184, 451, 111, 189, + 365, 359, 351, 451, 390, 389, 120, 392, 451, 0, + + 196, 451, 144, 199, 0, 368, 372, 0, 345, 350, + 354, 342, 82, 356, 354, 344, 349, 352, 333, 346, + 343, 330, 339, 342, 325, 0, 328, 340, 324, 326, + 88, 323, 335, 326, 329, 333, 335, 319, 360, 359, + 327, 319, 329, 451, 451, 187, 202, 213, 451, 339, + 0, 319, 322, 0, 0, 308, 320, 305, 313, 0, + 308, 303, 302, 303, 0, 308, 297, 298, 314, 309, + 300, 307, 293, 298, 306, 305, 303, 294, 298, 0, + 288, 294, 328, 157, 289, 295, 292, 451, 322, 0, + 295, 295, 0, 273, 284, 288, 274, 0, 0, 285, + + 285, 284, 0, 265, 270, 274, 273, 0, 277, 265, + 274, 276, 0, 268, 279, 266, 451, 205, 259, 228, + 265, 256, 262, 255, 254, 0, 262, 269, 0, 0, + 0, 0, 237, 238, 0, 0, 0, 220, 215, 199, + 201, 451, 231, 235, 245, 251, 248, 201, 182, 0, + 0, 0, 181, 188, 153, 159, 0, 155, 0, 158, + 169, 451, 162, 146, 101, 112, 101, 104, 0, 0, + 0, 88, 130, 120, 114, 0, 0, 0, 0, 451, + 107, 451, 451, 266, 270, 272, 276, 280, 75, 284, + 288, 292, 296 + } ; -static const short int yy_def[288] = +static yyconst short int yy_def[294] = { 0, - 277, 1, 277, 277, 277, 277, 278, 279, 277, 277, - 277, 277, 277, 277, 277, 280, 280, 280, 280, 280, - 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, - 280, 280, 280, 280, 277, 277, 278, 277, 277, 281, - 277, 277, 277, 282, 277, 277, 277, 277, 283, 277, - 277, 277, 277, 280, 280, 280, 280, 280, 280, 280, - 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, - 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, - 280, 280, 280, 280, 277, 277, 35, 277, 277, 277, - 277, 277, 277, 277, 277, 282, 277, 45, 277, 277, - - 277, 277, 283, 280, 280, 280, 280, 280, 280, 280, - 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, - 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, - 280, 280, 280, 280, 280, 284, 277, 277, 277, 277, - 277, 277, 277, 277, 277, 277, 280, 280, 280, 280, - 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, - 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, - 280, 280, 280, 280, 280, 280, 280, 280, 284, 277, - 277, 277, 277, 277, 277, 280, 280, 280, 280, 280, - 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, - - 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, - 280, 277, 277, 277, 277, 277, 280, 280, 280, 280, - 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, - 280, 280, 280, 280, 280, 277, 277, 285, 277, 277, - 277, 277, 280, 280, 280, 280, 280, 280, 280, 280, - 280, 280, 280, 280, 285, 277, 286, 277, 277, 280, - 280, 280, 280, 280, 280, 280, 286, 277, 287, 280, - 280, 280, 280, 277, 287, 277, 0, 277, 277, 277, - 277, 277, 277, 277, 277, 277, 277 + 283, 1, 283, 283, 283, 283, 284, 285, 283, 283, + 283, 283, 283, 283, 283, 286, 286, 286, 286, 286, + 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, + 286, 286, 286, 286, 286, 283, 283, 284, 283, 283, + 287, 283, 283, 283, 288, 283, 283, 283, 283, 289, + 283, 283, 283, 283, 286, 286, 286, 286, 286, 286, + 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, + 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, + 286, 286, 286, 286, 286, 286, 283, 283, 36, 283, + 283, 283, 283, 283, 283, 283, 283, 288, 283, 46, + + 283, 283, 283, 283, 289, 286, 286, 286, 286, 286, + 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, + 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, + 286, 286, 286, 286, 286, 286, 286, 286, 290, 283, + 283, 283, 283, 283, 283, 283, 283, 283, 283, 286, + 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, + 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, + 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, + 286, 286, 290, 283, 283, 283, 283, 283, 283, 286, + 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, + + 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, + 286, 286, 286, 286, 286, 286, 283, 283, 283, 283, + 283, 286, 286, 286, 286, 286, 286, 286, 286, 286, + 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, + 286, 283, 283, 291, 283, 283, 283, 283, 286, 286, + 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, + 291, 283, 292, 283, 283, 286, 286, 286, 286, 286, + 286, 286, 292, 283, 293, 286, 286, 286, 286, 283, + 293, 283, 0, 283, 283, 283, 283, 283, 283, 283, + 283, 283, 283 + } ; -static const short int yy_nxt[501] = +static yyconst short int yy_nxt[506] = { 0, 4, 5, 6, 5, 7, 4, 8, 4, 4, 9, 4, 10, 11, 12, 12, 13, 14, 15, 16, 16, 16, 17, 16, 16, 16, 16, 18, 16, 16, 4, 4, 19, 20, 21, 22, 23, 24, 16, 16, 25, - 26, 27, 16, 28, 16, 16, 29, 30, 31, 32, - 33, 34, 16, 16, 36, 57, 36, 41, 42, 42, - 43, 58, 60, 45, 44, 46, 46, 47, 45, 61, - 50, 50, 50, 48, 62, 63, 65, 103, 48, 76, - 71, 49, 77, 64, 83, 117, 66, 74, 48, 72, - 118, 75, 78, 48, 94, 79, 73, 36, 84, 36, - - 95, 95, 269, 131, 269, 49, 85, 86, 87, 276, - 45, 132, 46, 46, 47, 136, 276, 88, 88, 88, - 48, 45, 274, 50, 50, 50, 142, 170, 49, 153, - 154, 48, 143, 143, 268, 48, 273, 171, 45, 272, - 46, 46, 47, 271, 89, 90, 48, 270, 48, 91, - 257, 277, 49, 98, 98, 98, 102, 102, 102, 212, - 213, 99, 100, 48, 100, 45, 268, 47, 47, 47, - 45, 256, 50, 50, 50, 48, 99, 100, 101, 101, - 48, 100, 102, 102, 102, 85, 86, 87, 266, 265, - 48, 86, 137, 184, 264, 48, 88, 88, 88, 185, - - 185, 88, 88, 88, 144, 144, 263, 236, 145, 145, - 145, 102, 102, 102, 145, 145, 145, 237, 237, 237, - 146, 262, 146, 89, 261, 145, 145, 145, 91, 239, - 260, 240, 259, 236, 100, 146, 100, 256, 254, 146, - 241, 241, 241, 237, 237, 237, 239, 253, 240, 100, - 252, 258, 239, 100, 240, 257, 251, 241, 241, 241, - 241, 241, 241, 241, 241, 241, 37, 37, 37, 37, - 39, 250, 39, 39, 54, 54, 93, 249, 93, 93, - 96, 96, 96, 96, 179, 179, 179, 179, 255, 255, - 255, 255, 267, 267, 267, 267, 275, 275, 275, 275, - - 248, 247, 246, 245, 244, 243, 242, 238, 235, 234, - 233, 232, 231, 230, 229, 228, 227, 226, 225, 224, - 223, 222, 221, 220, 219, 218, 217, 184, 216, 215, - 214, 180, 211, 210, 209, 208, 207, 206, 205, 204, - 203, 202, 201, 200, 199, 198, 197, 196, 195, 194, - 193, 192, 191, 190, 189, 188, 187, 186, 183, 182, - 181, 136, 180, 178, 177, 176, 175, 174, 173, 172, - 169, 168, 167, 166, 165, 164, 163, 162, 161, 160, - 159, 158, 157, 156, 155, 152, 151, 150, 149, 148, - 147, 97, 141, 141, 140, 139, 138, 135, 134, 133, - - 130, 129, 128, 127, 126, 125, 124, 123, 122, 121, - 120, 119, 116, 115, 114, 113, 112, 111, 110, 109, - 108, 107, 106, 105, 104, 97, 92, 38, 82, 81, - 80, 70, 69, 68, 67, 59, 56, 55, 53, 52, - 51, 40, 38, 277, 35, 3, 277, 277, 277, 277, - 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, - 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, - 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, - 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, - 277, 277, 277, 277, 277, 277, 277, 277, 277, 277 - + 26, 27, 28, 29, 16, 16, 30, 31, 32, 33, + 34, 35, 16, 16, 37, 58, 37, 42, 43, 43, + 44, 59, 61, 46, 45, 47, 47, 48, 46, 62, + 51, 51, 51, 49, 63, 64, 66, 105, 49, 78, + 73, 50, 79, 65, 85, 119, 67, 76, 49, 74, + 120, 77, 80, 49, 96, 81, 75, 37, 86, 37, + + 97, 97, 275, 134, 275, 50, 87, 88, 89, 282, + 46, 135, 47, 47, 48, 139, 282, 90, 90, 90, + 49, 46, 280, 51, 51, 51, 145, 174, 50, 156, + 157, 49, 146, 146, 274, 49, 279, 175, 46, 278, + 47, 47, 48, 277, 91, 92, 49, 276, 49, 93, + 263, 283, 50, 100, 100, 100, 104, 104, 104, 217, + 218, 101, 102, 49, 102, 46, 274, 48, 48, 48, + 46, 262, 51, 51, 51, 49, 101, 102, 103, 103, + 49, 102, 104, 104, 104, 87, 88, 89, 272, 271, + 49, 88, 140, 188, 270, 49, 90, 90, 90, 189, + + 189, 90, 90, 90, 147, 147, 269, 242, 148, 148, + 148, 104, 104, 104, 148, 148, 148, 243, 243, 243, + 149, 268, 149, 91, 267, 148, 148, 148, 93, 245, + 266, 246, 265, 242, 102, 149, 102, 262, 260, 149, + 247, 247, 247, 243, 243, 243, 245, 259, 246, 102, + 258, 264, 245, 102, 246, 263, 257, 247, 247, 247, + 247, 247, 247, 247, 247, 247, 38, 38, 38, 38, + 40, 256, 40, 40, 55, 55, 95, 255, 95, 95, + 98, 98, 98, 98, 183, 183, 183, 183, 261, 261, + 261, 261, 273, 273, 273, 273, 281, 281, 281, 281, + + 254, 253, 252, 251, 250, 249, 248, 244, 241, 240, + 239, 238, 237, 236, 235, 234, 233, 232, 231, 230, + 229, 228, 227, 226, 225, 224, 223, 222, 188, 221, + 220, 219, 184, 216, 215, 214, 213, 212, 211, 210, + 209, 208, 207, 206, 205, 204, 203, 202, 201, 200, + 199, 198, 197, 196, 195, 194, 193, 192, 191, 190, + 187, 186, 185, 139, 184, 182, 181, 180, 179, 178, + 177, 176, 173, 172, 171, 170, 169, 168, 167, 166, + 165, 164, 163, 162, 161, 160, 159, 158, 155, 154, + 153, 152, 151, 150, 99, 144, 144, 143, 142, 141, + + 138, 137, 136, 133, 132, 131, 130, 129, 128, 127, + 126, 125, 124, 123, 122, 121, 118, 117, 116, 115, + 114, 113, 112, 111, 110, 109, 108, 107, 106, 99, + 94, 39, 84, 83, 82, 72, 71, 70, 69, 68, + 60, 57, 56, 54, 53, 52, 41, 39, 283, 36, + 3, 283, 283, 283, 283, 283, 283, 283, 283, 283, + 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, + 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, + 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, + 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, + + 283, 283, 283, 283, 283 } ; -static const short int yy_chk[501] = +static yyconst short int yy_chk[506] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -480,54 +507,55 @@ static const short int yy_chk[501] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 19, 5, 9, 9, 9, 10, 19, 21, 11, 10, 11, 11, 11, 12, 21, - 12, 12, 12, 11, 21, 22, 23, 283, 12, 30, - 28, 11, 30, 22, 34, 68, 23, 29, 11, 28, - 68, 29, 30, 12, 40, 30, 28, 36, 34, 36, - - 40, 40, 259, 81, 259, 11, 35, 35, 35, 275, - 41, 81, 41, 41, 41, 87, 269, 35, 35, 35, - 41, 42, 268, 42, 42, 42, 95, 128, 41, 111, - 111, 42, 95, 95, 267, 41, 266, 128, 46, 262, - 46, 46, 46, 261, 35, 35, 42, 260, 46, 35, - 258, 87, 41, 45, 45, 45, 101, 101, 101, 180, - 180, 45, 45, 46, 45, 47, 257, 47, 47, 47, - 50, 255, 50, 50, 50, 47, 45, 45, 48, 48, - 50, 45, 48, 48, 48, 85, 85, 85, 254, 252, - 47, 88, 88, 143, 250, 50, 85, 85, 85, 143, - - 143, 88, 88, 88, 99, 99, 249, 213, 99, 99, - 99, 102, 102, 102, 144, 144, 144, 213, 213, 213, - 102, 248, 102, 85, 247, 145, 145, 145, 85, 215, - 243, 215, 242, 237, 145, 102, 145, 238, 235, 102, - 215, 215, 215, 237, 237, 237, 239, 234, 239, 145, - 233, 241, 240, 145, 240, 240, 232, 239, 239, 239, - 241, 241, 241, 240, 240, 240, 278, 278, 278, 278, - 279, 228, 279, 279, 280, 280, 281, 227, 281, 281, - 282, 282, 282, 282, 284, 284, 284, 284, 285, 285, - 285, 285, 286, 286, 286, 286, 287, 287, 287, 287, - - 223, 222, 220, 219, 218, 217, 216, 214, 211, 210, - 209, 207, 206, 205, 204, 202, 201, 200, 199, 197, - 196, 193, 192, 191, 190, 188, 187, 185, 183, 182, - 181, 179, 178, 177, 175, 174, 173, 172, 171, 170, - 169, 168, 167, 166, 165, 164, 163, 161, 160, 159, - 158, 156, 155, 154, 153, 150, 149, 147, 140, 139, - 138, 137, 136, 135, 134, 133, 132, 131, 130, 129, - 127, 126, 125, 124, 122, 121, 120, 119, 118, 117, - 116, 115, 114, 113, 112, 110, 109, 108, 107, 105, - 104, 96, 94, 93, 91, 90, 89, 84, 83, 82, - - 80, 79, 78, 77, 76, 75, 74, 73, 72, 71, - 70, 69, 67, 66, 65, 64, 63, 62, 61, 60, - 59, 58, 57, 56, 55, 44, 39, 37, 33, 32, - 31, 27, 26, 25, 24, 20, 18, 17, 15, 14, - 13, 8, 7, 3, 2, 277, 277, 277, 277, 277, - 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, - 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, - 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, - 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, - 277, 277, 277, 277, 277, 277, 277, 277, 277, 277 - + 12, 12, 12, 11, 21, 22, 23, 289, 12, 31, + 29, 11, 31, 22, 35, 69, 23, 30, 11, 29, + 69, 30, 31, 12, 41, 31, 29, 37, 35, 37, + + 41, 41, 265, 83, 265, 11, 36, 36, 36, 281, + 42, 83, 42, 42, 42, 89, 275, 36, 36, 36, + 42, 43, 274, 43, 43, 43, 97, 131, 42, 113, + 113, 43, 97, 97, 273, 42, 272, 131, 47, 268, + 47, 47, 47, 267, 36, 36, 43, 266, 47, 36, + 264, 89, 42, 46, 46, 46, 103, 103, 103, 184, + 184, 46, 46, 47, 46, 48, 263, 48, 48, 48, + 51, 261, 51, 51, 51, 48, 46, 46, 49, 49, + 51, 46, 49, 49, 49, 87, 87, 87, 260, 258, + 48, 90, 90, 146, 256, 51, 87, 87, 87, 146, + + 146, 90, 90, 90, 101, 101, 255, 218, 101, 101, + 101, 104, 104, 104, 147, 147, 147, 218, 218, 218, + 104, 254, 104, 87, 253, 148, 148, 148, 87, 220, + 249, 220, 248, 243, 148, 104, 148, 244, 241, 104, + 220, 220, 220, 243, 243, 243, 245, 240, 245, 148, + 239, 247, 246, 148, 246, 246, 238, 245, 245, 245, + 247, 247, 247, 246, 246, 246, 284, 284, 284, 284, + 285, 234, 285, 285, 286, 286, 287, 233, 287, 287, + 288, 288, 288, 288, 290, 290, 290, 290, 291, 291, + 291, 291, 292, 292, 292, 292, 293, 293, 293, 293, + + 228, 227, 225, 224, 223, 222, 221, 219, 216, 215, + 214, 212, 211, 210, 209, 207, 206, 205, 204, 202, + 201, 200, 197, 196, 195, 194, 192, 191, 189, 187, + 186, 185, 183, 182, 181, 179, 178, 177, 176, 175, + 174, 173, 172, 171, 170, 169, 168, 167, 166, 164, + 163, 162, 161, 159, 158, 157, 156, 153, 152, 150, + 143, 142, 141, 140, 139, 138, 137, 136, 135, 134, + 133, 132, 130, 129, 128, 127, 125, 124, 123, 122, + 121, 120, 119, 118, 117, 116, 115, 114, 112, 111, + 110, 109, 107, 106, 98, 96, 95, 93, 92, 91, + + 86, 85, 84, 82, 81, 80, 79, 78, 77, 76, + 75, 74, 73, 72, 71, 70, 68, 67, 66, 65, + 64, 63, 62, 61, 60, 59, 58, 57, 56, 45, + 40, 38, 34, 33, 32, 28, 27, 26, 25, 24, + 20, 18, 17, 15, 14, 13, 8, 7, 3, 2, + 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, + 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, + 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, + 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, + 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, + + 283, 283, 283, 283, 283 } ; static yy_state_type yy_last_accepting_state; @@ -539,14 +567,16 @@ static char *yy_last_accepting_cpos; #define REJECT reject_used_but_not_detected #define yymore() yymore_used_but_not_detected #define YY_MORE_ADJ 0 +#define YY_RESTORE_YY_MORE_OFFSET #ifndef YYLMAX #define YYLMAX 8192 #endif char yytext[YYLMAX]; char *yytext_ptr; -# line 1 "idl.ll" -# line 3 "idl.ll" +#line 1 "idl.ll" +#define INITIAL 0 +#line 3 "idl.ll" /* COPYRIGHT @@ -645,6 +675,54 @@ inline char *__yytext() * section 1. */ +#ifndef YY_SKIP_YYWRAP +#ifdef __cplusplus +extern "C" int yywrap YY_PROTO(( void )); +#else +extern int yywrap YY_PROTO(( void )); +#endif +#endif + +#ifndef YY_NO_UNPUT +static void yyunput YY_PROTO(( int c, char *buf_ptr )); +#endif + +#ifndef yytext_ptr +static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int )); +#endif + +#ifdef YY_NEED_STRLEN +static int yy_flex_strlen YY_PROTO(( yyconst char * )); +#endif + +#ifndef YY_NO_INPUT +#ifdef __cplusplus +static int yyinput YY_PROTO(( void )); +#else +static int input YY_PROTO(( void )); +#endif +#endif + +#if YY_STACK_USED +static int yy_start_stack_ptr = 0; +static int yy_start_stack_depth = 0; +static int *yy_start_stack = 0; +#ifndef YY_NO_PUSH_STATE +static void yy_push_state YY_PROTO(( int new_state )); +#endif +#ifndef YY_NO_POP_STATE +static void yy_pop_state YY_PROTO(( void )); +#endif +#ifndef YY_NO_TOP_STATE +static int yy_top_state YY_PROTO(( void )); +#endif + +#else +#define YY_NO_PUSH_STATE 1 +#define YY_NO_POP_STATE 1 +#define YY_NO_TOP_STATE 1 +#endif + #ifdef YY_MALLOC_DECL YY_MALLOC_DECL #else @@ -681,9 +759,15 @@ YY_MALLOC_DECL #define YY_INPUT(buf,result,max_size) \ if ( yy_current_buffer->yy_is_interactive ) \ { \ - int c = getc( yyin ); \ - result = c == EOF ? 0 : 1; \ - buf[0] = (char) c; \ + int c = '*', n; \ + for ( n = 0; n < max_size && \ + (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ + buf[n] = (char) c; \ + if ( c == '\n' ) \ + buf[n++] = (char) c; \ + if ( c == EOF && ferror( yyin ) ) \ + YY_FATAL_ERROR( "input in flex scanner failed" ); \ + result = n; \ } \ else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \ && ferror( yyin ) ) \ @@ -727,18 +811,26 @@ YY_MALLOC_DECL #define YY_BREAK break; #endif +#define YY_RULE_SETUP \ + if ( yyleng > 0 ) \ + yy_current_buffer->yy_at_bol = \ + (yytext[yyleng - 1] == '\n'); \ + YY_USER_ACTION + YY_DECL { register yy_state_type yy_current_state; register char *yy_cp, *yy_bp; register int yy_act; -# line 100 "idl.ll" +#line 100 "idl.ll" if ( yy_init ) { + yy_init = 0; + #ifdef YY_USER_INIT YY_USER_INIT; #endif @@ -752,15 +844,11 @@ YY_DECL if ( ! yyout ) yyout = stdout; - if ( yy_current_buffer ) - yy_init_buffer( yy_current_buffer, yyin ); - else + if ( ! yy_current_buffer ) yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); yy_load_buffer_state(); - - yy_init = 0; } while ( 1 ) /* loops until end-of-file is reached */ @@ -776,8 +864,7 @@ YY_DECL yy_bp = yy_cp; yy_current_state = yy_start; - if ( yy_bp[-1] == '\n' ) - ++yy_current_state; + yy_current_state += YY_AT_BOL(); yy_match: do { @@ -790,16 +877,22 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 278 ) + if ( yy_current_state >= 284 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_base[yy_current_state] != 446 ); + while ( yy_base[yy_current_state] != 451 ); yy_find_action: yy_act = yy_accept[yy_current_state]; + if ( yy_act == 0 ) + { /* have to back up */ + yy_cp = yy_last_accepting_cpos; + yy_current_state = yy_last_accepting_state; + yy_act = yy_accept[yy_current_state]; + } YY_DO_BEFORE_ACTION; @@ -817,201 +910,206 @@ do_action: /* This label is used only to access EOF actions. */ goto yy_find_action; case 1: -YY_USER_ACTION -# line 102 "idl.ll" +YY_RULE_SETUP +#line 102 "idl.ll" return IDL_ANY; YY_BREAK case 2: -YY_USER_ACTION -# line 103 "idl.ll" +YY_RULE_SETUP +#line 103 "idl.ll" return IDL_MODULE; YY_BREAK case 3: -YY_USER_ACTION -# line 104 "idl.ll" +YY_RULE_SETUP +#line 104 "idl.ll" return IDL_RAISES; YY_BREAK case 4: -YY_USER_ACTION -# line 105 "idl.ll" +YY_RULE_SETUP +#line 105 "idl.ll" return IDL_READONLY; YY_BREAK case 5: -YY_USER_ACTION -# line 106 "idl.ll" +YY_RULE_SETUP +#line 106 "idl.ll" return IDL_ATTRIBUTE; YY_BREAK case 6: -YY_USER_ACTION -# line 107 "idl.ll" +YY_RULE_SETUP +#line 107 "idl.ll" return IDL_EXCEPTION; YY_BREAK case 7: -YY_USER_ACTION -# line 108 "idl.ll" +YY_RULE_SETUP +#line 108 "idl.ll" return IDL_CONTEXT; YY_BREAK case 8: -YY_USER_ACTION -# line 109 "idl.ll" +YY_RULE_SETUP +#line 109 "idl.ll" return IDL_INTERFACE; YY_BREAK case 9: -YY_USER_ACTION -# line 110 "idl.ll" +YY_RULE_SETUP +#line 110 "idl.ll" return IDL_CONST; YY_BREAK case 10: -YY_USER_ACTION -# line 111 "idl.ll" +YY_RULE_SETUP +#line 111 "idl.ll" return IDL_TYPEDEF; YY_BREAK case 11: -YY_USER_ACTION -# line 112 "idl.ll" +YY_RULE_SETUP +#line 112 "idl.ll" return IDL_STRUCT; YY_BREAK case 12: -YY_USER_ACTION -# line 113 "idl.ll" +YY_RULE_SETUP +#line 113 "idl.ll" return IDL_ENUM; YY_BREAK case 13: -YY_USER_ACTION -# line 114 "idl.ll" +YY_RULE_SETUP +#line 114 "idl.ll" return IDL_STRING; YY_BREAK case 14: -YY_USER_ACTION -# line 115 "idl.ll" +YY_RULE_SETUP +#line 115 "idl.ll" return IDL_WSTRING; YY_BREAK case 15: -YY_USER_ACTION -# line 116 "idl.ll" +YY_RULE_SETUP +#line 116 "idl.ll" return IDL_SEQUENCE; YY_BREAK case 16: -YY_USER_ACTION -# line 117 "idl.ll" +YY_RULE_SETUP +#line 117 "idl.ll" return IDL_UNION; YY_BREAK case 17: -YY_USER_ACTION -# line 118 "idl.ll" +YY_RULE_SETUP +#line 118 "idl.ll" return IDL_SWITCH; YY_BREAK case 18: -YY_USER_ACTION -# line 119 "idl.ll" +YY_RULE_SETUP +#line 119 "idl.ll" return IDL_CASE; YY_BREAK case 19: -YY_USER_ACTION -# line 120 "idl.ll" +YY_RULE_SETUP +#line 120 "idl.ll" return IDL_DEFAULT; YY_BREAK case 20: -YY_USER_ACTION -# line 121 "idl.ll" +YY_RULE_SETUP +#line 121 "idl.ll" return IDL_FLOAT; YY_BREAK case 21: -YY_USER_ACTION -# line 122 "idl.ll" +YY_RULE_SETUP +#line 122 "idl.ll" return IDL_DOUBLE; YY_BREAK case 22: -YY_USER_ACTION -# line 123 "idl.ll" +YY_RULE_SETUP +#line 123 "idl.ll" return IDL_LONG; YY_BREAK case 23: -YY_USER_ACTION -# line 124 "idl.ll" +YY_RULE_SETUP +#line 124 "idl.ll" return IDL_SHORT; YY_BREAK case 24: -YY_USER_ACTION -# line 125 "idl.ll" +YY_RULE_SETUP +#line 125 "idl.ll" return IDL_UNSIGNED; YY_BREAK case 25: -YY_USER_ACTION -# line 126 "idl.ll" +YY_RULE_SETUP +#line 126 "idl.ll" return IDL_CHAR; YY_BREAK case 26: -YY_USER_ACTION -# line 127 "idl.ll" +YY_RULE_SETUP +#line 127 "idl.ll" return IDL_WCHAR; YY_BREAK case 27: -YY_USER_ACTION -# line 128 "idl.ll" +YY_RULE_SETUP +#line 128 "idl.ll" return IDL_BOOLEAN; YY_BREAK case 28: -YY_USER_ACTION -# line 129 "idl.ll" +YY_RULE_SETUP +#line 129 "idl.ll" return IDL_OCTET; YY_BREAK case 29: -YY_USER_ACTION -# line 130 "idl.ll" +YY_RULE_SETUP +#line 130 "idl.ll" return IDL_VOID; YY_BREAK case 30: -YY_USER_ACTION -# line 132 "idl.ll" -return IDL_TRUETOK; +YY_RULE_SETUP +#line 131 "idl.ll" +return IDL_NATIVE; YY_BREAK case 31: -YY_USER_ACTION -# line 133 "idl.ll" -return IDL_FALSETOK; +YY_RULE_SETUP +#line 133 "idl.ll" +return IDL_TRUETOK; YY_BREAK case 32: -YY_USER_ACTION -# line 135 "idl.ll" -return IDL_INOUT; +YY_RULE_SETUP +#line 134 "idl.ll" +return IDL_FALSETOK; YY_BREAK case 33: -YY_USER_ACTION -# line 136 "idl.ll" -return IDL_IN; +YY_RULE_SETUP +#line 136 "idl.ll" +return IDL_INOUT; YY_BREAK case 34: -YY_USER_ACTION -# line 137 "idl.ll" -return IDL_OUT; +YY_RULE_SETUP +#line 137 "idl.ll" +return IDL_IN; YY_BREAK case 35: -YY_USER_ACTION -# line 138 "idl.ll" -return IDL_ONEWAY; +YY_RULE_SETUP +#line 138 "idl.ll" +return IDL_OUT; YY_BREAK case 36: -YY_USER_ACTION -# line 140 "idl.ll" -return IDL_LEFT_SHIFT; +YY_RULE_SETUP +#line 139 "idl.ll" +return IDL_ONEWAY; YY_BREAK case 37: -YY_USER_ACTION -# line 141 "idl.ll" -return IDL_RIGHT_SHIFT; +YY_RULE_SETUP +#line 141 "idl.ll" +return IDL_LEFT_SHIFT; YY_BREAK case 38: -YY_USER_ACTION -# line 142 "idl.ll" +YY_RULE_SETUP +#line 142 "idl.ll" +return IDL_RIGHT_SHIFT; + YY_BREAK +case 39: +YY_RULE_SETUP +#line 143 "idl.ll" { yylval.strval = "::"; return IDL_SCOPE_DELIMITOR; } YY_BREAK -case 39: -YY_USER_ACTION -# line 147 "idl.ll" +case 40: +YY_RULE_SETUP +#line 148 "idl.ll" { char *z = (char *) malloc(strlen(ace_yytext) + 1); strcpy(z, ace_yytext); @@ -1019,49 +1117,49 @@ YY_USER_ACTION return IDENTIFIER; } YY_BREAK -case 40: -YY_USER_ACTION -# line 154 "idl.ll" +case 41: +YY_RULE_SETUP +#line 155 "idl.ll" { yylval.dval = idl_atof(ace_yytext); return IDL_FLOATING_PT_LITERAL; } YY_BREAK -case 41: -YY_USER_ACTION -# line 158 "idl.ll" +case 42: +YY_RULE_SETUP +#line 159 "idl.ll" { yylval.dval = idl_atof(ace_yytext); return IDL_FLOATING_PT_LITERAL; } YY_BREAK -case 42: -YY_USER_ACTION -# line 163 "idl.ll" +case 43: +YY_RULE_SETUP +#line 164 "idl.ll" { yylval.ival = idl_atoi(ace_yytext, 10); return IDL_INTEGER_LITERAL; } YY_BREAK -case 43: -YY_USER_ACTION -# line 167 "idl.ll" +case 44: +YY_RULE_SETUP +#line 168 "idl.ll" { yylval.ival = idl_atoi(ace_yytext, 16); return IDL_INTEGER_LITERAL; } YY_BREAK -case 44: -YY_USER_ACTION -# line 171 "idl.ll" +case 45: +YY_RULE_SETUP +#line 172 "idl.ll" { yylval.ival = idl_atoi(ace_yytext, 8); return IDL_INTEGER_LITERAL; } YY_BREAK -case 45: -YY_USER_ACTION -# line 176 "idl.ll" +case 46: +YY_RULE_SETUP +#line 177 "idl.ll" { /* Skip the quotes */ char *tmp = ace_yytext; @@ -1070,86 +1168,86 @@ YY_USER_ACTION return IDL_STRING_LITERAL; } YY_BREAK -case 46: -YY_USER_ACTION -# line 183 "idl.ll" +case 47: +YY_RULE_SETUP +#line 184 "idl.ll" { yylval.cval = ace_yytext [1]; return IDL_CHARACTER_LITERAL; } YY_BREAK -case 47: -YY_USER_ACTION -# line 187 "idl.ll" +case 48: +YY_RULE_SETUP +#line 188 "idl.ll" { // octal character constant yylval.cval = idl_escape_reader(ace_yytext + 1); return IDL_CHARACTER_LITERAL; } YY_BREAK -case 48: -YY_USER_ACTION -# line 192 "idl.ll" +case 49: +YY_RULE_SETUP +#line 193 "idl.ll" { yylval.cval = idl_escape_reader(ace_yytext + 1); return IDL_CHARACTER_LITERAL; } YY_BREAK -case 49: -YY_USER_ACTION -# line 196 "idl.ll" +case 50: +YY_RULE_SETUP +#line 197 "idl.ll" {/* remember pragma */ idl_global->set_lineno(idl_global->lineno() + 1); idl_store_pragma(ace_yytext); } YY_BREAK -case 50: -YY_USER_ACTION -# line 200 "idl.ll" +case 51: +YY_RULE_SETUP +#line 201 "idl.ll" { idl_parse_line_and_file(ace_yytext); } YY_BREAK -case 51: -YY_USER_ACTION -# line 203 "idl.ll" +case 52: +YY_RULE_SETUP +#line 204 "idl.ll" { idl_parse_line_and_file(ace_yytext); } YY_BREAK -case 52: -YY_USER_ACTION -# line 206 "idl.ll" +case 53: +YY_RULE_SETUP +#line 207 "idl.ll" { idl_parse_line_and_file(ace_yytext); } YY_BREAK -case 53: -YY_USER_ACTION -# line 209 "idl.ll" +case 54: +YY_RULE_SETUP +#line 210 "idl.ll" { idl_parse_line_and_file(ace_yytext); } YY_BREAK -case 54: -YY_USER_ACTION -# line 212 "idl.ll" +case 55: +YY_RULE_SETUP +#line 213 "idl.ll" { /* ignore cpp ident */ idl_global->set_lineno(idl_global->lineno() + 1); } YY_BREAK -case 55: -YY_USER_ACTION -# line 216 "idl.ll" +case 56: +YY_RULE_SETUP +#line 217 "idl.ll" { /* ignore comments */ idl_global->set_lineno(idl_global->lineno() + 1); } YY_BREAK -case 56: -YY_USER_ACTION -# line 220 "idl.ll" +case 57: +YY_RULE_SETUP +#line 221 "idl.ll" { for(;;) { char c = yyinput(); @@ -1165,26 +1263,26 @@ YY_USER_ACTION } } YY_BREAK -case 57: -YY_USER_ACTION -# line 234 "idl.ll" +case 58: +YY_RULE_SETUP +#line 235 "idl.ll" ; YY_BREAK -case 58: -YY_USER_ACTION -# line 235 "idl.ll" +case 59: +YY_RULE_SETUP +#line 236 "idl.ll" { idl_global->set_lineno(idl_global->lineno() + 1); } YY_BREAK -case 59: -YY_USER_ACTION -# line 238 "idl.ll" +case 60: +YY_RULE_SETUP +#line 239 "idl.ll" return ace_yytext [0]; YY_BREAK -case 60: -YY_USER_ACTION -# line 240 "idl.ll" +case 61: +YY_RULE_SETUP +#line 241 "idl.ll" TAO_ECHO; YY_BREAK case YY_STATE_EOF(INITIAL): @@ -1193,10 +1291,11 @@ case YY_STATE_EOF(INITIAL): case YY_END_OF_BUFFER: { /* Amount of text matched not including the EOB char. */ - int yy_amount_of_matched_text = yy_cp - yytext_ptr - 1; + int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1; /* Undo the effects of YY_DO_BEFORE_ACTION. */ *yy_cp = yy_hold_char; + YY_RESTORE_YY_MORE_OFFSET if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW ) { @@ -1252,7 +1351,7 @@ case YY_STATE_EOF(INITIAL): else { - yy_cp = yy_c_buf_p; + yy_cp = yy_c_buf_p; goto yy_find_action; } } @@ -1330,7 +1429,7 @@ case YY_STATE_EOF(INITIAL): static int yy_get_next_buffer() { register char *dest = yy_current_buffer->yy_ch_buf; - register char *source = yytext_ptr - 1; /* copy prev. char, too */ + register char *source = yytext_ptr; register int number_to_move, i; int ret_val; @@ -1342,7 +1441,7 @@ static int yy_get_next_buffer() { /* Don't try to fill the buffer, so this is an EOF. */ if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 ) { - /* We matched a singled characater, the EOB, so + /* We matched a single character, the EOB, so * treat this as a final EOF. */ return EOB_ACT_END_OF_FILE; @@ -1360,7 +1459,7 @@ static int yy_get_next_buffer() /* Try to read more data. */ /* First move last chars to start of buffer. */ - number_to_move = yy_c_buf_p - yytext_ptr; + number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1; for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); @@ -1369,7 +1468,7 @@ static int yy_get_next_buffer() /* don't do the read, it's not guaranteed to return an EOF, * just force an EOF */ - yy_n_chars = 0; + yy_current_buffer->yy_n_chars = yy_n_chars = 0; else { @@ -1386,12 +1485,26 @@ static int yy_get_next_buffer() /* just a shorter name for the current buffer */ YY_BUFFER_STATE b = yy_current_buffer; - int yy_c_buf_p_offset = yy_c_buf_p - b->yy_ch_buf; + int yy_c_buf_p_offset = + (int) (yy_c_buf_p - b->yy_ch_buf); - b->yy_buf_size *= 2; - b->yy_ch_buf = (char *) - yy_flex_realloc( (void *) b->yy_ch_buf, - b->yy_buf_size ); + if ( b->yy_is_our_buffer ) + { + int new_size = b->yy_buf_size * 2; + + if ( new_size <= 0 ) + b->yy_buf_size += b->yy_buf_size / 8; + else + b->yy_buf_size *= 2; + + b->yy_ch_buf = (char *) + /* Include room in for 2 EOB chars. */ + yy_flex_realloc( (void *) b->yy_ch_buf, + b->yy_buf_size + 2 ); + } + else + /* Can't grow it, we don't own it. */ + b->yy_ch_buf = 0; if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( @@ -1410,11 +1523,13 @@ static int yy_get_next_buffer() /* Read in more data. */ YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]), yy_n_chars, num_to_read ); + + yy_current_buffer->yy_n_chars = yy_n_chars; } if ( yy_n_chars == 0 ) { - if ( number_to_move - YY_MORE_ADJ == 1 ) + if ( number_to_move == YY_MORE_ADJ ) { ret_val = EOB_ACT_END_OF_FILE; yyrestart( yyin ); @@ -1435,13 +1550,7 @@ static int yy_get_next_buffer() yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR; yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR; - /* yytext begins at the second character in yy_ch_buf; the first - * character is the one which preceded it before reading in the latest - * buffer; it needs to be kept around in case it's a newline, so - * yy_get_previous_state() will have with '^' rules active. - */ - - yytext_ptr = &yy_current_buffer->yy_ch_buf[1]; + yytext_ptr = &yy_current_buffer->yy_ch_buf[0]; return ret_val; } @@ -1454,11 +1563,8 @@ static yy_state_type yy_get_previous_state() register yy_state_type yy_current_state; register char *yy_cp; - register char *yy_bp = yytext_ptr; - yy_current_state = yy_start; - if ( yy_bp[-1] == '\n' ) - ++yy_current_state; + yy_current_state += YY_AT_BOL(); for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp ) { @@ -1471,7 +1577,7 @@ static yy_state_type yy_get_previous_state() while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 278 ) + if ( yy_current_state >= 284 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -1506,16 +1612,17 @@ yy_state_type yy_current_state; while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 278 ) + if ( yy_current_state >= 284 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 277); + yy_is_jam = (yy_current_state == 283); return yy_is_jam ? 0 : yy_current_state; } +#ifndef YY_NO_UNPUT #ifdef YY_USE_PROTOS static void yyunput( int c, register char *yy_bp ) #else @@ -1541,25 +1648,23 @@ register char *yy_bp; while ( source > yy_current_buffer->yy_ch_buf ) *--dest = *--source; - yy_cp += dest - source; - yy_bp += dest - source; - yy_n_chars = yy_current_buffer->yy_buf_size; + yy_cp += (int) (dest - source); + yy_bp += (int) (dest - source); + yy_current_buffer->yy_n_chars = + yy_n_chars = yy_current_buffer->yy_buf_size; if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) YY_FATAL_ERROR( "flex scanner push-back overflow" ); } - if ( yy_cp > yy_bp && yy_cp[-1] == '\n' ) - yy_cp[-2] = '\n'; - *--yy_cp = (char) c; - /* Note: the formal parameter *must* be called "yy_bp" for this - * macro to now work correctly. - */ - YY_DO_BEFORE_ACTION; /* set up yytext again */ + yytext_ptr = yy_bp; + yy_hold_char = *yy_cp; + yy_c_buf_p = yy_cp; } +#endif /* ifndef YY_NO_UNPUT */ #ifdef __cplusplus @@ -1584,21 +1689,34 @@ static int input() else { /* need more input */ - yytext_ptr = yy_c_buf_p; + int offset = yy_c_buf_p - yytext_ptr; ++yy_c_buf_p; switch ( yy_get_next_buffer() ) { + case EOB_ACT_LAST_MATCH: + /* This happens because yy_g_n_b() + * sees that we've accumulated a + * token and flags that we need to + * try matching the token before + * proceeding. But for input(), + * there's no matching to consider. + * So convert the EOB_ACT_LAST_MATCH + * to EOB_ACT_END_OF_FILE. + */ + + /* Reset buffer status. */ + yyrestart( yyin ); + + /* fall through */ + case EOB_ACT_END_OF_FILE: { if ( yywrap() ) - { - yy_c_buf_p = - yytext_ptr + YY_MORE_ADJ; return EOF; - } - YY_NEW_FILE; + if ( ! yy_did_buffer_switch_on_eof ) + YY_NEW_FILE; #ifdef __cplusplus return yyinput(); #else @@ -1607,17 +1725,8 @@ static int input() } case EOB_ACT_CONTINUE_SCAN: - yy_c_buf_p = yytext_ptr + YY_MORE_ADJ; + yy_c_buf_p = yytext_ptr + offset; break; - - case EOB_ACT_LAST_MATCH: -#ifdef __cplusplus - YY_FATAL_ERROR( - "unexpected last match in yyinput()" ); -#else - YY_FATAL_ERROR( - "unexpected last match in input()" ); -#endif } } } @@ -1626,6 +1735,8 @@ static int input() *yy_c_buf_p = '\0'; /* preserve yytext */ yy_hold_char = *++yy_c_buf_p; + yy_current_buffer->yy_at_bol = (c == '\n'); + return c; } @@ -1699,7 +1810,6 @@ int size; YY_BUFFER_STATE b; b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) ); - if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); @@ -1709,10 +1819,11 @@ int size; * we need to put in 2 end-of-buffer characters. */ b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 ); - if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); + b->yy_is_our_buffer = 1; + yy_init_buffer( b, file ); return b; @@ -1726,14 +1837,25 @@ void yy_delete_buffer( b ) YY_BUFFER_STATE b; #endif { + if ( ! b ) + return; + if ( b == yy_current_buffer ) yy_current_buffer = (YY_BUFFER_STATE) 0; - yy_flex_free( (void *) b->yy_ch_buf ); + if ( b->yy_is_our_buffer ) + yy_flex_free( (void *) b->yy_ch_buf ); + yy_flex_free( (void *) b ); } +#ifndef YY_ALWAYS_INTERACTIVE +#ifndef YY_NEVER_INTERACTIVE +extern int isatty YY_PROTO(( int )); +#endif +#endif + #ifdef YY_USE_PROTOS void yy_init_buffer( YY_BUFFER_STATE b, FILE *file ) #else @@ -1741,33 +1863,151 @@ void yy_init_buffer( b, file ) YY_BUFFER_STATE b; FILE *file; #endif + + { + yy_flush_buffer( b ); + b->yy_input_file = file; + b->yy_fill_buffer = 1; - /* We put in the '\n' and start reading from [1] so that an - * initial match-at-newline will be true. - */ +#if YY_ALWAYS_INTERACTIVE + b->yy_is_interactive = 1; +#else +#if YY_NEVER_INTERACTIVE + b->yy_is_interactive = 0; +#else + b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; +#endif +#endif + } + + +#ifdef YY_USE_PROTOS +void yy_flush_buffer( YY_BUFFER_STATE b ) +#else +void yy_flush_buffer( b ) +YY_BUFFER_STATE b; +#endif + + { + if ( ! b ) + return; - b->yy_ch_buf[0] = '\n'; - b->yy_n_chars = 1; + b->yy_n_chars = 0; /* We always need two end-of-buffer characters. The first causes * a transition to the end-of-buffer state. The second causes * a jam in that state. */ + b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR; b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR; - b->yy_ch_buf[2] = YY_END_OF_BUFFER_CHAR; - b->yy_buf_pos = &b->yy_ch_buf[1]; + b->yy_buf_pos = &b->yy_ch_buf[0]; - b->yy_is_interactive = file ? isatty( fileno(file) ) : 0; + b->yy_at_bol = 1; + b->yy_buffer_status = YY_BUFFER_NEW; - b->yy_fill_buffer = 1; + if ( b == yy_current_buffer ) + yy_load_buffer_state(); + } + + +#ifndef YY_NO_SCAN_BUFFER +#ifdef YY_USE_PROTOS +YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size ) +#else +YY_BUFFER_STATE yy_scan_buffer( base, size ) +char *base; +yy_size_t size; +#endif + { + YY_BUFFER_STATE b; + + if ( size < 2 || + base[size-2] != YY_END_OF_BUFFER_CHAR || + base[size-1] != YY_END_OF_BUFFER_CHAR ) + /* They forgot to leave room for the EOB's. */ + return 0; + b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) ); + if ( ! b ) + YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); + + b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ + b->yy_buf_pos = b->yy_ch_buf = base; + b->yy_is_our_buffer = 0; + b->yy_input_file = 0; + b->yy_n_chars = b->yy_buf_size; + b->yy_is_interactive = 0; + b->yy_at_bol = 1; + b->yy_fill_buffer = 0; b->yy_buffer_status = YY_BUFFER_NEW; + + yy_switch_to_buffer( b ); + + return b; } +#endif +#ifndef YY_NO_SCAN_STRING +#ifdef YY_USE_PROTOS +YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str ) +#else +YY_BUFFER_STATE yy_scan_string( yy_str ) +yyconst char *yy_str; +#endif + { + int len; + for ( len = 0; yy_str[len]; ++len ) + ; + + return yy_scan_bytes( yy_str, len ); + } +#endif + + +#ifndef YY_NO_SCAN_BYTES +#ifdef YY_USE_PROTOS +YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len ) +#else +YY_BUFFER_STATE yy_scan_bytes( bytes, len ) +yyconst char *bytes; +int len; +#endif + { + YY_BUFFER_STATE b; + char *buf; + yy_size_t n; + int i; + + /* Get memory for full buffer, including space for trailing EOB's. */ + n = len + 2; + buf = (char *) yy_flex_alloc( n ); + if ( ! buf ) + YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); + + for ( i = 0; i < len; ++i ) + buf[i] = bytes[i]; + + buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR; + + b = yy_scan_buffer( buf, n ); + if ( ! b ) + YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); + + /* It's okay to grow etc. this buffer, and we should throw it + * away when we're done. + */ + b->yy_is_our_buffer = 1; + + return b; + } +#endif + + +#ifndef YY_NO_PUSH_STATE #ifdef YY_USE_PROTOS static void yy_push_state( int new_state ) #else @@ -1777,7 +2017,7 @@ int new_state; { if ( yy_start_stack_ptr >= yy_start_stack_depth ) { - int new_size; + yy_size_t new_size; yy_start_stack_depth += YY_START_STACK_INCR; new_size = yy_start_stack_depth * sizeof( int ); @@ -1798,8 +2038,10 @@ int new_state; BEGIN(new_state); } +#endif +#ifndef YY_NO_POP_STATE static void yy_pop_state() { if ( --yy_start_stack_ptr < 0 ) @@ -1807,23 +2049,29 @@ static void yy_pop_state() BEGIN(yy_start_stack[yy_start_stack_ptr]); } +#endif +#ifndef YY_NO_TOP_STATE static int yy_top_state() { return yy_start_stack[yy_start_stack_ptr - 1]; } +#endif +#ifndef YY_EXIT_FAILURE +#define YY_EXIT_FAILURE 2 +#endif #ifdef YY_USE_PROTOS -static void yy_fatal_error( const char msg[] ) +static void yy_fatal_error( yyconst char msg[] ) #else static void yy_fatal_error( msg ) char msg[]; #endif { (void) fprintf( stderr, "%s\n", msg ); - exit( 1 ); + exit( YY_EXIT_FAILURE ); } @@ -1836,7 +2084,7 @@ char msg[]; { \ /* Undo effects of setting up yytext. */ \ yytext[yyleng] = yy_hold_char; \ - yy_c_buf_p = yytext + n - YY_MORE_ADJ; \ + yy_c_buf_p = yytext + n; \ yy_hold_char = *yy_c_buf_p; \ *yy_c_buf_p = '\0'; \ yyleng = n; \ @@ -1848,11 +2096,11 @@ char msg[]; #ifndef yytext_ptr #ifdef YY_USE_PROTOS -static void yy_flex_strncpy( char *s1, const char *s2, int n ) +static void yy_flex_strncpy( char *s1, yyconst char *s2, int n ) #else static void yy_flex_strncpy( s1, s2, n ) char *s1; -const char *s2; +yyconst char *s2; int n; #endif { @@ -1862,26 +2110,49 @@ int n; } #endif +#ifdef YY_NEED_STRLEN +#ifdef YY_USE_PROTOS +static int yy_flex_strlen( yyconst char *s ) +#else +static int yy_flex_strlen( s ) +yyconst char *s; +#endif + { + register int n; + for ( n = 0; s[n]; ++n ) + ; + + return n; + } +#endif + #ifdef YY_USE_PROTOS -static void *yy_flex_alloc( unsigned int size ) +static void *yy_flex_alloc( yy_size_t size ) #else static void *yy_flex_alloc( size ) -unsigned int size; +yy_size_t size; #endif { return (void *) malloc( size ); } #ifdef YY_USE_PROTOS -static void *yy_flex_realloc( void *ptr, unsigned int size ) +static void *yy_flex_realloc( void *ptr, yy_size_t size ) #else static void *yy_flex_realloc( ptr, size ) void *ptr; -unsigned int size; +yy_size_t size; #endif { - return (void *) realloc( ptr, size ); + /* The cast to (char *) in the following accommodates both + * implementations that use char* generic pointers, and those + * that use void* generic pointers. It works with the latter + * because both ANSI C and C++ allow castless assignment from + * any pointer type to void*, and deal with argument conversions + * as though doing an assignment. + */ + return (void *) realloc( (char *) ptr, size ); } #ifdef YY_USE_PROTOS @@ -1893,7 +2164,15 @@ void *ptr; { free( ptr ); } -# line 240 "idl.ll" + +#if YY_MAIN +int main() + { + yylex(); + return 0; + } +#endif +#line 241 "idl.ll" /* subroutines */ @@ -1926,13 +2205,13 @@ idl_parse_line_and_file(char *buf) UTL_String *nm; /* Skip initial '#' */ - if (*r != '#') + if (*r != '#') return; else r++; /* Check to see if we're running under the screwy Microsoft scheme */ - /* of putting #line num instead of #num. */ + /* of putting #line num instead of #num. */ if (ACE_OS::strncmp (r, "line", 4) == 0) r += 5; @@ -1947,7 +2226,7 @@ idl_parse_line_and_file(char *buf) idl_global->set_lineno(idl_atoi(h, 10)); /* Find file name, if present */ - for (; *r != '"'; r++) + for (; *r != '"'; r++) if (*r == '\n' || *r == '\0') return; diff --git a/TAO/TAO_IDL/fe/y.tab.h b/TAO/TAO_IDL/fe/y.tab.h index 7752d999a11..8c197aab46b 100644 --- a/TAO/TAO_IDL/fe/y.tab.h +++ b/TAO/TAO_IDL/fe/y.tab.h @@ -65,12 +65,13 @@ extern YYSTYPE yylval; # define IDL_INOUT 289 # define IDL_RAISES 290 # define IDL_CONTEXT 291 -# define IDL_INTEGER_LITERAL 292 -# define IDL_STRING_LITERAL 293 -# define IDL_CHARACTER_LITERAL 294 -# define IDL_FLOATING_PT_LITERAL 295 -# define IDL_TRUETOK 296 -# define IDL_FALSETOK 297 -# define IDL_SCOPE_DELIMITOR 298 -# define IDL_LEFT_SHIFT 299 -# define IDL_RIGHT_SHIFT 300 +# define IDL_NATIVE 292 +# define IDL_INTEGER_LITERAL 293 +# define IDL_STRING_LITERAL 294 +# define IDL_CHARACTER_LITERAL 295 +# define IDL_FLOATING_PT_LITERAL 296 +# define IDL_TRUETOK 297 +# define IDL_FALSETOK 298 +# define IDL_SCOPE_DELIMITOR 299 +# define IDL_LEFT_SHIFT 300 +# define IDL_RIGHT_SHIFT 301 diff --git a/TAO/TAO_IDL/include/ast.h b/TAO/TAO_IDL/include/ast.h index e3672b2625f..5fdeef19e0c 100644 --- a/TAO/TAO_IDL/include/ast.h +++ b/TAO/TAO_IDL/include/ast.h @@ -51,8 +51,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -106,7 +106,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ast_array.h" // class AST_Array #include "ast_sequence.h" // class AST_Sequence #include "ast_string.h" // class AST_String -#include "ast_typedef.h" // class AST_Typedef +#include "ast_typedef.h" // class AST_Typedef +#include "ast_native.h" // class AST_Native #include "utl_list.h" // class UTL_List #include "utl_strlist.h" // class UTL_StrList diff --git a/TAO/TAO_IDL/include/ast_decl.h b/TAO/TAO_IDL/include/ast_decl.h index aad54683770..964cc917f8a 100644 --- a/TAO/TAO_IDL/include/ast_decl.h +++ b/TAO/TAO_IDL/include/ast_decl.h @@ -122,6 +122,9 @@ public: , NT_sequence // Denotes an IDL sequence , NT_typedef // Denotes a typedef , NT_pre_defined // Denotes a predefined type + , NT_native // Denotes a native type + // dependent on the programming + // language }; // Operations diff --git a/TAO/TAO_IDL/include/ast_generator.h b/TAO/TAO_IDL/include/ast_generator.h index c9154fc366d..887ac7aa156 100644 --- a/TAO/TAO_IDL/include/ast_generator.h +++ b/TAO/TAO_IDL/include/ast_generator.h @@ -51,8 +51,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -207,6 +207,11 @@ public: virtual AST_Typedef *create_typedef(AST_Type *bt, UTL_ScopedName *n, UTL_StrList *p); + + // Create a node representing a native + virtual AST_Native *create_native (UTL_ScopedName *n, + UTL_StrList *p); + }; #endif // _AST_GENERATOR_AST_GENERATOR_HH diff --git a/TAO/TAO_IDL/include/ast_interface.h b/TAO/TAO_IDL/include/ast_interface.h index fe8c96e8b3b..06f01ddecb1 100644 --- a/TAO/TAO_IDL/include/ast_interface.h +++ b/TAO/TAO_IDL/include/ast_interface.h @@ -51,8 +51,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -138,6 +138,7 @@ private: virtual AST_Enum *fe_add_enum(AST_Enum *e); virtual AST_EnumVal *fe_add_enum_val(AST_EnumVal *v); virtual AST_Typedef *fe_add_typedef(AST_Typedef *t); + virtual AST_Native *fe_add_native (AST_Native *n); }; diff --git a/TAO/TAO_IDL/include/ast_module.h b/TAO/TAO_IDL/include/ast_module.h index 305d47dd4fa..81dbbf0e50d 100644 --- a/TAO/TAO_IDL/include/ast_module.h +++ b/TAO/TAO_IDL/include/ast_module.h @@ -51,8 +51,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -112,6 +112,7 @@ private: virtual AST_Enum *fe_add_enum(AST_Enum *e); virtual AST_EnumVal *fe_add_enum_val(AST_EnumVal *v); virtual AST_Typedef *fe_add_typedef(AST_Typedef *t); + virtual AST_Native *fe_add_native (AST_Native *n); }; diff --git a/TAO/TAO_IDL/include/idl_fwd.h b/TAO/TAO_IDL/include/idl_fwd.h index e0719c1a171..a5342d73b86 100644 --- a/TAO/TAO_IDL/include/idl_fwd.h +++ b/TAO/TAO_IDL/include/idl_fwd.h @@ -51,8 +51,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -141,5 +141,6 @@ class AST_Sequence; // A sequence declaration class AST_String; // A string declaration class AST_Array; // An array declaration class AST_Typedef; // A typedef declaration +class AST_Native; // A native declaration #endif // _IDL_FWD_IDL_FWD_HH diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h index 04079024263..fbe2dffab13 100644 --- a/TAO/TAO_IDL/include/idl_global.h +++ b/TAO/TAO_IDL/include/idl_global.h @@ -51,8 +51,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -86,7 +86,7 @@ public: , PS_InterfaceDeclSeen // Seen complete interface declaration , PS_ModuleDeclSeen // Seen complete module declaration , PS_AttrDeclSeen // Seen complete attribute declaration - , PS_OpDeclSeen // Seen complete operation declaration + , PS_OpDeclSeen // Seen complete operation declaration , PS_ModuleSeen // Seen a MODULE keyword , PS_ModuleIDSeen // Seen the module ID , PS_ModuleSqSeen // '{' seen for module @@ -192,6 +192,7 @@ public: , PS_OpContextCommaSeen // Seen ',' for CONTEXT , PS_DeclsCommaSeen // Seen ',' in declarators list , PS_DeclsDeclSeen // Seen complete decl in decls list + , PS_NativeSeen // Seen a native declaration }; // Constructor @@ -230,7 +231,7 @@ public: // file name? virtual void set_real_filename(String *); // Set it - + virtual String *stripped_filename(); // Stripped filename virtual void set_stripped_filename(String *); // Set it @@ -301,7 +302,7 @@ public: static const char *be_get_server_inline_fname (); // Helper functions: obtain the names of each generated file given - // the IDL file name. + // the IDL file name. static const char *be_get_client_hdr (String *idl_file_name); static const char *be_get_client_stub (String *idl_file_name); static const char *be_get_client_inline (String *idl_file_name); diff --git a/TAO/TAO_IDL/include/utl_scope.h b/TAO/TAO_IDL/include/utl_scope.h index 7f14206fdbf..ff105101964 100644 --- a/TAO/TAO_IDL/include/utl_scope.h +++ b/TAO/TAO_IDL/include/utl_scope.h @@ -51,8 +51,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -135,6 +135,7 @@ public: virtual AST_Sequence *add_sequence(AST_Sequence *s); virtual AST_String *add_string(AST_String *s); virtual AST_Array *add_array(AST_Array *a); + virtual AST_Native *add_native (AST_Native *n); // Call back end add_XXX functions for this scope virtual AST_Decl *call_add(); @@ -252,6 +253,7 @@ private: virtual AST_Sequence *fe_add_sequence(AST_Sequence *s); virtual AST_String *fe_add_string(AST_String *s); virtual AST_Array *fe_add_array(AST_Array *a); + virtual AST_Native *fe_add_native (AST_Native *n); }; // Active iterator for a UTL_Scope node diff --git a/TAO/TAO_IDL/narrow/Makefile b/TAO/TAO_IDL/narrow/Makefile index 82b6b32bc37..c48946eee3e 100644 --- a/TAO/TAO_IDL/narrow/Makefile +++ b/TAO/TAO_IDL/narrow/Makefile @@ -56,8 +56,11 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C .obj/narrow.o .shobj/narrow.so: narrow.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -66,7 +69,6 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -84,14 +86,15 @@ CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_C ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/TAO_IDL/util/Makefile b/TAO/TAO_IDL/util/Makefile index c6a2067b127..793c43b93df 100644 --- a/TAO/TAO_IDL/util/Makefile +++ b/TAO/TAO_IDL/util/Makefile @@ -73,8 +73,11 @@ $(LOBJS): $(LHDRS) .obj/utl_scope.o .shobj/utl_scope.so: utl_scope.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -83,7 +86,6 @@ $(LOBJS): $(LHDRS) $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -101,20 +103,24 @@ $(LOBJS): $(LHDRS) ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/utl_stack.o .shobj/utl_stack.so: utl_stack.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -123,7 +129,6 @@ $(LOBJS): $(LHDRS) $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -141,20 +146,24 @@ $(LOBJS): $(LHDRS) ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/utl_string.o .shobj/utl_string.so: utl_string.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -163,7 +172,6 @@ $(LOBJS): $(LHDRS) $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -181,20 +189,24 @@ $(LOBJS): $(LHDRS) ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/utl_decllist.o .shobj/utl_decllist.so: utl_decllist.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -203,7 +215,6 @@ $(LOBJS): $(LHDRS) $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -221,20 +232,24 @@ $(LOBJS): $(LHDRS) ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/utl_labellist.o .shobj/utl_labellist.so: utl_labellist.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -243,7 +258,6 @@ $(LOBJS): $(LHDRS) $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -261,20 +275,24 @@ $(LOBJS): $(LHDRS) ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/utl_namelist.o .shobj/utl_namelist.so: utl_namelist.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -283,7 +301,6 @@ $(LOBJS): $(LHDRS) $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -301,20 +318,24 @@ $(LOBJS): $(LHDRS) ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/utl_exceptlist.o .shobj/utl_exceptlist.so: utl_exceptlist.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -323,7 +344,6 @@ $(LOBJS): $(LHDRS) $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -341,20 +361,24 @@ $(LOBJS): $(LHDRS) ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/utl_strlist.o .shobj/utl_strlist.so: utl_strlist.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -363,7 +387,6 @@ $(LOBJS): $(LHDRS) $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -381,20 +404,24 @@ $(LOBJS): $(LHDRS) ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/utl_list.o .shobj/utl_list.so: utl_list.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -403,7 +430,6 @@ $(LOBJS): $(LHDRS) $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -421,20 +447,24 @@ $(LOBJS): $(LHDRS) ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/utl_exprlist.o .shobj/utl_exprlist.so: utl_exprlist.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -443,7 +473,6 @@ $(LOBJS): $(LHDRS) $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -461,20 +490,24 @@ $(LOBJS): $(LHDRS) ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/utl_error.o .shobj/utl_error.so: utl_error.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -483,7 +516,6 @@ $(LOBJS): $(LHDRS) $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -501,20 +533,24 @@ $(LOBJS): $(LHDRS) ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/utl_indenter.o .shobj/utl_indenter.so: utl_indenter.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -523,7 +559,6 @@ $(LOBJS): $(LHDRS) $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -541,20 +576,24 @@ $(LOBJS): $(LHDRS) ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/utl_identifier.o .shobj/utl_identifier.so: utl_identifier.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -563,7 +602,6 @@ $(LOBJS): $(LHDRS) $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -581,20 +619,24 @@ $(LOBJS): $(LHDRS) ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/utl_idlist.o .shobj/utl_idlist.so: utl_idlist.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -603,7 +645,6 @@ $(LOBJS): $(LHDRS) $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -621,20 +662,24 @@ $(LOBJS): $(LHDRS) ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h .obj/utl_global.o .shobj/utl_global.so: utl_global.cpp ../include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/iosfwd.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -643,7 +688,6 @@ $(LOBJS): $(LHDRS) $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/streams.h \ ../include/intlmacros.h ../include/idl_narrow.h \ ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \ ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \ @@ -661,14 +705,15 @@ $(LOBJS): $(LHDRS) ../include/ast_constant.h ../include/ast_enum_val.h \ ../include/ast_array.h ../include/ast_sequence.h \ ../include/ast_string.h ../include/ast_typedef.h \ - ../include/utl_strlist.h ../include/utl_exprlist.h \ - ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \ - ../include/utl_idlist.h ../include/utl_exceptlist.h \ - ../include/utl_namelist.h ../include/utl_labellist.h \ - ../include/utl_decllist.h ../include/idl_global.h \ - ../include/utl_error.h ../include/utl_indenter.h \ - ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \ - ../include/drv_extern.h ../include/ast_extern.h \ - ../include/nr_extern.h ../include/global_extern.h + ../include/ast_native.h ../include/utl_strlist.h \ + ../include/utl_exprlist.h ../include/ast_generator.h \ + ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \ + ../include/utl_exceptlist.h ../include/utl_namelist.h \ + ../include/utl_labellist.h ../include/utl_decllist.h \ + ../include/idl_global.h ../include/utl_error.h \ + ../include/utl_indenter.h ../include/idl_extern.h \ + ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \ + ../include/ast_extern.h ../include/nr_extern.h \ + ../include/global_extern.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/TAO_IDL/util/utl_scope.cpp b/TAO/TAO_IDL/util/utl_scope.cpp index f9d6e21ebb5..f3428bff74a 100644 --- a/TAO/TAO_IDL/util/utl_scope.cpp +++ b/TAO/TAO_IDL/util/utl_scope.cpp @@ -51,8 +51,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -197,7 +197,7 @@ UTL_Scope::UTL_Scope(AST_Decl::NodeType nt) * Private operations */ -static +static AST_Decl * add_type(AST_Type *type) { AST_Decl * result = 0; @@ -209,18 +209,18 @@ AST_Decl * add_type(AST_Type *type) break; case AST_Decl::NT_enum: result = type->defined_in()->add_enum(AST_Enum::narrow_from_decl(type)); - scope = AST_Enum::narrow_from_decl(type); + scope = AST_Enum::narrow_from_decl(type); break; case AST_Decl::NT_sequence: result = idl_global->root()->add_sequence(AST_Sequence::narrow_from_decl(type)); break; case AST_Decl::NT_string: - result = + result = idl_global->root()->add_string(AST_String::narrow_from_decl(type)); break; case AST_Decl::NT_struct: - result = + result = type->defined_in()-> add_structure(AST_Structure::narrow_from_decl(type)); scope = AST_Structure::narrow_from_decl(type); @@ -238,7 +238,7 @@ AST_Decl * add_type(AST_Type *type) } if (scope) result = scope->call_add(); - return result; + return result; } /* @@ -367,7 +367,7 @@ AST_UnionBranch *UTL_Scope::add_union_branch(AST_UnionBranch *u) u->set_added(I_TRUE); if (!u->field_type()->added()) { return add_type(u->field_type()) ? u : 0 ; - } else + } else return u; } @@ -408,7 +408,7 @@ AST_Typedef *UTL_Scope::add_typedef(AST_Typedef *t) t->set_added(I_TRUE); if (!t->base_type()->added()) { return add_type(t->base_type()) ? t : 0 ; - } else + } else return t; } @@ -435,10 +435,17 @@ AST_Array *UTL_Scope::add_array(AST_Array *a) a->set_added(I_TRUE); if (!a->base_type()->added()) { return add_type(a->base_type()) ? a : 0 ; - } else + } else return a; } +AST_Native *UTL_Scope::add_native (AST_Native *n) +{ + if (n == NULL) return NULL; + n->set_added (I_TRUE); + return n; +} + // Protected Front End Scope Management Protocol // // All members of the protocol defined in UTL_Scope simply return NULL @@ -551,6 +558,11 @@ AST_Array *UTL_Scope::fe_add_array(AST_Array *) return NULL; } +AST_Native *UTL_Scope::fe_add_native (AST_Native *) +{ + return NULL; +} + // This is the second pass of the front end // It calls the public add protocol on everything in scope. // It calls the add_xx functions of the most derived AST_Node. @@ -568,13 +580,13 @@ AST_Decl *UTL_Scope::call_add() decl = i->item(); scope = 0; switch (decl->node_type()) { - case AST_Decl::NT_argument: + case AST_Decl::NT_argument: result = add_argument(AST_Argument::narrow_from_decl(decl)); break; case AST_Decl::NT_array: result = add_array(AST_Array::narrow_from_decl(decl)); break; - case AST_Decl::NT_attr: + case AST_Decl::NT_attr: result = add_attribute(AST_Attribute::narrow_from_decl(decl)); break; case AST_Decl::NT_const: @@ -585,7 +597,7 @@ AST_Decl *UTL_Scope::call_add() result = add_enum(AST_Enum::narrow_from_decl(decl)); break; case AST_Decl::NT_enum_val: - result = add_enum_val(AST_EnumVal::narrow_from_decl(decl)); + result = add_enum_val(AST_EnumVal::narrow_from_decl(decl)); break; case AST_Decl::NT_except: scope = AST_Exception::narrow_from_decl(decl); @@ -603,8 +615,11 @@ AST_Decl *UTL_Scope::call_add() break; case AST_Decl::NT_module: scope = AST_Module::narrow_from_decl(decl); - result = add_module(AST_Module::narrow_from_decl(decl)); + result = add_module(AST_Module::narrow_from_decl(decl)); break; + case AST_Decl::NT_native: + result = add_native (AST_Native::narrow_from_decl(decl)); + break; case AST_Decl::NT_op: result = add_operation(AST_Operation::narrow_from_decl(decl)); scope = AST_Operation::narrow_from_decl(decl); @@ -771,7 +786,7 @@ UTL_Scope::look_in_inherited(UTL_ScopedName *e, idl_bool treat_as_ref) * Not found */ return NULL; -} +} /* * Look up a String * in local scope only @@ -931,7 +946,7 @@ UTL_Scope::add_to_referenced(AST_Decl *e, idl_bool recursive) long i; if (e == NULL) return; - + // Special case for forward declared interfaces in the // scope in which they're defined. Cannot add before full // definition is seen @@ -971,7 +986,7 @@ UTL_Scope::add_to_referenced(AST_Decl *e, idl_bool recursive) s->add_to_referenced(e, recursive); } } - + // Add a node to set of nodes declared in this scope void UTL_Scope::add_to_scope(AST_Decl *e) @@ -981,7 +996,7 @@ UTL_Scope::add_to_scope(AST_Decl *e) long i; if (e == NULL) return; - + // Make sure there's space for one more if (pd_decls_allocated == pd_decls_used) { @@ -1155,8 +1170,8 @@ UTL_ScopeActiveIterator::is_done() { long limit; - limit = (stage == UTL_Scope::IK_decls) - ? iter_source->pd_decls_used + limit = (stage == UTL_Scope::IK_decls) + ? iter_source->pd_decls_used : iter_source->pd_locals_used; for (;;) { diff --git a/TAO/tao/corbacom.h b/TAO/tao/corbacom.h index 49450606ab8..273a02d57d2 100644 --- a/TAO/tao/corbacom.h +++ b/TAO/tao/corbacom.h @@ -77,6 +77,8 @@ class CORBA_ORB; //typedef class CORBA_ORB *CORBA_ORB_ptr; class CORBA_Object; +class CORBA_Object_var; +class CORBA_Object_out; //typedef class CORBA_Object *CORBA_Object_ptr; class CORBA_ServerRequest; diff --git a/TAO/tao/iiopobj.cpp b/TAO/tao/iiopobj.cpp index 04bfdf9dacf..15241bbb4c0 100644 --- a/TAO/tao/iiopobj.cpp +++ b/TAO/tao/iiopobj.cpp @@ -1,3 +1,4 @@ + // @ (#)iiopobj.cpp 1.9 95/11/04 // Copyright 1995 by Sun Microsystems Inc. // All Rights Reserved @@ -46,7 +47,7 @@ IIOP::Profile::set (const char *h, { if (this->set (h, p, addr) == -1) return -1; - + // Enough room as to print a <void*> const int bufs = 32; char buffer[bufs]; @@ -106,7 +107,7 @@ IIOP::Profile::set (const ACE_INET_Addr &addr, const char *key) { // Set up an IIOP Profile to hold the host name. - + if (addr.get_ip_address () == INADDR_ANY) { // Special case @@ -137,7 +138,7 @@ IIOP::Profile::set (const ACE_INET_Addr &addr, const TAO_opaque &key) { // Set up an IIOP Profile to hold the host name. - + if (addr.get_ip_address () == INADDR_ANY) { // Special case diff --git a/TAO/tao/varout.h b/TAO/tao/varout.h index 53267ae973c..02e2f19a484 100644 --- a/TAO/tao/varout.h +++ b/TAO/tao/varout.h @@ -4,7 +4,7 @@ // // = LIBRARY // TAO -// +// // = FILENAME // varout.h // @@ -13,7 +13,7 @@ // // = AUTHOR // -// Aniruddha Gokhale +// Aniruddha Gokhale // ============================================================================ #if !defined (TAO_VAROUT_H) @@ -207,7 +207,7 @@ private: // seq instance }; -template <class T_ptr> +template <class T, class T_ptr> class TAO_Object_var // = TITLE // template<class T, class T_ptr> TAO_Object_var @@ -622,4 +622,3 @@ private: }; #endif /* TAO_VAROUT_H */ - diff --git a/TAO/tests/Param_Test/client.cpp b/TAO/tests/Param_Test/client.cpp index 1d9fe2e6022..8bc216c11fb 100644 --- a/TAO/tests/Param_Test/client.cpp +++ b/TAO/tests/Param_Test/client.cpp @@ -59,7 +59,14 @@ Param_Test_Client<T>::run_sii_test (void) this->results_.iterations (opt->loop_count ()); // initialize parameters for the test - this->test_object_->init_parameters (); + if (this->test_object_->init_parameters (this->param_test_, env) == -1) + { + ACE_ERROR ((LM_ERROR, + "(%N:%l) client.cpp - run_sii_test:" + "init_parameters failed for opname - %s", + opname)); + return -1; + } // Make the calls in a loop. for (i = 0; i < opt->loop_count (); i++) @@ -94,6 +101,7 @@ Param_Test_Client<T>::run_sii_test (void) ACE_DEBUG ((LM_DEBUG, "\n****** After call values *****\n")); this->test_object_->print_values (); } + if (!this->test_object_->check_validity ()) { this->results_.error_count (this->results_.error_count () + 1); @@ -104,7 +112,14 @@ Param_Test_Client<T>::run_sii_test (void) continue; } // reset parameters for the test - this->test_object_->reset_parameters (); + if (this->test_object_->reset_parameters () == -1) + { + ACE_ERROR ((LM_ERROR, + "(%N:%l) client.cpp - run_dii_test:" + "init_parameters failed for opname - %s", + opname)); + return -1; + } } // print statistics @@ -130,7 +145,14 @@ Param_Test_Client<T>::run_dii_test (void) this->results_.iterations (opt->loop_count ()); // initialize parameters for the test - this->test_object_->init_parameters (); + if (this->test_object_->init_parameters (this->param_test_, env) == -1) + { + ACE_ERROR ((LM_ERROR, + "(%N:%l) client.cpp - run_dii_test:" + "init_parameters failed for opname - %s", + opname)); + return -1; + } // Make the calls in a loop. for (i = 0; i < opt->loop_count (); i++) diff --git a/TAO/tests/Param_Test/driver.cpp b/TAO/tests/Param_Test/driver.cpp index 0deeea10bfe..0e58ab1fb19 100644 --- a/TAO/tests/Param_Test/driver.cpp +++ b/TAO/tests/Param_Test/driver.cpp @@ -206,6 +206,19 @@ Driver::run (void) delete client; } break; + case Options::TEST_OBJREF: + { + Param_Test_Client<Test_ObjRef> *client = new + Param_Test_Client<Test_ObjRef> (this->orb_ptr_, + this->objref_, + new Test_ObjRef); + if (opt->invoke_type () == Options::SII) + retstatus = client->run_sii_test (); + else + retstatus = client->run_dii_test (); + delete client; + } + break; default: break; } @@ -220,6 +233,7 @@ template class Param_Test_Client<Test_Fixed_Struct>; template class Param_Test_Client<Test_String_Sequence>; template class Param_Test_Client<Test_Var_Struct>; template class Param_Test_Client<Test_Nested_Struct>; +template class Param_Test_Client<Test_ObjRef>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Singleton<Driver, ACE_SYNCH_RECURSIVE_MUTEX> #pragma instantiate Param_Test_Client<Test_Short> @@ -228,4 +242,5 @@ template class Param_Test_Client<Test_Nested_Struct>; #pragma instantiate Param_Test_Client<Test_String_Sequence> #pragma instantiate Param_Test_Client<Test_Var_Struct> #pragma instantiate Param_Test_Client<Test_Nested_Struct> +#pragma instantiate Param_Test_Client<Test_ObjRef> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tests/Param_Test/options.cpp b/TAO/tests/Param_Test/options.cpp index a58d3977db0..b311b46ccf8 100644 --- a/TAO/tests/Param_Test/options.cpp +++ b/TAO/tests/Param_Test/options.cpp @@ -84,6 +84,8 @@ Options::parse_args (int argc, char **argv) this->test_type_ = Options::TEST_VAR_STRUCT; else if (!ACE_OS::strcmp (get_opts.optarg, "nested_struct")) this->test_type_ = Options::TEST_NESTED_STRUCT; + else if (!ACE_OS::strcmp (get_opts.optarg, "objref")) + this->test_type_ = Options::TEST_OBJREF; break; case '?': default: diff --git a/TAO/tests/Param_Test/options.h b/TAO/tests/Param_Test/options.h index f86d08966d0..47445dde079 100644 --- a/TAO/tests/Param_Test/options.h +++ b/TAO/tests/Param_Test/options.h @@ -33,7 +33,8 @@ public: TEST_FIXED_STRUCT, TEST_STRING_SEQUENCE, TEST_VAR_STRUCT, - TEST_NESTED_STRUCT + TEST_NESTED_STRUCT, + TEST_OBJREF }; enum INVOKE_TYPE diff --git a/TAO/tests/Param_Test/param_test.idl b/TAO/tests/Param_Test/param_test.idl index c3a5fcd6b64..f94eca36b1d 100644 --- a/TAO/tests/Param_Test/param_test.idl +++ b/TAO/tests/Param_Test/param_test.idl @@ -19,7 +19,6 @@ // // ============================================================================ -/* interface Coffee { struct Desc @@ -27,9 +26,8 @@ interface Coffee string name; }; - readonly attribute Desc description; + attribute Desc description; // provides us the coffee object type }; - */ interface Param_Test { @@ -89,11 +87,11 @@ interface Param_Test Nested_Struct test_nested_struct (in Nested_Struct s1, inout Nested_Struct s2, out Nested_Struct s3); - /* // object references Coffee make_coffee (); // make a Coffee object - Coffee test_Coffee (in Coffee o1, inout Coffee o2, out Coffee o3); + Coffee test_objref (in Coffee o1, inout Coffee o2, out Coffee o3); + /* long test_long (in long l1, inout long l2, out long l3); diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp index a2edd5883a0..d4ff792cd37 100644 --- a/TAO/tests/Param_Test/param_test_i.cpp +++ b/TAO/tests/Param_Test/param_test_i.cpp @@ -16,10 +16,48 @@ #include "tao/corba.h" #include "param_test_i.h" +// ********* class Coffee_i **************** // Constructor -Param_Test_i::Param_Test_i (const char *obj_name) - : POA_Param_Test (obj_name) +Coffee_i::Coffee_i (const char *name, + const char *obj_name) + : name_ (name), + POA_Coffee (obj_name) +{ +} + +// Destructor + +Coffee_i::~Coffee_i (void) +{ +} + +// get attribute +Coffee::Desc * +Coffee_i::description (CORBA::Environment & /*env*/) +{ + Coffee::Desc *desc = new Coffee::Desc; + desc->name = CORBA::string_dup (this->name_); + return desc; +} + +// set attribute +void +Coffee_i::description (const Coffee::Desc &description, + CORBA::Environment & /*env*/) +{ + this->name_ = CORBA::string_dup (description.name); +} + + +// ********* class Param_Test_i **************** + +// Constructor + +Param_Test_i::Param_Test_i (const char *coffee_name, + const char *obj_name) + : obj_ (new Coffee_i (coffee_name)), + POA_Param_Test (obj_name) { } @@ -81,6 +119,7 @@ Param_Test_i::test_strseq (const Param_Test::StrSeq &s1, Param_Test::StrSeq_out s3, CORBA::Environment &env) { + ACE_UNUSED_ARG (env); // we copy the "in" sequences into all the inout, out and return sequences. Param_Test::StrSeq @@ -102,6 +141,7 @@ Param_Test_i::test_var_struct (const Param_Test::Var_Struct &s1, Param_Test::Var_Struct_out s3, CORBA::Environment &env) { + ACE_UNUSED_ARG (env); // we copy the "in" sequences into all the inout, out and return sequences. Param_Test::Var_Struct @@ -123,6 +163,7 @@ Param_Test_i::test_nested_struct (const Param_Test::Nested_Struct &s1, Param_Test::Nested_Struct_out s3, CORBA::Environment &env) { + ACE_UNUSED_ARG (env); // we copy the "in" sequences into all the inout, out and return sequences. Param_Test::Nested_Struct @@ -136,3 +177,32 @@ Param_Test_i::test_nested_struct (const Param_Test::Nested_Struct &s1, s3 = out; return ret; } + +// make a Coffee object +Coffee_ptr +Param_Test_i::make_coffee (CORBA::Environment & /*env*/) +{ + return Coffee::_duplicate (this->obj_.in ()); +} + +// test for object references +Coffee_ptr +Param_Test_i::test_objref (Coffee_ptr o1, + Coffee_ptr &o2, + Coffee_out o3, + CORBA::Environment &env) +{ + // o1's attribute should be same as the one we have + if (this->obj_->_is_equivalent (o1, env)) + { + o2 = Coffee::_duplicate (this->obj_.in ()); + o3 = Coffee::_duplicate (this->obj_.in ()); + return Coffee::_duplicate (this->obj_.in ()); + } + else + { + o2 = Coffee::_nil (); + o3 = Coffee::_nil (); + return Coffee::_nil (); + } +} diff --git a/TAO/tests/Param_Test/param_test_i.h b/TAO/tests/Param_Test/param_test_i.h index 50c19abf7b3..584da7372ac 100644 --- a/TAO/tests/Param_Test/param_test_i.h +++ b/TAO/tests/Param_Test/param_test_i.h @@ -18,6 +18,33 @@ #include "param_testS.h" +// Implementation of the Coffee interface +class Coffee_i : public POA_Coffee + +{ +public: + Coffee_i (const char *name, + const char *obj_name = 0); + // constructor + + ~Coffee_i (void); + // destructor + + // =methods for the attribute + + virtual Coffee::Desc * description (CORBA::Environment &env); + // get attribute + + virtual void description (const Coffee::Desc &description, + CORBA::Environment &env); + // set attribute + +private: + CORBA::String_var name_; + // my description +}; + +// the implementation of the Param_test interface class Param_Test_i : public POA_Param_Test { // = TITLE @@ -25,7 +52,8 @@ class Param_Test_i : public POA_Param_Test // = DESCRIPTION // Implementation of the Param_Test test suite. public: - Param_Test_i (const char *obj_name = 0); + Param_Test_i (const char *coffee_name, + const char *obj_name = 0); // Constructor ~Param_Test_i (void); @@ -70,6 +98,21 @@ public: Param_Test::Nested_Struct_out s3, CORBA::Environment &env); // test for nested structs + + virtual Coffee_ptr + make_coffee (CORBA::Environment &env); + // make a coffee object + + virtual Coffee_ptr + test_objref (Coffee_ptr o1, + Coffee_ptr &o2, + Coffee_out o3, + CORBA::Environment &env); + // test for object references + +private: + Coffee_var obj_; + // the coffee object reference we maintain }; #endif /* PARAM_TEST_I_H */ diff --git a/TAO/tests/Param_Test/server.cpp b/TAO/tests/Param_Test/server.cpp index 15c784abc68..c31d165eef9 100644 --- a/TAO/tests/Param_Test/server.cpp +++ b/TAO/tests/Param_Test/server.cpp @@ -76,7 +76,7 @@ main (int argc, char *argv[]) Param_Test_i *param_test; // implicitly initializes with the OA - ACE_NEW_RETURN (param_test, Param_Test_i ("param_test"), 1); + ACE_NEW_RETURN (param_test, Param_Test_i ("unknown", "param_test"), 1); if (TAO_debug_level > 0) { diff --git a/TAO/tests/Param_Test/tests.cpp b/TAO/tests/Param_Test/tests.cpp index 3bf683734d3..f8fd02a48db 100644 --- a/TAO/tests/Param_Test/tests.cpp +++ b/TAO/tests/Param_Test/tests.cpp @@ -41,21 +41,27 @@ Test_Short::opname (void) const return this->opname_; } -void -Test_Short::init_parameters (void) +int +Test_Short::init_parameters (Param_Test_ptr objref, + CORBA::Environment &env) { Generator *gen = GENERATOR::instance (); // value generator + ACE_UNUSED_ARG (objref); + ACE_UNUSED_ARG (env); + this->in_ = gen->gen_short (); this->inout_ = 0; + return 0; } -void +int Test_Short::reset_parameters (void) { this->inout_ = 0; this->out_ = 0; this->ret_ = 0; + return 0; } int @@ -158,10 +164,14 @@ Test_Unbounded_String::opname (void) const return this->opname_; } -void -Test_Unbounded_String::init_parameters (void) +int +Test_Unbounded_String::init_parameters (Param_Test_ptr objref, + CORBA::Environment &env) { Generator *gen = GENERATOR::instance (); // value generator + ACE_UNUSED_ARG (objref); + ACE_UNUSED_ARG (env); + // release any previously occupied values CORBA::string_free (this->in_); CORBA::string_free (this->inout_); @@ -174,9 +184,10 @@ Test_Unbounded_String::init_parameters (void) this->in_ = gen->gen_string (); this->inout_ = CORBA::string_dup (this->in_); + return 0; } -void +int Test_Unbounded_String::reset_parameters (void) { // release any previously occupied values @@ -185,6 +196,7 @@ Test_Unbounded_String::reset_parameters (void) this->ret_ = 0; this->inout_ = CORBA::string_dup (this->in_); + return 0; } int @@ -284,21 +296,27 @@ Test_Fixed_Struct::opname (void) const return this->opname_; } -void -Test_Fixed_Struct::init_parameters (void) +int +Test_Fixed_Struct::init_parameters (Param_Test_ptr objref, + CORBA::Environment &env) { Generator *gen = GENERATOR::instance (); // value generator + ACE_UNUSED_ARG (objref); + ACE_UNUSED_ARG (env); + this->in_ = gen->gen_fixed_struct (); ACE_OS::memset (&this->inout_, 0, sizeof (Param_Test::Fixed_Struct)); + return 0; } -void +int Test_Fixed_Struct::reset_parameters (void) { ACE_OS::memset (&this->inout_, 0, sizeof (Param_Test::Fixed_Struct)); ACE_OS::memset (&this->out_, 0, sizeof (Param_Test::Fixed_Struct)); ACE_OS::memset (&this->ret_, 0, sizeof (Param_Test::Fixed_Struct)); + return 0; } int @@ -471,11 +489,15 @@ Test_String_Sequence::opname (void) const return this->opname_; } -void -Test_String_Sequence::init_parameters (void) +int +Test_String_Sequence::init_parameters (Param_Test_ptr objref, + CORBA::Environment &env) { Generator *gen = GENERATOR::instance (); // value generator + ACE_UNUSED_ARG (objref); + ACE_UNUSED_ARG (env); + // get some sequence length (not more than 10) CORBA::ULong len = (CORBA::ULong) (gen->gen_long () % 10) + 1; @@ -489,14 +511,16 @@ Test_String_Sequence::init_parameters (void) char *str = gen->gen_string (); this->in_[i] = str; } + return 0; } -void +int Test_String_Sequence::reset_parameters (void) { this->inout_ = new Param_Test::StrSeq; // delete the previous one this->out_ = 0; this->ret_ = 0; + return 0; } int @@ -616,11 +640,15 @@ Test_Var_Struct::opname (void) const return this->opname_; } -void -Test_Var_Struct::init_parameters (void) +int +Test_Var_Struct::init_parameters (Param_Test_ptr objref, + CORBA::Environment &env) { Generator *gen = GENERATOR::instance (); // value generator + ACE_UNUSED_ARG (objref); + ACE_UNUSED_ARG (env); + // get some sequence length (not more than 10) CORBA::ULong len = (CORBA::ULong) (gen->gen_long () % 10) + 1; @@ -634,14 +662,16 @@ Test_Var_Struct::init_parameters (void) char *str = gen->gen_string (); this->in_.seq[i] = str; } + return 0; } -void +int Test_Var_Struct::reset_parameters (void) { this->inout_ = new Param_Test::Var_Struct; // delete the previous one this->out_ = 0; this->ret_ = 0; + return 0; } int @@ -761,11 +791,15 @@ Test_Nested_Struct::opname (void) const return this->opname_; } -void -Test_Nested_Struct::init_parameters (void) +int +Test_Nested_Struct::init_parameters (Param_Test_ptr objref, + CORBA::Environment &env) { Generator *gen = GENERATOR::instance (); // value generator + ACE_UNUSED_ARG (objref); + ACE_UNUSED_ARG (env); + // get some sequence length (not more than 10) CORBA::ULong len = (CORBA::ULong) (gen->gen_long () % 10) + 1; @@ -779,14 +813,16 @@ Test_Nested_Struct::init_parameters (void) char *str = gen->gen_string (); this->in_.vs.seq[i] = str; } + return 0; } -void +int Test_Nested_Struct::reset_parameters (void) { this->inout_ = new Param_Test::Nested_Struct; // delete the previous one this->out_ = 0; this->ret_ = 0; + return 0; } int @@ -849,12 +885,13 @@ CORBA::Boolean Test_Nested_Struct::check_validity (CORBA::Request_ptr req) { CORBA::Environment env; - this->inout_ = new Param_Test::Nested_Struct (*(Param_Test::Nested_Struct *) req->arguments - ()->item (1, env)->value ()->value ()); + this->inout_ = new Param_Test::Nested_Struct (*(Param_Test::Nested_Struct *) + req->arguments ()->item + (1, env)->value ()->value ()); this->out_ = new Param_Test::Nested_Struct (*(Param_Test::Nested_Struct *) req->arguments - ()->item (2, env)->value ()->value ()); + ()->item (2, env)->value ()->value ()); this->ret_ = new Param_Test::Nested_Struct (*(Param_Test::Nested_Struct *)req->result - ()->value ()->value ()); + ()->value ()->value ()); return this->check_validity (); } @@ -880,3 +917,247 @@ Test_Nested_Struct::print_values (void) (this->ret_->vs.seq.length ()? (char *)this->ret_->vs.seq[i]:"<nul>"))); } } + +// ************************************************************************ +// Test_ObjRef +// ************************************************************************ + +Test_ObjRef::Test_ObjRef (void) + : opname_ (CORBA::string_dup ("test_objref")) +{ +} + +Test_ObjRef::~Test_ObjRef (void) +{ + CORBA::string_free (this->opname_); + this->opname_ = 0; +} + +const char * +Test_ObjRef::opname (void) const +{ + return this->opname_; +} + +static char *Coffee_Flavor [] = { + "Italian Roast", + "Irish Creme", + "Costa Rican", + "Colombian Supremo", + "Macademia Nut", + "Swiss Chocolate Mocha" +}; + +int +Test_ObjRef::init_parameters (Param_Test_ptr objref, + CORBA::Environment &env) +{ + Coffee::Desc desc; + Generator *gen = GENERATOR::instance (); // value generator + + // first get a Coffee object + this->in_ = objref->make_coffee (env); + if (env.exception ()) + { + env.print_exception ("make_coffee"); + return -1; + } + + // get some sequence length (not more than 10) + CORBA::ULong index = (CORBA::ULong) (gen->gen_long () % 6); + desc.name = Coffee_Flavor [index]; + // set the attribute of the object + this->in_->description (desc, env); // set the attribute for the in object + if (env.exception ()) + { + env.print_exception ("set coffee attribute"); + return -1; + } + return 0; +} + +int +Test_ObjRef::reset_parameters (void) +{ + CORBA::Environment env; + Coffee::Desc desc; + Generator *gen = GENERATOR::instance (); // value generator + + // get some sequence length (not more than 10) + CORBA::ULong index = (CORBA::ULong) (gen->gen_long () % 6); + desc.name = Coffee_Flavor [index]; + // set the attribute of the object + this->in_->description (desc, env); // set the attribute for the in object + if (env.exception ()) + { + env.print_exception ("set coffee attribute"); + return -1; + } + + this->inout_ = Coffee::_nil (); + this->out_ = Coffee::_nil (); + this->ret_ = Coffee::_nil (); + return 0; +} + +int +Test_ObjRef::run_sii_test (Param_Test_ptr objref, + CORBA::Environment &env) +{ + Coffee_out out (this->out_.out ()); + this->ret_ = objref->test_objref (this->in_.in (), + this->inout_.inout (), + out, + env); + return (env.exception () ? -1:0); +} + +int +Test_ObjRef::add_args (CORBA::NVList_ptr ¶m_list, + CORBA::NVList_ptr &retval, + CORBA::Environment &env) +{ + CORBA::Any in_arg (_tc_Coffee, &this->in_, 0); + CORBA::Any inout_arg (_tc_Coffee, &this->inout_, 0); + CORBA::Any out_arg (_tc_Coffee, &this->out_, 0); + + // add parameters + (void)param_list->add_value ("o1", in_arg, CORBA::ARG_IN, env); + (void)param_list->add_value ("o2", inout_arg, CORBA::ARG_INOUT, env); + (void)param_list->add_value ("o3", out_arg, CORBA::ARG_OUT, env); + + // add return value + (void)retval->item (0, env)->value ()->replace (_tc_Coffee, + &this->ret_, + 0, // does not own + env); + return 0; +} + +CORBA::Boolean +Test_ObjRef::check_validity (void) +{ + CORBA::Environment env; + char // attribute names + *in, + *inout, + *out, + *ret; + + in = this->in_->description (env)->name; + if (env.exception ()) + { + env.print_exception ("retrieving description"); + return 0; + } + + inout = this->inout_->description (env)->name; + if (env.exception ()) + { + env.print_exception ("retrieving description"); + return 0; + } + + out = this->out_->description (env)->name; + if (env.exception ()) + { + env.print_exception ("retrieving description"); + return 0; + } + + ret = this->ret_->description (env)->name; + if (env.exception ()) + { + env.print_exception ("retrieving description"); + return 0; + } + + // now compare them + if (!ACE_OS::strcmp (in, inout) && + !ACE_OS::strcmp (in, out) && + !ACE_OS::strcmp (in, ret)) + return 1; // success + else + return 0; +} + +CORBA::Boolean +Test_ObjRef::check_validity (CORBA::Request_ptr req) +{ + CORBA::Environment env; + this->inout_ = Coffee::_narrow ((CORBA::Object_ptr) req->arguments ()->item + (1, env)->value ()->value (), env); + if (env.exception ()) + { + env.print_exception ("_narrow from DII result"); + return 0; + } + + this->out_ = Coffee::_narrow ((CORBA::Object_ptr) req->arguments ()->item + (2, env)->value ()->value (), env); + if (env.exception ()) + { + env.print_exception ("_narrow from DII result"); + return 0; + } + + this->ret_ = Coffee::_narrow ((CORBA::Object_ptr)req->result ()->value + ()->value (), env); + if (env.exception ()) + { + env.print_exception ("_narrow from DII result"); + return 0; + } + + return this->check_validity (); +} + +void +Test_ObjRef::print_values (void) +{ + CORBA::Environment env; + char // attribute names + *in, + *inout, + *out, + *ret; + + in = this->in_->description (env)->name; + if (env.exception ()) + { + env.print_exception ("retrieving description"); + return; + } + + inout = this->inout_->description (env)->name; + if (env.exception ()) + { + env.print_exception ("retrieving description"); + return; + } + + out = this->out_->description (env)->name; + if (env.exception ()) + { + env.print_exception ("retrieving description"); + return; + } + + ret = this->ret_->description (env)->name; + if (env.exception ()) + { + env.print_exception ("retrieving description"); + return; + } + + ACE_DEBUG ((LM_DEBUG, + "\n=*=*=*=*=*=*" + "in = %s, " + "inout = %s, " + "out = %s, " + "ret = %s*=*=*=*=*=\n", + in, + inout, + out, + ret)); +} diff --git a/TAO/tests/Param_Test/tests.h b/TAO/tests/Param_Test/tests.h index e45e7322d7c..a87eb464215 100644 --- a/TAO/tests/Param_Test/tests.h +++ b/TAO/tests/Param_Test/tests.h @@ -45,10 +45,11 @@ public: const char *opname (void) const; // return operation name - void init_parameters (void); + int init_parameters (Param_Test_ptr objref, + CORBA::Environment &env); // set values for parameters - void reset_parameters (void); + int reset_parameters (void); // reset values for CORBA CORBA::Boolean check_validity (void); @@ -101,10 +102,11 @@ public: const char *opname (void) const; // return operation name - void init_parameters (void); + int init_parameters (Param_Test_ptr objref, + CORBA::Environment &env); // set values for parameters - void reset_parameters (void); + int reset_parameters (void); // reset values for CORBA CORBA::Boolean check_validity (void); @@ -158,10 +160,11 @@ public: const char *opname (void) const; // return operation name - void init_parameters (void); + int init_parameters (Param_Test_ptr objref, + CORBA::Environment &env); // set values for parameters - void reset_parameters (void); + int reset_parameters (void); // reset values for CORBA CORBA::Boolean check_validity (void); @@ -215,10 +218,11 @@ public: const char *opname (void) const; // return operation name - void init_parameters (void); + int init_parameters (Param_Test_ptr objref, + CORBA::Environment &env); // set values for parameters - void reset_parameters (void); + int reset_parameters (void); // reset values for CORBA CORBA::Boolean check_validity (void); @@ -272,10 +276,11 @@ public: const char *opname (void) const; // return operation name - void init_parameters (void); + int init_parameters (Param_Test_ptr objref, + CORBA::Environment &env); // set values for parameters - void reset_parameters (void); + int reset_parameters (void); // reset values for CORBA CORBA::Boolean check_validity (void); @@ -330,10 +335,11 @@ public: const char *opname (void) const; // return operation name - void init_parameters (void); + int init_parameters (Param_Test_ptr objref, + CORBA::Environment &env); // set values for parameters - void reset_parameters (void); + int reset_parameters (void); // reset values for CORBA CORBA::Boolean check_validity (void); @@ -363,4 +369,61 @@ private: // return value }; +// =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=* +// test objrefs +// =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=* +class Test_ObjRef +{ +public: + Test_ObjRef (void); + // ctor + + ~Test_ObjRef (void); + // dtor + + int run_sii_test (Param_Test_ptr objref, + CORBA::Environment &env); + // run the SII test + + int add_args (CORBA::NVList_ptr &nvlist, + CORBA::NVList_ptr &retval, + CORBA::Environment &env); + // add args to NVList for DII + + const char *opname (void) const; + // return operation name + + int init_parameters (Param_Test_ptr objref, + CORBA::Environment &env); + // set values for parameters + + int reset_parameters (void); + // reset values for CORBA + + CORBA::Boolean check_validity (void); + // check if results are valid + + CORBA::Boolean check_validity (CORBA::Request_ptr req); + // check if results are valid. This is used for DII results + + void print_values (void); + // print all the values + +private: + char *opname_; + // operation name + + Coffee_var in_; + // in parameter + + Coffee_var inout_; + // inout parameter + + Coffee_var out_; + // out parameter + + Coffee_var ret_; + // return value +}; + #endif /* if !defined */ |