Remove UNOIDL "array" and "union" vaporware from idlc

Change-Id: Iccd5a78b54620796cfde672388b70ad97d17b7a5

7 files changed, 0 insertions, 251 deletions

diff --git a/idlc/inc/idlc/astarray.hxx b/idlc/inc/idlc/astarray.hxx
deleted file mode 100644
index e75e0100b25a..000000000000
--- a/idlc/inc/idlc/astarray.hxx
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _IDLC_ASTARRAY_HXX_
-#define _IDLC_ASTARRAY_HXX_
-
-#include <idlc/asttype.hxx>
-#include <idlc/astscope.hxx>
-
-class AstArray : public AstType
-{
-public:
-    AstArray(const OString& name, AstType* pType, const ExprList& rDimExpr, AstScope* pScope);
-    AstArray(AstType* pType, const ExprList& rDimExpr, AstScope* pScope);
-
-    virtual ~AstArray() {}
-
-    AstType* getType()
-        { return m_pType; }
-    void setType(AstType* pType)
-        {
-            m_pType = pType;
-            setName(makeName());
-        }
-    ExprList* getDimExpressions()
-        {   return &m_dimExpressions; }
-    sal_uInt32 getDimension()
-        {   return m_dimension; }
-
-private:
-    OString makeName();
-
-    AstType*    m_pType;
-    sal_uInt32  m_dimension;
-    ExprList    m_dimExpressions;
-};
-
-#endif // _IDLC_ASTARRAY_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astdeclaration.hxx b/idlc/inc/idlc/astdeclaration.hxx
index a52565ad9012..424e5b2ae8d3 100644
--- a/idlc/inc/idlc/astdeclaration.hxx
+++ b/idlc/inc/idlc/astdeclaration.hxx
@@ -43,8 +43,6 @@ enum NodeType
     NT_property,            // Denotes an property
     NT_operation,           // Denotes an operation
     NT_parameter,           // Denotes an op. parameter
-    NT_union,               // Denotes a union
-    NT_union_branch,        // Denotes a union branch
     NT_struct,              // Denotes either a plain struct type, or a
                             // polymorphic struct type template
     NT_type_parameter,      // Denotes a type parameter of a polymorphic struct
@@ -53,7 +51,6 @@ enum NodeType
     NT_member,              // Denotes a member in structure, exception
     NT_enum,                // Denotes an enumeration
     NT_enum_val,            // Denotes an enum. value
-    NT_array,               // Denotes an IDL array
     NT_sequence,            // Denotes an IDL sequence
     NT_typedef,             // Denotes a typedef
     NT_predefined,          // Denotes a predefined type
diff --git a/idlc/inc/idlc/astunion.hxx b/idlc/inc/idlc/astunion.hxx
deleted file mode 100644
index d1b9b477c7b7..000000000000
--- a/idlc/inc/idlc/astunion.hxx
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _IDLC_ASTUNION_HXX_
-#define _IDLC_ASTUNION_HXX_
-
-#include <idlc/aststruct.hxx>
-#include <idlc/astunionbranch.hxx>
-
-class AstUnion : public AstStruct
-{
-public:
-    AstUnion(const OString& name, AstType* pDiscType, AstScope* pScope);
-    virtual ~AstUnion();
-
-    AstType* getDiscrimantType()
-        { return m_pDiscriminantType; }
-    ExprType getDiscrimantExprType()
-        { return m_discExprType; }
-
-    virtual sal_Bool dump(RegistryKey& rKey);
-
-    virtual AstDeclaration* addDeclaration(AstDeclaration* pDecl);
-protected:
-    // Look up a branch by node pointer
-    AstUnionBranch* lookupBranch(AstUnionBranch* pBranch);
-
-    // Look up the branch with the "default" label
-    AstUnionBranch* lookupDefault(sal_Bool bReportError = sal_True );
-
-    // Look up a branch given a branch with a label. This is used to
-    // check for duplicate labels
-    AstUnionBranch* lookupLabel(AstUnionBranch* pBranch);
-
-    // Look up a union branch given an enumerator. This is used to
-    // check for duplicate enum labels
-    AstUnionBranch* lookupEnum(AstUnionBranch* pBranch);
-
-private:
-    AstType*    m_pDiscriminantType;
-    ExprType    m_discExprType;
-};
-
-#endif // _IDLC_ASTUNION_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astunionbranch.hxx b/idlc/inc/idlc/astunionbranch.hxx
deleted file mode 100644
index 9c114da45152..000000000000
--- a/idlc/inc/idlc/astunionbranch.hxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _IDLC_ASTUNIONBRANCH_HXX_
-#define _IDLC_ASTUNIONBRANCH_HXX_
-
-#include <idlc/astmember.hxx>
-#include <idlc/astunionlabel.hxx>
-
-class AstUnionBranch : public AstMember
-{
-public:
-    AstUnionBranch(AstUnionLabel* pLabel, AstType const * pType, const OString& name, AstScope* pScope);
-    virtual ~AstUnionBranch();
-
-    AstUnionLabel* getLabel()
-        { return m_pLabel; }
-private:
-    AstUnionLabel*  m_pLabel;
-};
-
-#endif // _IDLC_ASTUNIONBRANCH_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astunionlabel.hxx b/idlc/inc/idlc/astunionlabel.hxx
deleted file mode 100644
index a280dfbccf25..000000000000
--- a/idlc/inc/idlc/astunionlabel.hxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _IDLC_ASTUNIONLABEL_HXX_
-#define _IDLC_ASTUNIONLABEL_HXX_
-
-enum UnionLabel
-{
-    UL_default,     // Label is "default"
-    UL_label        // Regular label
-};
-
-class AstUnionLabel
-{
-public:
-    AstUnionLabel(UnionLabel labelKind, AstExpression* pExpr);
-    virtual ~AstUnionLabel();
-
-    UnionLabel getLabelKind()
-        { return m_label; }
-    AstExpression* getLabelValue()
-        { return m_pLabelValue; }
-private:
-    UnionLabel      m_label;
-    AstExpression*  m_pLabelValue;
-};
-
-#endif // _IDLC_ASTUNIONLABEL_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/errorhandler.hxx b/idlc/inc/idlc/errorhandler.hxx
index 8a7b1e4b07e2..085aac541545 100644
--- a/idlc/inc/idlc/errorhandler.hxx
+++ b/idlc/inc/idlc/errorhandler.hxx
@@ -21,7 +21,6 @@
 
 #include <idlc/astdeclaration.hxx>
 #include <idlc/astexpression.hxx>
-#include <idlc/astunion.hxx>
 #include <idlc/astenum.hxx>
 
 enum ErrorCode
@@ -33,11 +32,8 @@ enum ErrorCode
     EIDL_REDEF,             // Redefinition
     EIDL_REDEF_SCOPE,       // Redefinition inside defining scope
     EIDL_DEF_USE,           // Definition after use
-    EIDL_MULTIPLE_BRANCH,   // More than one union branch with this label
     EIDL_COERCION_FAILURE,  // Coercion failure
     EIDL_SCOPE_CONFLICT,    // Between fwd declare and full declare
-    EIDL_DISC_TYPE,         // Illegal discriminator type in union
-    EIDL_LABEL_TYPE,        // Mismatch with discriminator type in union
     EIDL_ILLEGAL_ADD,       // Illegal add action
     EIDL_ILLEGAL_USE,       // Illegal type used in expression
     EIDL_ILLEGAL_RAISES,    // Error in "raises" clause
@@ -46,8 +42,6 @@ enum ErrorCode
     EIDL_INHERIT_FWD_ERROR, // Cannot inherit from fwd decl interface
     EIDL_CONSTANT_EXPECTED, // We got something else..
     EIDL_NAME_CASE_ERROR,   // Spelling differences found
-    EIDL_ENUM_VAL_EXPECTED, // Expected an enumerator
-    EIDL_ENUM_VAL_NOT_FOUND,    // Didnt find an enumerator with that name
     EIDL_EVAL_ERROR,        // Error in evaluating expression
     EIDL_AMBIGUOUS,         // Ambiguous name definition
     EIDL_DECL_NOT_DEFINED,  // Forward declared but never defined
@@ -130,15 +124,6 @@ public:
 
     void    evalError(AstExpression* pExpr);
 
-    // Report a situation where an enumerator was expected but we got
-    // something else instead. This occurs when a union with an enum
-    // discriminator is being parsed and one of the branch labels is
-    // not an enumerator in that enum
-    void    enumValExpected(AstUnion* pUnion);
-
-    // Report a failed enumerator lookup in an enum
-    void    enumValLookupFailure(AstUnion* pUnion, AstEnum* pEnum, const OString& name);
-
     bool checkPublished(AstDeclaration const * decl, bool bOptiional=false);
 };
 
diff --git a/idlc/inc/idlc/idlctypes.hxx b/idlc/inc/idlc/idlctypes.hxx
index 842ef68e11cf..fcda52100538 100644
--- a/idlc/inc/idlc/idlctypes.hxx
+++ b/idlc/inc/idlc/idlctypes.hxx
@@ -58,12 +58,6 @@ typedef ::std::list< OString >               StringList;
 typedef ::std::vector< OString >             StringVector;
 typedef ::std::set< OString, LessString >    StringSet;
 
-class AstExpression;
-typedef ::std::list< AstExpression* >   ExprList;
-
-class AstUnionLabel;
-typedef ::std::list< AstUnionLabel* >   LabelList;
-
 class AstDeclaration;
 
 typedef ::boost::unordered_map< OString, AstDeclaration*, HashString, EqualString > DeclMap;
@@ -171,25 +165,6 @@ enum ParseState
     PS_MemberDeclsSeen,     // Seen decls of struct or except members
     PS_MemberDeclsCompleted,// Completed one struct or except member to ';'
 
-    PS_UnionSeen,           // Seen a UNION keyword
-    PS_UnionIDSeen,         // Seen the union ID
-    PS_SwitchSeen,          // Seen the SWITCH keyword
-    PS_SwitchOpenParSeen,   // Seen the switch open par.
-    PS_SwitchTypeSeen,      // Seen the switch type spec
-    PS_SwitchCloseParSeen,  // Seen the switch close par.
-    PS_UnionSqSeen,         // '{' seen for union
-    PS_UnionQsSeen,         // '}' seen for union
-    PS_DefaultSeen,         // Seen DEFAULT keyword
-    PS_UnionLabelSeen,      // Seen label of union element
-    PS_LabelColonSeen,      // Seen ':' of union branch label
-    PS_LabelExprSeen,       // Seen expression of union branch label
-    PS_UnionElemSeen,       // Seen a union element
-    PS_UnionElemCompleted,  // Completed one union member up to ';'
-    PS_CaseSeen,            // Seen a CASE keyword
-    PS_UnionElemTypeSeen,   // Seen type spec for union element
-    PS_UnionElemDeclSeen,   // Seen declarator for union element
-    PS_UnionBodySeen,       // Seen completed union body
-
     PS_EnumSeen,            // Seen an ENUM keyword
     PS_EnumIDSeen,          // Seen the enum ID
     PS_EnumSqSeen,          // Seen '{' for enum
@@ -202,14 +177,6 @@ enum ParseState
     PS_SequenceQsSeen,      // Seen '>' for sequence
     PS_SequenceTypeSeen,    // Seen type decl for sequence
 
-    PS_ArrayIDSeen,         // Seen array ID
-    PS_ArrayTypeSeen,       // Seen array type
-    PS_ArrayCompleted,      // Seen completed array declaration
-    PS_DimSqSeen,           // Seen '[' for array dimension
-    PS_DimQsSeen,           // Seen ']' for array dimension
-    PS_DimExprSeen,         // Seen size expression for array dimension
-
-
     PS_FlagHeaderSeen,      // Seen the attribute|property|interface member head
     PS_AttrSeen,            // Seen ATTRIBUTE keyword
     PS_AttrTypeSeen,        // Seen type decl for attribute