summaryrefslogtreecommitdiff
path: root/unoidl
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-11-22 17:49:09 +0100
committerStephan Bergmann <sbergman@redhat.com>2013-11-22 19:00:29 +0100
commitbde3b4bb2681f2a1fce423fc600a398940bcf25a (patch)
treed21ed531a8577b15ce6987d1f35e4f189d801cfb /unoidl
parent9a9dd2ddda6b78bee822644e0eeec2e51709df30 (diff)
Fix unoidl sourceprovider typedef check
Change-Id: I7faa689c803f83687cfcc39dc7c4fd145584e849 (cherry picked from commit add28638db1bf367751c98631624c6dd7adc6c22)
Diffstat (limited to 'unoidl')
-rw-r--r--unoidl/source/sourceprovider-parser.y12
1 files changed, 6 insertions, 6 deletions
diff --git a/unoidl/source/sourceprovider-parser.y b/unoidl/source/sourceprovider-parser.y
index 7b9e224544fc..ec8108363b26 100644
--- a/unoidl/source/sourceprovider-parser.y
+++ b/unoidl/source/sourceprovider-parser.y
@@ -1882,20 +1882,20 @@ typedefDefn:
unoidl::detail::SourceProviderType t(*$4);
delete $4;
OUString name(convertToFullName(data, $5));
- // There is no good reason to forbid typedefs to VOID and to instantiated
- // polymorphic struct types, but some old client code of registry data
- // expects this typedef restriction (like the assert(false) default in
- // handleTypedef in codemaker/source/javamaker/javatype.cxx), so forbid
- // them for now:
+ // There is no good reason to forbid typedefs to VOID, to instantiated
+ // polymorphic struct types, and to exception types, but some old client
+ // code of registry data expects this typedef restriction (like the
+ // assert(false) default in handleTypedef in
+ // codemaker/source/javamaker/javatype.cxx), so forbid them for now:
switch (t.type) {
case unoidl::detail::SourceProviderType::TYPE_VOID:
+ case unoidl::detail::SourceProviderType::TYPE_EXCEPTION:
case unoidl::detail::SourceProviderType::TYPE_INSTANTIATED_POLYMORPHIC_STRUCT:
error(@4, yyscanner, "bad typedef type");
YYERROR;
break;
case unoidl::detail::SourceProviderType::TYPE_ENUM:
case unoidl::detail::SourceProviderType::TYPE_PLAIN_STRUCT:
- case unoidl::detail::SourceProviderType::TYPE_EXCEPTION:
case unoidl::detail::SourceProviderType::TYPE_INTERFACE:
if ($2) {
bool unpub = false;