diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-01-22 17:53:33 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-01-22 18:39:28 +0100 |
| commit | 3b269d6d2d679536e9cbabc5b2d2339ef4bd75d2 (patch) | |
| tree | 01a405e8422dbc3614c8817fa37afac6bcada558 /idlc/source | |
| parent | 147b7f0df3af28fbe6df36a2b25408fbe69cb876 (diff) | |
API CHANGE: Remove support for individual constants from UNOIDL
...i.e., "const X = N;" declarations outside of constant groups. This appears
to be unused in practice, and removing it will allow to simplify future code
related to UNO type information.
This removes the definition of "constant-decl", and the branch mentioning
"constant-decl" from the definition of "declaration" at
<http://wiki.openoffice.org/w/index.php?title=Documentation/DevGuide/AppendixD/UNOIDL_Syntax_Specification&oldid=137490>.
Change-Id: I218626f02ebd46ee438bf5453ca1510c9ed8e5f0
Diffstat (limited to 'idlc/source')
| -rw-r--r-- | idlc/source/parser.y | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/idlc/source/parser.y b/idlc/source/parser.y index 2b5997d00d2f..629c2f23ea84 100644 --- a/idlc/source/parser.y +++ b/idlc/source/parser.y @@ -361,7 +361,7 @@ bool includes(AstDeclaration const * type1, AstDeclaration const * type2) { /* * These are production names: */ -%type <dclval> type_dcl const_dcl +%type <dclval> type_dcl %type <dclval> array_declarator %type <dclval> exception_name %type <cdclval> array_type constructed_type_spec enum_type op_type_spec @@ -448,14 +448,6 @@ publishable_definition: { idlc()->setParseState(PS_NoState); } - | const_dcl - { - idlc()->setParseState(PS_ConstantDeclSeen); - } - ';' - { - idlc()->setParseState(PS_NoState); - } | exception_dcl { idlc()->setParseState(PS_ExceptionDeclSeen); @@ -1288,13 +1280,6 @@ constants_exports : ; constants_export : - const_dcl - { - idlc()->setParseState(PS_ConstantDeclSeen); - } - ';' {}; - -const_dcl : IDL_CONST { idlc()->setParseState(PS_ConstSeen); @@ -1331,7 +1316,10 @@ const_dcl : } } delete $5; + + idlc()->setParseState(PS_ConstantDeclSeen); } + ';' {}; ; constants_dcl : |