diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-01-18 12:34:49 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-01-18 12:34:49 +0000 |
| commit | 3107fd0b17cac2e8b8b1168c2ddce7a97fa62e84 (patch) | |
| tree | f4de4f6b7e46cdb4698f062cc94c5f5309fe9c97 /idlc/source | |
| parent | 217a4d47c2b9a84ecab1252391e69ad83c88ada6 (diff) | |
INTEGRATION: CWS sb28 (1.10.8); FILE MERGED
2005/01/03 16:38:00 sb 1.10.8.1: #i28722# Removed support for char and string constants.
Diffstat (limited to 'idlc/source')
| -rw-r--r-- | idlc/source/parser.y | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/idlc/source/parser.y b/idlc/source/parser.y index afe2c0e2a0f6..f11fc40a67ad 100644 --- a/idlc/source/parser.y +++ b/idlc/source/parser.y @@ -2,9 +2,9 @@ * * $RCSfile: parser.y,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: rt $ $Date: 2004-08-20 09:20:41 $ + * last change: $Author: kz $ $Date: 2005-01-18 13:34:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -330,7 +330,6 @@ bool includes(AstDeclaration const * type1, AstDeclaration const * type2) { ::rtl::OString* sval; /* OString value */ std::vector< rtl::OString > * svals; sal_Char* strval; /* sal_Char* value */ - sal_Char cval; /* sal_Char value */ sal_Bool bval; /* sal_Boolean* value */ sal_Int64 ival; /* sal_Int64 value */ sal_uInt32 ulval; /* sal_uInt32 value */ @@ -413,9 +412,7 @@ bool includes(AstDeclaration const * type1, AstDeclaration const * type2) { %token <strval> IDL_SCOPESEPARATOR %token <ival> IDL_INTEGER_LITERAL -%token <sval> IDL_STRING_LITERAL %token <dval> IDL_FLOATING_PT_LITERAL -%token <cval> IDL_CHARACTER_LITERAL /* * These are production names: @@ -1532,7 +1529,7 @@ primary_expr : * but only when it is evaluated (such as when it is assigned * as a constant value) */ - $$ = new AstExpression($1, sal_True); + $$ = new AstExpression($1); } | literal | '(' const_expr ')' @@ -1546,14 +1543,6 @@ literal : { $$ = new AstExpression($1); } - | IDL_STRING_LITERAL - { - $$ = new AstExpression($1); - } - | IDL_CHARACTER_LITERAL - { - $$ = new AstExpression($1); - } | IDL_FLOATING_PT_LITERAL { $$ = new AstExpression($1); |