diff options
-rw-r--r-- | TAO/ChangeLog | 18 | ||||
-rw-r--r-- | TAO/TAO_IDL/ast/ast_expression.cpp | 5 | ||||
-rw-r--r-- | TAO/TAO_IDL/ast/ast_generator.cpp | 6 | ||||
-rw-r--r-- | TAO/TAO_IDL/be/be_expression.cpp | 6 | ||||
-rw-r--r-- | TAO/TAO_IDL/be/be_generator.cpp | 6 | ||||
-rw-r--r-- | TAO/TAO_IDL/be_include/be_expression.h | 3 | ||||
-rw-r--r-- | TAO/TAO_IDL/be_include/be_generator.h | 3 | ||||
-rw-r--r-- | TAO/TAO_IDL/fe/idl.yy | 4 | ||||
-rw-r--r-- | TAO/TAO_IDL/fe/y.tab.cpp | 4 | ||||
-rw-r--r-- | TAO/TAO_IDL/include/ast_expression.h | 3 | ||||
-rw-r--r-- | TAO/TAO_IDL/include/ast_generator.h | 3 |
11 files changed, 47 insertions, 14 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 49d8c925847..e0d36329963 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,21 @@ +Wed Aug 13 16:33:16 2003 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/ast/ast_expression.cpp: + * TAO_IDL/ast/ast_generator.cpp: + * TAO_IDL/be/be_expression.cpp: + * TAO_IDL/be/be_generator.cpp: + * TAO_IDL/be_include/be_expression.h: + * TAO_IDL/be_include/be_generator.h: + * TAO_IDL/fe/idl.yy: + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/include/ast_expression.h: + * TAO_IDL/include/ast_generator.h: + + Added AST_Expression::ExprType enum parameter to the AST_Expression + constructor taking an ACE_UINT64, to disambiguate it from the + constructor taking an unsigned long, on platforms where these + two types are the same. + Wed Aug 13 15:22:08 2003 Jeff Parsons <j.parsons@vanderbilt.edu> * orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp (create_event_i): diff --git a/TAO/TAO_IDL/ast/ast_expression.cpp b/TAO/TAO_IDL/ast/ast_expression.cpp index 5ee5f438dfa..46dd6808f86 100644 --- a/TAO/TAO_IDL/ast/ast_expression.cpp +++ b/TAO/TAO_IDL/ast/ast_expression.cpp @@ -235,7 +235,8 @@ AST_Expression::AST_Expression (unsigned long ulv) } // An AST_Expression denoting an unsigned long integer. -AST_Expression::AST_Expression (ACE_UINT64 ulv) +AST_Expression::AST_Expression (ACE_UINT64 ulv, + ExprType t) : pd_ec (EC_none), pd_ev (0), pd_v1 (0), @@ -248,7 +249,7 @@ AST_Expression::AST_Expression (ACE_UINT64 ulv) ACE_NEW (this->pd_ev, AST_ExprValue); - this->pd_ev->et = EV_ulonglong; + this->pd_ev->et = t; this->pd_ev->u.ullval = ulv; } diff --git a/TAO/TAO_IDL/ast/ast_generator.cpp b/TAO/TAO_IDL/ast/ast_generator.cpp index 054812ecb29..25e89918a47 100644 --- a/TAO/TAO_IDL/ast/ast_generator.cpp +++ b/TAO/TAO_IDL/ast/ast_generator.cpp @@ -722,11 +722,13 @@ AST_Generator::create_expr (unsigned long v) } AST_Expression * -AST_Generator::create_expr (ACE_UINT64 v) +AST_Generator::create_expr (ACE_UINT64 v, + AST_Expression::ExprType t) { AST_Expression *retval = 0; ACE_NEW_RETURN (retval, - AST_Expression (v), + AST_Expression (v, + t), 0); return retval; diff --git a/TAO/TAO_IDL/be/be_expression.cpp b/TAO/TAO_IDL/be/be_expression.cpp index 23c6f9e0970..b7022962ee5 100644 --- a/TAO/TAO_IDL/be/be_expression.cpp +++ b/TAO/TAO_IDL/be/be_expression.cpp @@ -58,8 +58,10 @@ be_expression::be_expression (long l, { } -be_expression::be_expression (ACE_UINT64 l) - : AST_Expression (l) +be_expression::be_expression (ACE_UINT64 l, + AST_Expression::ExprType t) + : AST_Expression (l, + t) { } diff --git a/TAO/TAO_IDL/be/be_generator.cpp b/TAO/TAO_IDL/be/be_generator.cpp index 12b4496307d..32886afd97c 100644 --- a/TAO/TAO_IDL/be/be_generator.cpp +++ b/TAO/TAO_IDL/be/be_generator.cpp @@ -703,11 +703,13 @@ be_generator::create_expr (long l, } AST_Expression * -be_generator::create_expr (ACE_UINT64 l) +be_generator::create_expr (ACE_UINT64 l, + AST_Expression::ExprType t) { be_expression *retval = 0; ACE_NEW_RETURN (retval, - be_expression (l), + be_expression (l, + t), 0); return retval; diff --git a/TAO/TAO_IDL/be_include/be_expression.h b/TAO/TAO_IDL/be_include/be_expression.h index 96bd6e997b0..4ebca2d7819 100644 --- a/TAO/TAO_IDL/be_include/be_expression.h +++ b/TAO/TAO_IDL/be_include/be_expression.h @@ -44,7 +44,8 @@ public: be_expression (long l, AST_Expression::ExprType t); - be_expression (ACE_UINT64 l); + be_expression (ACE_UINT64 l, + AST_Expression::ExprType t); be_expression (UTL_String *s); diff --git a/TAO/TAO_IDL/be_include/be_generator.h b/TAO/TAO_IDL/be_include/be_generator.h index b8e33fb4ae3..4444a8999e6 100644 --- a/TAO/TAO_IDL/be_include/be_generator.h +++ b/TAO/TAO_IDL/be_include/be_generator.h @@ -218,7 +218,8 @@ public: virtual AST_Expression *create_expr (long v, AST_Expression::ExprType t); - virtual AST_Expression *create_expr (ACE_UINT64 v); + virtual AST_Expression *create_expr (ACE_UINT64 v, + AST_Expression::ExprType t); virtual AST_Expression *create_expr(UTL_String *s); diff --git a/TAO/TAO_IDL/fe/idl.yy b/TAO/TAO_IDL/fe/idl.yy index cae06f47153..1e00d11198d 100644 --- a/TAO/TAO_IDL/fe/idl.yy +++ b/TAO/TAO_IDL/fe/idl.yy @@ -1621,7 +1621,9 @@ literal | IDL_UINTEGER_LITERAL { // | IDL_UINTEGER_LITERAL - $$ = idl_global->gen ()->create_expr ($1); + $$ = + idl_global->gen ()->create_expr ($1, + AST_Expression::EV_ulonglong); } | IDL_STRING_LITERAL { diff --git a/TAO/TAO_IDL/fe/y.tab.cpp b/TAO/TAO_IDL/fe/y.tab.cpp index 472f7d898a5..5c90b4343b2 100644 --- a/TAO/TAO_IDL/fe/y.tab.cpp +++ b/TAO/TAO_IDL/fe/y.tab.cpp @@ -3045,7 +3045,9 @@ case 152: { /* | IDL_UINTEGER_LITERAL */ - tao_yyval.exval = idl_global->gen ()->create_expr (tao_yyvsp[0].uival); + tao_yyval.exval = + idl_global->gen ()->create_expr (tao_yyvsp[0].uival, + AST_Expression::EV_ulonglong); } break; case 153: diff --git a/TAO/TAO_IDL/include/ast_expression.h b/TAO/TAO_IDL/include/ast_expression.h index d8980ad88b1..86d97d2b855 100644 --- a/TAO/TAO_IDL/include/ast_expression.h +++ b/TAO/TAO_IDL/include/ast_expression.h @@ -204,7 +204,8 @@ public: AST_Expression (unsigned long ul); - AST_Expression (ACE_UINT64 ull); + AST_Expression (ACE_UINT64 ull, + ExprType t); AST_Expression (float f); diff --git a/TAO/TAO_IDL/include/ast_generator.h b/TAO/TAO_IDL/include/ast_generator.h index 3393453a22a..988b4b7f62b 100644 --- a/TAO/TAO_IDL/include/ast_generator.h +++ b/TAO/TAO_IDL/include/ast_generator.h @@ -285,7 +285,8 @@ public: virtual AST_Expression *create_expr (unsigned long v); - virtual AST_Expression *create_expr (ACE_UINT64 v); + virtual AST_Expression *create_expr (ACE_UINT64 v, + AST_Expression::ExprType t); virtual AST_Expression *create_expr (UTL_String *s); |