summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/face.yml1
-rw-r--r--.github/workflows/fuzz.yml1
-rw-r--r--.github/workflows/linux.yml1
-rw-r--r--.github/workflows/macosx.yml1
-rw-r--r--.github/workflows/windows.yml1
-rw-r--r--ACE/bin/MakeProjectCreator/templates/gnu.mpd1
-rw-r--r--TAO/MPC/config/tao_rules.mpb2
-rw-r--r--TAO/TAO_IDL/fe/fe_lookup.cpp112
-rw-r--r--TAO/TAO_IDL/fe/idl.tab.cpp1885
-rw-r--r--TAO/TAO_IDL/fe/idl.tab.hpp2
-rw-r--r--TAO/TAO_IDL/fe/idl.ypp13
-rw-r--r--TAO/TAO_IDL/fe/idl.yy.cpp160
12 files changed, 1102 insertions, 1078 deletions
diff --git a/.github/workflows/face.yml b/.github/workflows/face.yml
index 6248c205db1..85c31c45928 100644
--- a/.github/workflows/face.yml
+++ b/.github/workflows/face.yml
@@ -5,6 +5,7 @@ on:
pull_request:
schedule:
- cron: '0 1 * * SUN'
+ workflow_dispatch:
jobs:
build:
diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml
index 3d122e1baf3..0ea405916c4 100644
--- a/.github/workflows/fuzz.yml
+++ b/.github/workflows/fuzz.yml
@@ -5,6 +5,7 @@ on:
pull_request:
schedule:
- cron: '0 1 * * SUN'
+ workflow_dispatch:
jobs:
build:
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 506858c15e9..1764dd643b4 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -5,6 +5,7 @@ on:
pull_request:
schedule:
- cron: '0 1 * * SUN'
+ workflow_dispatch:
jobs:
build:
diff --git a/.github/workflows/macosx.yml b/.github/workflows/macosx.yml
index 014bece5fdd..43346a29f24 100644
--- a/.github/workflows/macosx.yml
+++ b/.github/workflows/macosx.yml
@@ -5,6 +5,7 @@ on:
pull_request:
schedule:
- cron: '0 1 * * SUN'
+ workflow_dispatch:
jobs:
build:
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index a54f30e3f18..2a00f397685 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -5,6 +5,7 @@ on:
pull_request:
schedule:
- cron: '0 1 * * SUN'
+ workflow_dispatch:
jobs:
msvc:
diff --git a/ACE/bin/MakeProjectCreator/templates/gnu.mpd b/ACE/bin/MakeProjectCreator/templates/gnu.mpd
index 2cf1998133a..9b7180b953a 100644
--- a/ACE/bin/MakeProjectCreator/templates/gnu.mpd
+++ b/ACE/bin/MakeProjectCreator/templates/gnu.mpd
@@ -200,6 +200,7 @@ VSHDIR = <%targetoutdir%>.shobj/
include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
<%marker(extension)%>
+<%marker(deferred-extension)%>
<%if(version)%>
GNUACE_PROJECT_VERSION = <%version%>
diff --git a/TAO/MPC/config/tao_rules.mpb b/TAO/MPC/config/tao_rules.mpb
index e052c156cea..0f8043dc8c4 100644
--- a/TAO/MPC/config/tao_rules.mpb
+++ b/TAO/MPC/config/tao_rules.mpb
@@ -1,5 +1,5 @@
project {
- verbatim(gnuace, extension, 1) {
+ verbatim(gnuace, deferred-extension, 1) {
include $(TAO_ROOT)/rules.tao.GNU
}
}
diff --git a/TAO/TAO_IDL/fe/fe_lookup.cpp b/TAO/TAO_IDL/fe/fe_lookup.cpp
index 2756a6bd529..9a130541e72 100644
--- a/TAO/TAO_IDL/fe/fe_lookup.cpp
+++ b/TAO/TAO_IDL/fe/fe_lookup.cpp
@@ -43,134 +43,134 @@ TAO_IDL_CPP_Keyword_Table::lookup (const char *str, unsigned int len)
static const struct TAO_IDL_CPP_Keyword_Entry wordlist[] =
{
- {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
+ {"",0},{"",0},{"",0},{"",0},{"",0},{"",0},
{"delete", "_cxx_delete"},
{"mutable", "_cxx_mutable"},
- {"",nullptr},
+ {"",0},
{"enum", "_cxx_enum"},
- {"",nullptr},
+ {"",0},
{"double", "_cxx_double"},
{"do", "_cxx_do"},
{"unsigned", "_cxx_unsigned"},
- {"",nullptr},
+ {"",0},
{"union", "_cxx_union"},
- {"",nullptr},{"",nullptr},{"",nullptr},
+ {"",0},{"",0},{"",0},
{"goto", "_cxx_goto"},
- {"",nullptr},{"",nullptr},{"",nullptr},
+ {"",0},{"",0},{"",0},
{"and", "_cxx_and"},
{"auto", "_cxx_auto"},
- {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
+ {"",0},{"",0},{"",0},{"",0},
{"namespace", "_cxx_namespace"},
{"using", "_cxx_using"},
- {"",nullptr},{"",nullptr},{"",nullptr},
+ {"",0},{"",0},{"",0},
{"else", "_cxx_else"},
- {"",nullptr},{"",nullptr},{"",nullptr},
+ {"",0},{"",0},{"",0},
{"asm", "_cxx_asm"},
- {"",nullptr},
+ {"",0},
{"while", "_cxx_while"},
- {"",nullptr},{"",nullptr},
+ {"",0},{"",0},
{"new", "_cxx_new"},
{"long", "_cxx_long"},
- {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
+ {"",0},{"",0},{"",0},{"",0},{"",0},{"",0},
{"return", "_cxx_return"},
- {"",nullptr},{"",nullptr},
+ {"",0},{"",0},
{"void", "_cxx_void"},
{"false", "_cxx_false"},
- {"",nullptr},{"",nullptr},
+ {"",0},{"",0},
{"volatile", "_cxx_volatile"},
- {"",nullptr},{"",nullptr},
+ {"",0},{"",0},
{"switch", "_cxx_switch"},
- {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
+ {"",0},{"",0},{"",0},{"",0},
{"not_eq", "_cxx_not_eq"},
{"private", "_cxx_private"},
- {"",nullptr},
+ {"",0},
{"protected", "_cxx_protected"},
- {"",nullptr},
+ {"",0},
{"inline", "_cxx_inline"},
- {"",nullptr},
+ {"",0},
{"operator", "_cxx_operator"},
{"bool", "_cxx_bool"},
- {"",nullptr},
+ {"",0},
{"and_eq", "_cxx_and_eq"},
- {"",nullptr},
+ {"",0},
{"continue", "_cxx_continue"},
- {"",nullptr},
+ {"",0},
{"break", "_cxx_break"},
{"friend", "_cxx_friend"},
- {"",nullptr},
+ {"",0},
{"for", "_cxx_for"},
{"case", "_cxx_case"},
{"catch", "_cxx_catch"},
{"signed", "_cxx_signed"},
{"or", "_cxx_or"},
{"register", "_cxx_register"},
- {"",nullptr},{"",nullptr},
+ {"",0},{"",0},
{"public", "_cxx_public"},
- {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
+ {"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},
{"or_eq", "_cxx_or_eq"},
{"bitand", "_cxx_bitand"},
- {"",nullptr},{"",nullptr},{"",nullptr},
+ {"",0},{"",0},{"",0},
{"compl", "_cxx_compl"},
{"extern", "_cxx_extern"},
- {"",nullptr},{"",nullptr},
+ {"",0},{"",0},
{"char", "_cxx_char"},
- {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
+ {"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},
{"default", "_cxx_default"},
{"template", "_cxx_template"},
- {"",nullptr},
+ {"",0},
{"class", "_cxx_class"},
{"sizeof", "_cxx_sizeof"},
- {"",nullptr},
+ {"",0},
{"not", "_cxx_not"},
- {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
+ {"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},
{"if", "_cxx_if"},
- {"",nullptr},
+ {"",0},
{"this", "_cxx_this"},
{"short", "_cxx_short"},
- {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
+ {"",0},{"",0},{"",0},{"",0},
{"bitor", "_cxx_bitor"},
- {"",nullptr},
+ {"",0},
{"virtual", "_cxx_virtual"},
{"xor", "_cxx_xor"},
- {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
+ {"",0},{"",0},{"",0},{"",0},{"",0},{"",0},
{"throw", "_cxx_throw"},
- {"",nullptr},{"",nullptr},{"",nullptr},
+ {"",0},{"",0},{"",0},
{"true", "_cxx_true"},
- {"",nullptr},
+ {"",0},
{"xor_eq", "_cxx_xor_eq"},
- {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
+ {"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},
{"reinterpret_cast", "_cxx_reinterpret_cast"},
- {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
+ {"",0},{"",0},{"",0},{"",0},
{"typeid", "_cxx_typeid"},
- {"",nullptr},
+ {"",0},
{"typename", "_cxx_typename"},
- {"",nullptr},{"",nullptr},{"",nullptr},
+ {"",0},{"",0},{"",0},
{"dynamic_cast", "_cxx_dynamic_cast"},
{"int", "_cxx_int"},
- {"",nullptr},
+ {"",0},
{"float", "_cxx_float"},
- {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
+ {"",0},{"",0},{"",0},{"",0},
{"const", "_cxx_const"},
- {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
+ {"",0},{"",0},{"",0},{"",0},
{"const_cast", "_cxx_const_cast"},
- {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
- {"",nullptr},
+ {"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},
+ {"",0},
{"static", "_cxx_static"},
- {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
+ {"",0},{"",0},{"",0},{"",0},{"",0},
{"typedef", "_cxx_typedef"},
{"try", "_cxx_try"},
- {"",nullptr},{"",nullptr},
+ {"",0},{"",0},
{"export", "_cxx_export"},
- {"",nullptr},
+ {"",0},
{"explicit", "_cxx_explicit"},
- {"",nullptr},{"",nullptr},{"",nullptr},
+ {"",0},{"",0},{"",0},
{"wchar_t", "_cxx_wchar_t"},
- {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
- {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
- {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
- {"",nullptr},
+ {"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},
+ {"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},
+ {"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},
+ {"",0},
{"struct", "_cxx_struct"},
- {"",nullptr},{"",nullptr},{"",nullptr},{"",nullptr},
+ {"",0},{"",0},{"",0},{"",0},
{"static_cast", "_cxx_static_cast"},
};
@@ -186,5 +186,5 @@ TAO_IDL_CPP_Keyword_Table::lookup (const char *str, unsigned int len)
return &wordlist[key];
}
}
- return nullptr;
+ return 0;
}
diff --git a/TAO/TAO_IDL/fe/idl.tab.cpp b/TAO/TAO_IDL/fe/idl.tab.cpp
index f87f408f96f..2b4b8a4258a 100644
--- a/TAO/TAO_IDL/fe/idl.tab.cpp
+++ b/TAO/TAO_IDL/fe/idl.tab.cpp
@@ -146,14 +146,14 @@
#include <fe_utils.h>
void tao_yyerror (const char *);
-int tao_yylex ();
+int tao_yylex (void);
extern "C" int tao_yywrap (void);
extern char tao_yytext[];
extern int tao_yyleng;
-AST_Enum *tao_enum_constant_decl = nullptr;
-AST_String *tao_string_decl = nullptr;
+AST_Enum *tao_enum_constant_decl = 0;
+AST_String *tao_string_decl = 0;
AST_Expression::ExprType t_param_const_type = AST_Expression::EV_none;
bool stack_based_lookup_for_primary_expr = false;
@@ -354,7 +354,7 @@ typedef union YYSTYPE YYSTYPE;
extern YYSTYPE tao_yylval;
-int tao_yyparse ();
+int tao_yyparse (void);
#endif /* !YY_TAO_YY_FE_IDL_TAB_HPP_INCLUDED */
/* Symbol kind. */
@@ -1279,30 +1279,30 @@ static const yytype_int16 yyrline[] =
3618, 3639, 3638, 3688, 3713, 3737, 3741, 3772, 3776, 3736,
3800, 3805, 3803, 3809, 3813, 3853, 3857, 3851, 3941, 4008,
4017, 4007, 4031, 4041, 4045, 4039, 4087, 4113, 4122, 4126,
- 4120, 4159, 4185, 4193, 4192, 4235, 4245, 4263, 4271, 4275,
- 4270, 4335, 4336, 4341, 4345, 4349, 4353, 4340, 4412, 4416,
- 4420, 4424, 4411, 4492, 4496, 4528, 4532, 4491, 4549, 4553,
- 4614, 4618, 4548, 4655, 4660, 4665, 4672, 4673, 4684, 4689,
- 4732, 4683, 4754, 4753, 4762, 4761, 4772, 4777, 4775, 4781,
- 4786, 4790, 4785, 4829, 4828, 4837, 4836, 4847, 4852, 4850,
- 4856, 4861, 4865, 4860, 4910, 4917, 4918, 4919, 5026, 5030,
- 5034, 5042, 5046, 5041, 5055, 5063, 5067, 5062, 5076, 5084,
- 5088, 5083, 5097, 5105, 5109, 5104, 5118, 5125, 5137, 5135,
- 5158, 5165, 5195, 5234, 5235, 5239, 5270, 5312, 5316, 5269,
- 5335, 5339, 5333, 5380, 5379, 5387, 5394, 5409, 5410, 5415,
- 5414, 5424, 5423, 5433, 5432, 5442, 5441, 5451, 5450, 5460,
- 5459, 5469, 5468, 5479, 5572, 5578, 5603, 5710, 5719, 5723,
- 5730, 5805, 5877, 5953, 5952, 6002, 6006, 6010, 6014, 6018,
- 6022, 6001, 6075, 6074, 6082, 6089, 6094, 6102, 6106, 6101,
- 6116, 6117, 6121, 6123, 6122, 6131, 6130, 6143, 6166, 6141,
- 6192, 6219, 6190, 6243, 6244, 6245, 6249, 6250, 6254, 6283,
- 6315, 6359, 6363, 6313, 6380, 6389, 6407, 6418, 6417, 6455,
- 6506, 6510, 6453, 6527, 6531, 6538, 6542, 6546, 6550, 6554,
- 6558, 6562, 6566, 6570, 6574, 6582, 6613, 6626, 6633, 6658,
- 6676, 6683, 6698, 6705, 6715, 6719, 6738, 6746, 6714, 6761,
- 6776, 6780, 6781, 6785, 6786, 6788, 6787, 6798, 6865, 6913,
- 6929, 6942, 6949, 7008, 7016, 7020, 7015, 7081, 7085, 7080,
- 7098, 7099, 7104, 7103, 7112, 7111, 7120, 7119, 7128, 7127
+ 4120, 4168, 4194, 4202, 4201, 4244, 4254, 4272, 4280, 4284,
+ 4279, 4344, 4345, 4350, 4354, 4358, 4362, 4349, 4421, 4425,
+ 4429, 4433, 4420, 4501, 4505, 4537, 4541, 4500, 4558, 4562,
+ 4623, 4627, 4557, 4664, 4669, 4674, 4681, 4682, 4693, 4698,
+ 4741, 4692, 4763, 4762, 4771, 4770, 4781, 4786, 4784, 4790,
+ 4795, 4799, 4794, 4838, 4837, 4846, 4845, 4856, 4861, 4859,
+ 4865, 4870, 4874, 4869, 4919, 4926, 4927, 4928, 5035, 5039,
+ 5043, 5051, 5055, 5050, 5064, 5072, 5076, 5071, 5085, 5093,
+ 5097, 5092, 5106, 5114, 5118, 5113, 5127, 5134, 5146, 5144,
+ 5167, 5174, 5204, 5243, 5244, 5248, 5279, 5321, 5325, 5278,
+ 5344, 5348, 5342, 5389, 5388, 5396, 5403, 5418, 5419, 5424,
+ 5423, 5433, 5432, 5442, 5441, 5451, 5450, 5460, 5459, 5469,
+ 5468, 5478, 5477, 5488, 5581, 5587, 5612, 5719, 5728, 5732,
+ 5739, 5814, 5886, 5962, 5961, 6011, 6015, 6019, 6023, 6027,
+ 6031, 6010, 6084, 6083, 6091, 6098, 6103, 6111, 6115, 6110,
+ 6125, 6126, 6130, 6132, 6131, 6140, 6139, 6152, 6175, 6150,
+ 6201, 6228, 6199, 6252, 6253, 6254, 6258, 6259, 6263, 6292,
+ 6324, 6368, 6372, 6322, 6389, 6398, 6416, 6427, 6426, 6464,
+ 6515, 6519, 6462, 6536, 6540, 6547, 6551, 6555, 6559, 6563,
+ 6567, 6571, 6575, 6579, 6583, 6591, 6622, 6635, 6642, 6667,
+ 6685, 6692, 6707, 6714, 6724, 6728, 6747, 6755, 6723, 6770,
+ 6785, 6789, 6790, 6794, 6795, 6797, 6796, 6807, 6874, 6922,
+ 6938, 6951, 6958, 7017, 7025, 7029, 7024, 7090, 7094, 7089,
+ 7107, 7108, 7113, 7112, 7121, 7120, 7129, 7128, 7137, 7136
};
#endif
@@ -2530,7 +2530,7 @@ int yynerrs;
`----------*/
int
-yyparse ()
+yyparse (void)
{
yy_state_fast_t yystate;
/* Number of tokens to shift before error messages enabled. */
@@ -3038,7 +3038,7 @@ yyreduce:
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
yyerrok;
- (yyval.dcval) = nullptr;
+ (yyval.dcval) = 0;
}
#line 3044 "fe/idl.tab.cpp"
break;
@@ -3076,13 +3076,13 @@ yyreduce:
IDL_GlobalData::PS_ModuleIDSeen);
}
- AST_Module *m = nullptr;
+ AST_Module *m = 0;
UTL_Scope *s = idl_global->scopes ().top_non_null ();
/*
* Make a new module and add it to the enclosing scope
*/
- if (s != nullptr)
+ if (s != 0)
{
m = idl_global->gen ()->create_module (s, (yyvsp[0].idlist));
(void) s->fe_add_module (m);
@@ -3090,7 +3090,7 @@ yyreduce:
(yyvsp[0].idlist)->destroy ();
delete (yyvsp[0].idlist);
- (yyvsp[0].idlist) = nullptr;
+ (yyvsp[0].idlist) = 0;
/*
* Push it on the stack
@@ -3186,7 +3186,7 @@ yyreduce:
// We've probably tried to reopen a template module,
// going further will cause a crash.
- if (m == nullptr)
+ if (m == 0)
{
return 1;
}
@@ -3238,9 +3238,9 @@ yyreduce:
// Clear the pointer so scoped name lookup will know
// that we are no longer in a template module scope.
- idl_global->current_params (nullptr);
+ idl_global->current_params (0);
- (yyval.dcval) = nullptr;
+ (yyval.dcval) = 0;
}
#line 3246 "fe/idl.tab.cpp"
break;
@@ -3273,7 +3273,7 @@ yyreduce:
AST_Decl *d =
s->lookup_by_name ((yyvsp[-6].idlist));
- if (d == nullptr)
+ if (d == 0)
{
idl_global->err ()->lookup_error ((yyvsp[-6].idlist));
return 1;
@@ -3282,7 +3282,7 @@ yyreduce:
AST_Template_Module *ref =
dynamic_cast<AST_Template_Module*> (d);
- if (ref == nullptr)
+ if (ref == 0)
{
idl_global->err ()->template_module_expected (d);
return 1;
@@ -3298,7 +3298,7 @@ yyreduce:
return 1;
}
- UTL_ScopedName sn ((yyvsp[0].idval), nullptr);
+ UTL_ScopedName sn ((yyvsp[0].idval), 0);
AST_Template_Module_Ref *tmr =
idl_global->gen ()->create_template_module_ref (
@@ -3311,7 +3311,7 @@ yyreduce:
sn.destroy ();
(yyvsp[-6].idlist)->destroy ();
delete (yyvsp[-6].idlist);
- (yyvsp[-6].idlist) = nullptr;
+ (yyvsp[-6].idlist) = 0;
// Save the current flag value to be restored below.
bool itmna_flag = idl_global->in_tmpl_mod_no_alias ();
@@ -3371,10 +3371,10 @@ yyreduce:
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName *sn = (yyvsp[-5].idlist);
- AST_Template_Module *ref = nullptr;
+ AST_Template_Module *ref = 0;
AST_Decl *d = s->lookup_by_name (sn);
- if (d == nullptr)
+ if (d == 0)
{
idl_global->err ()->lookup_error (sn);
return 1;
@@ -3383,7 +3383,7 @@ yyreduce:
{
ref = dynamic_cast<AST_Template_Module*> (d);
- if (ref == nullptr)
+ if (ref == 0)
{
idl_global->err ()->template_module_expected (d);
return 1;
@@ -3392,8 +3392,8 @@ yyreduce:
sn->destroy ();
delete sn;
- sn = nullptr;
- (yyvsp[-5].idlist) = nullptr;
+ sn = 0;
+ (yyvsp[-5].idlist) = 0;
if (! ref->match_arg_names ((yyvsp[-3].alval)))
{
@@ -3402,7 +3402,7 @@ yyreduce:
ACE_NEW_RETURN (sn,
UTL_ScopedName ((yyvsp[0].idval),
- nullptr),
+ 0),
1);
AST_Template_Module_Inst *tmi =
@@ -3426,7 +3426,7 @@ yyreduce:
idl_global->set_err_count (idl_global->err_count () + 1);
}
- (yyval.dcval) = nullptr;
+ (yyval.dcval) = 0;
}
#line 3432 "fe/idl.tab.cpp"
break;
@@ -3435,10 +3435,10 @@ yyreduce:
#line 916 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
- AST_Interface *i = nullptr;
+ AST_Interface *i = 0;
FE_InterfaceHeader *header = (yyvsp[0].ihval);
- (yyvsp[0].ihval) = nullptr;
+ (yyvsp[0].ihval) = 0;
/*
* Make a new interface node and add it to its enclosing scope.
@@ -3525,7 +3525,7 @@ yyreduce:
{
idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen);
- if ((yyvsp[0].nlval) != nullptr && (yyvsp[0].nlval)->truncatable ())
+ if ((yyvsp[0].nlval) != 0 && (yyvsp[0].nlval)->truncatable ())
{
idl_global->err ()->syntax_error (
IDL_GlobalData::PS_InheritColonSeen
@@ -3538,9 +3538,9 @@ yyreduce:
* list of all interfaces which this interface inherits from,
* recursively
*/
- UTL_ScopedName *n = nullptr;
+ UTL_ScopedName *n = 0;
ACE_NEW_RETURN (n,
- UTL_ScopedName ((yyvsp[-1].idval), nullptr),
+ UTL_ScopedName ((yyvsp[-1].idval), 0),
1);
ACE_NEW_RETURN ((yyval.ihval),
FE_InterfaceHeader (n,
@@ -3550,11 +3550,11 @@ yyreduce:
true),
1);
- if (nullptr != (yyvsp[0].nlval))
+ if (0 != (yyvsp[0].nlval))
{
(yyvsp[0].nlval)->destroy ();
delete (yyvsp[0].nlval);
- (yyvsp[0].nlval) = nullptr;
+ (yyvsp[0].nlval) = 0;
}
}
#line 3561 "fe/idl.tab.cpp"
@@ -3571,9 +3571,9 @@ yyreduce:
* list of all interfaces which this interface inherits from,
* recursively
*/
- UTL_ScopedName *n = nullptr;
+ UTL_ScopedName *n = 0;
ACE_NEW_RETURN (n,
- UTL_ScopedName ((yyvsp[-1].idval), nullptr),
+ UTL_ScopedName ((yyvsp[-1].idval), 0),
1);
ACE_NEW_RETURN ((yyval.ihval),
FE_InterfaceHeader (n,
@@ -3583,11 +3583,11 @@ yyreduce:
true),
1);
- if (nullptr != (yyvsp[0].nlval))
+ if (0 != (yyvsp[0].nlval))
{
(yyvsp[0].nlval)->destroy ();
delete (yyvsp[0].nlval);
- (yyvsp[0].nlval) = nullptr;
+ (yyvsp[0].nlval) = 0;
}
}
#line 3594 "fe/idl.tab.cpp"
@@ -3604,9 +3604,9 @@ yyreduce:
* list of all interfaces which this interface inherits from,
* recursively
*/
- UTL_ScopedName *n = nullptr;
+ UTL_ScopedName *n = 0;
ACE_NEW_RETURN (n,
- UTL_ScopedName ((yyvsp[-1].idval), nullptr),
+ UTL_ScopedName ((yyvsp[-1].idval), 0),
1);
ACE_NEW_RETURN ((yyval.ihval),
FE_InterfaceHeader (n,
@@ -3616,11 +3616,11 @@ yyreduce:
true),
1);
- if (nullptr != (yyvsp[0].nlval))
+ if (0 != (yyvsp[0].nlval))
{
(yyvsp[0].nlval)->destroy ();
delete (yyvsp[0].nlval);
- (yyvsp[0].nlval) = nullptr;
+ (yyvsp[0].nlval) = 0;
}
}
#line 3627 "fe/idl.tab.cpp"
@@ -3646,7 +3646,7 @@ yyreduce:
case 77:
#line 1095 "fe/idl.ypp"
{
- (yyval.nlval) = nullptr;
+ (yyval.nlval) = 0;
}
#line 3652 "fe/idl.tab.cpp"
break;
@@ -3665,7 +3665,7 @@ yyreduce:
{
FE_OBVHeader *&valuetype_header = (yyvsp[0].vhval);
UTL_Scope *scope = idl_global->scopes ().top_non_null ();
- AST_ValueType *valuetype = nullptr;
+ AST_ValueType *valuetype = 0;
if (scope && valuetype_header)
{
@@ -3698,7 +3698,7 @@ yyreduce:
// FE_OBVHeader is not automatically destroyed in the AST
valuetype_header->destroy ();
delete valuetype_header;
- valuetype_header = nullptr;
+ valuetype_header = 0;
}
/*
@@ -3737,7 +3737,7 @@ yyreduce:
idl_global->scopes ().top_non_null ()
);
- if (vt != nullptr && vt->will_have_factory ())
+ if (vt != 0 && vt->will_have_factory ())
{
idl_global->valuefactory_seen_ = true;
}
@@ -3756,10 +3756,10 @@ yyreduce:
#line 1198 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
- AST_ValueType *v = nullptr;
- AST_Interface *i = nullptr;
+ AST_ValueType *v = 0;
+ AST_Interface *i = 0;
- if (s != nullptr && (yyvsp[0].vhval) != nullptr)
+ if (s != 0 && (yyvsp[0].vhval) != 0)
{
v =
idl_global->gen ()->create_valuetype (
@@ -3788,7 +3788,7 @@ yyreduce:
// FE_OBVHeader is not automatically destroyed in the AST
(yyvsp[0].vhval)->destroy ();
delete (yyvsp[0].vhval);
- (yyvsp[0].vhval) = nullptr;
+ (yyvsp[0].vhval) = 0;
}
/*
@@ -3825,7 +3825,7 @@ yyreduce:
*/
idl_global->scopes ().pop ();
- (yyval.dcval) = nullptr;
+ (yyval.dcval) = 0;
}
#line 3831 "fe/idl.tab.cpp"
break;
@@ -3843,31 +3843,31 @@ yyreduce:
{
idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen);
- UTL_ScopedName *sn = nullptr;
+ UTL_ScopedName *sn = 0;
ACE_NEW_RETURN (sn,
- UTL_ScopedName ((yyvsp[-3].idval), nullptr),
+ UTL_ScopedName ((yyvsp[-3].idval), 0),
1);
ACE_NEW_RETURN ((yyval.vhval),
FE_OBVHeader (sn,
(yyvsp[-2].nlval),
(yyvsp[0].nlval),
- ((yyvsp[-2].nlval) != nullptr
+ ((yyvsp[-2].nlval) != 0
? (yyvsp[-2].nlval)->truncatable ()
: false)),
1);
- if (nullptr != (yyvsp[0].nlval))
+ if (0 != (yyvsp[0].nlval))
{
(yyvsp[0].nlval)->destroy ();
delete (yyvsp[0].nlval);
- (yyvsp[0].nlval) = nullptr;
+ (yyvsp[0].nlval) = 0;
}
- if (nullptr != (yyvsp[-2].nlval))
+ if (0 != (yyvsp[-2].nlval))
{
(yyvsp[-2].nlval)->destroy ();
delete (yyvsp[-2].nlval);
- (yyvsp[-2].nlval) = nullptr;
+ (yyvsp[-2].nlval) = 0;
}
}
#line 3874 "fe/idl.tab.cpp"
@@ -3917,7 +3917,7 @@ yyreduce:
case 99:
#line 1330 "fe/idl.ypp"
{
- (yyval.nlval) = nullptr;
+ (yyval.nlval) = 0;
}
#line 3923 "fe/idl.tab.cpp"
break;
@@ -3927,15 +3927,15 @@ yyreduce:
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval),
- nullptr);
- AST_ValueTypeFwd *f = nullptr;
+ 0);
+ AST_ValueTypeFwd *f = 0;
idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeForwardSeen);
/*
* Create a node representing a forward declaration of an
* valuetype. Store it in the enclosing scope
*/
- if (s != nullptr)
+ if (s != 0)
{
f = idl_global->gen ()->create_valuetype_fwd (&n,
true);
@@ -3944,7 +3944,7 @@ yyreduce:
(yyvsp[0].idval)->destroy ();
delete (yyvsp[0].idval);
- (yyvsp[0].idval) = nullptr;
+ (yyvsp[0].idval) = 0;
}
#line 3950 "fe/idl.tab.cpp"
break;
@@ -3954,15 +3954,15 @@ yyreduce:
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval),
- nullptr);
- AST_ValueTypeFwd *f = nullptr;
+ 0);
+ AST_ValueTypeFwd *f = 0;
idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeForwardSeen);
/*
* Create a node representing a forward declaration of an
* valuetype. Store it in the enclosing scope
*/
- if (s != nullptr)
+ if (s != 0)
{
f = idl_global->gen ()->create_valuetype_fwd (&n,
false);
@@ -3971,9 +3971,9 @@ yyreduce:
(yyvsp[0].idval)->destroy ();
delete (yyvsp[0].idval);
- (yyvsp[0].idval) = nullptr;
+ (yyvsp[0].idval) = 0;
- (yyval.dcval) = nullptr;
+ (yyval.dcval) = 0;
}
#line 3979 "fe/idl.tab.cpp"
break;
@@ -3985,18 +3985,18 @@ yyreduce:
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[-1].idval),
- nullptr);
+ 0);
- if (s != nullptr && (yyvsp[0].dcval) != nullptr)
+ if (s != 0 && (yyvsp[0].dcval) != 0)
{
/*
* Get the type_spec associated with the valuebox
*/
- AST_Type *tp = nullptr;
+ AST_Type *tp = 0;
AST_Typedef *td
= dynamic_cast<AST_Typedef*> ((yyvsp[0].dcval));
- if (td == nullptr)
+ if (td == 0)
{
tp = dynamic_cast<AST_Type*> ((yyvsp[0].dcval));
}
@@ -4005,7 +4005,7 @@ yyreduce:
tp = td->primitive_base_type ();
}
- if (tp == nullptr)
+ if (tp == 0)
{
// The <type_spec> given is a valid type
idl_global->err ()->not_a_type ((yyvsp[0].dcval));
@@ -4038,9 +4038,9 @@ yyreduce:
(yyvsp[-1].idval)->destroy ();
delete (yyvsp[-1].idval);
- (yyvsp[-1].idval) = nullptr;
+ (yyvsp[-1].idval) = 0;
- (yyval.dcval) = nullptr;
+ (yyval.dcval) = 0;
}
#line 4046 "fe/idl.tab.cpp"
break;
@@ -4080,7 +4080,7 @@ yyreduce:
#line 1484 "fe/idl.ypp"
{
AST_Decl *&node = (yyvsp[0].dcval);
- AST_Decls *value = nullptr;
+ AST_Decls *value = 0;
if (node)
{
value = new AST_Decls;
@@ -4095,7 +4095,7 @@ yyreduce:
#line 1495 "fe/idl.ypp"
{
AST_Decl *&node = (yyvsp[0].dcval);
- AST_Decls *value = nullptr;
+ AST_Decls *value = 0;
if (node)
{
value = new AST_Decls;
@@ -4296,7 +4296,7 @@ yyreduce:
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
yyerrok;
- (yyval.dcval) = nullptr;
+ (yyval.dcval) = 0;
}
#line 4302 "fe/idl.tab.cpp"
break;
@@ -4325,13 +4325,13 @@ yyreduce:
{
idl_global->set_parse_state (IDL_GlobalData::PS_ScopedNameSeen);
- UTL_NameList *nl = nullptr;
+ UTL_NameList *nl = 0;
ACE_NEW_RETURN (nl,
UTL_NameList ((yyvsp[0].idlist),
- nullptr),
+ 0),
1);
- if ((yyvsp[-3].nlval) == nullptr)
+ if ((yyvsp[-3].nlval) == 0)
{
(yyval.nlval) = nl;
}
@@ -4347,7 +4347,7 @@ yyreduce:
case 136:
#line 1673 "fe/idl.ypp"
{
- (yyval.nlval) = nullptr;
+ (yyval.nlval) = 0;
}
#line 4353 "fe/idl.tab.cpp"
break;
@@ -4359,7 +4359,7 @@ yyreduce:
ACE_NEW_RETURN ((yyval.idlist),
UTL_IdList ((yyvsp[0].idval),
- nullptr),
+ 0),
1);
}
#line 4366 "fe/idl.tab.cpp"
@@ -4378,16 +4378,16 @@ yyreduce:
{
idl_global->set_parse_state (IDL_GlobalData::PS_SN_IDSeen);
- Identifier *id = nullptr;
+ Identifier *id = 0;
ACE_NEW_RETURN (id,
Identifier ((yyvsp[-2].strval)),
1);
ACE::strdelete ((yyvsp[-2].strval));
- (yyvsp[-2].strval) = nullptr;
- UTL_IdList *sn = nullptr;
+ (yyvsp[-2].strval) = 0;
+ UTL_IdList *sn = 0;
ACE_NEW_RETURN (sn,
UTL_IdList ((yyvsp[0].idval),
- nullptr),
+ 0),
1);
ACE_NEW_RETURN ((yyval.idlist),
UTL_IdList (id,
@@ -4406,7 +4406,7 @@ yyreduce:
// If there is a global one, it gets put into the UTL_IdList,
// so we clean it up in the case above.
ACE::strdelete ((yyvsp[0].strval));
- (yyvsp[0].strval) = nullptr;
+ (yyvsp[0].strval) = 0;
}
#line 4412 "fe/idl.tab.cpp"
break;
@@ -4416,10 +4416,10 @@ yyreduce:
{
idl_global->set_parse_state (IDL_GlobalData::PS_SN_IDSeen);
- UTL_IdList *sn = nullptr;
+ UTL_IdList *sn = 0;
ACE_NEW_RETURN (sn,
UTL_IdList ((yyvsp[0].idval),
- nullptr),
+ 0),
1);
(yyvsp[-3].idlist)->nconc (sn);
(yyval.idlist) = (yyvsp[-3].idlist);
@@ -4434,7 +4434,7 @@ yyreduce:
Identifier ((yyvsp[0].strval)),
1);
ACE::strdelete ((yyvsp[0].strval));
- (yyvsp[0].strval) = nullptr;
+ (yyvsp[0].strval) = 0;
}
#line 4440 "fe/idl.tab.cpp"
break;
@@ -4446,7 +4446,7 @@ yyreduce:
whereas id is usually a reference to a defining identifier */
ACE_NEW_RETURN ((yyval.idval), Identifier ((yyvsp[0].strval)), 1);
ACE::strdelete ((yyvsp[0].strval));
- (yyvsp[0].strval) = nullptr;
+ (yyvsp[0].strval) = 0;
}
#line 4452 "fe/idl.tab.cpp"
break;
@@ -4455,7 +4455,7 @@ yyreduce:
#line 1759 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
- UTL_ScopedName n ((yyvsp[0].idval), nullptr);
+ UTL_ScopedName n ((yyvsp[0].idval), 0);
if (ACE_OS::strcmp ((yyvsp[0].idval)->get_string (),
"TypeCode") == 0
@@ -4471,29 +4471,29 @@ yyreduce:
(yyvsp[0].idval)->destroy ();
delete (yyvsp[0].idval);
- (yyvsp[0].idval) = nullptr;
+ (yyvsp[0].idval) = 0;
break;
}
- AST_InterfaceFwd *f = nullptr;
+ AST_InterfaceFwd *f = 0;
idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceForwardSeen);
/*
* Create a node representing a forward declaration of an
* interface. Store it in the enclosing scope
*/
- if (s != nullptr)
+ if (s != 0)
{
f = idl_global->gen ()->create_interface_fwd (&n,
- false,
- false);
+ 0,
+ 0);
(void) s->fe_add_interface_fwd (f);
}
(yyvsp[0].idval)->destroy ();
delete (yyvsp[0].idval);
- (yyvsp[0].idval) = nullptr;
+ (yyvsp[0].idval) = 0;
}
#line 4499 "fe/idl.tab.cpp"
break;
@@ -4503,8 +4503,8 @@ yyreduce:
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval),
- nullptr);
- AST_InterfaceFwd *f = nullptr;
+ 0);
+ AST_InterfaceFwd *f = 0;
idl_global->set_parse_state (
IDL_GlobalData::PS_InterfaceForwardSeen
);
@@ -4513,17 +4513,17 @@ yyreduce:
* Create a node representing a forward declaration of an
* interface. Store it in the enclosing scope
*/
- if (s != nullptr)
+ if (s != 0)
{
f = idl_global->gen ()->create_interface_fwd (&n,
- true,
- false);
+ 1,
+ 0);
(void) s->fe_add_interface_fwd (f);
}
(yyvsp[0].idval)->destroy ();
delete (yyvsp[0].idval);
- (yyvsp[0].idval) = nullptr;
+ (yyvsp[0].idval) = 0;
}
#line 4529 "fe/idl.tab.cpp"
break;
@@ -4533,8 +4533,8 @@ yyreduce:
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval),
- nullptr);
- AST_InterfaceFwd *f = nullptr;
+ 0);
+ AST_InterfaceFwd *f = 0;
idl_global->set_parse_state (
IDL_GlobalData::PS_InterfaceForwardSeen
);
@@ -4543,17 +4543,17 @@ yyreduce:
* Create a node representing a forward declaration of an
* interface. Store it in the enclosing scope
*/
- if (s != nullptr)
+ if (s != 0)
{
f = idl_global->gen ()->create_interface_fwd (&n,
- false,
- true);
+ 0,
+ 1);
(void) s->fe_add_interface_fwd (f);
}
(yyvsp[0].idval)->destroy ();
delete (yyvsp[0].idval);
- (yyvsp[0].idval) = nullptr;
+ (yyvsp[0].idval) = 0;
(yyval.dcval) = dynamic_cast<AST_Decl *> (f);
}
@@ -4595,39 +4595,39 @@ yyreduce:
case 151:
#line 1877 "fe/idl.ypp"
{
- (yyval.dcval) = nullptr;
- UTL_ScopedName n ((yyvsp[-4].idval), nullptr);
+ (yyval.dcval) = 0;
+ UTL_ScopedName n ((yyvsp[-4].idval), 0);
UTL_Scope *s = idl_global->scopes ().top_non_null ();
- AST_Constant *c = nullptr;
+ AST_Constant *c = 0;
idl_global->set_parse_state (IDL_GlobalData::PS_ConstExprSeen);
/*
* Create a node representing a constant declaration. Store
* it in the enclosing scope.
*/
- if ((yyvsp[0].exval) != nullptr && s != nullptr)
+ if ((yyvsp[0].exval) != 0 && s != 0)
{
AST_Param_Holder *param_holder = (yyvsp[0].exval)->param_holder ();
AST_Expression::AST_ExprValue *result =
(yyvsp[0].exval)->check_and_coerce ((yyvsp[-6].etval), tao_enum_constant_decl);
- tao_enum_constant_decl = nullptr;
+ tao_enum_constant_decl = 0;
// If the expression is a template parameter place
// holder, 'result' will be 0, but it's ok.
- if (result == nullptr && param_holder == nullptr)
+ if (result == 0 && param_holder == 0)
{
idl_global->err ()->coercion_error ((yyvsp[0].exval), (yyvsp[-6].etval));
(yyvsp[0].exval)->destroy ();
delete (yyvsp[0].exval);
- (yyvsp[0].exval) = nullptr;
+ (yyvsp[0].exval) = 0;
}
else
{
AST_Expression::ExprType et = (yyvsp[-6].etval);
- if (param_holder != nullptr
+ if (param_holder != 0
&& et != param_holder->info ()->const_type_)
{
idl_global->err ()->mismatched_template_param (
@@ -4642,12 +4642,12 @@ yyreduce:
}
delete result;
- result = nullptr;
+ result = 0;
}
(yyvsp[-4].idval)->destroy ();
delete (yyvsp[-4].idval);
- (yyvsp[-4].idval) = nullptr;
+ (yyvsp[-4].idval) = 0;
}
#line 4653 "fe/idl.tab.cpp"
break;
@@ -4672,8 +4672,8 @@ yyreduce:
#line 1950 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
- AST_PredefinedType *c = nullptr;
- AST_Typedef *t = nullptr;
+ AST_PredefinedType *c = 0;
+ AST_Typedef *t = 0;
UTL_ScopedName *sn = (yyvsp[0].idlist);
/*
@@ -4683,7 +4683,7 @@ yyreduce:
AST_Decl *d =
s->lookup_by_name (sn);
- if (s != nullptr && d != nullptr)
+ if (s != 0 && d != 0)
{
/*
* Look through typedefs.
@@ -4692,7 +4692,7 @@ yyreduce:
{
t = dynamic_cast<AST_Typedef*> (d);
- if (t == nullptr)
+ if (t == 0)
{
break;
}
@@ -4732,8 +4732,8 @@ yyreduce:
sn->destroy ();
delete sn;
- sn = nullptr;
- (yyvsp[0].idlist) = nullptr;
+ sn = 0;
+ (yyvsp[0].idlist) = 0;
}
#line 4739 "fe/idl.tab.cpp"
break;
@@ -4875,7 +4875,7 @@ yyreduce:
idl_global->gen ()->create_expr (
AST_Expression::EC_u_plus,
(yyvsp[0].exval),
- nullptr
+ 0
);
}
#line 4882 "fe/idl.tab.cpp"
@@ -4888,7 +4888,7 @@ yyreduce:
idl_global->gen ()->create_expr (
AST_Expression::EC_u_minus,
(yyvsp[0].exval),
- nullptr
+ 0
);
}
#line 4895 "fe/idl.tab.cpp"
@@ -4901,7 +4901,7 @@ yyreduce:
idl_global->gen ()->create_expr (
AST_Expression::EC_bit_neg,
(yyvsp[0].exval),
- nullptr
+ 0
);
}
#line 4908 "fe/idl.tab.cpp"
@@ -4917,7 +4917,7 @@ yyreduce:
* but only when it is evaluated (such as when it is assigned
* as a constant value).
*/
- AST_Expression *expr = nullptr;
+ AST_Expression *expr = 0;
AST_Decl *node = stack_based_lookup_for_primary_expr ?
idl_global->scopes ().lookup_by_name (name) :
@@ -4963,7 +4963,7 @@ yyreduce:
(yyval.exval) = expr;
name->destroy ();
delete name;
- (yyvsp[0].idlist) = name = nullptr;
+ (yyvsp[0].idlist) = name = 0;
}
#line 4969 "fe/idl.tab.cpp"
break;
@@ -4999,7 +4999,7 @@ yyreduce:
(yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].sval));
(yyvsp[0].sval)->destroy ();
delete (yyvsp[0].sval);
- (yyvsp[0].sval) = nullptr;
+ (yyvsp[0].sval) = 0;
}
#line 5005 "fe/idl.tab.cpp"
break;
@@ -5010,7 +5010,7 @@ yyreduce:
char *wide_string = (yyvsp[0].wsval);
(yyval.exval) = idl_global->gen ()->create_expr (wide_string);
ACE_OS::free (wide_string);
- (yyvsp[0].wsval) = nullptr;
+ (yyvsp[0].wsval) = 0;
}
#line 5016 "fe/idl.tab.cpp"
break;
@@ -5076,7 +5076,7 @@ yyreduce:
* AST_Constant), the AST_ExprValue will probably not be set,
* but there's no need to check anyway
*/
- if (ev != nullptr)
+ if (ev != 0)
{
switch (ev->et)
{
@@ -5143,7 +5143,7 @@ yyreduce:
}
Identifier *id = (yyvsp[-1].idval);
- UTL_ScopedName name (id, nullptr);
+ UTL_ScopedName name (id, 0);
AST_Annotation_Decl::escape_name (&name);
AST_Annotation_Decl *annotation_decl = idl_global->gen ()->
create_annotation_decl (&name);
@@ -5162,7 +5162,7 @@ yyreduce:
id->destroy ();
delete id;
- (yyval.dcval) = nullptr;
+ (yyval.dcval) = 0;
}
#line 5168 "fe/idl.tab.cpp"
break;
@@ -5186,7 +5186,7 @@ yyreduce:
Identifier *name = (yyvsp[-2].idval);
// Annotation member names can't clash with C++ keywords
FE_Utils::original_local_name (name);
- UTL_ScopedName *scoped_name = new UTL_ScopedName (name, nullptr);
+ UTL_ScopedName *scoped_name = new UTL_ScopedName (name, 0);
AST_Expression *default_value = (yyvsp[-1].exval);
AST_Decl * type_obj;
@@ -5204,7 +5204,7 @@ yyreduce:
}
FE_Declarator *declarator = new FE_Declarator (
- scoped_name, FE_Declarator::FD_simple, nullptr);
+ scoped_name, FE_Declarator::FD_simple, 0);
AST_Annotation_Member *member = idl_global->gen ()->
create_annotation_member (
type, declarator->compose (type_obj), declarator->name ());
@@ -5218,7 +5218,7 @@ yyreduce:
// Check if types are compatible, else report error
AST_Expression::AST_ExprValue *result =
default_value->check_and_coerce (type, tao_enum_constant_decl);
- tao_enum_constant_decl = nullptr;
+ tao_enum_constant_decl = 0;
if (result)
{
member->value (default_value);
@@ -5244,7 +5244,7 @@ yyreduce:
case 210:
#line 2462 "fe/idl.ypp"
{
- (yyval.exval) = nullptr;
+ (yyval.exval) = 0;
}
#line 5250 "fe/idl.tab.cpp"
break;
@@ -5294,7 +5294,7 @@ yyreduce:
"Annotations are an IDL4 feature");
}
- AST_Annotation_Decl *decl = nullptr;
+ AST_Annotation_Decl *decl = 0;
UTL_ScopedName *name = (yyvsp[0].idlist);
AST_Annotation_Decl::escape_name (name);
@@ -5351,7 +5351,7 @@ yyreduce:
{
idl_global->ignore_lookup_errors_ = false;
stack_based_lookup_for_primary_expr = false;
- AST_Annotation_Appl *appl = nullptr;
+ AST_Annotation_Appl *appl = 0;
UTL_ScopedName *name = (yyvsp[-2].idlist);
AST_Annotation_Decl *decl = (yyvsp[-1].annotation_decl_val);
AST_Annotation_Appl::Params *params = (yyvsp[0].annotation_params_val);
@@ -5389,7 +5389,7 @@ yyreduce:
case 217:
#line 2591 "fe/idl.ypp"
{
- (yyval.annotation_params_val) = nullptr;
+ (yyval.annotation_params_val) = 0;
}
#line 5395 "fe/idl.tab.cpp"
break;
@@ -5399,7 +5399,7 @@ yyreduce:
{
AST_Annotation_Appl::Params *params = new AST_Annotation_Appl::Params;
AST_Annotation_Appl::Param *param = new AST_Annotation_Appl::Param;
- param->id = nullptr;
+ param->id = 0;
param->expr = (yyvsp[0].exval);
params->push (param);
(yyval.annotation_params_val) = params;
@@ -5501,14 +5501,14 @@ yyreduce:
#line 2668 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
- AST_Native *node = nullptr;
+ AST_Native *node = 0;
idl_global->set_parse_state (IDL_GlobalData::PS_NativeSeen);
/*
* Create a node representing a Native and add it to its
* enclosing scope
*/
- if (s != nullptr)
+ if (s != 0)
{
node =
idl_global->gen ()->create_native (
@@ -5522,9 +5522,9 @@ yyreduce:
(yyvsp[0].deval)->destroy ();
delete (yyvsp[0].deval);
- (yyvsp[0].deval) = nullptr;
+ (yyvsp[0].deval) = 0;
- (yyval.dcval) = nullptr;
+ (yyval.dcval) = 0;
}
#line 5530 "fe/idl.tab.cpp"
break;
@@ -5532,7 +5532,7 @@ yyreduce:
case 230:
#line 2696 "fe/idl.ypp"
{
- (yyval.dcval) = nullptr;
+ (yyval.dcval) = 0;
}
#line 5538 "fe/idl.tab.cpp"
break;
@@ -5552,8 +5552,8 @@ yyreduce:
UTL_DeclList *decls = (yyvsp[0].dlval);
UTL_Scope *s = idl_global->scopes ().top_non_null ();
- FE_Declarator *d = nullptr;
- AST_Typedef *t = nullptr;
+ FE_Declarator *d = 0;
+ AST_Typedef *t = 0;
unsigned long index = 0UL;
idl_global->set_parse_state (IDL_GlobalData::PS_DeclaratorsSeen);
@@ -5566,13 +5566,13 @@ yyreduce:
for (UTL_DecllistActiveIterator l (decls); !l.is_done (); l.next ())
{
d = l.item ();
- if (d == nullptr)
+ if (d == 0)
{
continue;
}
AST_Type *tp = d->compose (type_spec);
- if (tp == nullptr)
+ if (tp == 0)
{
continue;
}
@@ -5605,7 +5605,7 @@ yyreduce:
// This FE_Declarator class isn't destroyed with the AST.
decls->destroy ();
delete decls;
- (yyvsp[0].dlval) = decls = nullptr;
+ (yyvsp[0].dlval) = decls = 0;
}
(yyval.dcval) = t;
@@ -5628,15 +5628,15 @@ yyreduce:
#line 2787 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
- AST_Decl *d = nullptr;
+ AST_Decl *d = 0;
- if (s != nullptr)
+ if (s != 0)
{
d =
s->lookup_by_name ((yyvsp[0].idlist));
}
- if (d == nullptr)
+ if (d == 0)
{
idl_global->err ()->lookup_error ((yyvsp[0].idlist));
}
@@ -5675,13 +5675,13 @@ yyreduce:
{
idl_global->set_parse_state (IDL_GlobalData::PS_DeclsDeclSeen);
- UTL_DeclList *dl = nullptr;
+ UTL_DeclList *dl = 0;
ACE_NEW_RETURN (dl,
UTL_DeclList ((yyvsp[0].deval),
- nullptr),
+ 0),
1);
- if ((yyvsp[-3].dlval) == nullptr)
+ if ((yyvsp[-3].dlval) == 0)
{
(yyval.dlval) = dl;
}
@@ -5697,7 +5697,7 @@ yyreduce:
case 258:
#line 2877 "fe/idl.ypp"
{
- (yyval.dlval) = nullptr;
+ (yyval.dlval) = 0;
}
#line 5703 "fe/idl.tab.cpp"
break;
@@ -5726,13 +5726,13 @@ yyreduce:
{
idl_global->set_parse_state (IDL_GlobalData::PS_DeclsDeclSeen);
- UTL_DeclList *dl = nullptr;
+ UTL_DeclList *dl = 0;
ACE_NEW_RETURN (dl,
UTL_DeclList ((yyvsp[0].deval),
- nullptr),
+ 0),
1);
- if ((yyvsp[-3].dlval) == nullptr)
+ if ((yyvsp[-3].dlval) == 0)
{
(yyval.dlval) = dl;
}
@@ -5748,7 +5748,7 @@ yyreduce:
case 264:
#line 2924 "fe/idl.ypp"
{
- (yyval.dlval) = nullptr;
+ (yyval.dlval) = 0;
}
#line 5754 "fe/idl.tab.cpp"
break;
@@ -5756,15 +5756,15 @@ yyreduce:
case 265:
#line 2931 "fe/idl.ypp"
{
- UTL_ScopedName *sn = nullptr;
+ UTL_ScopedName *sn = 0;
ACE_NEW_RETURN (sn,
UTL_ScopedName ((yyvsp[0].idval),
- nullptr),
+ 0),
1);
ACE_NEW_RETURN ((yyval.deval),
FE_Declarator (sn,
FE_Declarator::FD_simple,
- nullptr),
+ 0),
1);
}
#line 5771 "fe/idl.tab.cpp"
@@ -5773,11 +5773,11 @@ yyreduce:
case 266:
#line 2947 "fe/idl.ypp"
{
- UTL_ScopedName *sn = nullptr;
+ UTL_ScopedName *sn = 0;
ACE_NEW_RETURN (sn,
UTL_ScopedName (
(yyvsp[0].dcval)->local_name ()->copy (),
- nullptr
+ 0
),
1);
ACE_NEW_RETURN ((yyval.deval),
@@ -5938,14 +5938,14 @@ yyreduce:
#line 3074 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
- UTL_ScopedName n ((yyvsp[0].idval), nullptr);
- AST_Structure *d = nullptr;
+ UTL_ScopedName n ((yyvsp[0].idval), 0);
+ AST_Structure *d = 0;
/*
* Create a node representing a struct declaration. Add it
* to the enclosing scope
*/
- if (s != nullptr)
+ if (s != 0)
{
d =
idl_global->gen ()->create_structure (
@@ -5964,7 +5964,7 @@ yyreduce:
(yyvsp[0].idval)->destroy ();
delete (yyvsp[0].idval);
- (yyvsp[0].idval) = nullptr;
+ (yyvsp[0].idval) = 0;
}
#line 5970 "fe/idl.tab.cpp"
break;
@@ -6039,15 +6039,15 @@ yyreduce:
#line 3160 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
- FE_Declarator *d = nullptr;
- AST_Field *f = nullptr;
+ FE_Declarator *d = 0;
+ AST_Field *f = 0;
idl_global->set_parse_state (IDL_GlobalData::PS_MemberDeclsCompleted);
- AST_Decls *members = nullptr;
+ AST_Decls *members = 0;
/*
* Check for illegal recursive use of type.
*/
- if ((yyvsp[-4].dcval) != nullptr
+ if ((yyvsp[-4].dcval) != 0
&& AST_illegal_recursive_type ((yyvsp[-4].dcval)))
{
idl_global->err ()->error1 (UTL_Error::EIDL_RECURSIVE_TYPE,
@@ -6066,14 +6066,14 @@ yyreduce:
{
d = l.item ();
- if (d == nullptr)
+ if (d == 0)
{
continue;
}
AST_Type *tp = d->compose ((yyvsp[-4].dcval));
- if (tp == nullptr)
+ if (tp == 0)
{
continue;
}
@@ -6086,7 +6086,7 @@ yyreduce:
(yyvsp[-2].dlval)->destroy ();
delete (yyvsp[-2].dlval);
- (yyvsp[-2].dlval) = nullptr;
+ (yyvsp[-2].dlval) = 0;
(yyval.decls_val) = members;
}
@@ -6139,17 +6139,17 @@ yyreduce:
#line 3242 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
- UTL_ScopedName n ((yyvsp[-3].idval), nullptr);
- AST_Union *u = nullptr;
+ UTL_ScopedName n ((yyvsp[-3].idval), 0);
+ AST_Union *u = 0;
idl_global->set_parse_state (IDL_GlobalData::PS_SwitchOpenParSeen);
/*
* Create a node representing an empty union. Add it to its enclosing
* scope.
*/
- if (s != nullptr)
+ if (s != 0)
{
- u = idl_global->gen ()->create_union (nullptr,
+ u = idl_global->gen ()->create_union (0,
&n,
s->is_local (),
s->is_abstract ());
@@ -6194,25 +6194,25 @@ yyreduce:
AST_Annotation_Appls *disc_annotations = (yyvsp[-3].annotations_val);
UTL_Scope *s = idl_global->scopes ().top_non_null ();
- UTL_ScopedName n ((yyvsp[-8].idval), nullptr);
+ UTL_ScopedName n ((yyvsp[-8].idval), 0);
idl_global->set_parse_state (IDL_GlobalData::PS_SwitchCloseParSeen);
/*
* Create a node representing a union.
*/
- if ((yyvsp[-2].dcval) != nullptr && s != nullptr)
+ if ((yyvsp[-2].dcval) != 0 && s != 0)
{
AST_ConcreteType *tp =
dynamic_cast<AST_ConcreteType*> ((yyvsp[-2].dcval));
- if (tp == nullptr)
+ if (tp == 0)
{
idl_global->err ()->not_a_type ((yyvsp[-2].dcval));
}
else
{
/* Create a union with a correct discriminator. */
- AST_Union *u = nullptr;
+ AST_Union *u = 0;
u = idl_global->gen ()->create_union (tp,
&n,
s->is_local (),
@@ -6236,7 +6236,7 @@ yyreduce:
(yyvsp[-8].idval)->destroy ();
delete (yyvsp[-8].idval);
- (yyvsp[-8].idval) = nullptr;
+ (yyvsp[-8].idval) = 0;
delete disc_annotations;
}
@@ -6271,7 +6271,7 @@ yyreduce:
idl_global->scopes ().top_non_null ()
);
- if ((yyval.dcval) != nullptr)
+ if ((yyval.dcval) != 0)
{
idl_global->scopes ().pop ();
}
@@ -6335,9 +6335,9 @@ yyreduce:
#line 3402 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
- AST_Decl *d = nullptr;
- AST_PredefinedType *p = nullptr;
- AST_Typedef *t = nullptr;
+ AST_Decl *d = 0;
+ AST_PredefinedType *p = 0;
+ AST_Typedef *t = 0;
bool found = false;
/*
@@ -6349,7 +6349,7 @@ yyreduce:
d =
s->lookup_by_name ((yyvsp[0].idlist));
- if (s != nullptr && d != nullptr)
+ if (s != 0 && d != 0)
{
while (!found)
{
@@ -6362,7 +6362,7 @@ yyreduce:
case AST_Decl::NT_pre_defined:
p = dynamic_cast<AST_PredefinedType*> (d);
- if (p != nullptr)
+ if (p != 0)
{
switch (p->pt ())
{
@@ -6383,18 +6383,18 @@ yyreduce:
idl_global->err ()->error0 (
UTL_Error::EIDL_DISC_TYPE
);
- (yyval.dcval) = nullptr;
+ (yyval.dcval) = 0;
found = true;
break;
default:
- (yyval.dcval) = nullptr;
+ (yyval.dcval) = 0;
found = true;
break;
}
}
else
{
- (yyval.dcval) = nullptr;
+ (yyval.dcval) = 0;
found = true;
}
@@ -6402,14 +6402,14 @@ yyreduce:
case AST_Decl::NT_typedef:
t = dynamic_cast<AST_Typedef*> (d);
- if (t != nullptr)
+ if (t != 0)
{
d = t->base_type ();
}
break;
default:
- (yyval.dcval) = nullptr;
+ (yyval.dcval) = 0;
found = true;
break;
}
@@ -6417,16 +6417,16 @@ yyreduce:
}
else
{
- (yyval.dcval) = nullptr;
+ (yyval.dcval) = 0;
}
- if ((yyval.dcval) == nullptr)
+ if ((yyval.dcval) == 0)
{
idl_global->err ()->lookup_error ((yyvsp[0].idlist));
(yyvsp[0].idlist)->destroy ();
delete (yyvsp[0].idlist);
- (yyvsp[0].idlist) = nullptr;
+ (yyvsp[0].idlist) = 0;
/* If we don't return here, we'll crash later.*/
if (!idl_global->ignore_lookup_errors_)
@@ -6437,7 +6437,7 @@ yyreduce:
(yyvsp[0].idlist)->destroy ();
delete (yyvsp[0].idlist);
- (yyvsp[0].idlist) = nullptr;
+ (yyvsp[0].idlist) = 0;
}
#line 6443 "fe/idl.tab.cpp"
break;
@@ -6462,7 +6462,7 @@ yyreduce:
#line 3527 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
- AST_UnionBranch *b = nullptr;
+ AST_UnionBranch *b = 0;
AST_Annotation_Appls *annotations = (yyvsp[-3].annotations_val);
AST_Field *f = (yyvsp[-2].ffval);
idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemCompleted);
@@ -6471,7 +6471,7 @@ yyreduce:
* Create several nodes representing branches of a union.
* Add them to the enclosing scope (the union scope)
*/
- if (s != nullptr && (yyvsp[-5].llval) != nullptr && (yyvsp[-2].ffval) != nullptr)
+ if (s != 0 && (yyvsp[-5].llval) != 0 && (yyvsp[-2].ffval) != 0)
{
b =
idl_global->gen ()->create_union_branch (
@@ -6486,7 +6486,7 @@ yyreduce:
// but the rest still needs to be cleaned up.
f->AST_Decl::destroy ();
delete f;
- f = nullptr;
+ f = 0;
}
delete annotations;
@@ -6525,13 +6525,13 @@ yyreduce:
case 324:
#line 3581 "fe/idl.ypp"
{
- UTL_LabelList *ll = nullptr;
+ UTL_LabelList *ll = 0;
ACE_NEW_RETURN (ll,
UTL_LabelList ((yyvsp[0].ulval),
- nullptr),
+ 0),
1);
- if ((yyvsp[-1].llval) == nullptr)
+ if ((yyvsp[-1].llval) == 0)
{
(yyval.llval) = ll;
}
@@ -6547,7 +6547,7 @@ yyreduce:
case 325:
#line 3599 "fe/idl.ypp"
{
- (yyval.llval) = nullptr;
+ (yyval.llval) = 0;
}
#line 6553 "fe/idl.tab.cpp"
break;
@@ -6567,7 +6567,7 @@ yyreduce:
(yyval.ulval) = idl_global->gen ()->create_union_label (
AST_UnionLabel::UL_default,
- nullptr
+ 0
);
}
#line 6574 "fe/idl.tab.cpp"
@@ -6618,28 +6618,28 @@ yyreduce:
/*
* Check for illegal recursive use of type
*/
- if ((yyvsp[-2].dcval) != nullptr
+ if ((yyvsp[-2].dcval) != 0
&& AST_illegal_recursive_type ((yyvsp[-2].dcval)))
{
idl_global->err ()->error1 (UTL_Error::EIDL_RECURSIVE_TYPE, (yyvsp[-2].dcval));
- (yyval.ffval) = nullptr;
+ (yyval.ffval) = 0;
}
/*
* Create a field in a union branch
*/
- else if ((yyvsp[-2].dcval) == nullptr
- || (yyvsp[0].deval) == nullptr)
+ else if ((yyvsp[-2].dcval) == 0
+ || (yyvsp[0].deval) == 0)
{
- (yyval.ffval) = nullptr;
+ (yyval.ffval) = 0;
}
else
{
AST_Type *tp = (yyvsp[0].deval)->compose ((yyvsp[-2].dcval));
- if (tp == nullptr)
+ if (tp == 0)
{
- (yyval.ffval) = nullptr;
+ (yyval.ffval) = 0;
}
else
{
@@ -6651,7 +6651,7 @@ yyreduce:
(yyvsp[0].deval)->destroy ();
delete (yyvsp[0].deval);
- (yyvsp[0].deval) = nullptr;
+ (yyvsp[0].deval) = 0;
}
}
#line 6658 "fe/idl.tab.cpp"
@@ -6662,13 +6662,13 @@ yyreduce:
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval),
- nullptr);
- AST_StructureFwd *d = nullptr;
+ 0);
+ AST_StructureFwd *d = 0;
/*
* Create a node representing a forward declaration of a struct.
*/
- if (s != nullptr)
+ if (s != 0)
{
d = idl_global->gen ()->create_structure_fwd (&n);
(void) s->fe_add_structure_fwd (d);
@@ -6676,7 +6676,7 @@ yyreduce:
(yyvsp[0].idval)->destroy ();
delete (yyvsp[0].idval);
- (yyvsp[0].idval) = nullptr;
+ (yyvsp[0].idval) = 0;
(yyval.dcval) = d;
}
@@ -6688,13 +6688,13 @@ yyreduce:
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval),
- nullptr);
- AST_UnionFwd *u = nullptr;
+ 0);
+ AST_UnionFwd *u = 0;
/*
* Create a node representing a forward declaration of a union.
*/
- if (s != nullptr)
+ if (s != 0)
{
u = idl_global->gen ()->create_union_fwd (&n);
(void) s->fe_add_union_fwd (u);
@@ -6702,7 +6702,7 @@ yyreduce:
(yyvsp[0].idval)->destroy ();
delete (yyvsp[0].idval);
- (yyvsp[0].idval) = nullptr;
+ (yyvsp[0].idval) = 0;
}
#line 6708 "fe/idl.tab.cpp"
break;
@@ -6719,15 +6719,15 @@ yyreduce:
#line 3741 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
- UTL_ScopedName n ((yyvsp[0].idval), nullptr);
- AST_Enum *e = nullptr;
+ UTL_ScopedName n ((yyvsp[0].idval), 0);
+ AST_Enum *e = 0;
idl_global->set_parse_state (IDL_GlobalData::PS_EnumIDSeen);
/*
* Create a node representing an enum and add it to its
* enclosing scope.
*/
- if (s != nullptr)
+ if (s != 0)
{
e = idl_global->gen ()->create_enum (&n,
s->is_local (),
@@ -6745,7 +6745,7 @@ yyreduce:
(yyvsp[0].idval)->destroy ();
delete (yyvsp[0].idval);
- (yyvsp[0].idval) = nullptr;
+ (yyvsp[0].idval) = 0;
}
#line 6751 "fe/idl.tab.cpp"
break;
@@ -6774,9 +6774,9 @@ yyreduce:
/*
* Done with this enum. Pop its scope from the scopes stack.
*/
- if (idl_global->scopes ().top () == nullptr)
+ if (idl_global->scopes ().top () == 0)
{
- (yyval.dcval) = nullptr;
+ (yyval.dcval) = 0;
}
else
{
@@ -6804,21 +6804,21 @@ yyreduce:
AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val);
Identifier id ((yyvsp[0].strval));
ACE::strdelete ((yyvsp[0].strval));
- (yyvsp[0].strval) = nullptr;
- UTL_ScopedName n (&id, nullptr);
- AST_EnumVal *e = nullptr;
- AST_Enum *c = nullptr;
+ (yyvsp[0].strval) = 0;
+ UTL_ScopedName n (&id, 0);
+ AST_EnumVal *e = 0;
+ AST_Enum *c = 0;
/*
* Create a node representing one enumerator in an enum
* Add it to the enclosing scope (the enum scope)
*/
- if (s != nullptr
+ if (s != 0
&& s->scope_node_type () == AST_Decl::NT_enum)
{
c = dynamic_cast<AST_Enum*> (s);
- if (c != nullptr)
+ if (c != 0)
{
e = idl_global->gen ()->create_enum_val (
c->next_enum_val (),
@@ -6857,10 +6857,10 @@ yyreduce:
{
idl_global->set_parse_state (IDL_GlobalData::PS_SequenceQsSeen);
- AST_Sequence *seq = nullptr;
+ AST_Sequence *seq = 0;
Decl_Annotations_Pair *seq_head = (yyvsp[-5].decl_annotations_pair_val);
- AST_Decl *type = nullptr;
- AST_Annotation_Appls *type_annotations = nullptr;
+ AST_Decl *type = 0;
+ AST_Annotation_Appls *type_annotations = 0;
if (seq_head)
{
type = seq_head->decl;
@@ -6871,7 +6871,7 @@ yyreduce:
/*
* Remove sequence marker from scopes stack.
*/
- if (idl_global->scopes ().top () == nullptr)
+ if (idl_global->scopes ().top () == 0)
{
idl_global->scopes ().pop ();
}
@@ -6881,10 +6881,10 @@ yyreduce:
/*
* Create a node representing a sequence
*/
- AST_Expression::AST_ExprValue *ev = nullptr;
- AST_Param_Holder *param_holder = nullptr;
+ AST_Expression::AST_ExprValue *ev = 0;
+ AST_Param_Holder *param_holder = 0;
- if ((yyvsp[-2].exval) != nullptr)
+ if ((yyvsp[-2].exval) != 0)
{
param_holder =
(yyvsp[-2].exval)->param_holder ();
@@ -6895,8 +6895,8 @@ yyreduce:
// If the expression corresponds to a template parameter,
// it's ok for the coercion to fail at this point. We check
// for a type mismatch below.
- if (nullptr == (yyvsp[-2].exval)
- || (nullptr == ev && nullptr == param_holder))
+ if (0 == (yyvsp[-2].exval)
+ || (0 == ev && 0 == param_holder))
{
idl_global->err ()->coercion_error ((yyvsp[-2].exval),
AST_Expression::EV_ulong);
@@ -6905,7 +6905,7 @@ yyreduce:
{
AST_Type *tp = dynamic_cast<AST_Type*> (type);
- if (nullptr == tp)
+ if (0 == tp)
{
; // Error will be caught in FE_Declarator.
}
@@ -6913,7 +6913,7 @@ yyreduce:
{
Identifier id ("sequence");
UTL_ScopedName sn (&id,
- nullptr);
+ 0);
seq =
idl_global->gen ()->create_sequence (
@@ -6931,7 +6931,7 @@ yyreduce:
delete type_annotations;
delete ev;
- ev = nullptr;
+ ev = 0;
(yyval.dcval) = seq;
}
#line 6938 "fe/idl.tab.cpp"
@@ -6942,10 +6942,10 @@ yyreduce:
{
idl_global->set_parse_state (IDL_GlobalData::PS_SequenceQsSeen);
- AST_Sequence *seq = nullptr;
+ AST_Sequence *seq = 0;
Decl_Annotations_Pair *seq_head = (yyvsp[-1].decl_annotations_pair_val);
- AST_Decl *type = nullptr;
- AST_Annotation_Appls *type_annotations = nullptr;
+ AST_Decl *type = 0;
+ AST_Annotation_Appls *type_annotations = 0;
if (seq_head)
{
type = seq_head->decl;
@@ -6956,7 +6956,7 @@ yyreduce:
/*
* Remove sequence marker from scopes stack.
*/
- if (idl_global->scopes ().top () == nullptr)
+ if (idl_global->scopes ().top () == 0)
{
idl_global->scopes ().pop ();
}
@@ -6970,14 +6970,14 @@ yyreduce:
{
AST_Type *tp = dynamic_cast<AST_Type*> (type);
- if (tp == nullptr)
+ if (tp == 0)
{
; // Error will be caught in FE_Declarator.
}
else
{
Identifier id ("sequence");
- UTL_ScopedName sn (&id, nullptr);
+ UTL_ScopedName sn (&id, 0);
ACE_CDR::ULong bound = 0UL;
seq =
@@ -7011,7 +7011,7 @@ yyreduce:
/*
* Push a sequence marker on scopes stack.
*/
- idl_global->scopes ().push (nullptr);
+ idl_global->scopes ().push (0);
}
#line 7017 "fe/idl.tab.cpp"
break;
@@ -7069,18 +7069,18 @@ yyreduce:
/*
* Create a node representing a string.
*/
- AST_Expression::AST_ExprValue *ev = nullptr;
+ AST_Expression::AST_ExprValue *ev = 0;
- if ((yyvsp[-2].exval) != nullptr)
+ if ((yyvsp[-2].exval) != 0)
{
ev = (yyvsp[-2].exval)->coerce (AST_Expression::EV_ulong);
}
- if (nullptr == (yyvsp[-2].exval) || nullptr == ev)
+ if (0 == (yyvsp[-2].exval) || 0 == ev)
{
idl_global->err ()->coercion_error ((yyvsp[-2].exval),
AST_Expression::EV_ulong);
- (yyval.dcval) = nullptr;
+ (yyval.dcval) = 0;
}
else
{
@@ -7099,7 +7099,7 @@ yyreduce:
}
delete ev;
- ev = nullptr;
+ ev = 0;
}
#line 7105 "fe/idl.tab.cpp"
break;
@@ -7163,12 +7163,18 @@ yyreduce:
/*
* Create a node representing a string.
*/
- if ((yyvsp[-2].exval) == nullptr
- || (yyvsp[-2].exval)->coerce (AST_Expression::EV_ulong) == nullptr)
+ AST_Expression::AST_ExprValue *ev = 0;
+
+ if ((yyvsp[-2].exval) != 0)
+ {
+ ev = (yyvsp[-2].exval)->coerce (AST_Expression::EV_ulong);
+ }
+
+ if (0 == (yyvsp[-2].exval) || 0 == ev)
{
idl_global->err ()->coercion_error ((yyvsp[-2].exval),
AST_Expression::EV_ulong);
- (yyval.dcval) = nullptr;
+ (yyval.dcval) = 0;
}
else
{
@@ -7185,12 +7191,15 @@ yyreduce:
(yyval.dcval) = string;
}
+
+ delete ev;
+ ev = 0;
}
-#line 7190 "fe/idl.tab.cpp"
+#line 7199 "fe/idl.tab.cpp"
break;
case 361:
-#line 4160 "fe/idl.ypp"
+#line 4169 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_StringCompleted);
@@ -7213,31 +7222,31 @@ yyreduce:
(yyval.dcval) = string;
}
-#line 7217 "fe/idl.tab.cpp"
+#line 7226 "fe/idl.tab.cpp"
break;
case 362:
-#line 4186 "fe/idl.ypp"
+#line 4195 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_StringSeen);
}
-#line 7225 "fe/idl.tab.cpp"
+#line 7234 "fe/idl.tab.cpp"
break;
case 363:
-#line 4193 "fe/idl.ypp"
+#line 4202 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ArrayIDSeen);
}
-#line 7233 "fe/idl.tab.cpp"
+#line 7242 "fe/idl.tab.cpp"
break;
case 364:
-#line 4197 "fe/idl.ypp"
+#line 4206 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ArrayCompleted);
- AST_Array *array = nullptr;
+ AST_Array *array = 0;
AST_Annotation_Appls *base_type_annotations = (yyvsp[-1].annotations_val);
UTL_ExprList *array_dims = (yyvsp[0].elval);
@@ -7247,14 +7256,14 @@ yyreduce:
if (array_dims)
{
UTL_ScopedName sn ((yyvsp[-3].idval),
- nullptr);
+ 0);
array =
idl_global->gen ()->create_array (
&sn,
array_dims->length (),
array_dims,
- false,
- false
+ 0,
+ 0
);
array->base_type_annotations (*base_type_annotations);
sn.destroy ();
@@ -7269,30 +7278,30 @@ yyreduce:
(yyval.dcval) = array;
}
-#line 7273 "fe/idl.tab.cpp"
+#line 7282 "fe/idl.tab.cpp"
break;
case 365:
-#line 4236 "fe/idl.ypp"
+#line 4245 "fe/idl.ypp"
{
ACE_NEW_RETURN ((yyval.elval),
UTL_ExprList ((yyvsp[-1].exval),
(yyvsp[0].elval)),
1);
}
-#line 7284 "fe/idl.tab.cpp"
+#line 7293 "fe/idl.tab.cpp"
break;
case 366:
-#line 4246 "fe/idl.ypp"
+#line 4255 "fe/idl.ypp"
{
- UTL_ExprList *el = nullptr;
+ UTL_ExprList *el = 0;
ACE_NEW_RETURN (el,
UTL_ExprList ((yyvsp[0].exval),
- nullptr),
+ 0),
1);
- if ((yyvsp[-1].elval) == nullptr)
+ if ((yyvsp[-1].elval) == 0)
{
(yyval.elval) = el;
}
@@ -7302,35 +7311,35 @@ yyreduce:
(yyval.elval) = (yyvsp[-1].elval);
}
}
-#line 7306 "fe/idl.tab.cpp"
+#line 7315 "fe/idl.tab.cpp"
break;
case 367:
-#line 4264 "fe/idl.ypp"
+#line 4273 "fe/idl.ypp"
{
- (yyval.elval) = nullptr;
+ (yyval.elval) = 0;
}
-#line 7314 "fe/idl.tab.cpp"
+#line 7323 "fe/idl.tab.cpp"
break;
case 368:
-#line 4271 "fe/idl.ypp"
+#line 4280 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_DimSqSeen);
}
-#line 7322 "fe/idl.tab.cpp"
+#line 7331 "fe/idl.tab.cpp"
break;
case 369:
-#line 4275 "fe/idl.ypp"
+#line 4284 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_DimExprSeen);
}
-#line 7330 "fe/idl.tab.cpp"
+#line 7339 "fe/idl.tab.cpp"
break;
case 370:
-#line 4279 "fe/idl.ypp"
+#line 4288 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_DimQsSeen);
@@ -7338,10 +7347,10 @@ yyreduce:
* Array dimensions are expressions which must be coerced to
* positive integers.
*/
- AST_Expression::AST_ExprValue *ev = nullptr;
- AST_Param_Holder *param_holder = nullptr;
+ AST_Expression::AST_ExprValue *ev = 0;
+ AST_Param_Holder *param_holder = 0;
- if ((yyvsp[-2].exval) != nullptr)
+ if ((yyvsp[-2].exval) != 0)
{
param_holder =
(yyvsp[-2].exval)->param_holder ();
@@ -7350,16 +7359,16 @@ yyreduce:
(yyvsp[-2].exval)->coerce (AST_Expression::EV_ulong);
}
- if (nullptr == (yyvsp[-2].exval)
- || (ev == nullptr && param_holder == nullptr))
+ if (0 == (yyvsp[-2].exval)
+ || (ev == 0 && param_holder == 0))
{
idl_global->err ()->coercion_error ((yyvsp[-2].exval),
AST_Expression::EV_ulong);
- (yyval.exval) = nullptr;
+ (yyval.exval) = 0;
}
else
{
- if (param_holder != nullptr)
+ if (param_holder != 0)
{
AST_Expression::ExprType et =
param_holder->info ()->const_type_;
@@ -7373,7 +7382,7 @@ yyreduce:
param_holder->info ()->name_.c_str ());
delete ev;
- ev = nullptr;
+ ev = 0;
return 1;
}
}
@@ -7382,49 +7391,49 @@ yyreduce:
}
delete ev;
- ev = nullptr;
+ ev = 0;
}
-#line 7388 "fe/idl.tab.cpp"
+#line 7397 "fe/idl.tab.cpp"
break;
case 373:
-#line 4341 "fe/idl.ypp"
+#line 4350 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_AttrROSeen);
}
-#line 7396 "fe/idl.tab.cpp"
+#line 7405 "fe/idl.tab.cpp"
break;
case 374:
-#line 4345 "fe/idl.ypp"
+#line 4354 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_AttrSeen);
}
-#line 7404 "fe/idl.tab.cpp"
+#line 7413 "fe/idl.tab.cpp"
break;
case 375:
-#line 4349 "fe/idl.ypp"
+#line 4358 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_AttrTypeSeen);
}
-#line 7412 "fe/idl.tab.cpp"
+#line 7421 "fe/idl.tab.cpp"
break;
case 376:
-#line 4353 "fe/idl.ypp"
+#line 4362 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclsSeen);
}
-#line 7420 "fe/idl.tab.cpp"
+#line 7429 "fe/idl.tab.cpp"
break;
case 377:
-#line 4357 "fe/idl.ypp"
+#line 4366 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
- AST_Attribute *a = nullptr;
- FE_Declarator *d = nullptr;
+ AST_Attribute *a = 0;
+ FE_Declarator *d = 0;
idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted);
@@ -7432,20 +7441,20 @@ yyreduce:
* Create nodes representing attributes and add them to the
* enclosing scope.
*/
- if (s != nullptr && (yyvsp[-4].dcval) != nullptr && (yyvsp[-2].dlval) != nullptr)
+ if (s != 0 && (yyvsp[-4].dcval) != 0 && (yyvsp[-2].dlval) != 0)
{
for (UTL_DecllistActiveIterator l ((yyvsp[-2].dlval)); !l.is_done (); l.next ())
{
d = l.item ();
- if (d == nullptr)
+ if (d == 0)
{
continue;
}
AST_Type *tp = d->compose ((yyvsp[-4].dcval));
- if (tp == nullptr)
+ if (tp == 0)
{
continue;
}
@@ -7453,13 +7462,13 @@ yyreduce:
a = idl_global->gen ()->create_attribute (
true, tp, d->name (), s->is_local (), s->is_abstract ());
- if ((yyvsp[0].nlval) != nullptr)
+ if ((yyvsp[0].nlval) != 0)
{
(void) a->fe_add_get_exceptions ((yyvsp[0].nlval));
(yyvsp[0].nlval)->destroy ();
delete (yyvsp[0].nlval);
- (yyvsp[0].nlval) = nullptr;
+ (yyvsp[0].nlval) = 0;
}
(void) s->fe_add_attribute (a);
@@ -7468,51 +7477,51 @@ yyreduce:
(yyvsp[-2].dlval)->destroy ();
delete (yyvsp[-2].dlval);
- (yyvsp[-2].dlval) = nullptr;
+ (yyvsp[-2].dlval) = 0;
(yyval.dcval) = a;
}
-#line 7476 "fe/idl.tab.cpp"
+#line 7485 "fe/idl.tab.cpp"
break;
case 378:
-#line 4412 "fe/idl.ypp"
+#line 4421 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_AttrSeen);
}
-#line 7484 "fe/idl.tab.cpp"
+#line 7493 "fe/idl.tab.cpp"
break;
case 379:
-#line 4416 "fe/idl.ypp"
+#line 4425 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_AttrTypeSeen);
}
-#line 7492 "fe/idl.tab.cpp"
+#line 7501 "fe/idl.tab.cpp"
break;
case 380:
-#line 4420 "fe/idl.ypp"
+#line 4429 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclsSeen);
}
-#line 7500 "fe/idl.tab.cpp"
+#line 7509 "fe/idl.tab.cpp"
break;
case 381:
-#line 4424 "fe/idl.ypp"
+#line 4433 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseCompleted);
}
-#line 7508 "fe/idl.tab.cpp"
+#line 7517 "fe/idl.tab.cpp"
break;
case 382:
-#line 4428 "fe/idl.ypp"
+#line 4437 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
- AST_Attribute *a = nullptr;
- FE_Declarator *d = nullptr;
+ AST_Attribute *a = 0;
+ FE_Declarator *d = 0;
idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseCompleted);
@@ -7520,20 +7529,20 @@ yyreduce:
* Create nodes representing attributes and add them to the
* enclosing scope.
*/
- if (s != nullptr && (yyvsp[-6].dcval) != nullptr && (yyvsp[-4].dlval) != nullptr)
+ if (s != 0 && (yyvsp[-6].dcval) != 0 && (yyvsp[-4].dlval) != 0)
{
for (UTL_DecllistActiveIterator l ((yyvsp[-4].dlval)); !l.is_done (); l.next ())
{
d = l.item ();
- if (d == nullptr)
+ if (d == 0)
{
continue;
}
AST_Type *tp = d->compose ((yyvsp[-6].dcval));
- if (tp == nullptr)
+ if (tp == 0)
{
continue;
}
@@ -7541,22 +7550,22 @@ yyreduce:
a = idl_global->gen ()->create_attribute (
false, tp, d->name (), s->is_local (), s->is_abstract ());
- if ((yyvsp[-2].nlval) != nullptr)
+ if ((yyvsp[-2].nlval) != 0)
{
(void) a->fe_add_get_exceptions ((yyvsp[-2].nlval));
(yyvsp[-2].nlval)->destroy ();
delete (yyvsp[-2].nlval);
- (yyvsp[-2].nlval) = nullptr;
+ (yyvsp[-2].nlval) = 0;
}
- if ((yyvsp[0].nlval) != nullptr)
+ if ((yyvsp[0].nlval) != 0)
{
(void) a->fe_add_set_exceptions ((yyvsp[0].nlval));
(yyvsp[0].nlval)->destroy ();
delete (yyvsp[0].nlval);
- (yyvsp[0].nlval) = nullptr;
+ (yyvsp[0].nlval) = 0;
}
(void) s->fe_add_attribute (a);
@@ -7565,28 +7574,28 @@ yyreduce:
(yyvsp[-4].dlval)->destroy ();
delete (yyvsp[-4].dlval);
- (yyvsp[-4].dlval) = nullptr;
+ (yyvsp[-4].dlval) = 0;
(yyval.dcval) = a;
}
-#line 7573 "fe/idl.tab.cpp"
+#line 7582 "fe/idl.tab.cpp"
break;
case 383:
-#line 4492 "fe/idl.ypp"
+#line 4501 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ExceptSeen);
}
-#line 7581 "fe/idl.tab.cpp"
+#line 7590 "fe/idl.tab.cpp"
break;
case 384:
-#line 4496 "fe/idl.ypp"
+#line 4505 "fe/idl.ypp"
{
Identifier *&id = (yyvsp[0].idval);
UTL_Scope *scope = idl_global->scopes ().top_non_null ();
- UTL_ScopedName scoped_name (id, nullptr);
- AST_Exception *exception = nullptr;
+ UTL_ScopedName scoped_name (id, 0);
+ AST_Exception *exception = 0;
idl_global->set_parse_state (IDL_GlobalData::PS_ExceptIDSeen);
/*
@@ -7609,31 +7618,31 @@ yyreduce:
id->destroy ();
delete id;
- id = nullptr;
+ id = 0;
(yyval.dcval) = exception;
}
-#line 7617 "fe/idl.tab.cpp"
+#line 7626 "fe/idl.tab.cpp"
break;
case 385:
-#line 4528 "fe/idl.ypp"
+#line 4537 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ExceptSqSeen);
}
-#line 7625 "fe/idl.tab.cpp"
+#line 7634 "fe/idl.tab.cpp"
break;
case 386:
-#line 4532 "fe/idl.ypp"
+#line 4541 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ExceptBodySeen);
}
-#line 7633 "fe/idl.tab.cpp"
+#line 7642 "fe/idl.tab.cpp"
break;
case 387:
-#line 4536 "fe/idl.ypp"
+#line 4545 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ExceptQsSeen);
/*
@@ -7643,42 +7652,42 @@ yyreduce:
(yyval.dcval) = (yyvsp[-5].dcval);
}
-#line 7647 "fe/idl.tab.cpp"
+#line 7656 "fe/idl.tab.cpp"
break;
case 388:
-#line 4549 "fe/idl.ypp"
+#line 4558 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpTypeSeen);
}
-#line 7655 "fe/idl.tab.cpp"
+#line 7664 "fe/idl.tab.cpp"
break;
case 389:
-#line 4553 "fe/idl.ypp"
+#line 4562 "fe/idl.ypp"
{
- AST_Operation *op = nullptr;
+ AST_Operation *op = 0;
UTL_Scope *scope = idl_global->scopes ().top_non_null ();
AST_Operation::Flags op_flags = (yyvsp[-3].ofval);
AST_Decl *type_node = (yyvsp[-2].dcval);
- (yyvsp[-2].dcval) = nullptr;
+ (yyvsp[-2].dcval) = 0;
Identifier id ((yyvsp[0].strval));
ACE::strdelete ((yyvsp[0].strval));
- (yyvsp[0].strval) = nullptr;
+ (yyvsp[0].strval) = 0;
- UTL_ScopedName name (&id, nullptr);
+ UTL_ScopedName name (&id, 0);
idl_global->set_parse_state (IDL_GlobalData::PS_OpIDSeen);
/*
* Create a node representing an operation on an interface
* and add it to its enclosing scope.
*/
- if (scope != nullptr && type_node != nullptr)
+ if (scope != 0 && type_node != 0)
{
AST_Type *type = dynamic_cast<AST_Type*> (type_node);
- if (type == nullptr)
+ if (type == 0)
{
idl_global->err ()->not_a_type (type_node);
}
@@ -7702,7 +7711,7 @@ yyreduce:
idl_global->err ()->local_remote_mismatch (type, op);
op->destroy ();
delete op;
- op = nullptr;
+ op = 0;
}
else
{
@@ -7716,45 +7725,45 @@ yyreduce:
*/
idl_global->scopes ().push (op);
}
-#line 7720 "fe/idl.tab.cpp"
+#line 7729 "fe/idl.tab.cpp"
break;
case 390:
-#line 4614 "fe/idl.ypp"
+#line 4623 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted);
}
-#line 7728 "fe/idl.tab.cpp"
+#line 7737 "fe/idl.tab.cpp"
break;
case 391:
-#line 4618 "fe/idl.ypp"
+#line 4627 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted);
}
-#line 7736 "fe/idl.tab.cpp"
+#line 7745 "fe/idl.tab.cpp"
break;
case 392:
-#line 4622 "fe/idl.ypp"
+#line 4631 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
- AST_Operation *o = nullptr;
+ AST_Operation *o = 0;
idl_global->set_parse_state (IDL_GlobalData::PS_OpCompleted);
/*
* Add exceptions and context to the operation.
*/
- if (s != nullptr && s->scope_node_type () == AST_Decl::NT_op)
+ if (s != 0 && s->scope_node_type () == AST_Decl::NT_op)
{
o = dynamic_cast<AST_Operation*> (s);
- if ((yyvsp[-2].nlval) != nullptr && o != nullptr)
+ if ((yyvsp[-2].nlval) != 0 && o != 0)
{
(void) o->fe_add_exceptions ((yyvsp[-2].nlval));
}
- if ((yyvsp[0].slval) != nullptr)
+ if ((yyvsp[0].slval) != 0)
{
(void) o->fe_add_context ((yyvsp[0].slval));
}
@@ -7767,57 +7776,57 @@ yyreduce:
(yyval.dcval) = o;
}
-#line 7771 "fe/idl.tab.cpp"
+#line 7780 "fe/idl.tab.cpp"
break;
case 393:
-#line 4656 "fe/idl.ypp"
+#line 4665 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpAttrSeen);
(yyval.ofval) = AST_Operation::OP_oneway;
}
-#line 7780 "fe/idl.tab.cpp"
+#line 7789 "fe/idl.tab.cpp"
break;
case 394:
-#line 4661 "fe/idl.ypp"
+#line 4670 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpAttrSeen);
(yyval.ofval) = AST_Operation::OP_idempotent;
}
-#line 7789 "fe/idl.tab.cpp"
+#line 7798 "fe/idl.tab.cpp"
break;
case 395:
-#line 4666 "fe/idl.ypp"
+#line 4675 "fe/idl.ypp"
{
(yyval.ofval) = AST_Operation::OP_noflags;
}
-#line 7797 "fe/idl.tab.cpp"
+#line 7806 "fe/idl.tab.cpp"
break;
case 397:
-#line 4674 "fe/idl.ypp"
+#line 4683 "fe/idl.ypp"
{
(yyval.dcval) =
idl_global->scopes ().bottom ()->lookup_primitive_type (
AST_Expression::EV_void
);
}
-#line 7808 "fe/idl.tab.cpp"
+#line 7817 "fe/idl.tab.cpp"
break;
case 398:
-#line 4684 "fe/idl.ypp"
+#line 4693 "fe/idl.ypp"
{
//@@ PS_FactorySeen?
idl_global->set_parse_state (IDL_GlobalData::PS_OpTypeSeen);
}
-#line 7817 "fe/idl.tab.cpp"
+#line 7826 "fe/idl.tab.cpp"
break;
case 399:
-#line 4689 "fe/idl.ypp"
+#line 4698 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
@@ -7836,18 +7845,18 @@ yyreduce:
Identifier id ((yyvsp[0].strval));
ACE::strdelete ((yyvsp[0].strval));
- (yyvsp[0].strval) = nullptr;
+ (yyvsp[0].strval) = 0;
UTL_ScopedName n (&id,
- nullptr);
- AST_Factory *factory = nullptr;
+ 0);
+ AST_Factory *factory = 0;
idl_global->set_parse_state (IDL_GlobalData::PS_OpIDSeen);
/*
* Create a node representing an factory construct
* and add it to its enclosing scope
*/
- if (s != nullptr)
+ if (s != 0)
{
factory = idl_global->gen ()->create_factory (&n);
(void) s->fe_add_factory (factory);
@@ -7860,19 +7869,19 @@ yyreduce:
(yyval.dcval) = factory;
}
-#line 7864 "fe/idl.tab.cpp"
+#line 7873 "fe/idl.tab.cpp"
break;
case 400:
-#line 4732 "fe/idl.ypp"
+#line 4741 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted);
}
-#line 7872 "fe/idl.tab.cpp"
+#line 7881 "fe/idl.tab.cpp"
break;
case 401:
-#line 4736 "fe/idl.ypp"
+#line 4745 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted);
@@ -7887,83 +7896,83 @@ yyreduce:
(yyval.dcval) = (yyvsp[-3].dcval);
}
-#line 7891 "fe/idl.tab.cpp"
+#line 7900 "fe/idl.tab.cpp"
break;
case 402:
-#line 4754 "fe/idl.ypp"
+#line 4763 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen);
}
-#line 7899 "fe/idl.tab.cpp"
+#line 7908 "fe/idl.tab.cpp"
break;
case 403:
-#line 4758 "fe/idl.ypp"
+#line 4767 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen);
}
-#line 7907 "fe/idl.tab.cpp"
+#line 7916 "fe/idl.tab.cpp"
break;
case 404:
-#line 4762 "fe/idl.ypp"
+#line 4771 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen);
}
-#line 7915 "fe/idl.tab.cpp"
+#line 7924 "fe/idl.tab.cpp"
break;
case 405:
-#line 4767 "fe/idl.ypp"
+#line 4776 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen);
}
-#line 7923 "fe/idl.tab.cpp"
+#line 7932 "fe/idl.tab.cpp"
break;
case 407:
-#line 4777 "fe/idl.ypp"
+#line 4786 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpParCommaSeen);
}
-#line 7931 "fe/idl.tab.cpp"
+#line 7940 "fe/idl.tab.cpp"
break;
case 410:
-#line 4786 "fe/idl.ypp"
+#line 4795 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpParDirSeen);
}
-#line 7939 "fe/idl.tab.cpp"
+#line 7948 "fe/idl.tab.cpp"
break;
case 411:
-#line 4790 "fe/idl.ypp"
+#line 4799 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpParTypeSeen);
}
-#line 7947 "fe/idl.tab.cpp"
+#line 7956 "fe/idl.tab.cpp"
break;
case 412:
-#line 4794 "fe/idl.ypp"
+#line 4803 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
- AST_Argument *a = nullptr;
+ AST_Argument *a = 0;
idl_global->set_parse_state (IDL_GlobalData::PS_OpParDeclSeen);
/*
* Create a node representing an argument to an operation
* Add it to the enclosing scope (the operation scope).
*/
- if ((yyvsp[-2].dcval) != nullptr
- && (yyvsp[0].deval) != nullptr &&
- s != nullptr)
+ if ((yyvsp[-2].dcval) != 0
+ && (yyvsp[0].deval) != 0 &&
+ s != 0)
{
AST_Type *tp = (yyvsp[0].deval)->compose ((yyvsp[-2].dcval));
- if (tp != nullptr)
+ if (tp != 0)
{
a = idl_global->gen ()->create_argument (
AST_Argument::dir_IN,
@@ -7977,85 +7986,85 @@ yyreduce:
(yyvsp[0].deval)->destroy ();
delete (yyvsp[0].deval);
- (yyvsp[0].deval) = nullptr;
+ (yyvsp[0].deval) = 0;
}
-#line 7983 "fe/idl.tab.cpp"
+#line 7992 "fe/idl.tab.cpp"
break;
case 413:
-#line 4829 "fe/idl.ypp"
+#line 4838 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen);
}
-#line 7991 "fe/idl.tab.cpp"
+#line 8000 "fe/idl.tab.cpp"
break;
case 414:
-#line 4833 "fe/idl.ypp"
+#line 4842 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen);
}
-#line 7999 "fe/idl.tab.cpp"
+#line 8008 "fe/idl.tab.cpp"
break;
case 415:
-#line 4837 "fe/idl.ypp"
+#line 4846 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen);
}
-#line 8007 "fe/idl.tab.cpp"
+#line 8016 "fe/idl.tab.cpp"
break;
case 416:
-#line 4842 "fe/idl.ypp"
+#line 4851 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen);
}
-#line 8015 "fe/idl.tab.cpp"
+#line 8024 "fe/idl.tab.cpp"
break;
case 418:
-#line 4852 "fe/idl.ypp"
+#line 4861 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpParCommaSeen);
}
-#line 8023 "fe/idl.tab.cpp"
+#line 8032 "fe/idl.tab.cpp"
break;
case 421:
-#line 4861 "fe/idl.ypp"
+#line 4870 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpParDirSeen);
}
-#line 8031 "fe/idl.tab.cpp"
+#line 8040 "fe/idl.tab.cpp"
break;
case 422:
-#line 4865 "fe/idl.ypp"
+#line 4874 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpParTypeSeen);
}
-#line 8039 "fe/idl.tab.cpp"
+#line 8048 "fe/idl.tab.cpp"
break;
case 423:
-#line 4869 "fe/idl.ypp"
+#line 4878 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
- AST_Argument *a = nullptr;
+ AST_Argument *a = 0;
idl_global->set_parse_state (IDL_GlobalData::PS_OpParDeclSeen);
/*
* Create a node representing an argument to an operation
* Add it to the enclosing scope (the operation scope).
*/
- if ((yyvsp[-2].dcval) != nullptr
- && (yyvsp[0].deval) != nullptr
- && s != nullptr)
+ if ((yyvsp[-2].dcval) != 0
+ && (yyvsp[0].deval) != 0
+ && s != 0)
{
AST_Type *tp = (yyvsp[0].deval)->compose ((yyvsp[-2].dcval));
- if (tp != nullptr)
+ if (tp != 0)
{
if (!s->is_local () && tp->is_local ())
{
@@ -8076,39 +8085,39 @@ yyreduce:
(yyvsp[0].deval)->destroy ();
delete (yyvsp[0].deval);
- (yyvsp[0].deval) = nullptr;
+ (yyvsp[0].deval) = 0;
}
-#line 8082 "fe/idl.tab.cpp"
+#line 8091 "fe/idl.tab.cpp"
break;
case 424:
-#line 4911 "fe/idl.ypp"
+#line 4920 "fe/idl.ypp"
{
(yyval.dcval) =
idl_global->scopes ().bottom ()->lookup_primitive_type (
(yyvsp[0].etval)
);
}
-#line 8093 "fe/idl.tab.cpp"
+#line 8102 "fe/idl.tab.cpp"
break;
case 427:
-#line 4920 "fe/idl.ypp"
+#line 4929 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
- AST_Decl *d = nullptr;
+ AST_Decl *d = 0;
UTL_ScopedName *n = (yyvsp[0].idlist);
- if (s != nullptr)
+ if (s != 0)
{
d = s->lookup_by_name (n, false, false);
}
- if (d == nullptr)
+ if (d == 0)
{
idl_global->err ()->lookup_error (n);
(yyvsp[0].idlist)->destroy ();
- (yyvsp[0].idlist) = nullptr;
+ (yyvsp[0].idlist) = 0;
/* If we don't return here, we'll crash later.*/
return 1;
@@ -8118,7 +8127,7 @@ yyreduce:
d->last_referenced_as ((yyvsp[0].idlist));
AST_Decl::NodeType nt = d->node_type ();
AST_Type *t = dynamic_cast<AST_Type*> (d);
- AST_Typedef *td = nullptr;
+ AST_Typedef *td = 0;
bool can_be_undefined = false;
if (nt == AST_Decl::NT_typedef)
@@ -8176,7 +8185,7 @@ yyreduce:
AST_StructureFwd *fwd =
dynamic_cast<AST_StructureFwd*> (d);
- if (fwd != nullptr)
+ if (fwd != 0)
{
t = fwd->full_definition ();
@@ -8197,194 +8206,194 @@ yyreduce:
(yyval.dcval) = d;
}
-#line 8201 "fe/idl.tab.cpp"
+#line 8210 "fe/idl.tab.cpp"
break;
case 428:
-#line 5027 "fe/idl.ypp"
+#line 5036 "fe/idl.ypp"
{
(yyval.dival) = AST_Argument::dir_IN;
}
-#line 8209 "fe/idl.tab.cpp"
+#line 8218 "fe/idl.tab.cpp"
break;
case 429:
-#line 5031 "fe/idl.ypp"
+#line 5040 "fe/idl.ypp"
{
(yyval.dival) = AST_Argument::dir_OUT;
}
-#line 8217 "fe/idl.tab.cpp"
+#line 8226 "fe/idl.tab.cpp"
break;
case 430:
-#line 5035 "fe/idl.ypp"
+#line 5044 "fe/idl.ypp"
{
(yyval.dival) = AST_Argument::dir_INOUT;
}
-#line 8225 "fe/idl.tab.cpp"
+#line 8234 "fe/idl.tab.cpp"
break;
case 431:
-#line 5042 "fe/idl.ypp"
+#line 5051 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseSeen);
}
-#line 8233 "fe/idl.tab.cpp"
+#line 8242 "fe/idl.tab.cpp"
break;
case 432:
-#line 5046 "fe/idl.ypp"
+#line 5055 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseSqSeen);
}
-#line 8241 "fe/idl.tab.cpp"
+#line 8250 "fe/idl.tab.cpp"
break;
case 433:
-#line 5051 "fe/idl.ypp"
+#line 5060 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseQsSeen);
(yyval.nlval) = (yyvsp[-1].nlval);
}
-#line 8250 "fe/idl.tab.cpp"
+#line 8259 "fe/idl.tab.cpp"
break;
case 434:
-#line 5056 "fe/idl.ypp"
+#line 5065 "fe/idl.ypp"
{
- (yyval.nlval) = nullptr;
+ (yyval.nlval) = 0;
}
-#line 8258 "fe/idl.tab.cpp"
+#line 8267 "fe/idl.tab.cpp"
break;
case 435:
-#line 5063 "fe/idl.ypp"
+#line 5072 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseSeen);
}
-#line 8266 "fe/idl.tab.cpp"
+#line 8275 "fe/idl.tab.cpp"
break;
case 436:
-#line 5067 "fe/idl.ypp"
+#line 5076 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseSqSeen);
}
-#line 8274 "fe/idl.tab.cpp"
+#line 8283 "fe/idl.tab.cpp"
break;
case 437:
-#line 5072 "fe/idl.ypp"
+#line 5081 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseQsSeen);
(yyval.nlval) = (yyvsp[-1].nlval);
}
-#line 8283 "fe/idl.tab.cpp"
+#line 8292 "fe/idl.tab.cpp"
break;
case 438:
-#line 5077 "fe/idl.ypp"
+#line 5086 "fe/idl.ypp"
{
- (yyval.nlval) = nullptr;
+ (yyval.nlval) = 0;
}
-#line 8291 "fe/idl.tab.cpp"
+#line 8300 "fe/idl.tab.cpp"
break;
case 439:
-#line 5084 "fe/idl.ypp"
+#line 5093 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseSeen);
}
-#line 8299 "fe/idl.tab.cpp"
+#line 8308 "fe/idl.tab.cpp"
break;
case 440:
-#line 5088 "fe/idl.ypp"
+#line 5097 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseSqSeen);
}
-#line 8307 "fe/idl.tab.cpp"
+#line 8316 "fe/idl.tab.cpp"
break;
case 441:
-#line 5093 "fe/idl.ypp"
+#line 5102 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseQsSeen);
(yyval.nlval) = (yyvsp[-1].nlval);
}
-#line 8316 "fe/idl.tab.cpp"
+#line 8325 "fe/idl.tab.cpp"
break;
case 442:
-#line 5098 "fe/idl.ypp"
+#line 5107 "fe/idl.ypp"
{
- (yyval.nlval) = nullptr;
+ (yyval.nlval) = 0;
}
-#line 8324 "fe/idl.tab.cpp"
+#line 8333 "fe/idl.tab.cpp"
break;
case 443:
-#line 5105 "fe/idl.ypp"
+#line 5114 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpContextSeen);
}
-#line 8332 "fe/idl.tab.cpp"
+#line 8341 "fe/idl.tab.cpp"
break;
case 444:
-#line 5109 "fe/idl.ypp"
+#line 5118 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpContextSqSeen);
}
-#line 8340 "fe/idl.tab.cpp"
+#line 8349 "fe/idl.tab.cpp"
break;
case 445:
-#line 5114 "fe/idl.ypp"
+#line 5123 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpContextQsSeen);
(yyval.slval) = (yyvsp[-1].slval);
}
-#line 8349 "fe/idl.tab.cpp"
+#line 8358 "fe/idl.tab.cpp"
break;
case 446:
-#line 5119 "fe/idl.ypp"
+#line 5128 "fe/idl.ypp"
{
- (yyval.slval) = nullptr;
+ (yyval.slval) = 0;
}
-#line 8357 "fe/idl.tab.cpp"
+#line 8366 "fe/idl.tab.cpp"
break;
case 447:
-#line 5126 "fe/idl.ypp"
+#line 5135 "fe/idl.ypp"
{
ACE_NEW_RETURN ((yyval.slval),
UTL_StrList ((yyvsp[-1].sval),
(yyvsp[0].slval)),
1);
}
-#line 8368 "fe/idl.tab.cpp"
+#line 8377 "fe/idl.tab.cpp"
break;
case 448:
-#line 5137 "fe/idl.ypp"
+#line 5146 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpContextCommaSeen);
}
-#line 8376 "fe/idl.tab.cpp"
+#line 8385 "fe/idl.tab.cpp"
break;
case 449:
-#line 5141 "fe/idl.ypp"
+#line 5150 "fe/idl.ypp"
{
- UTL_StrList *sl = nullptr;
+ UTL_StrList *sl = 0;
ACE_NEW_RETURN (sl,
UTL_StrList ((yyvsp[0].sval),
- nullptr),
+ 0),
1);
- if ((yyvsp[-3].slval) == nullptr)
+ if ((yyvsp[-3].slval) == 0)
{
(yyval.slval) = sl;
}
@@ -8394,25 +8403,25 @@ yyreduce:
(yyval.slval) = (yyvsp[-3].slval);
}
}
-#line 8398 "fe/idl.tab.cpp"
+#line 8407 "fe/idl.tab.cpp"
break;
case 450:
-#line 5159 "fe/idl.ypp"
+#line 5168 "fe/idl.ypp"
{
- (yyval.slval) = nullptr;
+ (yyval.slval) = 0;
}
-#line 8406 "fe/idl.tab.cpp"
+#line 8415 "fe/idl.tab.cpp"
break;
case 451:
-#line 5166 "fe/idl.ypp"
+#line 5175 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_Decl *d =
s->lookup_by_name ((yyvsp[-1].idlist));
- if (d == nullptr)
+ if (d == 0)
{
idl_global->err ()->lookup_error ((yyvsp[-1].idlist));
}
@@ -8425,19 +8434,19 @@ yyreduce:
(yyvsp[-1].idlist)->destroy ();
delete (yyvsp[-1].idlist);
- (yyvsp[-1].idlist) = nullptr;
+ (yyvsp[-1].idlist) = 0;
(yyvsp[0].sval)->destroy ();
delete (yyvsp[0].sval);
- (yyvsp[0].sval) = nullptr;
+ (yyvsp[0].sval) = 0;
- (yyval.dcval) = nullptr;
+ (yyval.dcval) = 0;
}
-#line 8437 "fe/idl.tab.cpp"
+#line 8446 "fe/idl.tab.cpp"
break;
case 452:
-#line 5196 "fe/idl.ypp"
+#line 5205 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_Decl *d = ScopeAsDecl (s);
@@ -8452,7 +8461,7 @@ yyreduce:
s->lookup_by_name ((yyvsp[-1].idlist));
}
- if (d == nullptr)
+ if (d == 0)
{
idl_global->err ()->lookup_error ((yyvsp[-1].idlist));
}
@@ -8465,24 +8474,24 @@ yyreduce:
(yyvsp[-1].idlist)->destroy ();
delete (yyvsp[-1].idlist);
- (yyvsp[-1].idlist) = nullptr;
+ (yyvsp[-1].idlist) = 0;
(yyvsp[0].sval)->destroy ();
delete (yyvsp[0].sval);
- (yyvsp[0].sval) = nullptr;
+ (yyvsp[0].sval) = 0;
- (yyval.dcval) = nullptr;
+ (yyval.dcval) = 0;
}
-#line 8477 "fe/idl.tab.cpp"
+#line 8486 "fe/idl.tab.cpp"
break;
case 455:
-#line 5241 "fe/idl.ypp"
+#line 5250 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval),
- nullptr);
- AST_ComponentFwd *f = nullptr;
+ 0);
+ AST_ComponentFwd *f = 0;
idl_global->set_parse_state (
IDL_GlobalData::PS_ComponentForwardSeen
);
@@ -8491,7 +8500,7 @@ yyreduce:
* Create a node representing a forward declaration of a
* component. Store it in the enclosing scope.
*/
- if (s != nullptr)
+ if (s != 0)
{
f = idl_global->gen ()->create_component_fwd (&n);
(void) s->fe_add_component_fwd (f);
@@ -8499,19 +8508,19 @@ yyreduce:
(yyvsp[0].idval)->destroy ();
delete (yyvsp[0].idval);
- (yyvsp[0].idval) = nullptr;
+ (yyvsp[0].idval) = 0;
- (yyval.dcval) = nullptr;
+ (yyval.dcval) = 0;
}
-#line 8507 "fe/idl.tab.cpp"
+#line 8516 "fe/idl.tab.cpp"
break;
case 456:
-#line 5270 "fe/idl.ypp"
+#line 5279 "fe/idl.ypp"
{
FE_ComponentHeader *&component_header = (yyvsp[0].chval);
UTL_Scope *scope = idl_global->scopes ().top_non_null ();
- AST_Component *component = nullptr;
+ AST_Component *component = 0;
/*
* Make a new component node and add it to the enclosing scope.
@@ -8539,7 +8548,7 @@ yyreduce:
// This FE_ComponentHeader class isn't destroyed with the AST.
component_header->destroy ();
delete component_header;
- component_header = nullptr;
+ component_header = 0;
}
/*
@@ -8549,27 +8558,27 @@ yyreduce:
(yyval.dcval) = component;
}
-#line 8553 "fe/idl.tab.cpp"
+#line 8562 "fe/idl.tab.cpp"
break;
case 457:
-#line 5312 "fe/idl.ypp"
+#line 5321 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ComponentSqSeen);
}
-#line 8561 "fe/idl.tab.cpp"
+#line 8570 "fe/idl.tab.cpp"
break;
case 458:
-#line 5316 "fe/idl.ypp"
+#line 5325 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ComponentBodySeen);
}
-#line 8569 "fe/idl.tab.cpp"
+#line 8578 "fe/idl.tab.cpp"
break;
case 459:
-#line 5320 "fe/idl.ypp"
+#line 5329 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ComponentQsSeen);
@@ -8580,27 +8589,27 @@ yyreduce:
(yyval.dcval) = (yyvsp[-5].dcval);
}
-#line 8584 "fe/idl.tab.cpp"
+#line 8593 "fe/idl.tab.cpp"
break;
case 460:
-#line 5335 "fe/idl.ypp"
+#line 5344 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ComponentIDSeen);
}
-#line 8592 "fe/idl.tab.cpp"
+#line 8601 "fe/idl.tab.cpp"
break;
case 461:
-#line 5339 "fe/idl.ypp"
+#line 5348 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen);
}
-#line 8600 "fe/idl.tab.cpp"
+#line 8609 "fe/idl.tab.cpp"
break;
case 462:
-#line 5343 "fe/idl.ypp"
+#line 5352 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen);
@@ -8608,10 +8617,10 @@ yyreduce:
* Create an AST representation of the information in the header
* part of a component.
*/
- UTL_ScopedName *n = nullptr;
+ UTL_ScopedName *n = 0;
ACE_NEW_RETURN (n,
UTL_ScopedName ((yyvsp[-4].idval),
- nullptr),
+ 0),
1);
ACE_NEW_RETURN ((yyval.chval),
FE_ComponentHeader (n,
@@ -8620,49 +8629,49 @@ yyreduce:
false),
1);
- if (nullptr != (yyvsp[0].nlval))
+ if (0 != (yyvsp[0].nlval))
{
(yyvsp[0].nlval)->destroy ();
delete (yyvsp[0].nlval);
- (yyvsp[0].nlval) = nullptr;
+ (yyvsp[0].nlval) = 0;
}
- if (nullptr != (yyvsp[-2].idlist))
+ if (0 != (yyvsp[-2].idlist))
{
(yyvsp[-2].idlist)->destroy ();
delete (yyvsp[-2].idlist);
- (yyvsp[-2].idlist) = nullptr;
+ (yyvsp[-2].idlist) = 0;
}
}
-#line 8638 "fe/idl.tab.cpp"
+#line 8647 "fe/idl.tab.cpp"
break;
case 463:
-#line 5380 "fe/idl.ypp"
+#line 5389 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen);
}
-#line 8646 "fe/idl.tab.cpp"
+#line 8655 "fe/idl.tab.cpp"
break;
case 464:
-#line 5384 "fe/idl.ypp"
+#line 5393 "fe/idl.ypp"
{
(yyval.idlist) = (yyvsp[0].idlist);
}
-#line 8654 "fe/idl.tab.cpp"
+#line 8663 "fe/idl.tab.cpp"
break;
case 465:
-#line 5388 "fe/idl.ypp"
+#line 5397 "fe/idl.ypp"
{
- (yyval.idlist) = nullptr;
+ (yyval.idlist) = 0;
}
-#line 8662 "fe/idl.tab.cpp"
+#line 8671 "fe/idl.tab.cpp"
break;
case 466:
-#line 5395 "fe/idl.ypp"
+#line 5404 "fe/idl.ypp"
{
AST_Annotation_Appls *&annotations = (yyvsp[-1].annotations_val);
AST_Decl *&node = (yyvsp[0].dcval);
@@ -8677,140 +8686,140 @@ yyreduce:
}
delete annotations;
}
-#line 8681 "fe/idl.tab.cpp"
+#line 8690 "fe/idl.tab.cpp"
break;
case 469:
-#line 5415 "fe/idl.ypp"
+#line 5424 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ProvidesDeclSeen);
}
-#line 8689 "fe/idl.tab.cpp"
+#line 8698 "fe/idl.tab.cpp"
break;
case 470:
-#line 5419 "fe/idl.ypp"
+#line 5428 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
(yyval.dcval) = (yyvsp[-2].dcval);
}
-#line 8698 "fe/idl.tab.cpp"
+#line 8707 "fe/idl.tab.cpp"
break;
case 471:
-#line 5424 "fe/idl.ypp"
+#line 5433 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_UsesDeclSeen);
}
-#line 8706 "fe/idl.tab.cpp"
+#line 8715 "fe/idl.tab.cpp"
break;
case 472:
-#line 5428 "fe/idl.ypp"
+#line 5437 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
(yyval.dcval) = (yyvsp[-2].dcval);
}
-#line 8715 "fe/idl.tab.cpp"
+#line 8724 "fe/idl.tab.cpp"
break;
case 473:
-#line 5433 "fe/idl.ypp"
+#line 5442 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_EmitsDeclSeen);
}
-#line 8723 "fe/idl.tab.cpp"
+#line 8732 "fe/idl.tab.cpp"
break;
case 474:
-#line 5437 "fe/idl.ypp"
+#line 5446 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
(yyval.dcval) = (yyvsp[-2].dcval);
}
-#line 8732 "fe/idl.tab.cpp"
+#line 8741 "fe/idl.tab.cpp"
break;
case 475:
-#line 5442 "fe/idl.ypp"
+#line 5451 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_PublishesDeclSeen);
}
-#line 8740 "fe/idl.tab.cpp"
+#line 8749 "fe/idl.tab.cpp"
break;
case 476:
-#line 5446 "fe/idl.ypp"
+#line 5455 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
(yyval.dcval) = (yyvsp[-2].dcval);
}
-#line 8749 "fe/idl.tab.cpp"
+#line 8758 "fe/idl.tab.cpp"
break;
case 477:
-#line 5451 "fe/idl.ypp"
+#line 5460 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ConsumesDeclSeen);
}
-#line 8757 "fe/idl.tab.cpp"
+#line 8766 "fe/idl.tab.cpp"
break;
case 478:
-#line 5455 "fe/idl.ypp"
+#line 5464 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
(yyval.dcval) = (yyvsp[-2].dcval);
}
-#line 8766 "fe/idl.tab.cpp"
+#line 8775 "fe/idl.tab.cpp"
break;
case 479:
-#line 5460 "fe/idl.ypp"
+#line 5469 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen);
}
-#line 8774 "fe/idl.tab.cpp"
+#line 8783 "fe/idl.tab.cpp"
break;
case 480:
-#line 5464 "fe/idl.ypp"
+#line 5473 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
(yyval.dcval) = (yyvsp[-2].dcval);
}
-#line 8783 "fe/idl.tab.cpp"
+#line 8792 "fe/idl.tab.cpp"
break;
case 481:
-#line 5469 "fe/idl.ypp"
+#line 5478 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen);
}
-#line 8791 "fe/idl.tab.cpp"
+#line 8800 "fe/idl.tab.cpp"
break;
case 482:
-#line 5473 "fe/idl.ypp"
+#line 5482 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
(yyval.dcval) = (yyvsp[-2].dcval);
}
-#line 8800 "fe/idl.tab.cpp"
+#line 8809 "fe/idl.tab.cpp"
break;
case 483:
-#line 5480 "fe/idl.ypp"
+#line 5489 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
bool so_far_so_good = true;
AST_Decl::NodeType nt = AST_Decl::NT_type;
- AST_Param_Holder *ph = nullptr;
+ AST_Param_Holder *ph = 0;
AST_Decl *d =
s->lookup_by_name ((yyvsp[-1].idlist), true, false);
- if (d == nullptr)
+ if (d == 0)
{
idl_global->err ()->lookup_error ((yyvsp[-1].idlist));
so_far_so_good = false;
@@ -8861,7 +8870,7 @@ yyreduce:
}
}
- AST_Provides *provides = nullptr;
+ AST_Provides *provides = 0;
if (so_far_so_good)
{
@@ -8872,7 +8881,7 @@ yyreduce:
FE_Utils::original_local_name ((yyvsp[0].idval));
UTL_ScopedName sn ((yyvsp[0].idval),
- nullptr);
+ 0);
provides = idl_global->gen ()->create_provides (
&sn, port_interface_type);
@@ -8882,40 +8891,40 @@ yyreduce:
(yyvsp[-1].idlist)->destroy ();
delete (yyvsp[-1].idlist);
- (yyvsp[-1].idlist) = nullptr;
+ (yyvsp[-1].idlist) = 0;
(yyvsp[0].idval)->destroy ();
delete (yyvsp[0].idval);
- (yyvsp[0].idval) = nullptr;
+ (yyvsp[0].idval) = 0;
(yyval.dcval) = dynamic_cast<AST_Decl *> (provides);
}
-#line 8894 "fe/idl.tab.cpp"
+#line 8903 "fe/idl.tab.cpp"
break;
case 484:
-#line 5573 "fe/idl.ypp"
+#line 5582 "fe/idl.ypp"
{
// Lookups and checking are done where the 'interface_type'
// token is used, in 'provides_decl' and 'uses_decl'.
(yyval.idlist) = (yyvsp[0].idlist);
}
-#line 8904 "fe/idl.tab.cpp"
+#line 8913 "fe/idl.tab.cpp"
break;
case 485:
-#line 5579 "fe/idl.ypp"
+#line 5588 "fe/idl.ypp"
{
- Identifier *corba_id = nullptr;
+ Identifier *corba_id = 0;
ACE_NEW_RETURN (corba_id,
Identifier ("Object"),
1);
- UTL_IdList *conc_name = nullptr;
+ UTL_IdList *conc_name = 0;
ACE_NEW_RETURN (conc_name,
UTL_IdList (corba_id,
- nullptr),
+ 0),
1);
ACE_NEW_RETURN (corba_id,
@@ -8927,21 +8936,21 @@ yyreduce:
conc_name),
1);
}
-#line 8931 "fe/idl.tab.cpp"
+#line 8940 "fe/idl.tab.cpp"
break;
case 486:
-#line 5604 "fe/idl.ypp"
+#line 5613 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
bool so_far_so_good = true;
AST_Decl::NodeType nt = AST_Decl::NT_type;
- AST_Param_Holder *ph = nullptr;
+ AST_Param_Holder *ph = 0;
AST_Decl *d =
s->lookup_by_name ((yyvsp[-1].idlist), true, false);
- if (d == nullptr)
+ if (d == 0)
{
idl_global->err ()->lookup_error ((yyvsp[-1].idlist));
so_far_so_good = false;
@@ -8992,7 +9001,7 @@ yyreduce:
}
}
- AST_Uses *uses = nullptr;
+ AST_Uses *uses = 0;
if (so_far_so_good)
{
@@ -9003,7 +9012,7 @@ yyreduce:
FE_Utils::original_local_name ((yyvsp[0].idval));
UTL_ScopedName sn ((yyvsp[0].idval),
- nullptr);
+ 0);
uses = idl_global->gen ()->create_uses (
&sn, port_interface_type, (yyvsp[-2].bval));
@@ -9012,7 +9021,7 @@ yyreduce:
AST_Component *c =
dynamic_cast<AST_Component*> (s);
- if (c != nullptr
+ if (c != 0
&& uses->is_multiple ()
&& !idl_global->using_ifr_backend ()
&& !idl_global->ignore_idl3 ()
@@ -9027,55 +9036,55 @@ yyreduce:
(yyvsp[-1].idlist)->destroy ();
delete (yyvsp[-1].idlist);
- (yyvsp[-1].idlist) = nullptr;
+ (yyvsp[-1].idlist) = 0;
(yyvsp[0].idval)->destroy ();
delete (yyvsp[0].idval);
- (yyvsp[0].idval) = nullptr;
+ (yyvsp[0].idval) = 0;
(yyval.dcval) = uses;
}
-#line 9039 "fe/idl.tab.cpp"
+#line 9048 "fe/idl.tab.cpp"
break;
case 487:
-#line 5711 "fe/idl.ypp"
+#line 5720 "fe/idl.ypp"
{
// We use this extra rule here to use in both uses_decl and
// extended_uses_decl, so the LALR(1) parser can avoid conflicts.
(yyval.bval) = (yyvsp[0].bval);
}
-#line 9049 "fe/idl.tab.cpp"
+#line 9058 "fe/idl.tab.cpp"
break;
case 488:
-#line 5720 "fe/idl.ypp"
+#line 5729 "fe/idl.ypp"
{
(yyval.bval) = true;
}
-#line 9057 "fe/idl.tab.cpp"
+#line 9066 "fe/idl.tab.cpp"
break;
case 489:
-#line 5724 "fe/idl.ypp"
+#line 5733 "fe/idl.ypp"
{
(yyval.bval) = false;
}
-#line 9065 "fe/idl.tab.cpp"
+#line 9074 "fe/idl.tab.cpp"
break;
case 490:
-#line 5731 "fe/idl.ypp"
+#line 5740 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
bool so_far_so_good = true;
AST_Decl::NodeType nt = AST_Decl::NT_type;
- AST_Param_Holder *ph = nullptr;
+ AST_Param_Holder *ph = 0;
AST_Decl *d =
s->lookup_by_name ((yyvsp[-1].idlist), true, false);
- if (nullptr == d)
+ if (0 == d)
{
idl_global->err ()->lookup_error ((yyvsp[-1].idlist));
so_far_so_good = false;
@@ -9109,7 +9118,7 @@ yyreduce:
}
}
- AST_Emits *e = nullptr;
+ AST_Emits *e = 0;
if (so_far_so_good)
{
@@ -9120,7 +9129,7 @@ yyreduce:
FE_Utils::original_local_name ((yyvsp[0].idval));
UTL_ScopedName sn ((yyvsp[0].idval),
- nullptr);
+ 0);
e = idl_global->gen ()->create_emits (&sn, event_type);
@@ -9129,29 +9138,29 @@ yyreduce:
(yyvsp[-1].idlist)->destroy ();
delete (yyvsp[-1].idlist);
- (yyvsp[-1].idlist) = nullptr;
+ (yyvsp[-1].idlist) = 0;
(yyvsp[0].idval)->destroy ();
delete (yyvsp[0].idval);
- (yyvsp[0].idval) = nullptr;
+ (yyvsp[0].idval) = 0;
(yyval.dcval) = e;
}
-#line 9141 "fe/idl.tab.cpp"
+#line 9150 "fe/idl.tab.cpp"
break;
case 491:
-#line 5806 "fe/idl.ypp"
+#line 5815 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
bool so_far_so_good = true;
AST_Decl::NodeType nt = AST_Decl::NT_type;
- AST_Param_Holder *ph = nullptr;
+ AST_Param_Holder *ph = 0;
AST_Decl *d =
s->lookup_by_name ((yyvsp[-1].idlist), true, false);
- if (nullptr == d)
+ if (0 == d)
{
idl_global->err ()->lookup_error ((yyvsp[-1].idlist));
so_far_so_good = false;
@@ -9185,7 +9194,7 @@ yyreduce:
}
}
- AST_Publishes *p = nullptr;
+ AST_Publishes *p = 0;
if (so_far_so_good)
{
@@ -9195,36 +9204,36 @@ yyreduce:
// Strip off _cxx_, if any, for port name.
FE_Utils::original_local_name ((yyvsp[0].idval));
- UTL_ScopedName sn ((yyvsp[0].idval), nullptr);
+ UTL_ScopedName sn ((yyvsp[0].idval), 0);
p = idl_global->gen ()->create_publishes (&sn, event_type);
s->fe_add_publishes (p);
}
(yyvsp[-1].idlist)->destroy ();
delete (yyvsp[-1].idlist);
- (yyvsp[-1].idlist) = nullptr;
+ (yyvsp[-1].idlist) = 0;
(yyvsp[0].idval)->destroy ();
delete (yyvsp[0].idval);
- (yyvsp[0].idval) = nullptr;
+ (yyvsp[0].idval) = 0;
(yyval.dcval) = p;
}
-#line 9214 "fe/idl.tab.cpp"
+#line 9223 "fe/idl.tab.cpp"
break;
case 492:
-#line 5878 "fe/idl.ypp"
+#line 5887 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
bool so_far_so_good = true;
AST_Decl::NodeType nt = AST_Decl::NT_type;
- AST_Param_Holder *ph = nullptr;
+ AST_Param_Holder *ph = 0;
AST_Decl *d =
s->lookup_by_name ((yyvsp[-1].idlist), true, false);
- if (nullptr == d)
+ if (0 == d)
{
idl_global->err ()->lookup_error ((yyvsp[-1].idlist));
so_far_so_good = false;
@@ -9258,7 +9267,7 @@ yyreduce:
}
}
- AST_Consumes *c = nullptr;
+ AST_Consumes *c = 0;
if (so_far_so_good)
{
@@ -9269,7 +9278,7 @@ yyreduce:
FE_Utils::original_local_name ((yyvsp[0].idval));
UTL_ScopedName sn ((yyvsp[0].idval),
- nullptr);
+ 0);
c = idl_global->gen ()->create_consumes (&sn, event_type);
@@ -9278,27 +9287,27 @@ yyreduce:
(yyvsp[-1].idlist)->destroy ();
delete (yyvsp[-1].idlist);
- (yyvsp[-1].idlist) = nullptr;
+ (yyvsp[-1].idlist) = 0;
(yyvsp[0].idval)->destroy ();
delete (yyvsp[0].idval);
- (yyvsp[0].idval) = nullptr;
+ (yyvsp[0].idval) = 0;
(yyval.dcval) = c;
}
-#line 9290 "fe/idl.tab.cpp"
+#line 9299 "fe/idl.tab.cpp"
break;
case 493:
-#line 5953 "fe/idl.ypp"
+#line 5962 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
- AST_Home *h = nullptr;
+ AST_Home *h = 0;
/*
* Make a new home node and add it to the enclosing scope.
*/
- if (s != nullptr && (yyvsp[0].hhval) != nullptr)
+ if (s != 0 && (yyvsp[0].hhval) != 0)
{
h =
idl_global->gen ()->create_home (
@@ -9319,7 +9328,7 @@ yyreduce:
// This FE_HomeHeader class isn't destroyed with the AST.
(yyvsp[0].hhval)->destroy ();
delete (yyvsp[0].hhval);
- (yyvsp[0].hhval) = nullptr;
+ (yyvsp[0].hhval) = 0;
}
/*
@@ -9327,72 +9336,72 @@ yyreduce:
*/
idl_global->scopes ().push (h);
}
-#line 9331 "fe/idl.tab.cpp"
+#line 9340 "fe/idl.tab.cpp"
break;
case 494:
-#line 5990 "fe/idl.ypp"
+#line 5999 "fe/idl.ypp"
{
/*
* Done with this component - pop it off the scopes stack.
*/
idl_global->scopes ().pop ();
- (yyval.dcval) = nullptr;
+ (yyval.dcval) = 0;
}
-#line 9344 "fe/idl.tab.cpp"
+#line 9353 "fe/idl.tab.cpp"
break;
case 495:
-#line 6002 "fe/idl.ypp"
+#line 6011 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_HomeSeen);
}
-#line 9352 "fe/idl.tab.cpp"
+#line 9361 "fe/idl.tab.cpp"
break;
case 496:
-#line 6006 "fe/idl.ypp"
+#line 6015 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_HomeIDSeen);
}
-#line 9360 "fe/idl.tab.cpp"
+#line 9369 "fe/idl.tab.cpp"
break;
case 497:
-#line 6010 "fe/idl.ypp"
+#line 6019 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen);
}
-#line 9368 "fe/idl.tab.cpp"
+#line 9377 "fe/idl.tab.cpp"
break;
case 498:
-#line 6014 "fe/idl.ypp"
+#line 6023 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen);
}
-#line 9376 "fe/idl.tab.cpp"
+#line 9385 "fe/idl.tab.cpp"
break;
case 499:
-#line 6018 "fe/idl.ypp"
+#line 6027 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ManagesSeen);
}
-#line 9384 "fe/idl.tab.cpp"
+#line 9393 "fe/idl.tab.cpp"
break;
case 500:
-#line 6022 "fe/idl.ypp"
+#line 6031 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ManagesIDSeen);
}
-#line 9392 "fe/idl.tab.cpp"
+#line 9401 "fe/idl.tab.cpp"
break;
case 501:
-#line 6026 "fe/idl.ypp"
+#line 6035 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_PrimaryKeySpecSeen);
@@ -9400,9 +9409,9 @@ yyreduce:
* Create an AST representation of the information in the header
* part of a component home.
*/
- UTL_ScopedName *n = nullptr;
+ UTL_ScopedName *n = 0;
ACE_NEW_RETURN (n,
- UTL_ScopedName ((yyvsp[-10].idval), nullptr),
+ UTL_ScopedName ((yyvsp[-10].idval), 0),
1);
ACE_NEW_RETURN ((yyval.hhval),
@@ -9415,134 +9424,134 @@ yyreduce:
(yyvsp[-2].idlist)->destroy ();
delete (yyvsp[-2].idlist);
- (yyvsp[-2].idlist) = nullptr;
+ (yyvsp[-2].idlist) = 0;
- if (nullptr != (yyvsp[-8].idlist))
+ if (0 != (yyvsp[-8].idlist))
{
(yyvsp[-8].idlist)->destroy ();
delete (yyvsp[-8].idlist);
- (yyvsp[-8].idlist) = nullptr;
+ (yyvsp[-8].idlist) = 0;
}
- if (nullptr != (yyvsp[0].idlist))
+ if (0 != (yyvsp[0].idlist))
{
(yyvsp[0].idlist)->destroy ();
delete (yyvsp[0].idlist);
- (yyvsp[0].idlist) = nullptr;
+ (yyvsp[0].idlist) = 0;
}
- if (nullptr != (yyvsp[-6].nlval))
+ if (0 != (yyvsp[-6].nlval))
{
(yyvsp[-6].nlval)->destroy ();
delete (yyvsp[-6].nlval);
- (yyvsp[-6].nlval) = nullptr;
+ (yyvsp[-6].nlval) = 0;
}
}
-#line 9442 "fe/idl.tab.cpp"
+#line 9451 "fe/idl.tab.cpp"
break;
case 502:
-#line 6075 "fe/idl.ypp"
+#line 6084 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen);
}
-#line 9450 "fe/idl.tab.cpp"
+#line 9459 "fe/idl.tab.cpp"
break;
case 503:
-#line 6079 "fe/idl.ypp"
+#line 6088 "fe/idl.ypp"
{
(yyval.idlist) = (yyvsp[0].idlist);
}
-#line 9458 "fe/idl.tab.cpp"
+#line 9467 "fe/idl.tab.cpp"
break;
case 504:
-#line 6083 "fe/idl.ypp"
+#line 6092 "fe/idl.ypp"
{
- (yyval.idlist) = nullptr;
+ (yyval.idlist) = 0;
}
-#line 9466 "fe/idl.tab.cpp"
+#line 9475 "fe/idl.tab.cpp"
break;
case 505:
-#line 6091 "fe/idl.ypp"
+#line 6100 "fe/idl.ypp"
{
(yyval.idlist) = (yyvsp[0].idlist);
}
-#line 9474 "fe/idl.tab.cpp"
+#line 9483 "fe/idl.tab.cpp"
break;
case 506:
-#line 6095 "fe/idl.ypp"
+#line 6104 "fe/idl.ypp"
{
- (yyval.idlist) = nullptr;
+ (yyval.idlist) = 0;
}
-#line 9482 "fe/idl.tab.cpp"
+#line 9491 "fe/idl.tab.cpp"
break;
case 507:
-#line 6102 "fe/idl.ypp"
+#line 6111 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_HomeSqSeen);
}
-#line 9490 "fe/idl.tab.cpp"
+#line 9499 "fe/idl.tab.cpp"
break;
case 508:
-#line 6106 "fe/idl.ypp"
+#line 6115 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_HomeBodySeen);
}
-#line 9498 "fe/idl.tab.cpp"
+#line 9507 "fe/idl.tab.cpp"
break;
case 509:
-#line 6110 "fe/idl.ypp"
+#line 6119 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_HomeQsSeen);
}
-#line 9506 "fe/idl.tab.cpp"
+#line 9515 "fe/idl.tab.cpp"
break;
case 513:
-#line 6123 "fe/idl.ypp"
+#line 6132 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_FactoryDeclSeen);
}
-#line 9514 "fe/idl.tab.cpp"
+#line 9523 "fe/idl.tab.cpp"
break;
case 514:
-#line 6127 "fe/idl.ypp"
+#line 6136 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 9522 "fe/idl.tab.cpp"
+#line 9531 "fe/idl.tab.cpp"
break;
case 515:
-#line 6131 "fe/idl.ypp"
+#line 6140 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_FinderDeclSeen);
}
-#line 9530 "fe/idl.tab.cpp"
+#line 9539 "fe/idl.tab.cpp"
break;
case 516:
-#line 6135 "fe/idl.ypp"
+#line 6144 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 9538 "fe/idl.tab.cpp"
+#line 9547 "fe/idl.tab.cpp"
break;
case 517:
-#line 6143 "fe/idl.ypp"
+#line 6152 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval),
- nullptr);
+ 0);
idl_global->set_parse_state (IDL_GlobalData::PS_OpIDSeen);
/*
@@ -9554,26 +9563,26 @@ yyreduce:
(yyvsp[0].idval)->destroy ();
delete (yyvsp[0].idval);
- (yyvsp[0].idval) = nullptr;
+ (yyvsp[0].idval) = 0;
/*
* Push the factory scope onto the scopes stack.
*/
idl_global->scopes ().push (f);
}
-#line 9565 "fe/idl.tab.cpp"
+#line 9574 "fe/idl.tab.cpp"
break;
case 518:
-#line 6166 "fe/idl.ypp"
+#line 6175 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted);
}
-#line 9573 "fe/idl.tab.cpp"
+#line 9582 "fe/idl.tab.cpp"
break;
case 519:
-#line 6170 "fe/idl.ypp"
+#line 6179 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted);
@@ -9581,7 +9590,7 @@ yyreduce:
/*
* Add exceptions and context to the factory.
*/
- if ((yyvsp[0].nlval) != nullptr)
+ if ((yyvsp[0].nlval) != 0)
{
(void) s->fe_add_exceptions ((yyvsp[0].nlval));
}
@@ -9591,15 +9600,15 @@ yyreduce:
*/
idl_global->scopes ().pop ();
}
-#line 9595 "fe/idl.tab.cpp"
+#line 9604 "fe/idl.tab.cpp"
break;
case 520:
-#line 6192 "fe/idl.ypp"
+#line 6201 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval),
- nullptr);
+ 0);
idl_global->set_parse_state (IDL_GlobalData::PS_OpIDSeen);
@@ -9615,26 +9624,26 @@ yyreduce:
(yyvsp[0].idval)->destroy ();
delete (yyvsp[0].idval);
- (yyvsp[0].idval) = nullptr;
+ (yyvsp[0].idval) = 0;
/*
* Push the operation scope onto the scopes stack.
*/
idl_global->scopes ().push (f);
}
-#line 9626 "fe/idl.tab.cpp"
+#line 9635 "fe/idl.tab.cpp"
break;
case 521:
-#line 6219 "fe/idl.ypp"
+#line 6228 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted);
}
-#line 9634 "fe/idl.tab.cpp"
+#line 9643 "fe/idl.tab.cpp"
break;
case 522:
-#line 6223 "fe/idl.ypp"
+#line 6232 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted);
@@ -9642,7 +9651,7 @@ yyreduce:
/*
* Add exceptions and context to the finder.
*/
- if ((yyvsp[0].nlval) != nullptr)
+ if ((yyvsp[0].nlval) != 0)
{
(void) s->fe_add_exceptions ((yyvsp[0].nlval));
}
@@ -9652,23 +9661,23 @@ yyreduce:
*/
idl_global->scopes ().pop ();
}
-#line 9656 "fe/idl.tab.cpp"
+#line 9665 "fe/idl.tab.cpp"
break;
case 528:
-#line 6256 "fe/idl.ypp"
+#line 6265 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval),
- nullptr);
- AST_EventTypeFwd *f = nullptr;
+ 0);
+ AST_EventTypeFwd *f = 0;
idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeForwardSeen);
/*
* Create a node representing a forward declaration of an
* eventtype. Store it in the enclosing scope
*/
- if (s != nullptr)
+ if (s != 0)
{
f = idl_global->gen ()->create_eventtype_fwd (&n,
false);
@@ -9677,27 +9686,27 @@ yyreduce:
(yyvsp[0].idval)->destroy ();
delete (yyvsp[0].idval);
- (yyvsp[0].idval) = nullptr;
+ (yyvsp[0].idval) = 0;
- (yyval.dcval) = nullptr;
+ (yyval.dcval) = 0;
}
-#line 9685 "fe/idl.tab.cpp"
+#line 9694 "fe/idl.tab.cpp"
break;
case 529:
-#line 6286 "fe/idl.ypp"
+#line 6295 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval),
- nullptr);
- AST_EventTypeFwd *f = nullptr;
+ 0);
+ AST_EventTypeFwd *f = 0;
idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeForwardSeen);
/*
* Create a node representing a forward declaration of an
* eventtype. Store it in the enclosing scope
*/
- if (s != nullptr)
+ if (s != 0)
{
f = idl_global->gen ()->create_eventtype_fwd (&n,
true);
@@ -9706,24 +9715,24 @@ yyreduce:
(yyvsp[0].idval)->destroy ();
delete (yyvsp[0].idval);
- (yyvsp[0].idval) = nullptr;
+ (yyvsp[0].idval) = 0;
- (yyval.dcval) = nullptr;
+ (yyval.dcval) = 0;
}
-#line 9714 "fe/idl.tab.cpp"
+#line 9723 "fe/idl.tab.cpp"
break;
case 530:
-#line 6315 "fe/idl.ypp"
+#line 6324 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
- AST_EventType *e = nullptr;
- AST_Interface *i = nullptr;
+ AST_EventType *e = 0;
+ AST_Interface *i = 0;
- if (s != nullptr && (yyvsp[-1].idval) != nullptr)
+ if (s != 0 && (yyvsp[-1].idval) != 0)
{
UTL_ScopedName sn ((yyvsp[-1].idval),
- nullptr);
+ 0);
e =
idl_global->gen ()->create_eventtype (
&sn,
@@ -9756,29 +9765,29 @@ yyreduce:
(yyvsp[-1].idval)->destroy ();
delete (yyvsp[-1].idval);
- (yyvsp[-1].idval) = nullptr;
+ (yyvsp[-1].idval) = 0;
}
-#line 9762 "fe/idl.tab.cpp"
+#line 9771 "fe/idl.tab.cpp"
break;
case 531:
-#line 6359 "fe/idl.ypp"
+#line 6368 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeSqSeen);
}
-#line 9770 "fe/idl.tab.cpp"
+#line 9779 "fe/idl.tab.cpp"
break;
case 532:
-#line 6363 "fe/idl.ypp"
+#line 6372 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeBodySeen);
}
-#line 9778 "fe/idl.tab.cpp"
+#line 9787 "fe/idl.tab.cpp"
break;
case 533:
-#line 6367 "fe/idl.ypp"
+#line 6376 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeQsSeen);
@@ -9787,21 +9796,21 @@ yyreduce:
*/
idl_global->scopes ().pop ();
- (yyval.dcval) = nullptr;
+ (yyval.dcval) = 0;
}
-#line 9793 "fe/idl.tab.cpp"
+#line 9802 "fe/idl.tab.cpp"
break;
case 534:
-#line 6383 "fe/idl.ypp"
+#line 6392 "fe/idl.ypp"
{
(yyval.idval) = (yyvsp[0].idval);
}
-#line 9801 "fe/idl.tab.cpp"
+#line 9810 "fe/idl.tab.cpp"
break;
case 535:
-#line 6392 "fe/idl.ypp"
+#line 6401 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeIDSeen);
@@ -9812,37 +9821,37 @@ yyreduce:
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("Sorry, I (TAO_IDL) can't handle")
ACE_TEXT (" custom yet\n")));
- (yyval.idval) = nullptr;
+ (yyval.idval) = 0;
}
-#line 9818 "fe/idl.tab.cpp"
+#line 9827 "fe/idl.tab.cpp"
break;
case 536:
-#line 6409 "fe/idl.ypp"
+#line 6418 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeIDSeen);
(yyval.idval) = (yyvsp[0].idval);
}
-#line 9828 "fe/idl.tab.cpp"
+#line 9837 "fe/idl.tab.cpp"
break;
case 537:
-#line 6418 "fe/idl.ypp"
+#line 6427 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen);
}
-#line 9836 "fe/idl.tab.cpp"
+#line 9845 "fe/idl.tab.cpp"
break;
case 538:
-#line 6422 "fe/idl.ypp"
+#line 6431 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen);
ACE_NEW_RETURN ((yyval.vhval),
FE_OBVHeader (
- nullptr,
+ 0,
(yyvsp[-2].nlval),
(yyvsp[0].nlval),
(yyvsp[-2].nlval)
@@ -9851,36 +9860,36 @@ yyreduce:
true),
1);
- if (nullptr != (yyvsp[0].nlval))
+ if (0 != (yyvsp[0].nlval))
{
(yyvsp[0].nlval)->destroy ();
delete (yyvsp[0].nlval);
- (yyvsp[0].nlval) = nullptr;
+ (yyvsp[0].nlval) = 0;
}
- if (nullptr != (yyvsp[-2].nlval))
+ if (0 != (yyvsp[-2].nlval))
{
(yyvsp[-2].nlval)->destroy ();
delete (yyvsp[-2].nlval);
- (yyvsp[-2].nlval) = nullptr;
+ (yyvsp[-2].nlval) = 0;
}
}
-#line 9869 "fe/idl.tab.cpp"
+#line 9878 "fe/idl.tab.cpp"
break;
case 539:
-#line 6455 "fe/idl.ypp"
+#line 6464 "fe/idl.ypp"
{
UTL_Scope *scope = idl_global->scopes ().top_non_null ();
Identifier *&event_id = (yyvsp[-1].idval);
FE_OBVHeader *&event_header = (yyvsp[0].vhval);
- AST_EventType *eventtype = nullptr;
+ AST_EventType *eventtype = 0;
if (scope && event_header)
{
// We create the scoped name here instead of with the
// FE_OBVHeader because there is a token for it only here.
- UTL_ScopedName sn (event_id, nullptr);
+ UTL_ScopedName sn (event_id, 0);
eventtype = idl_global->gen ()->create_eventtype (
&sn,
event_header->inherits (),
@@ -9908,7 +9917,7 @@ yyreduce:
// FE_OBVHeader is not automatically destroyed in the AST
event_header->destroy ();
delete event_header;
- event_header = nullptr;
+ event_header = 0;
sn.destroy ();
}
@@ -9920,27 +9929,27 @@ yyreduce:
(yyval.dcval) = eventtype;
}
-#line 9924 "fe/idl.tab.cpp"
+#line 9933 "fe/idl.tab.cpp"
break;
case 540:
-#line 6506 "fe/idl.ypp"
+#line 6515 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeSqSeen);
}
-#line 9932 "fe/idl.tab.cpp"
+#line 9941 "fe/idl.tab.cpp"
break;
case 541:
-#line 6510 "fe/idl.ypp"
+#line 6519 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeBodySeen);
}
-#line 9940 "fe/idl.tab.cpp"
+#line 9949 "fe/idl.tab.cpp"
break;
case 542:
-#line 6514 "fe/idl.ypp"
+#line 6523 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeQsSeen);
@@ -9951,117 +9960,117 @@ yyreduce:
(yyval.dcval) = (yyvsp[-5].dcval);
}
-#line 9955 "fe/idl.tab.cpp"
+#line 9964 "fe/idl.tab.cpp"
break;
case 543:
-#line 6528 "fe/idl.ypp"
+#line 6537 "fe/idl.ypp"
{
(yyval.idval) = (yyvsp[0].idval);
}
-#line 9963 "fe/idl.tab.cpp"
+#line 9972 "fe/idl.tab.cpp"
break;
case 544:
-#line 6532 "fe/idl.ypp"
+#line 6541 "fe/idl.ypp"
{
(yyval.idval) = (yyvsp[0].idval);
}
-#line 9971 "fe/idl.tab.cpp"
+#line 9980 "fe/idl.tab.cpp"
break;
case 545:
-#line 6539 "fe/idl.ypp"
+#line 6548 "fe/idl.ypp"
{
(yyval.ntval) = AST_Decl::NT_type;
}
-#line 9979 "fe/idl.tab.cpp"
+#line 9988 "fe/idl.tab.cpp"
break;
case 546:
-#line 6543 "fe/idl.ypp"
+#line 6552 "fe/idl.ypp"
{
(yyval.ntval) = AST_Decl::NT_struct;
}
-#line 9987 "fe/idl.tab.cpp"
+#line 9996 "fe/idl.tab.cpp"
break;
case 547:
-#line 6547 "fe/idl.ypp"
+#line 6556 "fe/idl.ypp"
{
(yyval.ntval) = AST_Decl::NT_union;
}
-#line 9995 "fe/idl.tab.cpp"
+#line 10004 "fe/idl.tab.cpp"
break;
case 548:
-#line 6551 "fe/idl.ypp"
+#line 6560 "fe/idl.ypp"
{
(yyval.ntval) = AST_Decl::NT_eventtype;
}
-#line 10003 "fe/idl.tab.cpp"
+#line 10012 "fe/idl.tab.cpp"
break;
case 549:
-#line 6555 "fe/idl.ypp"
+#line 6564 "fe/idl.ypp"
{
(yyval.ntval) = AST_Decl::NT_sequence;
}
-#line 10011 "fe/idl.tab.cpp"
+#line 10020 "fe/idl.tab.cpp"
break;
case 550:
-#line 6559 "fe/idl.ypp"
+#line 6568 "fe/idl.ypp"
{
(yyval.ntval) = AST_Decl::NT_interface;
}
-#line 10019 "fe/idl.tab.cpp"
+#line 10028 "fe/idl.tab.cpp"
break;
case 551:
-#line 6563 "fe/idl.ypp"
+#line 6572 "fe/idl.ypp"
{
(yyval.ntval) = AST_Decl::NT_valuetype;
}
-#line 10027 "fe/idl.tab.cpp"
+#line 10036 "fe/idl.tab.cpp"
break;
case 552:
-#line 6567 "fe/idl.ypp"
+#line 6576 "fe/idl.ypp"
{
(yyval.ntval) = AST_Decl::NT_enum;
}
-#line 10035 "fe/idl.tab.cpp"
+#line 10044 "fe/idl.tab.cpp"
break;
case 553:
-#line 6571 "fe/idl.ypp"
+#line 6580 "fe/idl.ypp"
{
(yyval.ntval) = AST_Decl::NT_except;
}
-#line 10043 "fe/idl.tab.cpp"
+#line 10052 "fe/idl.tab.cpp"
break;
case 554:
-#line 6575 "fe/idl.ypp"
+#line 6584 "fe/idl.ypp"
{
(yyval.ntval) = AST_Decl::NT_const;
t_param_const_type = (yyvsp[0].etval);
}
-#line 10052 "fe/idl.tab.cpp"
+#line 10061 "fe/idl.tab.cpp"
break;
case 555:
-#line 6583 "fe/idl.ypp"
+#line 6592 "fe/idl.ypp"
{
- if ((yyvsp[0].plval) == nullptr)
+ if ((yyvsp[0].plval) == 0)
{
ACE_NEW_RETURN ((yyvsp[0].plval), FE_Utils::T_PARAMLIST_INFO, 1);
}
(yyvsp[0].plval)->enqueue_head (*(yyvsp[-1].pival));
delete (yyvsp[-1].pival);
- (yyvsp[-1].pival) = nullptr;
+ (yyvsp[-1].pival) = 0;
// The param added above is always the last one parsed,
// so we check for matches between sequence<T> & T here.
@@ -10072,7 +10081,7 @@ yyreduce:
if (!bad_id.empty ())
{
delete (yyvsp[0].plval);
- (yyvsp[0].plval) = nullptr;
+ (yyvsp[0].plval) = 0;
idl_global->err ()->mismatch_seq_of_param (bad_id.c_str ());
return 1;
@@ -10080,13 +10089,13 @@ yyreduce:
(yyval.plval) = (yyvsp[0].plval);
}
-#line 10084 "fe/idl.tab.cpp"
+#line 10093 "fe/idl.tab.cpp"
break;
case 556:
-#line 6614 "fe/idl.ypp"
+#line 6623 "fe/idl.ypp"
{
- if ((yyvsp[-2].plval) == nullptr)
+ if ((yyvsp[-2].plval) == 0)
{
ACE_NEW_RETURN ((yyvsp[-2].plval), FE_Utils::T_PARAMLIST_INFO, 1);
}
@@ -10095,21 +10104,21 @@ yyreduce:
(yyval.plval) = (yyvsp[-2].plval);
delete (yyvsp[0].pival);
- (yyvsp[0].pival) = nullptr;
+ (yyvsp[0].pival) = 0;
}
-#line 10101 "fe/idl.tab.cpp"
+#line 10110 "fe/idl.tab.cpp"
break;
case 557:
-#line 6627 "fe/idl.ypp"
+#line 6636 "fe/idl.ypp"
{
- (yyval.plval) = nullptr;
+ (yyval.plval) = 0;
}
-#line 10109 "fe/idl.tab.cpp"
+#line 10118 "fe/idl.tab.cpp"
break;
case 558:
-#line 6634 "fe/idl.ypp"
+#line 6643 "fe/idl.ypp"
{
ACE_NEW_RETURN ((yyval.pival),
@@ -10121,7 +10130,7 @@ yyreduce:
(yyval.pival)->type_ = nt;
(yyval.pival)->name_ = (yyvsp[0].strval);
ACE::strdelete ((yyvsp[0].strval));
- (yyvsp[0].strval) = nullptr;
+ (yyvsp[0].strval) = 0;
if (nt == AST_Decl::NT_const)
{
@@ -10131,14 +10140,14 @@ yyreduce:
// Reset these values.
t_param_const_type = AST_Expression::EV_none;
- tao_enum_constant_decl = nullptr;
+ tao_enum_constant_decl = 0;
}
}
-#line 10138 "fe/idl.tab.cpp"
+#line 10147 "fe/idl.tab.cpp"
break;
case 559:
-#line 6659 "fe/idl.ypp"
+#line 6668 "fe/idl.ypp"
{
ACE_NEW_RETURN ((yyval.pival),
FE_Utils::T_Param_Info,
@@ -10149,28 +10158,28 @@ yyreduce:
(yyval.pival)->name_ += (yyvsp[0].strval);
ACE::strdelete ((yyvsp[-2].strval));
- (yyvsp[-2].strval) = nullptr;
+ (yyvsp[-2].strval) = 0;
ACE::strdelete ((yyvsp[0].strval));
- (yyvsp[0].strval) = nullptr;
+ (yyvsp[0].strval) = 0;
}
-#line 10157 "fe/idl.tab.cpp"
+#line 10166 "fe/idl.tab.cpp"
break;
case 560:
-#line 6677 "fe/idl.ypp"
+#line 6686 "fe/idl.ypp"
{
ACE_NEW_RETURN ((yyval.slval), UTL_StrList ((yyvsp[-1].sval), (yyvsp[0].slval)), 1);
}
-#line 10165 "fe/idl.tab.cpp"
+#line 10174 "fe/idl.tab.cpp"
break;
case 561:
-#line 6684 "fe/idl.ypp"
+#line 6693 "fe/idl.ypp"
{
- UTL_StrList *sl = nullptr;
- ACE_NEW_RETURN (sl, UTL_StrList ((yyvsp[0].sval), nullptr), 1);
+ UTL_StrList *sl = 0;
+ ACE_NEW_RETURN (sl, UTL_StrList ((yyvsp[0].sval), 0), 1);
- if ((yyvsp[-2].slval) == nullptr)
+ if ((yyvsp[-2].slval) == 0)
{
(yyval.slval) = sl;
}
@@ -10180,37 +10189,37 @@ yyreduce:
(yyval.slval) = (yyvsp[-2].slval);
}
}
-#line 10184 "fe/idl.tab.cpp"
+#line 10193 "fe/idl.tab.cpp"
break;
case 562:
-#line 6699 "fe/idl.ypp"
+#line 6708 "fe/idl.ypp"
{
- (yyval.slval) = nullptr;
+ (yyval.slval) = 0;
}
-#line 10192 "fe/idl.tab.cpp"
+#line 10201 "fe/idl.tab.cpp"
break;
case 563:
-#line 6706 "fe/idl.ypp"
+#line 6715 "fe/idl.ypp"
{
ACE_NEW_RETURN ((yyval.sval),
UTL_String ((yyvsp[0].strval), true),
1);
}
-#line 10202 "fe/idl.tab.cpp"
+#line 10211 "fe/idl.tab.cpp"
break;
case 564:
-#line 6715 "fe/idl.ypp"
+#line 6724 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeSeen);
}
-#line 10210 "fe/idl.tab.cpp"
+#line 10219 "fe/idl.tab.cpp"
break;
case 565:
-#line 6719 "fe/idl.ypp"
+#line 6728 "fe/idl.ypp"
{
char *&id_value = (yyvsp[0].strval);
idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeIDSeen);
@@ -10218,9 +10227,9 @@ yyreduce:
Identifier id (id_value);
ACE::strdelete (id_value);
- id_value = nullptr;
+ id_value = 0;
- UTL_ScopedName scoped_name (&id, nullptr);
+ UTL_ScopedName scoped_name (&id, 0);
AST_PortType *porttype = idl_global->gen ()->create_porttype (
&scoped_name);
scope->fe_add_porttype (porttype);
@@ -10229,27 +10238,27 @@ yyreduce:
// Push it on the scopes stack.
idl_global->scopes ().push (porttype);
}
-#line 10233 "fe/idl.tab.cpp"
+#line 10242 "fe/idl.tab.cpp"
break;
case 566:
-#line 6738 "fe/idl.ypp"
+#line 6747 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeSqSeen);
}
-#line 10241 "fe/idl.tab.cpp"
+#line 10250 "fe/idl.tab.cpp"
break;
case 567:
-#line 6746 "fe/idl.ypp"
+#line 6755 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeBodySeen);
}
-#line 10249 "fe/idl.tab.cpp"
+#line 10258 "fe/idl.tab.cpp"
break;
case 568:
-#line 6750 "fe/idl.ypp"
+#line 6759 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeQsSeen);
@@ -10258,11 +10267,11 @@ yyreduce:
(yyval.dcval) = (yyvsp[-5].dcval);
}
-#line 10262 "fe/idl.tab.cpp"
+#line 10271 "fe/idl.tab.cpp"
break;
case 569:
-#line 6762 "fe/idl.ypp"
+#line 6771 "fe/idl.ypp"
{
AST_Annotation_Appls *&annotations = (yyvsp[-1].annotations_val);
AST_Decl *&node = (yyvsp[0].dcval);
@@ -10277,36 +10286,36 @@ yyreduce:
}
delete annotations;
}
-#line 10281 "fe/idl.tab.cpp"
+#line 10290 "fe/idl.tab.cpp"
break;
case 575:
-#line 6788 "fe/idl.ypp"
+#line 6797 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen);
}
-#line 10289 "fe/idl.tab.cpp"
+#line 10298 "fe/idl.tab.cpp"
break;
case 576:
-#line 6792 "fe/idl.ypp"
+#line 6801 "fe/idl.ypp"
{
(yyval.dcval) = (yyvsp[-2].dcval);
}
-#line 10297 "fe/idl.tab.cpp"
+#line 10306 "fe/idl.tab.cpp"
break;
case 577:
-#line 6799 "fe/idl.ypp"
+#line 6808 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen);
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_Decl *d =
s->lookup_by_name ((yyvsp[-1].idlist));
- AST_PortType *pt = nullptr;
+ AST_PortType *pt = 0;
bool so_far_so_good = true;
- if (d == nullptr)
+ if (d == 0)
{
idl_global->err ()->lookup_error ((yyvsp[-1].idlist));
so_far_so_good = false;
@@ -10315,7 +10324,7 @@ yyreduce:
{
pt = dynamic_cast<AST_PortType*> (d);
- if (pt == nullptr)
+ if (pt == 0)
{
idl_global->err ()->error1 (UTL_Error::EIDL_PORTTYPE_EXPECTED,
d);
@@ -10323,15 +10332,15 @@ yyreduce:
}
}
- AST_Extended_Port *ep = nullptr;
+ AST_Extended_Port *ep = 0;
if (so_far_so_good)
{
Identifier id ((yyvsp[0].strval));
ACE::strdelete ((yyvsp[0].strval));
- (yyvsp[0].strval) = nullptr;
+ (yyvsp[0].strval) = 0;
- UTL_ScopedName sn (&id, nullptr);
+ UTL_ScopedName sn (&id, 0);
ep = idl_global->gen ()->create_extended_port (&sn, pt);
s->fe_add_extended_port (ep);
@@ -10345,7 +10354,7 @@ yyreduce:
AST_Uses *u = dynamic_cast<AST_Uses*> (d);
- if (u != nullptr && u->is_multiple ())
+ if (u != 0 && u->is_multiple ())
{
AST_Component *c =
dynamic_cast<AST_Component*> (s);
@@ -10360,24 +10369,24 @@ yyreduce:
(yyvsp[-1].idlist)->destroy ();
delete (yyvsp[-1].idlist);
- (yyvsp[-1].idlist) = nullptr;
+ (yyvsp[-1].idlist) = 0;
(yyval.dcval) = ep;
}
-#line 10368 "fe/idl.tab.cpp"
+#line 10377 "fe/idl.tab.cpp"
break;
case 578:
-#line 6866 "fe/idl.ypp"
+#line 6875 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_MirrorPortDeclSeen);
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_Decl *d =
s->lookup_by_name ((yyvsp[-1].idlist));
- AST_PortType *pt = nullptr;
+ AST_PortType *pt = 0;
bool so_far_so_good = true;
- if (d == nullptr)
+ if (d == 0)
{
idl_global->err ()->lookup_error ((yyvsp[-1].idlist));
so_far_so_good = false;
@@ -10386,7 +10395,7 @@ yyreduce:
{
pt = dynamic_cast<AST_PortType*> (d);
- if (pt == nullptr)
+ if (pt == 0)
{
idl_global->err ()->error1 (UTL_Error::EIDL_PORTTYPE_EXPECTED,
d);
@@ -10394,32 +10403,32 @@ yyreduce:
}
}
- AST_Mirror_Port *mp = nullptr;
+ AST_Mirror_Port *mp = 0;
if (so_far_so_good)
{
Identifier id ((yyvsp[0].strval));
ACE::strdelete ((yyvsp[0].strval));
- (yyvsp[0].strval) = nullptr;
+ (yyvsp[0].strval) = 0;
- UTL_ScopedName sn (&id, nullptr);
+ UTL_ScopedName sn (&id, 0);
mp = idl_global->gen ()->create_mirror_port (&sn, pt);
s->fe_add_mirror_port (mp);
}
(yyvsp[-1].idlist)->destroy ();
delete (yyvsp[-1].idlist);
- (yyvsp[-1].idlist) = nullptr;
+ (yyvsp[-1].idlist) = 0;
(yyval.dcval) = mp;
}
-#line 10417 "fe/idl.tab.cpp"
+#line 10426 "fe/idl.tab.cpp"
break;
case 579:
-#line 6914 "fe/idl.ypp"
+#line 6923 "fe/idl.ypp"
{
- if ((yyvsp[0].alval) == nullptr)
+ if ((yyvsp[0].alval) == 0)
{
ACE_NEW_RETURN ((yyvsp[0].alval),
FE_Utils::T_ARGLIST,
@@ -10430,13 +10439,13 @@ yyreduce:
(yyvsp[0].alval)->enqueue_head ((yyvsp[-1].dcval));
(yyval.alval) = (yyvsp[0].alval);
}
-#line 10434 "fe/idl.tab.cpp"
+#line 10443 "fe/idl.tab.cpp"
break;
case 580:
-#line 6930 "fe/idl.ypp"
+#line 6939 "fe/idl.ypp"
{
- if ((yyvsp[-3].alval) == nullptr)
+ if ((yyvsp[-3].alval) == 0)
{
ACE_NEW_RETURN ((yyvsp[-3].alval),
FE_Utils::T_ARGLIST,
@@ -10447,19 +10456,19 @@ yyreduce:
(yyvsp[-3].alval)->enqueue_tail ((yyvsp[0].dcval));
(yyval.alval) = (yyvsp[-3].alval);
}
-#line 10451 "fe/idl.tab.cpp"
+#line 10460 "fe/idl.tab.cpp"
break;
case 581:
-#line 6943 "fe/idl.ypp"
+#line 6952 "fe/idl.ypp"
{
- (yyval.alval) = nullptr;
+ (yyval.alval) = 0;
}
-#line 10459 "fe/idl.tab.cpp"
+#line 10468 "fe/idl.tab.cpp"
break;
case 582:
-#line 6950 "fe/idl.ypp"
+#line 6959 "fe/idl.ypp"
{
// To avoid grammar conflicts with this LALR(1) parser,
// we take advantage of the fact that an expression can
@@ -10470,14 +10479,14 @@ yyreduce:
// arg list.
AST_Expression *ex = (yyvsp[0].exval);
UTL_ScopedName *sn = ex->n ();
- AST_Decl *d = nullptr;
+ AST_Decl *d = 0;
UTL_Scope *s = idl_global->scopes ().top_non_null ();
- if (sn != nullptr)
+ if (sn != 0)
{
d = s->lookup_by_name (sn);
- if (d == nullptr)
+ if (d == 0)
{
idl_global->err ()->lookup_error (sn);
return 1;
@@ -10512,55 +10521,55 @@ yyreduce:
idl_global->gen ()->create_constant (
(yyvsp[0].exval)->ev ()->et,
(yyvsp[0].exval),
- nullptr);
+ 0);
}
}
-#line 10519 "fe/idl.tab.cpp"
+#line 10528 "fe/idl.tab.cpp"
break;
case 583:
-#line 7009 "fe/idl.ypp"
+#line 7018 "fe/idl.ypp"
{
- (yyval.dcval) = nullptr;
+ (yyval.dcval) = 0;
}
-#line 10527 "fe/idl.tab.cpp"
+#line 10536 "fe/idl.tab.cpp"
break;
case 584:
-#line 7016 "fe/idl.ypp"
+#line 7025 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorSeen);
}
-#line 10535 "fe/idl.tab.cpp"
+#line 10544 "fe/idl.tab.cpp"
break;
case 585:
-#line 7020 "fe/idl.ypp"
+#line 7029 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorIDSeen);
}
-#line 10543 "fe/idl.tab.cpp"
+#line 10552 "fe/idl.tab.cpp"
break;
case 586:
-#line 7024 "fe/idl.ypp"
+#line 7033 "fe/idl.ypp"
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
- AST_Connector *parent = nullptr;
+ AST_Connector *parent = 0;
bool so_far_so_good = true;
Identifier id ((yyvsp[-2].strval));
ACE::strdelete ((yyvsp[-2].strval));
- (yyvsp[-2].strval) = nullptr;
+ (yyvsp[-2].strval) = 0;
- UTL_ScopedName sn (&id, nullptr);
+ UTL_ScopedName sn (&id, 0);
- if ((yyvsp[0].idlist) != nullptr)
+ if ((yyvsp[0].idlist) != 0)
{
AST_Decl *d =
s->lookup_by_name ((yyvsp[0].idlist));
- if (d == nullptr)
+ if (d == 0)
{
idl_global->err ()->lookup_error ((yyvsp[0].idlist));
so_far_so_good = false;
@@ -10569,7 +10578,7 @@ yyreduce:
parent =
dynamic_cast<AST_Connector*> (d);
- if (parent == nullptr)
+ if (parent == 0)
{
idl_global->err ()->error1 (
UTL_Error::EIDL_CONNECTOR_EXPECTED,
@@ -10580,7 +10589,7 @@ yyreduce:
(yyvsp[0].idlist)->destroy ();
delete (yyvsp[0].idlist);
- (yyvsp[0].idlist) = nullptr;
+ (yyvsp[0].idlist) = 0;
}
if (so_far_so_good)
@@ -10597,102 +10606,102 @@ yyreduce:
delete (yyvsp[-3].annotations_val);
}
-#line 10601 "fe/idl.tab.cpp"
+#line 10610 "fe/idl.tab.cpp"
break;
case 587:
-#line 7081 "fe/idl.ypp"
+#line 7090 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorSqSeen);
}
-#line 10609 "fe/idl.tab.cpp"
+#line 10618 "fe/idl.tab.cpp"
break;
case 588:
-#line 7085 "fe/idl.ypp"
+#line 7094 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorBodySeen);
}
-#line 10617 "fe/idl.tab.cpp"
+#line 10626 "fe/idl.tab.cpp"
break;
case 589:
-#line 7089 "fe/idl.ypp"
+#line 7098 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorQsSeen);
// Done with this connector - pop it off the scope stack.
idl_global->scopes ().pop ();
}
-#line 10628 "fe/idl.tab.cpp"
+#line 10637 "fe/idl.tab.cpp"
break;
case 592:
-#line 7104 "fe/idl.ypp"
+#line 7113 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ProvidesDeclSeen);
}
-#line 10636 "fe/idl.tab.cpp"
+#line 10645 "fe/idl.tab.cpp"
break;
case 593:
-#line 7108 "fe/idl.ypp"
+#line 7117 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 10644 "fe/idl.tab.cpp"
+#line 10653 "fe/idl.tab.cpp"
break;
case 594:
-#line 7112 "fe/idl.ypp"
+#line 7121 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_UsesDeclSeen);
}
-#line 10652 "fe/idl.tab.cpp"
+#line 10661 "fe/idl.tab.cpp"
break;
case 595:
-#line 7116 "fe/idl.ypp"
+#line 7125 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 10660 "fe/idl.tab.cpp"
+#line 10669 "fe/idl.tab.cpp"
break;
case 596:
-#line 7120 "fe/idl.ypp"
+#line 7129 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen);
}
-#line 10668 "fe/idl.tab.cpp"
+#line 10677 "fe/idl.tab.cpp"
break;
case 597:
-#line 7124 "fe/idl.ypp"
+#line 7133 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 10676 "fe/idl.tab.cpp"
+#line 10685 "fe/idl.tab.cpp"
break;
case 598:
-#line 7128 "fe/idl.ypp"
+#line 7137 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen);
}
-#line 10684 "fe/idl.tab.cpp"
+#line 10693 "fe/idl.tab.cpp"
break;
case 599:
-#line 7132 "fe/idl.ypp"
+#line 7141 "fe/idl.ypp"
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 10692 "fe/idl.tab.cpp"
+#line 10701 "fe/idl.tab.cpp"
break;
-#line 10696 "fe/idl.tab.cpp"
+#line 10705 "fe/idl.tab.cpp"
default: break;
}
@@ -10772,7 +10781,7 @@ yyerrlab:
yyerrorlab:
/* Pacify compilers when the user code never invokes YYERROR and the
label yyerrorlab therefore never appears in user code. */
- if (false)
+ if (0)
YYERROR;
/* Do not reclaim the symbols of the rule whose action triggered
@@ -10886,7 +10895,7 @@ yyreturn:
return yyresult;
}
-#line 7137 "fe/idl.ypp"
+#line 7146 "fe/idl.ypp"
/* programs */
diff --git a/TAO/TAO_IDL/fe/idl.tab.hpp b/TAO/TAO_IDL/fe/idl.tab.hpp
index 354e713e626..fbe1e9b75cc 100644
--- a/TAO/TAO_IDL/fe/idl.tab.hpp
+++ b/TAO/TAO_IDL/fe/idl.tab.hpp
@@ -203,6 +203,6 @@ typedef union YYSTYPE YYSTYPE;
extern YYSTYPE tao_yylval;
-int tao_yyparse ();
+int tao_yyparse (void);
#endif /* !YY_TAO_YY_FE_IDL_TAB_HPP_INCLUDED */
diff --git a/TAO/TAO_IDL/fe/idl.ypp b/TAO/TAO_IDL/fe/idl.ypp
index 2f168d1af31..c4fd51e4d99 100644
--- a/TAO/TAO_IDL/fe/idl.ypp
+++ b/TAO/TAO_IDL/fe/idl.ypp
@@ -4133,8 +4133,14 @@ wstring_type_spec
/*
* Create a node representing a string.
*/
- if ($4 == 0
- || $4->coerce (AST_Expression::EV_ulong) == 0)
+ AST_Expression::AST_ExprValue *ev = 0;
+
+ if ($4 != 0)
+ {
+ ev = $4->coerce (AST_Expression::EV_ulong);
+ }
+
+ if (0 == $4 || 0 == ev)
{
idl_global->err ()->coercion_error ($4,
AST_Expression::EV_ulong);
@@ -4155,6 +4161,9 @@ wstring_type_spec
$$ = string;
}
+
+ delete ev;
+ ev = 0;
}
| wstring_head
{
diff --git a/TAO/TAO_IDL/fe/idl.yy.cpp b/TAO/TAO_IDL/fe/idl.yy.cpp
index c919be1d965..bcb099c813a 100644
--- a/TAO/TAO_IDL/fe/idl.yy.cpp
+++ b/TAO/TAO_IDL/fe/idl.yy.cpp
@@ -506,7 +506,7 @@ struct yy_buffer_state
/* Stack of input buffers. */
static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
-static YY_BUFFER_STATE * yy_buffer_stack = nullptr; /**< Stack as an array. */
+static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
/* We provide macros for accessing buffer states in case in the
* future we want to put the buffer states in a more general
@@ -528,7 +528,7 @@ static int yy_n_chars; /* number of characters read into yy_ch_buf */
int yyleng;
/* Points to current character in buffer. */
-static char *yy_c_buf_p = nullptr;
+static char *yy_c_buf_p = 0;
static int yy_init = 0; /* whether we need to initialize */
static int yy_start = 0; /* start state number */
@@ -543,10 +543,10 @@ YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size );
void yy_delete_buffer ( YY_BUFFER_STATE b );
void yy_flush_buffer ( YY_BUFFER_STATE b );
void yypush_buffer_state ( YY_BUFFER_STATE new_buffer );
-void yypop_buffer_state ( );
+void yypop_buffer_state ( void );
-static void yyensure_buffer_stack ( );
-static void yy_load_buffer_state ( );
+static void yyensure_buffer_stack ( void );
+static void yy_load_buffer_state ( void );
static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file );
#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER )
@@ -582,7 +582,7 @@ void yyfree ( void * );
/* Begin user sect3 */
typedef flex_uint8_t YY_CHAR;
-FILE *yyin = nullptr, *yyout = nullptr;
+FILE *yyin = 0, *yyout = 0;
typedef int yy_state_type;
@@ -591,9 +591,9 @@ int yylineno = 1;
extern char yytext[];
-static yy_state_type yy_get_previous_state ( );
+static yy_state_type yy_get_previous_state ( void );
static yy_state_type yy_try_NUL_trans ( yy_state_type current_state );
-static int yy_get_next_buffer ( );
+static int yy_get_next_buffer ( void );
static void yynoreturn yy_fatal_error ( const char* msg );
/* Done after the current pattern has been matched and before the
@@ -1315,34 +1315,34 @@ static AST_Decl * idl_find_node (const char *);
#define YY_EXTRA_TYPE void *
#endif
-static int yy_init_globals ( );
+static int yy_init_globals ( void );
/* Accessor methods to globals.
These are made visible to non-reentrant scanners for convenience. */
-int yylex_destroy ( );
+int yylex_destroy ( void );
-int yyget_debug ( );
+int yyget_debug ( void );
void yyset_debug ( int debug_flag );
-YY_EXTRA_TYPE yyget_extra ( );
+YY_EXTRA_TYPE yyget_extra ( void );
void yyset_extra ( YY_EXTRA_TYPE user_defined );
-FILE *yyget_in ( );
+FILE *yyget_in ( void );
void yyset_in ( FILE * _in_str );
-FILE *yyget_out ( );
+FILE *yyget_out ( void );
void yyset_out ( FILE * _out_str );
- int yyget_leng ( );
+ int yyget_leng ( void );
-char *yyget_text ( );
+char *yyget_text ( void );
-int yyget_lineno ( );
+int yyget_lineno ( void );
void yyset_lineno ( int _line_number );
@@ -1374,7 +1374,7 @@ static int yy_flex_strlen ( const char * );
#ifndef YY_NO_INPUT
#ifdef __cplusplus
-static int yyinput ( );
+static int yyinput ( void );
#else
static int input ( void );
#endif
@@ -1461,7 +1461,7 @@ static int input ( void );
#ifndef YY_DECL
#define YY_DECL_IS_OURS 1
-extern int yylex ();
+extern int yylex (void);
#define YY_DECL int yylex (void)
#endif /* !YY_DECL */
@@ -1524,7 +1524,7 @@ YY_DECL
#line 1528 "fe/idl.yy.cpp"
- while ( /*CONSTCOND*/true ) /* loops until end-of-file is reached */
+ while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */
{
yy_cp = (yy_c_buf_p);
@@ -1965,7 +1965,7 @@ YY_RULE_SETUP
// regular expression is to handle EBCDIC, as well as ASCII.
TAO_IDL_CPP_Keyword_Table cpp_key_tbl;
- const TAO_IDL_CPP_Keyword_Entry *entry = nullptr;
+ const TAO_IDL_CPP_Keyword_Entry *entry = 0;
if (!idl_global->preserve_cpp_keywords())
{
// This check will ensure that escaped C++ keywords will be
@@ -2273,7 +2273,7 @@ YY_RULE_SETUP
if (next == '/')
break;
else
- yyunput (c, nullptr);
+ yyunput (c, 0);
}
else if (c == '\n')
{
@@ -2449,7 +2449,7 @@ case YY_STATE_EOF(INITIAL):
* EOB_ACT_CONTINUE_SCAN - continue scanning from current position
* EOB_ACT_END_OF_FILE - end of file
*/
-static int yy_get_next_buffer ()
+static int yy_get_next_buffer (void)
{
char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
char *source = (yytext_ptr);
@@ -2523,7 +2523,7 @@ static int yy_get_next_buffer ()
}
else
/* Can't grow it, we don't own it. */
- b->yy_ch_buf = nullptr;
+ b->yy_ch_buf = 0;
if ( ! b->yy_ch_buf )
YY_FATAL_ERROR(
@@ -2587,7 +2587,7 @@ static int yy_get_next_buffer ()
/* yy_get_previous_state - get the state just before the EOB char was reached */
- static yy_state_type yy_get_previous_state ()
+ static yy_state_type yy_get_previous_state (void)
{
yy_state_type yy_current_state;
char *yy_cp;
@@ -2686,9 +2686,9 @@ static int yy_get_next_buffer ()
#ifndef YY_NO_INPUT
#ifdef __cplusplus
- static int yyinput ()
+ static int yyinput (void)
#else
- static int input ()
+ static int input (void)
#endif
{
@@ -2813,7 +2813,7 @@ static int yy_get_next_buffer ()
(yy_did_buffer_switch_on_eof) = 1;
}
-static void yy_load_buffer_state ()
+static void yy_load_buffer_state (void)
{
(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
@@ -2862,7 +2862,7 @@ static void yy_load_buffer_state ()
return;
if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
- YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) nullptr;
+ YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
if ( b->yy_is_our_buffer )
yyfree( (void *) b->yy_ch_buf );
@@ -2933,7 +2933,7 @@ static void yy_load_buffer_state ()
*/
void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
{
- if (new_buffer == nullptr)
+ if (new_buffer == 0)
return;
yyensure_buffer_stack();
@@ -2961,13 +2961,13 @@ void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
* The next element becomes the new top.
*
*/
-void yypop_buffer_state ()
+void yypop_buffer_state (void)
{
if (!YY_CURRENT_BUFFER)
return;
yy_delete_buffer(YY_CURRENT_BUFFER );
- YY_CURRENT_BUFFER_LVALUE = nullptr;
+ YY_CURRENT_BUFFER_LVALUE = 0;
if ((yy_buffer_stack_top) > 0)
--(yy_buffer_stack_top);
@@ -2980,7 +2980,7 @@ void yypop_buffer_state ()
/* Allocates the stack if it does not exist.
* Guarantees space for at least one push.
*/
-static void yyensure_buffer_stack ()
+static void yyensure_buffer_stack (void)
{
yy_size_t num_to_alloc;
@@ -3037,7 +3037,7 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size )
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 nullptr;
+ return 0;
b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) );
if ( ! b )
@@ -3046,7 +3046,7 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size )
b->yy_buf_size = (int) (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 = nullptr;
+ b->yy_input_file = 0;
b->yy_n_chars = b->yy_buf_size;
b->yy_is_interactive = 0;
b->yy_at_bol = 1;
@@ -3141,7 +3141,7 @@ static void yynoreturn yy_fatal_error (const char* msg )
/** Get the current line number.
*
*/
-int yyget_lineno ()
+int yyget_lineno (void)
{
return yylineno;
@@ -3150,7 +3150,7 @@ int yyget_lineno ()
/** Get the input stream.
*
*/
-FILE *yyget_in ()
+FILE *yyget_in (void)
{
return yyin;
}
@@ -3158,7 +3158,7 @@ FILE *yyget_in ()
/** Get the output stream.
*
*/
-FILE *yyget_out ()
+FILE *yyget_out (void)
{
return yyout;
}
@@ -3166,7 +3166,7 @@ FILE *yyget_out ()
/** Get the length of the current token.
*
*/
-int yyget_leng ()
+int yyget_leng (void)
{
return yyleng;
}
@@ -3175,7 +3175,7 @@ int yyget_leng ()
*
*/
-char *yyget_text ()
+char *yyget_text (void)
{
return yytext;
}
@@ -3206,7 +3206,7 @@ void yyset_out (FILE * _out_str )
yyout = _out_str ;
}
-int yyget_debug ()
+int yyget_debug (void)
{
return yy_flex_debug;
}
@@ -3216,16 +3216,16 @@ void yyset_debug (int _bdebug )
yy_flex_debug = _bdebug ;
}
-static int yy_init_globals ()
+static int yy_init_globals (void)
{
/* Initialization is the same as for the non-reentrant scanner.
* This function is called from yylex_destroy(), so don't allocate here.
*/
- (yy_buffer_stack) = nullptr;
+ (yy_buffer_stack) = 0;
(yy_buffer_stack_top) = 0;
(yy_buffer_stack_max) = 0;
- (yy_c_buf_p) = nullptr;
+ (yy_c_buf_p) = 0;
(yy_init) = 0;
(yy_start) = 0;
@@ -3234,8 +3234,8 @@ static int yy_init_globals ()
yyin = stdin;
yyout = stdout;
#else
- yyin = nullptr;
- yyout = nullptr;
+ yyin = 0;
+ yyout = 0;
#endif
/* For future reference: Set errno on error, since we are called by
@@ -3245,19 +3245,19 @@ static int yy_init_globals ()
}
/* yylex_destroy is for both reentrant and non-reentrant scanners. */
-int yylex_destroy ()
+int yylex_destroy (void)
{
/* Pop the buffer stack, destroying each element. */
while(YY_CURRENT_BUFFER){
yy_delete_buffer( YY_CURRENT_BUFFER );
- YY_CURRENT_BUFFER_LVALUE = nullptr;
+ YY_CURRENT_BUFFER_LVALUE = 0;
yypop_buffer_state();
}
/* Destroy the stack itself. */
yyfree((yy_buffer_stack) );
- (yy_buffer_stack) = nullptr;
+ (yy_buffer_stack) = 0;
/* Reset the globals. This is important in a non-reentrant scanner so the next time
* yylex() is called, initialization will occur. */
@@ -3330,7 +3330,7 @@ same_file (char *path1, char *path2)
char *fp2 = ACE_OS::realpath (path2, fullpath2);
return
- (fp1 == nullptr || fp2 == nullptr)
+ (fp1 == 0 || fp2 == 0)
? false
: FE_Utils::path_cmp (fullpath1,fullpath2) == 0;
}
@@ -3340,8 +3340,8 @@ static void
idl_parse_line_and_file (char *buf)
{
char *r = buf;
- char *h = nullptr;
- UTL_String *nm = nullptr;
+ char *h = 0;
+ UTL_String *nm = 0;
// Skip initial '#'.
if (*r != '#')
@@ -3394,7 +3394,7 @@ idl_parse_line_and_file (char *buf)
}
*r = 0;
- UTL_String *tmp = nullptr;
+ UTL_String *tmp = 0;
if (*h == '\0')
{
@@ -3539,13 +3539,13 @@ idl_store_pragma (char *buf)
sp -= crunched;
*sp = '\0';
- if (ACE_OS::strstr (buf + 8, "import") != nullptr)
+ if (ACE_OS::strstr (buf + 8, "import") != 0)
{
idl_global->set_import (true);
return;
}
- if (ACE_OS::strstr (buf + 8, "include") != nullptr)
+ if (ACE_OS::strstr (buf + 8, "include") != 0)
{
idl_global->set_import (false);
return;
@@ -3555,14 +3555,14 @@ idl_store_pragma (char *buf)
{
char *new_prefix = idl_get_pragma_string (buf);
- if (new_prefix != nullptr)
+ if (new_prefix != 0)
{
unsigned long depth = idl_global->scopes ().depth ();
// We replace the prefix only if there is a prefix already
// associated with this file, otherwise we add the prefix.
char *ext_id = idl_global->filename ()->get_string ();
- ACE_Hash_Map_Entry<char *, char *> *entry = nullptr;
+ ACE_Hash_Map_Entry<char *, char *> *entry = 0;
int const status =
idl_global->file_prefixes ().find (ext_id, entry);
@@ -3570,7 +3570,7 @@ idl_store_pragma (char *buf)
{
if (ACE_OS::strcmp (entry->int_id_, "") != 0)
{
- char *trash = nullptr;
+ char *trash = 0;
idl_global->pragma_prefixes ().pop (trash);
delete [] trash;
}
@@ -3624,7 +3624,7 @@ idl_store_pragma (char *buf)
char *number = ACE_OS::strchr (tmp, ' ');
- if (number == nullptr)
+ if (number == 0)
{
number = ACE_OS::strchr (tmp, '\t');
}
@@ -3634,7 +3634,7 @@ idl_store_pragma (char *buf)
// Most likely this means there is only a version number
// without an identifier to apply it to.
- if (number == nullptr)
+ if (number == 0)
{
const char *msg = "no identifier or scoped name";
idl_global->err ()->version_syntax_error (msg);
@@ -3663,7 +3663,7 @@ idl_store_pragma (char *buf)
// do it here.
AST_Decl *d = idl_find_node (tmp);
- if (d == nullptr)
+ if (d == 0)
{
return;
}
@@ -3694,14 +3694,14 @@ idl_store_pragma (char *buf)
AST_Decl *d = idl_find_node (work.c_str ());
- if (d == nullptr)
+ if (d == 0)
{
return;
}
char *new_id = idl_get_pragma_string (buf);
- if (new_id != nullptr)
+ if (new_id != 0)
{
if (d->typeid_set ())
{
@@ -4153,33 +4153,33 @@ idl_get_pragma_string (char *pragma)
// Get pointers to each end of the substring between the quotes.
const char *firstquote = ACE_OS::strchr (pragma, '"');
- if (firstquote == nullptr)
+ if (firstquote == 0)
{
idl_global->err ()->syntax_error (
IDL_GlobalData::PS_PragmaPrefixSyntax
);
- return nullptr;
+ return 0;
}
const char *start = firstquote + 1;
const char *end = ACE_OS::strchr (start, '"');
- if (end == nullptr)
+ if (end == 0)
{
idl_global->err ()->syntax_error (
IDL_GlobalData::PS_PragmaPrefixSyntax
);
- return nullptr;
+ return 0;
}
int len = static_cast<int> (end - start);
- char *retval = nullptr;
+ char *retval = 0;
ACE_NEW_RETURN (retval,
char[len + 1],
- nullptr);
+ 0);
ACE_OS::strncpy (retval,
start,
@@ -4195,22 +4195,22 @@ idl_valid_version (char *s)
// Nothing preceding decimal point.
if (*s == '.')
{
- return false;
+ return 0;
}
char *minor = ACE_OS::strchr (s, '.');
int i;
- if (minor == nullptr)
+ if (minor == 0)
{
// No decimal point.
- return false;
+ return 0;
}
if (*(minor + 1) == '\0')
{
// Nothing following decimal point.
- return false;
+ return 0;
}
char *tmp = minor + 1;
@@ -4219,7 +4219,7 @@ idl_valid_version (char *s)
{
if (!isdigit (tmp[i]))
{
- return false;
+ return 0;
}
}
@@ -4229,7 +4229,7 @@ idl_valid_version (char *s)
{
if (!isdigit (s[i]))
{
- return false;
+ return 0;
}
}
@@ -4237,23 +4237,23 @@ idl_valid_version (char *s)
if (ACE_OS::atoi (minor + 1) > ACE_UINT16_MAX
|| ACE_OS::atoi (s) > ACE_UINT16_MAX)
{
- return false;
+ return 0;
}
- return true;
+ return 1;
}
static AST_Decl *
idl_find_node (const char *s)
{
UTL_ScopedName * node = FE_Utils::string_to_scoped_name (s);
- AST_Decl * d = nullptr;
+ AST_Decl * d = 0;
- if (node != nullptr)
+ if (node != 0)
{
d = idl_global->scopes ().top_non_null ()->lookup_by_name (node);
- if (d == nullptr)
+ if (d == 0)
{
idl_global->err ()->lookup_error (node);
}
View Lorry Controller Status