diff options
Diffstat (limited to 'idlc/inc/idlc')
35 files changed, 444 insertions, 444 deletions
diff --git a/idlc/inc/idlc/astarray.hxx b/idlc/inc/idlc/astarray.hxx index bb711823e869..4ee463ef9b66 100644 --- a/idlc/inc/idlc/astarray.hxx +++ b/idlc/inc/idlc/astarray.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,21 +42,21 @@ public: AstType* getType() { return m_pType; } void setType(AstType* pType) - { + { m_pType = pType; setName(makeName()); } ExprList* getDimExpressions() - { return &m_dimExpressions; } + { return &m_dimExpressions; } sal_uInt32 getDimension() - { return m_dimension; } - + { return m_dimension; } + private: ::rtl::OString makeName(); - AstType* m_pType; - sal_uInt32 m_dimension; - ExprList m_dimExpressions; + AstType* m_pType; + sal_uInt32 m_dimension; + ExprList m_dimExpressions; }; #endif // _IDLC_ASTARRAY_HXX_ diff --git a/idlc/inc/idlc/astattribute.hxx b/idlc/inc/idlc/astattribute.hxx index 9b55069b6609..1be771652764 100644 --- a/idlc/inc/idlc/astattribute.hxx +++ b/idlc/inc/idlc/astattribute.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -110,7 +110,7 @@ private: DeclList const & exceptions, RTMethodMode flags, sal_uInt16 * methodIndex); - const sal_uInt32 m_flags; + const sal_uInt32 m_flags; AstType const * m_pType; rtl::OUString m_getDocumentation; DeclList m_getExceptions; diff --git a/idlc/inc/idlc/astbasetype.hxx b/idlc/inc/idlc/astbasetype.hxx index 4d0793ef66fb..493e557f9936 100644 --- a/idlc/inc/idlc/astbasetype.hxx +++ b/idlc/inc/idlc/astbasetype.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/idlc/inc/idlc/astconstant.hxx b/idlc/inc/idlc/astconstant.hxx index b9c87ad42f03..8bd2952123f8 100644 --- a/idlc/inc/idlc/astconstant.hxx +++ b/idlc/inc/idlc/astconstant.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ public: AstConstant(const ExprType type, AstExpression* pExpr, const ::rtl::OString& name, AstScope* pScope); virtual ~AstConstant(); - + AstExpression* getConstValue() { return m_pConstValue; } ExprType getConstValueType() const @@ -50,8 +50,8 @@ public: sal_Bool dumpBlob( typereg::Writer & rBlob, sal_uInt16 index, bool published); private: - AstExpression* m_pConstValue; - const ExprType m_constValueType; + AstExpression* m_pConstValue; + const ExprType m_constValueType; }; #endif // _IDLC_ASTCONSTANT_HXX_ diff --git a/idlc/inc/idlc/astconstants.hxx b/idlc/inc/idlc/astconstants.hxx index f132a978b31d..1417db98358e 100644 --- a/idlc/inc/idlc/astconstants.hxx +++ b/idlc/inc/idlc/astconstants.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/idlc/inc/idlc/astdeclaration.hxx b/idlc/inc/idlc/astdeclaration.hxx index f0f6d29b0953..1daf4f2f8aff 100644 --- a/idlc/inc/idlc/astdeclaration.hxx +++ b/idlc/inc/idlc/astdeclaration.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,39 +34,39 @@ class AstScope; // Enum defining the different kinds of Ast nodes -enum NodeType +enum NodeType { - NT_object, // Denotes an object - NT_service, // Denotes an servcie - NT_interface_member, // Denotes an interface which is exported from object - NT_service_member, // Denotes an service which is exported from object - NT_observes, // Denotes an observed interface - NT_needs, // Denotes an needed service - NT_module, // Denotes a module - NT_root, // Denotes the root of AST - NT_interface, // Denotes an interface - NT_constants, // Denotes a constant group - NT_const, // Denotes a constant - NT_exception, // Denotes an exception - NT_attribute, // Denotes an attribute - 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_object, // Denotes an object + NT_service, // Denotes an servcie + NT_interface_member, // Denotes an interface which is exported from object + NT_service_member, // Denotes an service which is exported from object + NT_observes, // Denotes an observed interface + NT_needs, // Denotes an needed service + NT_module, // Denotes a module + NT_root, // Denotes the root of AST + NT_interface, // Denotes an interface + NT_constants, // Denotes a constant group + NT_const, // Denotes a constant + NT_exception, // Denotes an exception + NT_attribute, // Denotes an attribute + 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 // type template NT_instantiated_struct, // Denotes an instantiated polymorphic struct type - 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 - NT_singleton // Denotes a singleton + 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 + NT_singleton // Denotes a singleton }; class AstDeclaration @@ -80,11 +80,11 @@ public: void setName(const ::rtl::OString& name); const ::rtl::OString& getLocalName() const { return m_localName; } - const ::rtl::OString& getScopedName() const + const ::rtl::OString& getScopedName() const { return m_scopedName; } - const ::rtl::OString& getFullName() + const ::rtl::OString& getFullName() { return m_fullName; } - virtual const sal_Char* getRelativName() const + virtual const sal_Char* getRelativName() const { return m_fullName.getStr()+1; } AstScope* getScope() { return m_pScope; } @@ -128,21 +128,21 @@ public: bool isPredefined() { return m_bPredefined; } void setPredefined(bool bPredefined); - + protected: - ::rtl::OString m_localName; - ::rtl::OString m_scopedName; // full qualified name - ::rtl::OString m_fullName; // full qualified name with '/' as seperator - AstScope* m_pScope; + ::rtl::OString m_localName; + ::rtl::OString m_scopedName; // full qualified name + ::rtl::OString m_fullName; // full qualified name with '/' as seperator + AstScope* m_pScope; NodeType m_nodeType; - sal_Bool m_bImported; // imported ? - sal_Bool m_bIsAdded; // mark declaration as added in scope - sal_Bool m_bInMainFile; // defined in main file + sal_Bool m_bImported; // imported ? + sal_Bool m_bIsAdded; // mark declaration as added in scope + sal_Bool m_bInMainFile; // defined in main file bool m_bPublished; bool m_bPredefined; - sal_Int32 m_lineNumber; // line number defined in - ::rtl::OString m_fileName; // fileName defined in - ::rtl::OUString m_documentation; // fileName defined in + sal_Int32 m_lineNumber; // line number defined in + ::rtl::OString m_fileName; // fileName defined in + ::rtl::OUString m_documentation; // fileName defined in }; #endif // _IDLC_ASTDECLARATION_HXX_ diff --git a/idlc/inc/idlc/astenum.hxx b/idlc/inc/idlc/astenum.hxx index 6a3380a22250..ae4665631d72 100644 --- a/idlc/inc/idlc/astenum.hxx +++ b/idlc/inc/idlc/astenum.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ public: virtual AstDeclaration* addDeclaration(AstDeclaration* pDecl); private: - sal_Int32 m_enumValueCount; + sal_Int32 m_enumValueCount; }; #endif // _IDLC_ASTENUM_HXX_ diff --git a/idlc/inc/idlc/astexception.hxx b/idlc/inc/idlc/astexception.hxx index 2f4c73ac7d07..c6627889508d 100644 --- a/idlc/inc/idlc/astexception.hxx +++ b/idlc/inc/idlc/astexception.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/idlc/inc/idlc/astexpression.hxx b/idlc/inc/idlc/astexpression.hxx index 74dfb91b7c8c..b09472576367 100644 --- a/idlc/inc/idlc/astexpression.hxx +++ b/idlc/inc/idlc/astexpression.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,67 +33,67 @@ // Enum to define all the different operators to combine expressions enum ExprComb { - EC_add, // '+' - EC_minus, // '-' - EC_mul, // '*' - EC_div, // '/' - EC_mod, // '%' - EC_or, // '|' - EC_xor, // '^' - EC_and, // '&' - EC_left, // '<<' - EC_right, // '>>' - EC_u_plus, // unary '+' - EC_u_minus, // unary '-' - EC_bit_neg, // '~' - EC_none, // No operator (missing) - EC_symbol // a symbol (function or constant name) + EC_add, // '+' + EC_minus, // '-' + EC_mul, // '*' + EC_div, // '/' + EC_mod, // '%' + EC_or, // '|' + EC_xor, // '^' + EC_and, // '&' + EC_left, // '<<' + EC_right, // '>>' + EC_u_plus, // unary '+' + EC_u_minus, // unary '-' + EC_bit_neg, // '~' + EC_none, // No operator (missing) + EC_symbol // a symbol (function or constant name) }; // Enum to define the different kinds of evaluation possible -enum EvalKind +enum EvalKind { - EK_const, // Must evaluate to constant - EK_positive_int // Must evaluate to positive integer + EK_const, // Must evaluate to constant + EK_positive_int // Must evaluate to positive integer }; // Enum to define expression type enum ExprType { - ET_short, // Expression value is short - ET_ushort, // Expression value is unsigned short - ET_long, // Expression value is long - ET_ulong, // Expression value is unsigned long - ET_hyper, // Expression value is hyper (64 bit) - ET_uhyper, // Expression value is unsigned hyper - ET_float, // Expression value is 32-bit float - ET_double, // Expression value is 64-bit float - ET_char, // Expression value is char - ET_byte, // Expression value is byte - ET_boolean, // Expression value is boolean - ET_string, // Expression value is char * - ET_any, // Expression value is any of above - ET_void, // Expression value is void (absent) - ET_type, // Expression value is type - ET_none // Expression value is missing + ET_short, // Expression value is short + ET_ushort, // Expression value is unsigned short + ET_long, // Expression value is long + ET_ulong, // Expression value is unsigned long + ET_hyper, // Expression value is hyper (64 bit) + ET_uhyper, // Expression value is unsigned hyper + ET_float, // Expression value is 32-bit float + ET_double, // Expression value is 64-bit float + ET_char, // Expression value is char + ET_byte, // Expression value is byte + ET_boolean, // Expression value is boolean + ET_string, // Expression value is char * + ET_any, // Expression value is any of above + ET_void, // Expression value is void (absent) + ET_type, // Expression value is type + ET_none // Expression value is missing }; // Structure to describe value of constant expression and its type -struct AstExprValue +struct AstExprValue { - union + union { - sal_uInt8 byval; // Contains byte expression value - sal_Int16 sval; // Contains short expression value - sal_uInt16 usval; // Contains unsigned short expr value - sal_Int32 lval; // Contains long expression value - sal_uInt32 ulval; // Contains unsigned long expr value - sal_Int64 hval; // Contains hyper expression value - sal_uInt64 uhval; // Contains unsigned hyper expr value - sal_Bool bval; // Contains boolean expression value - float fval; // Contains 32-bit float expr value - double dval; // Contains 64-bit float expr value - sal_uInt32 eval; // Contains enumeration value + sal_uInt8 byval; // Contains byte expression value + sal_Int16 sval; // Contains short expression value + sal_uInt16 usval; // Contains unsigned short expr value + sal_Int32 lval; // Contains long expression value + sal_uInt32 ulval; // Contains unsigned long expr value + sal_Int64 hval; // Contains hyper expression value + sal_uInt64 uhval; // Contains unsigned hyper expr value + sal_Bool bval; // Contains boolean expression value + float fval; // Contains 32-bit float expr value + double dval; // Contains 64-bit float expr value + sal_uInt32 eval; // Contains enumeration value } u; ExprType et; }; @@ -106,18 +106,18 @@ public: // Constructor(s) AstExpression(ExprComb c, AstExpression *pExpr1, AstExpression *pExpr2); - AstExpression(sal_Int32 l); - AstExpression(sal_Int32 l, ExprType et); - AstExpression(sal_Int64 h); - AstExpression(sal_uInt64 uh); - AstExpression(double d); + AstExpression(sal_Int32 l); + AstExpression(sal_Int32 l, ExprType et); + AstExpression(sal_Int64 h); + AstExpression(sal_uInt64 uh); + AstExpression(double d); AstExpression(::rtl::OString* scopedName); virtual ~AstExpression(); // Data Accessors AstScope* getScope() - { return m_pScope; } + { return m_pScope; } void setScope(AstScope* pScope) { m_pScope = pScope; } sal_Int32 getLine() @@ -163,7 +163,7 @@ public: void dump() {} private: // Fill out the lineno, filename and definition scope details - void fillDefinitionDetails(); + void fillDefinitionDetails(); // Internal evaluation AstExprValue* eval_internal(EvalKind ek); // Evaluate different sets of operators @@ -172,15 +172,15 @@ private: AstExprValue* eval_un_op(EvalKind ek); AstExprValue* eval_symbol(EvalKind ek); - AstScope* m_pScope; // scope defined in - sal_Int32 m_lineNo; // line number defined in - ::rtl::OString m_fileName; // fileName defined in + AstScope* m_pScope; // scope defined in + sal_Int32 m_lineNo; // line number defined in + ::rtl::OString m_fileName; // fileName defined in - ExprComb m_combOperator; - AstExpression* m_subExpr1; - AstExpression* m_subExpr2; - AstExprValue* m_exprValue; - ::rtl::OString* m_pSymbolicName; + ExprComb m_combOperator; + AstExpression* m_subExpr1; + AstExpression* m_subExpr2; + AstExprValue* m_exprValue; + ::rtl::OString* m_pSymbolicName; }; #endif // _IDLC_ASTEXPRESSION_HXX_ diff --git a/idlc/inc/idlc/astinterface.hxx b/idlc/inc/idlc/astinterface.hxx index 5b4f3ae6fee7..038a810a5bbf 100644 --- a/idlc/inc/idlc/astinterface.hxx +++ b/idlc/inc/idlc/astinterface.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ public: AstInterface( const ::rtl::OString& name, AstInterface const * pInherits, - AstScope* pScope); + AstScope* pScope); virtual ~AstInterface(); InheritedInterfaces const & getAllInheritedInterfaces() const @@ -133,9 +133,9 @@ private: InheritedInterfaces m_inheritedInterfaces; InheritedInterfaces::size_type m_mandatoryInterfaces; - sal_Bool m_bIsDefined; - sal_Bool m_bForwarded; - sal_Bool m_bForwardedInSameFile; + sal_Bool m_bIsDefined; + sal_Bool m_bForwarded; + sal_Bool m_bForwardedInSameFile; bool m_bSingleInheritance; VisibleInterfaces m_visibleInterfaces; VisibleMembers m_visibleMembers; diff --git a/idlc/inc/idlc/astinterfacemember.hxx b/idlc/inc/idlc/astinterfacemember.hxx index 12eb19cf678e..8ea498bd0268 100644 --- a/idlc/inc/idlc/astinterfacemember.hxx +++ b/idlc/inc/idlc/astinterfacemember.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ class AstInterfaceMember : public AstDeclaration { public: - AstInterfaceMember(const sal_uInt32 flags, AstInterface* pRealInterface, + AstInterfaceMember(const sal_uInt32 flags, AstInterface* pRealInterface, const ::rtl::OString& name, AstScope* pScope) : AstDeclaration(NT_interface_member, name, pScope) , m_flags(flags) @@ -43,11 +43,11 @@ public: AstInterface* getRealInterface() { return m_pRealInterface; } - sal_Bool isOptional() + sal_Bool isOptional() { return ((m_flags & AF_OPTIONAL) == AF_OPTIONAL); } private: - const sal_uInt32 m_flags; - AstInterface* m_pRealInterface; + const sal_uInt32 m_flags; + AstInterface* m_pRealInterface; }; #endif // _IDLC_ASTINTERFACEMEMBER_HXX_ diff --git a/idlc/inc/idlc/astmember.hxx b/idlc/inc/idlc/astmember.hxx index 4100bffd3826..0f21f6e37f81 100644 --- a/idlc/inc/idlc/astmember.hxx +++ b/idlc/inc/idlc/astmember.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/idlc/inc/idlc/astmodule.hxx b/idlc/inc/idlc/astmodule.hxx index 54c95c2d1305..8e5b12d21099 100644 --- a/idlc/inc/idlc/astmodule.hxx +++ b/idlc/inc/idlc/astmodule.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/idlc/inc/idlc/astneeds.hxx b/idlc/inc/idlc/astneeds.hxx index c4084dfef5a5..767223e0a1b7 100644 --- a/idlc/inc/idlc/astneeds.hxx +++ b/idlc/inc/idlc/astneeds.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ public: AstService* getRealService() { return m_pRealService; } private: - AstService* m_pRealService; + AstService* m_pRealService; }; #endif // _IDLC_ASTNEEDS_HXX_ diff --git a/idlc/inc/idlc/astobserves.hxx b/idlc/inc/idlc/astobserves.hxx index 0faec0b8a949..085e28a96791 100644 --- a/idlc/inc/idlc/astobserves.hxx +++ b/idlc/inc/idlc/astobserves.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ public: AstInterface* getRealInterface() { return m_pRealInterface; } private: - AstInterface* m_pRealInterface; + AstInterface* m_pRealInterface; }; #endif // _IDLC_ASTOBSERVES_HXX_ diff --git a/idlc/inc/idlc/astoperation.hxx b/idlc/inc/idlc/astoperation.hxx index 397e1c3396c0..a49d0e8e385d 100644 --- a/idlc/inc/idlc/astoperation.hxx +++ b/idlc/inc/idlc/astoperation.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,8 +33,8 @@ namespace typereg { class Writer; } -#define OP_NONE 0x0000 -#define OP_ONEWAY 0x0001 +#define OP_NONE 0x0000 +#define OP_ONEWAY 0x0001 class AstType; @@ -68,9 +68,9 @@ public: // scope management virtual AstDeclaration* addDeclaration(AstDeclaration* pDecl); private: - sal_uInt32 m_flags; - AstType* m_pReturnType; - DeclList m_exceptions; + sal_uInt32 m_flags; + AstType* m_pReturnType; + DeclList m_exceptions; }; #endif // _IDLC_ASTOPERATION_HXX_ diff --git a/idlc/inc/idlc/astparameter.hxx b/idlc/inc/idlc/astparameter.hxx index 3d97e72d14b8..fc8fa330b469 100644 --- a/idlc/inc/idlc/astparameter.hxx +++ b/idlc/inc/idlc/astparameter.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include <idlc/astmember.hxx> -enum Direction { DIR_IN, DIR_OUT, DIR_INOUT }; +enum Direction { DIR_IN, DIR_OUT, DIR_INOUT }; class AstParameter: public AstMember { public: diff --git a/idlc/inc/idlc/astscope.hxx b/idlc/inc/idlc/astscope.hxx index e7f6a3962928..fb5d037a9c55 100644 --- a/idlc/inc/idlc/astscope.hxx +++ b/idlc/inc/idlc/astscope.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,8 +71,8 @@ protected: { return m_declarations.back(); } private: - DeclList m_declarations; - NodeType m_nodeType; + DeclList m_declarations; + NodeType m_nodeType; }; #endif // _IDLC_ASTSCOPE_HXX_ diff --git a/idlc/inc/idlc/astsequence.hxx b/idlc/inc/idlc/astsequence.hxx index d7e3cec03b9d..0b4e6e45f625 100644 --- a/idlc/inc/idlc/astsequence.hxx +++ b/idlc/inc/idlc/astsequence.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ public: , m_pMemberType(pMemberType) , m_pRelativName(NULL) {} - virtual ~AstSequence() + virtual ~AstSequence() { if ( m_pRelativName ) delete m_pRelativName; @@ -50,9 +50,9 @@ public: virtual bool isUnsigned() const { return m_pMemberType != 0 && m_pMemberType->isUnsigned(); } - virtual const sal_Char* getRelativName() const; + virtual const sal_Char* getRelativName() const; private: - AstType* m_pMemberType; + AstType* m_pMemberType; mutable ::rtl::OString* m_pRelativName; }; diff --git a/idlc/inc/idlc/astservice.hxx b/idlc/inc/idlc/astservice.hxx index 862c33ce17c4..cd6d2162fb10 100644 --- a/idlc/inc/idlc/astservice.hxx +++ b/idlc/inc/idlc/astservice.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/idlc/inc/idlc/astservicemember.hxx b/idlc/inc/idlc/astservicemember.hxx index f8b7932a647f..835387e55732 100644 --- a/idlc/inc/idlc/astservicemember.hxx +++ b/idlc/inc/idlc/astservicemember.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,11 +43,11 @@ public: AstService* getRealService() { return m_pRealService; } - sal_Bool isOptional() + sal_Bool isOptional() { return ((m_flags & AF_OPTIONAL) == AF_OPTIONAL); } private: - const sal_uInt32 m_flags; - AstService* m_pRealService; + const sal_uInt32 m_flags; + AstService* m_pRealService; }; #endif // _IDLC_ASTSERVICEMEMBER_HXX_ diff --git a/idlc/inc/idlc/aststack.hxx b/idlc/inc/idlc/aststack.hxx index 6604996c9bb2..6d34f83af4cb 100644 --- a/idlc/inc/idlc/aststack.hxx +++ b/idlc/inc/idlc/aststack.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,9 +48,9 @@ public: void clear(); private: - AstScope** m_stack; - sal_uInt32 m_size; - sal_uInt32 m_top; + AstScope** m_stack; + sal_uInt32 m_size; + sal_uInt32 m_top; }; #endif // _IDLC_ASTSTACK_HXX_ diff --git a/idlc/inc/idlc/aststruct.hxx b/idlc/inc/idlc/aststruct.hxx index 98cadcc4899c..92c09294a49b 100644 --- a/idlc/inc/idlc/aststruct.hxx +++ b/idlc/inc/idlc/aststruct.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,8 +44,8 @@ public: std::vector< rtl::OString > const & typeParameters, AstStruct* pBaseType, AstScope* pScope); - AstStruct(const NodeType type, - const ::rtl::OString& name, + AstStruct(const NodeType type, + const ::rtl::OString& name, AstStruct* pBaseType, AstScope* pScope); virtual ~AstStruct(); diff --git a/idlc/inc/idlc/aststructinstance.hxx b/idlc/inc/idlc/aststructinstance.hxx index 3428bc2be0b2..4b8539311b78 100644 --- a/idlc/inc/idlc/aststructinstance.hxx +++ b/idlc/inc/idlc/aststructinstance.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/idlc/inc/idlc/asttype.hxx b/idlc/inc/idlc/asttype.hxx index 32a18ab671f5..a3c2abba5b3e 100644 --- a/idlc/inc/idlc/asttype.hxx +++ b/idlc/inc/idlc/asttype.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/idlc/inc/idlc/asttypedef.hxx b/idlc/inc/idlc/asttypedef.hxx index 2b1839dcadd9..6f467e2a4a48 100644 --- a/idlc/inc/idlc/asttypedef.hxx +++ b/idlc/inc/idlc/asttypedef.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/idlc/inc/idlc/astunion.hxx b/idlc/inc/idlc/astunion.hxx index 4435317bee37..132bdd7064ac 100644 --- a/idlc/inc/idlc/astunion.hxx +++ b/idlc/inc/idlc/astunion.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,8 +61,8 @@ protected: AstUnionBranch* lookupEnum(AstUnionBranch* pBranch); private: - AstType* m_pDiscriminantType; - ExprType m_discExprType; + AstType* m_pDiscriminantType; + ExprType m_discExprType; }; #endif // _IDLC_ASTUNION_HXX_ diff --git a/idlc/inc/idlc/astunionbranch.hxx b/idlc/inc/idlc/astunionbranch.hxx index 20df92b90552..35a9d4b835ef 100644 --- a/idlc/inc/idlc/astunionbranch.hxx +++ b/idlc/inc/idlc/astunionbranch.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ public: AstUnionLabel* getLabel() { return m_pLabel; } private: - AstUnionLabel* m_pLabel; + AstUnionLabel* m_pLabel; }; #endif // _IDLC_ASTUNIONBRANCH_HXX_ diff --git a/idlc/inc/idlc/astunionlabel.hxx b/idlc/inc/idlc/astunionlabel.hxx index d468884d5a01..61f0fe3414eb 100644 --- a/idlc/inc/idlc/astunionlabel.hxx +++ b/idlc/inc/idlc/astunionlabel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,10 +28,10 @@ #ifndef _IDLC_ASTUNIONLABEL_HXX_ #define _IDLC_ASTUNIONLABEL_HXX_ -enum UnionLabel +enum UnionLabel { - UL_default, // Label is "default" - UL_label // Regular label + UL_default, // Label is "default" + UL_label // Regular label }; class AstUnionLabel @@ -45,8 +45,8 @@ public: AstExpression* getLabelValue() { return m_pLabelValue; } private: - UnionLabel m_label; - AstExpression* m_pLabelValue; + UnionLabel m_label; + AstExpression* m_pLabelValue; }; #endif // _IDLC_ASTUNIONLABEL_HXX_ diff --git a/idlc/inc/idlc/errorhandler.hxx b/idlc/inc/idlc/errorhandler.hxx index 44d2a8a5a704..c60bc3441514 100644 --- a/idlc/inc/idlc/errorhandler.hxx +++ b/idlc/inc/idlc/errorhandler.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,41 +35,41 @@ enum ErrorCode { - EIDL_NONE, // No error - EIDL_SYNTAX_ERROR, // Syntax error in IDL input + EIDL_NONE, // No error + EIDL_SYNTAX_ERROR, // Syntax error in IDL input // More details will be gleaned from examining // the parse state - 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_ONEWAY_CONFLICT, // Between op decl and argument direction - 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 - EIDL_CANT_INHERIT, // Cannot inherit from non-interface - EIDL_LOOKUP_ERROR, // Identifier not found - 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 - EIDL_FWD_DECL_LOOKUP, // Tried to lookup in fwd declared intf - EIDL_RECURSIVE_TYPE, // Illegal recursive use of type - EIDL_NONVOID_ONEWAY, // Non-void return type in oneway operation - EIDL_NOT_A_TYPE, // Not a type - EIDL_TYPE_NOT_VALID, // Type is not valid in this context - EIDL_INTERFACEMEMBER_LOOKUP, // interface is not defined or a fwd declaration not exists + 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_ONEWAY_CONFLICT, // Between op decl and argument direction + 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 + EIDL_CANT_INHERIT, // Cannot inherit from non-interface + EIDL_LOOKUP_ERROR, // Identifier not found + 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 + EIDL_FWD_DECL_LOOKUP, // Tried to lookup in fwd declared intf + EIDL_RECURSIVE_TYPE, // Illegal recursive use of type + EIDL_NONVOID_ONEWAY, // Non-void return type in oneway operation + EIDL_NOT_A_TYPE, // Not a type + EIDL_TYPE_NOT_VALID, // Type is not valid in this context + EIDL_INTERFACEMEMBER_LOOKUP, // interface is not defined or a fwd declaration not exists EIDL_SERVICEMEMBER_LOOKUP, - EIDL_TYPE_IDENT_CONFLICT, // type and identifier has equal names - EIDL_ONEWAY_RAISE_CONFLICT, // oneway function raised excpetion conflict + EIDL_TYPE_IDENT_CONFLICT, // type and identifier has equal names + EIDL_ONEWAY_RAISE_CONFLICT, // oneway function raised excpetion conflict EIDL_WRONGATTRIBUTEFLAG, EIDL_DEFINED_ATTRIBUTEFLAG, EIDL_WRONGATTRIBUTEKEYWORD, @@ -108,48 +108,48 @@ class ErrorHandler { public: // Report errors with varying numbers of arguments - void error0(ErrorCode e); - void error1(ErrorCode e, AstDeclaration const * d); - void error2( + void error0(ErrorCode e); + void error1(ErrorCode e, AstDeclaration const * d); + void error2( ErrorCode e, AstDeclaration const * d1, AstDeclaration const * d2); - void error3(ErrorCode e, AstDeclaration* d1, AstDeclaration* d2, AstDeclaration* d3); + void error3(ErrorCode e, AstDeclaration* d1, AstDeclaration* d2, AstDeclaration* d3); // Warning - void warning0(WarningCode e, const sal_Char* warningmsg); + void warning0(WarningCode e, const sal_Char* warningmsg); // Report a syntax error in IDL input - void syntaxError(ParseState state, sal_Int32 lineNumber, const sal_Char* errmsg); + void syntaxError(ParseState state, sal_Int32 lineNumber, const sal_Char* errmsg); // Report an unsuccesful coercion attempt - void coercionError(AstExpression *pExpr, ExprType et); + void coercionError(AstExpression *pExpr, ExprType et); // Report a failed name lookup attempt - void lookupError(const ::rtl::OString& n); + void lookupError(const ::rtl::OString& n); // Report a failed name lookup attempt - void lookupError(ErrorCode e, const ::rtl::OString& n, AstDeclaration* pScope); + void lookupError(ErrorCode e, const ::rtl::OString& n, AstDeclaration* pScope); // Report a type error - void noTypeError(AstDeclaration const * pDecl); + void noTypeError(AstDeclaration const * pDecl); - void inheritanceError(NodeType nodeType, const ::rtl::OString* name, AstDeclaration* pDecl); + void inheritanceError(NodeType nodeType, const ::rtl::OString* name, AstDeclaration* pDecl); - void flagError(ErrorCode e, sal_uInt32 flag); + void flagError(ErrorCode e, sal_uInt32 flag); - void forwardLookupError(AstDeclaration* pForward, const ::rtl::OString& name); + void forwardLookupError(AstDeclaration* pForward, const ::rtl::OString& name); - void constantExpected(AstDeclaration* pDecl, const ::rtl::OString& name); + void constantExpected(AstDeclaration* pDecl, const ::rtl::OString& name); - void evalError(AstExpression* pExpr); + 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); + void enumValExpected(AstUnion* pUnion); // Report a failed enumerator lookup in an enum - void enumValLookupFailure(AstUnion* pUnion, AstEnum* pEnum, const ::rtl::OString& name); + void enumValLookupFailure(AstUnion* pUnion, AstEnum* pEnum, const ::rtl::OString& name); bool checkPublished(AstDeclaration const * decl, bool bOptiional=false); }; diff --git a/idlc/inc/idlc/fehelper.hxx b/idlc/inc/idlc/fehelper.hxx index 9c716da3edfd..35e38e7e2d29 100644 --- a/idlc/inc/idlc/fehelper.hxx +++ b/idlc/inc/idlc/fehelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,10 +37,10 @@ class FeDeclarator { public: // Enum to denote types of declarators - enum DeclaratorType + enum DeclaratorType { - FD_simple, // Simple declarator - FD_complex // Complex declarator (complex_part field used) + FD_simple, // Simple declarator + FD_complex // Complex declarator (complex_part field used) }; FeDeclarator(const ::rtl::OString& name, DeclaratorType declType, AstDeclaration* pComplPart); @@ -50,7 +50,7 @@ public: { return m_pComplexPart; } const ::rtl::OString& getName() { return m_name; } - DeclaratorType getDeclType() + DeclaratorType getDeclType() { return m_declType; } sal_Bool checkType(AstDeclaration const * pType); @@ -58,7 +58,7 @@ public: private: AstDeclaration* m_pComplexPart; ::rtl::OString m_name; - DeclaratorType m_declType; + DeclaratorType m_declType; }; typedef ::std::list< FeDeclarator* > FeDeclList; @@ -69,7 +69,7 @@ public: FeInheritanceHeader( NodeType nodeType, ::rtl::OString* pName, ::rtl::OString* pInherits, std::vector< rtl::OString > * typeParameters); - + virtual ~FeInheritanceHeader() { if ( m_pName ) @@ -89,8 +89,8 @@ public: private: void initializeInherits(::rtl::OString* pinherits); - NodeType m_nodeType; - ::rtl::OString* m_pName; + NodeType m_nodeType; + ::rtl::OString* m_pName; AstDeclaration* m_pInherits; std::vector< rtl::OString > m_typeParameters; }; diff --git a/idlc/inc/idlc/idlc.hxx b/idlc/inc/idlc/idlc.hxx index 8262b26fc095..a423624579f9 100644 --- a/idlc/inc/idlc/idlc.hxx +++ b/idlc/inc/idlc/idlc.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,12 +75,12 @@ public: void setRealFileName(const ::rtl::OString& realFileName) { m_realFileName = realFileName; } const ::rtl::OString& getDocumentation() - { + { m_bIsDocValid = sal_False; - return m_documentation; + return m_documentation; } void setDocumentation(const ::rtl::OString& documentation) - { + { m_documentation = documentation; m_bIsDocValid = sal_True; } @@ -128,25 +128,25 @@ public: void reset(); private: - Options* m_pOptions; - AstStack* m_pScopes; - AstModule* m_pRoot; - ErrorHandler* m_pErrorHandler; - ::rtl::OString m_fileName; - ::rtl::OString m_mainFileName; - ::rtl::OString m_realFileName; - ::rtl::OString m_documentation; - sal_Bool m_bIsDocValid; - sal_Bool m_bGenerateDoc; - sal_Bool m_bIsInMainfile; + Options* m_pOptions; + AstStack* m_pScopes; + AstModule* m_pRoot; + ErrorHandler* m_pErrorHandler; + ::rtl::OString m_fileName; + ::rtl::OString m_mainFileName; + ::rtl::OString m_realFileName; + ::rtl::OString m_documentation; + sal_Bool m_bIsDocValid; + sal_Bool m_bGenerateDoc; + sal_Bool m_bIsInMainfile; bool m_published; - sal_uInt32 m_errorCount; - sal_uInt32 m_warningCount; - sal_uInt32 m_lineNumber; - sal_uInt32 m_offsetStart; - sal_uInt32 m_offsetEnd; - ParseState m_parseState; - StringSet m_includes; + sal_uInt32 m_errorCount; + sal_uInt32 m_warningCount; + sal_uInt32 m_lineNumber; + sal_uInt32 m_offsetStart; + sal_uInt32 m_offsetEnd; + ParseState m_parseState; + StringSet m_includes; }; sal_Int32 compileFile(const ::rtl::OString * pathname); diff --git a/idlc/inc/idlc/idlctypes.hxx b/idlc/inc/idlc/idlctypes.hxx index 0849dd85fb28..a23e760d00cd 100644 --- a/idlc/inc/idlc/idlctypes.hxx +++ b/idlc/inc/idlc/idlctypes.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,15 +61,15 @@ struct LessString } }; -typedef ::std::list< ::rtl::OString > StringList; -typedef ::std::vector< ::rtl::OString > StringVector; -typedef ::std::set< ::rtl::OString, LessString > StringSet; +typedef ::std::list< ::rtl::OString > StringList; +typedef ::std::vector< ::rtl::OString > StringVector; +typedef ::std::set< ::rtl::OString, LessString > StringSet; class AstExpression; -typedef ::std::list< AstExpression* > ExprList; +typedef ::std::list< AstExpression* > ExprList; class AstUnionLabel; -typedef ::std::list< AstUnionLabel* > LabelList; +typedef ::std::list< AstUnionLabel* > LabelList; class AstDeclaration; @@ -85,183 +85,183 @@ AstScope* SAL_CALL declAsScope(AstDeclaration* pDecl); #endif // flags used for attributes, properties and services -#define AF_INVALID 0x0000 -#define AF_READONLY 0x0001 -#define AF_OPTIONAL 0x0002 -#define AF_MAYBEVOID 0x0004 -#define AF_BOUND 0x0008 -#define AF_CONSTRAINED 0x0010 -#define AF_TRANSIENT 0x0020 -#define AF_MAYBEAMBIGUOUS 0x0040 -#define AF_MAYBEDEFAULT 0x0080 -#define AF_REMOVEABLE 0x0100 -#define AF_ATTRIBUTE 0x0200 -#define AF_PROPERTY 0x0400 +#define AF_INVALID 0x0000 +#define AF_READONLY 0x0001 +#define AF_OPTIONAL 0x0002 +#define AF_MAYBEVOID 0x0004 +#define AF_BOUND 0x0008 +#define AF_CONSTRAINED 0x0010 +#define AF_TRANSIENT 0x0020 +#define AF_MAYBEAMBIGUOUS 0x0040 +#define AF_MAYBEDEFAULT 0x0080 +#define AF_REMOVEABLE 0x0100 +#define AF_ATTRIBUTE 0x0200 +#define AF_PROPERTY 0x0400 enum ParseState { PS_NoState, - PS_TypeDeclSeen, // Seen complete typedef declaration - PS_ConstantDeclSeen, // Seen complete const declaration - PS_ExceptionDeclSeen, // Seen complete exception declaration - PS_InterfaceDeclSeen, // Seen complete interface declaration - PS_ServiceDeclSeen, // Seen complete service declaration - PS_SingletonDeclSeen, // Seen complete singleton declaration - PS_ModuleDeclSeen, // Seen complete module declaration - PS_AttributeDeclSeen, // Seen complete attribute declaration - PS_PropertyDeclSeen, // Seen complete property declaration - PS_OperationDeclSeen, // Seen complete operation declaration + PS_TypeDeclSeen, // Seen complete typedef declaration + PS_ConstantDeclSeen, // Seen complete const declaration + PS_ExceptionDeclSeen, // Seen complete exception declaration + PS_InterfaceDeclSeen, // Seen complete interface declaration + PS_ServiceDeclSeen, // Seen complete service declaration + PS_SingletonDeclSeen, // Seen complete singleton declaration + PS_ModuleDeclSeen, // Seen complete module declaration + PS_AttributeDeclSeen, // Seen complete attribute declaration + PS_PropertyDeclSeen, // Seen complete property declaration + PS_OperationDeclSeen, // Seen complete operation declaration PS_InterfaceInheritanceDeclSeen, // Seen complete interface inheritance decl - PS_ConstantsDeclSeen, // Seen complete constants declaration - - PS_ServiceSeen, // Seen a SERVICE keyword - PS_ServiceIDSeen, // Seen the service ID - PS_ServiceSqSeen, // '{' seen for service - PS_ServiceQsSeen, // '}' seen for service - PS_ServiceBodySeen, // Seen complete service body - PS_ServiceMemberSeen, // Seen a service member + PS_ConstantsDeclSeen, // Seen complete constants declaration + + PS_ServiceSeen, // Seen a SERVICE keyword + PS_ServiceIDSeen, // Seen the service ID + PS_ServiceSqSeen, // '{' seen for service + PS_ServiceQsSeen, // '}' seen for service + PS_ServiceBodySeen, // Seen complete service body + PS_ServiceMemberSeen, // Seen a service member PS_ServiceIFHeadSeen, // Seen an interface member header - PS_ServiceSHeadSeen, // Seen an service member header - - PS_SingletonSeen, // Seen a SINGLETON keyword - PS_SingletonIDSeen, // Seen the singleton ID - PS_SingletonSqSeen, // '{' seen for singleton - PS_SingletonQsSeen, // '}' seen for singleton - PS_SingletonBodySeen, // Seen complete singleton body - PS_SingletonMemberSeen, // Seen a singleton member - - PS_ModuleSeen, // Seen a MODULE keyword - PS_ModuleIDSeen, // Seen the module ID - PS_ModuleSqSeen, // '{' seen for module - PS_ModuleQsSeen, // '}' seen for module - PS_ModuleBodySeen, // Seen complete module body - - PS_ConstantsSeen, // Seen a CONSTANTS keyword - PS_ConstantsIDSeen, // Seen the constants ID - PS_ConstantsSqSeen, // '{' seen for constants - PS_ConstantsQsSeen, // '}' seen for constants - PS_ConstantsBodySeen, // Seen complete constants body - - PS_InterfaceSeen, // Seen an INTERFACE keyword - PS_InterfaceIDSeen, // Seen the interface ID - PS_InterfaceHeadSeen, // Seen the interface head - PS_InheritSpecSeen, // Seen a complete inheritance spec - PS_ForwardDeclSeen, // Forward interface decl seen - PS_InterfaceSqSeen, // '{' seen for interface - PS_InterfaceQsSeen, // '}' seen for interface - PS_InterfaceBodySeen, // Seen an interface body - PS_InheritColonSeen, // Seen ':' in inheritance list - - PS_SNListCommaSeen, // Seen ',' in list of scoped names - PS_ScopedNameSeen, // Seen a complete scoped name - PS_SN_IDSeen, // Seen an identifier as part of a scoped name - PS_ScopeDelimSeen, // Seen a scope delim as party of a scoped name - - PS_ConstSeen, // Seen a CONST keyword - PS_ConstTypeSeen, // Parsed the type of a constant - PS_ConstIDSeen, // Seen the constant ID - PS_ConstAssignSeen, // Seen the '=' - PS_ConstExprSeen, // Seen the constant value expression - - PS_TypedefSeen, // Seen a TYPEDEF keyword - PS_TypeSpecSeen, // Seen a complete type specification - PS_DeclaratorsSeen, // Seen a complete list of declarators - - PS_StructSeen, // Seen a STRUCT keyword - PS_StructHeaderSeen, // Seen struct header - PS_StructIDSeen, // Seen the struct ID - PS_StructSqSeen, // '{' seen for struct - PS_StructQsSeen, // '}' seen for struct - PS_StructBodySeen, // Seen complete body of struct decl - - PS_MemberTypeSeen, // Seen type of struct or except member - PS_MemberDeclsSeen, // Seen decls of struct or except members + PS_ServiceSHeadSeen, // Seen an service member header + + PS_SingletonSeen, // Seen a SINGLETON keyword + PS_SingletonIDSeen, // Seen the singleton ID + PS_SingletonSqSeen, // '{' seen for singleton + PS_SingletonQsSeen, // '}' seen for singleton + PS_SingletonBodySeen, // Seen complete singleton body + PS_SingletonMemberSeen, // Seen a singleton member + + PS_ModuleSeen, // Seen a MODULE keyword + PS_ModuleIDSeen, // Seen the module ID + PS_ModuleSqSeen, // '{' seen for module + PS_ModuleQsSeen, // '}' seen for module + PS_ModuleBodySeen, // Seen complete module body + + PS_ConstantsSeen, // Seen a CONSTANTS keyword + PS_ConstantsIDSeen, // Seen the constants ID + PS_ConstantsSqSeen, // '{' seen for constants + PS_ConstantsQsSeen, // '}' seen for constants + PS_ConstantsBodySeen, // Seen complete constants body + + PS_InterfaceSeen, // Seen an INTERFACE keyword + PS_InterfaceIDSeen, // Seen the interface ID + PS_InterfaceHeadSeen, // Seen the interface head + PS_InheritSpecSeen, // Seen a complete inheritance spec + PS_ForwardDeclSeen, // Forward interface decl seen + PS_InterfaceSqSeen, // '{' seen for interface + PS_InterfaceQsSeen, // '}' seen for interface + PS_InterfaceBodySeen, // Seen an interface body + PS_InheritColonSeen, // Seen ':' in inheritance list + + PS_SNListCommaSeen, // Seen ',' in list of scoped names + PS_ScopedNameSeen, // Seen a complete scoped name + PS_SN_IDSeen, // Seen an identifier as part of a scoped name + PS_ScopeDelimSeen, // Seen a scope delim as party of a scoped name + + PS_ConstSeen, // Seen a CONST keyword + PS_ConstTypeSeen, // Parsed the type of a constant + PS_ConstIDSeen, // Seen the constant ID + PS_ConstAssignSeen, // Seen the '=' + PS_ConstExprSeen, // Seen the constant value expression + + PS_TypedefSeen, // Seen a TYPEDEF keyword + PS_TypeSpecSeen, // Seen a complete type specification + PS_DeclaratorsSeen, // Seen a complete list of declarators + + PS_StructSeen, // Seen a STRUCT keyword + PS_StructHeaderSeen, // Seen struct header + PS_StructIDSeen, // Seen the struct ID + PS_StructSqSeen, // '{' seen for struct + PS_StructQsSeen, // '}' seen for struct + PS_StructBodySeen, // Seen complete body of struct decl + + PS_MemberTypeSeen, // Seen type of struct or except member + 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 - PS_EnumQsSeen, // Seen '}' for enum - PS_EnumBodySeen, // Seen complete enum body - PS_EnumCommaSeen, // Seen ',' in list of enumerators - - PS_SequenceSeen, // Seen a SEQUENCE keyword - PS_SequenceSqSeen, // Seen '<' for sequence - 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 - PS_AttrCompleted, // Seen complete attribute declaration - PS_ReadOnlySeen, // Seen READONLY keyword - PS_OptionalSeen, // Seen OPTIONAL keyword - PS_MayBeVoidSeen, // Seen MAYBEVOID yword - PS_BoundSeen, // Seen BOUND keyword - PS_ConstrainedSeen, // Seen CONSTRAINED keyword - PS_TransientSeen, // Seen TRANSIENT keyword - PS_MayBeAmbigiousSeen, // Seen MAYBEAMBIGIOUS keyword - PS_MayBeDefaultSeen, // Seen MAYBEDEFAULT keyword - PS_RemoveableSeen, // Seen REMOVEABLE keyword - - PS_PropertySeen, // Seen PROPERTY keyword - PS_PropertyTypeSeen, // Seen type decl for property - PS_PropertyCompleted, // Seen complete property declaration - - PS_ExceptSeen, // Seen EXCEPTION keyword - PS_ExceptHeaderSeen, // Seen exception header keyword - PS_ExceptIDSeen, // Seen exception identifier - PS_ExceptSqSeen, // Seen '{' for exception - PS_ExceptQsSeen, // Seen '}' for exception - PS_ExceptBodySeen, // Seen complete exception body - - PS_OpHeadSeen, // Seen the operation head - PS_OpTypeSeen, // Seen operation return type - PS_OpIDSeen, // Seen operation ID - PS_OpParsCompleted, // Completed operation param list - PS_OpCompleted, // Completed operation statement - PS_OpSqSeen, // Seen '(' for operation - PS_OpQsSeen, // Seen ')' for operation - PS_OpParCommaSeen, // Seen ',' in list of op params - PS_OpParDirSeen, // Seen parameter direction - PS_OpParTypeSeen, // Seen parameter type - PS_OpParDeclSeen, // Seen parameter declaration - PS_OpOnewaySeen, // Seen ONEWAY keyword + 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 + PS_EnumQsSeen, // Seen '}' for enum + PS_EnumBodySeen, // Seen complete enum body + PS_EnumCommaSeen, // Seen ',' in list of enumerators + + PS_SequenceSeen, // Seen a SEQUENCE keyword + PS_SequenceSqSeen, // Seen '<' for sequence + 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 + PS_AttrCompleted, // Seen complete attribute declaration + PS_ReadOnlySeen, // Seen READONLY keyword + PS_OptionalSeen, // Seen OPTIONAL keyword + PS_MayBeVoidSeen, // Seen MAYBEVOID yword + PS_BoundSeen, // Seen BOUND keyword + PS_ConstrainedSeen, // Seen CONSTRAINED keyword + PS_TransientSeen, // Seen TRANSIENT keyword + PS_MayBeAmbigiousSeen, // Seen MAYBEAMBIGIOUS keyword + PS_MayBeDefaultSeen, // Seen MAYBEDEFAULT keyword + PS_RemoveableSeen, // Seen REMOVEABLE keyword + + PS_PropertySeen, // Seen PROPERTY keyword + PS_PropertyTypeSeen, // Seen type decl for property + PS_PropertyCompleted, // Seen complete property declaration + + PS_ExceptSeen, // Seen EXCEPTION keyword + PS_ExceptHeaderSeen, // Seen exception header keyword + PS_ExceptIDSeen, // Seen exception identifier + PS_ExceptSqSeen, // Seen '{' for exception + PS_ExceptQsSeen, // Seen '}' for exception + PS_ExceptBodySeen, // Seen complete exception body + + PS_OpHeadSeen, // Seen the operation head + PS_OpTypeSeen, // Seen operation return type + PS_OpIDSeen, // Seen operation ID + PS_OpParsCompleted, // Completed operation param list + PS_OpCompleted, // Completed operation statement + PS_OpSqSeen, // Seen '(' for operation + PS_OpQsSeen, // Seen ')' for operation + PS_OpParCommaSeen, // Seen ',' in list of op params + PS_OpParDirSeen, // Seen parameter direction + PS_OpParTypeSeen, // Seen parameter type + PS_OpParDeclSeen, // Seen parameter declaration + PS_OpOnewaySeen, // Seen ONEWAY keyword PS_RaiseSeen, // Seen RAISES keyword PS_RaiseSqSeen, // Seen '(' for RAISES PS_RaiseQsSeen, // Seen ')' for RAISES - PS_DeclsCommaSeen, // Seen ',' in declarators list - PS_DeclsDeclSeen // Seen complete decl in decls list -}; + PS_DeclsCommaSeen, // Seen ',' in declarators list + PS_DeclsDeclSeen // Seen complete decl in decls list +}; #endif // _IDLC_IDLCTYPES_HXX_ diff --git a/idlc/inc/idlc/inheritedinterface.hxx b/idlc/inc/idlc/inheritedinterface.hxx index e983c751acd2..94545d98eb6b 100644 --- a/idlc/inc/idlc/inheritedinterface.hxx +++ b/idlc/inc/idlc/inheritedinterface.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/idlc/inc/idlc/options.hxx b/idlc/inc/idlc/options.hxx index 796552aec671..1b725c0414fd 100644 --- a/idlc/inc/idlc/options.hxx +++ b/idlc/inc/idlc/options.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include <idlc/idlctypes.hxx> -typedef ::std::hash_map< ::rtl::OString, +typedef ::std::hash_map< ::rtl::OString, ::rtl::OString, HashString, EqualString > OptionMap; @@ -42,7 +42,7 @@ public: IllegalArgument(const ::rtl::OString& msg) : m_message(msg) {} - ::rtl::OString m_message; + ::rtl::OString m_message; }; @@ -52,15 +52,15 @@ public: Options(); ~Options(); - sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False) + sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False) throw( IllegalArgument ); ::rtl::OString prepareHelp(); ::rtl::OString prepareVersion(); - const ::rtl::OString& getProgramName() const; - sal_Bool isValid(const ::rtl::OString& option); - const ::rtl::OString getOption(const ::rtl::OString& option) + const ::rtl::OString& getProgramName() const; + sal_Bool isValid(const ::rtl::OString& option); + const ::rtl::OString getOption(const ::rtl::OString& option) throw( IllegalArgument ); const StringVector& getInputFiles() const { return m_inputFiles; } @@ -69,14 +69,14 @@ public: bool quiet() const { return m_quiet; } protected: - ::rtl::OString m_program; - StringVector m_inputFiles; + ::rtl::OString m_program; + StringVector m_inputFiles; bool m_stdin; bool m_verbose; bool m_quiet; - OptionMap m_options; + OptionMap m_options; }; - + #endif // _IDLC_OPTIONS_HXX_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |