Kaydet (Commit) e3898d37 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

-Werror,-Wunused-private-field (Clang towards 3.2)

Change-Id: If07500e1b7dc0ac127450fbb61e3d569ac3727eb
üst a267f318
...@@ -91,20 +91,7 @@ class DT_White : public DT_Dsapi ...@@ -91,20 +91,7 @@ class DT_White : public DT_Dsapi
virtual bool IsWhiteOnly() const; virtual bool IsWhiteOnly() const;
}; };
class DT_MupType : public DT_Dsapi
class DT_MLTag : public DT_Dsapi
{
public:
enum E_Kind
{
k_unknown = 0,
k_begin,
k_end,
k_single
};
};
class DT_MupType : public DT_MLTag
{ {
public: public:
explicit DT_MupType() /// Constructor for End-Tag explicit DT_MupType() /// Constructor for End-Tag
...@@ -125,7 +112,7 @@ class DT_MupType : public DT_MLTag ...@@ -125,7 +112,7 @@ class DT_MupType : public DT_MLTag
bool bIsBegin; bool bIsBegin;
}; };
class DT_MupMember : public DT_MLTag class DT_MupMember : public DT_Dsapi
{ {
public: public:
explicit DT_MupMember() /// Constructor for End-Tag explicit DT_MupMember() /// Constructor for End-Tag
...@@ -164,7 +151,7 @@ class DT_MupConst : public DT_Dsapi ...@@ -164,7 +151,7 @@ class DT_MupConst : public DT_Dsapi
}; };
class DT_Style : public DT_MLTag class DT_Style : public DT_Dsapi
{ {
public: public:
DT_Style( DT_Style(
...@@ -181,7 +168,6 @@ class DT_Style : public DT_MLTag ...@@ -181,7 +168,6 @@ class DT_Style : public DT_MLTag
{ return bNewLine; } { return bNewLine; }
private: private:
String sText; /// With HTML. String sText; /// With HTML.
E_Kind eKind;
bool bNewLine; bool bNewLine;
}; };
......
...@@ -40,16 +40,15 @@ namespace idl ...@@ -40,16 +40,15 @@ namespace idl
DYN InternalGate & DYN InternalGate &
InternalGate::Create_Partition_(RepositoryCenter & i_center) InternalGate::Create_Partition_()
{ {
return *new RepositoryPartition(i_center); return *new RepositoryPartition;
} }
RepositoryPartition::RepositoryPartition( RepositoryCenter & i_repository ) RepositoryPartition::RepositoryPartition()
: pCenter(&i_repository), : pCes(0),
pCes(0),
pTypes(0), pTypes(0),
pNamesDictionary(new NameLookup) pNamesDictionary(new NameLookup)
{ {
......
...@@ -55,8 +55,7 @@ class RepositoryPartition : public InternalGate ...@@ -55,8 +55,7 @@ class RepositoryPartition : public InternalGate
{ {
public: public:
// LIFECYCLE // LIFECYCLE
RepositoryPartition( RepositoryPartition();
RepositoryCenter & i_repository );
~RepositoryPartition(); ~RepositoryPartition();
// INHERITED // INHERITED
// Interface Gate: // Interface Gate:
...@@ -73,8 +72,6 @@ class RepositoryPartition : public InternalGate ...@@ -73,8 +72,6 @@ class RepositoryPartition : public InternalGate
private: private:
// DATA // DATA
RepositoryCenter * pCenter;
Dyn<CeAdmin> pCes; Dyn<CeAdmin> pCes;
Dyn<TypeAdmin> pTypes; Dyn<TypeAdmin> pTypes;
Dyn<NameLookup> pNamesDictionary; Dyn<NameLookup> pNamesDictionary;
......
...@@ -23,14 +23,6 @@ ...@@ -23,14 +23,6 @@
// BASE CLASSES // BASE CLASSES
#include <ary/idl/i_gate.hxx> #include <ary/idl/i_gate.hxx>
namespace ary
{
class RepositoryCenter;
}
namespace ary namespace ary
{ {
namespace idl namespace idl
...@@ -46,8 +38,7 @@ class InternalGate : public ::ary::idl::Gate ...@@ -46,8 +38,7 @@ class InternalGate : public ::ary::idl::Gate
virtual ~InternalGate() {} virtual ~InternalGate() {}
static DYN InternalGate & static DYN InternalGate &
Create_Partition_( Create_Partition_();
RepositoryCenter & i_center );
}; };
......
...@@ -45,7 +45,7 @@ RepositoryCenter::RepositoryCenter() ...@@ -45,7 +45,7 @@ RepositoryCenter::RepositoryCenter()
aLocation(), aLocation(),
pIdlPartition(0) pIdlPartition(0)
{ {
pIdlPartition = & idl::InternalGate::Create_Partition_(*this); pIdlPartition = & idl::InternalGate::Create_Partition_();
} }
RepositoryCenter::~RepositoryCenter() RepositoryCenter::~RepositoryCenter()
......
...@@ -174,7 +174,7 @@ Write_Bases( csi::xml::Element & o_out, ...@@ -174,7 +174,7 @@ Write_Bases( csi::xml::Element & o_out,
o_out << " "; o_out << " ";
HF_IdlTypeText HF_IdlTypeText
aDisplay( i_env, o_out, true, i_env.CurPageCe()); aDisplay( i_env, o_out, i_env.CurPageCe());
aDisplay.Produce_byData(nType); aDisplay.Produce_byData(nType);
o_out << "\n"; o_out << "\n";
......
...@@ -307,7 +307,7 @@ HF_IdlInterface::produce_BaseHierarchy( Xml::Element & o_screen, ...@@ -307,7 +307,7 @@ HF_IdlInterface::produce_BaseHierarchy( Xml::Element & o_screen,
>> *new Html::TableCell >> *new Html::TableCell
<< new Html::ClassAttr(C_sCellStyle_SummaryLeft); << new Html::ClassAttr(C_sCellStyle_SummaryLeft);
HF_IdlTypeText HF_IdlTypeText
aTypeDisplay( Env(), rTerm, false, 0); aTypeDisplay( Env(), rTerm, 0);
aTypeDisplay.Produce_byData((*it).Type()); aTypeDisplay.Produce_byData((*it).Type());
Xml::Element & Xml::Element &
......
...@@ -90,7 +90,7 @@ HF_IdlMethod::write_Declaration( const String & i_sName, ...@@ -90,7 +90,7 @@ HF_IdlMethod::write_Declaration( const String & i_sName,
if (i_nReturnType.IsValid()) if (i_nReturnType.IsValid())
{ // Normal function, but not constructors: { // Normal function, but not constructors:
HF_IdlTypeText HF_IdlTypeText
aReturn(Env(), rReturnLine, true); aReturn(Env(), rReturnLine);
aReturn.Produce_byData(i_nReturnType); aReturn.Produce_byData(i_nReturnType);
} }
...@@ -139,7 +139,7 @@ HF_IdlMethod::write_Declaration( const String & i_sName, ...@@ -139,7 +139,7 @@ HF_IdlMethod::write_Declaration( const String & i_sName,
Xml::Element & Xml::Element &
rExcOut = aDecl.ExceptionCell(); rExcOut = aDecl.ExceptionCell();
HF_IdlTypeText HF_IdlTypeText
aExc(Env(), rExcOut, true); aExc(Env(), rExcOut);
aExc.Produce_byData(*i_rExceptions); aExc.Produce_byData(*i_rExceptions);
for (++i_rExceptions; i_rExceptions; ++i_rExceptions) for (++i_rExceptions; i_rExceptions; ++i_rExceptions)
...@@ -185,7 +185,7 @@ HF_IdlMethod::write_Param( HF_FunctionDeclaration & o_decl, ...@@ -185,7 +185,7 @@ HF_IdlMethod::write_Param( HF_FunctionDeclaration & o_decl,
} // end switch } // end switch
HF_IdlTypeText HF_IdlTypeText
aTypeWriter(Env(), rTypeCell, true); aTypeWriter(Env(), rTypeCell);
aTypeWriter.Produce_byData( i_param.Type() ); aTypeWriter.Produce_byData( i_param.Type() );
rNameCell rNameCell
......
...@@ -242,7 +242,7 @@ HF_IdlModule::produce_Link( Xml::Element & o_row, ...@@ -242,7 +242,7 @@ HF_IdlModule::produce_Link( Xml::Element & o_row,
if ( NOT ary::is_type<ary::idl::Module>(*i_ce) ) if ( NOT ary::is_type<ary::idl::Module>(*i_ce) )
{ {
HF_IdlTypeText HF_IdlTypeText
aText(Env(), rCell, true); aText(Env(), rCell);
aText.Produce_byData(i_ce->CeId()); aText.Produce_byData(i_ce->CeId());
} }
else else
......
...@@ -27,15 +27,6 @@ ...@@ -27,15 +27,6 @@
#include "hi_factory.hxx" #include "hi_factory.hxx"
// PARAMETERS // PARAMETERS
namespace ary
{
namespace idl
{
class CodeEntity;
}
}
class HF_NaviSubRow; class HF_NaviSubRow;
/** @resp /** @resp
...@@ -62,10 +53,6 @@ class HF_IdlNavigationBar : public HtmlFactory_Idl ...@@ -62,10 +53,6 @@ class HF_IdlNavigationBar : public HtmlFactory_Idl
/** Adds the subrow to the o_rOut argument of the constructor. /** Adds the subrow to the o_rOut argument of the constructor.
*/ */
DYN HF_NaviSubRow & Add_SubRow(); DYN HF_NaviSubRow & Add_SubRow();
private:
const ary::idl::CodeEntity *
pCe;
}; };
extern const String extern const String
......
...@@ -139,7 +139,7 @@ HF_IdlProperty::write_Declaration( const client & i_ce ) const ...@@ -139,7 +139,7 @@ HF_IdlProperty::write_Declaration( const client & i_ce ) const
} // end if } // end if
HF_IdlTypeText HF_IdlTypeText
aType( Env(), CurOut(), true ); aType( Env(), CurOut() );
aType.Produce_byData( PropertyAttr::Type(i_ce) ); aType.Produce_byData( PropertyAttr::Type(i_ce) );
CurOut() << " " >> *new Html::Bold << i_ce.LocalName(); CurOut() << " " >> *new Html::Bold << i_ce.LocalName();
...@@ -169,7 +169,7 @@ HF_IdlAttribute::write_Declaration( const client & i_ce ) const ...@@ -169,7 +169,7 @@ HF_IdlAttribute::write_Declaration( const client & i_ce ) const
} }
HF_IdlTypeText HF_IdlTypeText
aType( Env(), CurOut(), true ); aType( Env(), CurOut() );
aType.Produce_byData( AttributeAttr::Type(i_ce) ); aType.Produce_byData( AttributeAttr::Type(i_ce) );
CurOut() CurOut()
...@@ -194,7 +194,7 @@ HF_IdlAttribute::write_Declaration( const client & i_ce ) const ...@@ -194,7 +194,7 @@ HF_IdlAttribute::write_Declaration( const client & i_ce ) const
Xml::Element & Xml::Element &
rGet = aSub.Produce_Definition(); rGet = aSub.Produce_Definition();
HF_IdlTypeText HF_IdlTypeText
aExc(Env(), rGet, true); aExc(Env(), rGet);
type_list & itExc = *pGetExceptions; type_list & itExc = *pGetExceptions;
rGet << "get raises ("; rGet << "get raises (";
...@@ -215,7 +215,7 @@ HF_IdlAttribute::write_Declaration( const client & i_ce ) const ...@@ -215,7 +215,7 @@ HF_IdlAttribute::write_Declaration( const client & i_ce ) const
Xml::Element & Xml::Element &
rSet = aSub.Produce_Definition(); rSet = aSub.Produce_Definition();
HF_IdlTypeText HF_IdlTypeText
aExc(Env(), rSet, true); aExc(Env(), rSet);
type_list & itExc = *pSetExceptions; type_list & itExc = *pSetExceptions;
rSet << "set raises ("; rSet << "set raises (";
...@@ -274,7 +274,7 @@ HF_IdlConstant::write_Declaration( const client & i_ce ) const ...@@ -274,7 +274,7 @@ HF_IdlConstant::write_Declaration( const client & i_ce ) const
{ {
CurOut() << "const "; CurOut() << "const ";
HF_IdlTypeText HF_IdlTypeText
aType( Env(), CurOut(), true ); aType( Env(), CurOut() );
aType.Produce_byData(ConstantAttr::Type(i_ce)); aType.Produce_byData(ConstantAttr::Type(i_ce));
CurOut() CurOut()
<< " " << " "
...@@ -298,7 +298,7 @@ void ...@@ -298,7 +298,7 @@ void
HF_IdlStructElement::write_Declaration( const client & i_ce ) const HF_IdlStructElement::write_Declaration( const client & i_ce ) const
{ {
HF_IdlTypeText HF_IdlTypeText
aType( Env(), CurOut(), true ); aType( Env(), CurOut() );
aType.Produce_byData(StructElementAttr::Type(i_ce)); aType.Produce_byData(StructElementAttr::Type(i_ce));
CurOut() CurOut()
<< " " << " "
...@@ -425,7 +425,7 @@ HF_IdlCommentedRelationElement::write_Title( const client & /*i_ce*/ ) const ...@@ -425,7 +425,7 @@ HF_IdlCommentedRelationElement::write_Title( const client & /*i_ce*/ ) const
<< new Html::ClassAttr(C_sMemberTitle); << new Html::ClassAttr(C_sMemberTitle);
HF_IdlTypeText HF_IdlTypeText
aText(Env(), rAnchor, true); aText(Env(), rAnchor);
aText.Produce_byData(m_relation.Type()); aText.Produce_byData(m_relation.Type());
} }
......
...@@ -285,7 +285,7 @@ HF_IdlService::produce_SummaryDeclaration( Xml::Element & o_row, ...@@ -285,7 +285,7 @@ HF_IdlService::produce_SummaryDeclaration( Xml::Element & o_row,
} // end if } // end if
HF_IdlTypeText HF_IdlTypeText
aType( Env(), rCell, true ); aType( Env(), rCell );
aType.Produce_byData( PropertyAttr::Type(i_property) ); aType.Produce_byData( PropertyAttr::Type(i_property) );
StreamLock aLocalLink(100); StreamLock aLocalLink(100);
...@@ -325,7 +325,7 @@ HF_IdlService::produce_Link( Xml::Element & o_row, ...@@ -325,7 +325,7 @@ HF_IdlService::produce_Link( Xml::Element & o_row,
>> *new Html::TableCell >> *new Html::TableCell
<< new Html::ClassAttr(C_sCellStyle_SummaryLeft); << new Html::ClassAttr(C_sCellStyle_SummaryLeft);
HF_IdlTypeText HF_IdlTypeText
aText(Env(), rCell, true); aText(Env(), rCell);
aText.Produce_byData(i_type); aText.Produce_byData(i_type);
} }
......
...@@ -77,7 +77,7 @@ HF_IdlSingleton::Produce_byData_ServiceBased( const client & i_ce ) const ...@@ -77,7 +77,7 @@ HF_IdlSingleton::Produce_byData_ServiceBased( const client & i_ce ) const
aTopList.Produce_Term(C_sAssociatedService); aTopList.Produce_Term(C_sAssociatedService);
HF_IdlTypeText HF_IdlTypeText
aAssociatedService( Env(), aTopList.Produce_Definition(), true ); aAssociatedService( Env(), aTopList.Produce_Definition() );
aAssociatedService.Produce_byData( SingletonAttr::AssociatedService(i_ce) ); aAssociatedService.Produce_byData( SingletonAttr::AssociatedService(i_ce) );
CurOut() << new Html::HorizontalLine; CurOut() << new Html::HorizontalLine;
...@@ -105,7 +105,7 @@ HF_IdlSingleton::Produce_byData_InterfaceBased( const client & i_ce ) const ...@@ -105,7 +105,7 @@ HF_IdlSingleton::Produce_byData_InterfaceBased( const client & i_ce ) const
aTopList.Produce_Term(C_sImplementedInterface); aTopList.Produce_Term(C_sImplementedInterface);
HF_IdlTypeText HF_IdlTypeText
aImplementedInterface( Env(), aTopList.Produce_Definition(), true ); aImplementedInterface( Env(), aTopList.Produce_Definition() );
aImplementedInterface.Produce_byData( SglIfcSingletonAttr::BaseInterface(i_ce) ); aImplementedInterface.Produce_byData( SglIfcSingletonAttr::BaseInterface(i_ce) );
CurOut() << new Html::HorizontalLine; CurOut() << new Html::HorizontalLine;
......
...@@ -95,7 +95,7 @@ HF_IdlSglIfcService::Produce_byData( const client & i_ce ) const ...@@ -95,7 +95,7 @@ HF_IdlSglIfcService::Produce_byData( const client & i_ce ) const
aTopList.Produce_Term(C_sImplementedInterface); aTopList.Produce_Term(C_sImplementedInterface);
HF_IdlTypeText HF_IdlTypeText
aImplementedInterface( Env(), aTopList.Produce_Definition(), true, &i_ce); aImplementedInterface( Env(), aTopList.Produce_Definition(), &i_ce);
aImplementedInterface.Produce_byData( SglIfcServiceAttr::BaseInterface(i_ce) ); aImplementedInterface.Produce_byData( SglIfcServiceAttr::BaseInterface(i_ce) );
CurOut() << new Html::HorizontalLine; CurOut() << new Html::HorizontalLine;
......
...@@ -98,7 +98,7 @@ HF_IdlTag::Produce_byData( Xml::Element & o_rTitle, ...@@ -98,7 +98,7 @@ HF_IdlTag::Produce_byData( Xml::Element & o_rTitle,
o_rText << ", "; o_rText << ", ";
} }
HF_IdlTypeText HF_IdlTypeText
aLinkText(Env(), o_rText, true, &aTextOut.ScopeGivingCe()); aLinkText(Env(), o_rText, &aTextOut.ScopeGivingCe());
aLinkText.Produce_byData( (*it)->LinkText() ); aLinkText.Produce_byData( (*it)->LinkText() );
} }
} }
...@@ -123,7 +123,7 @@ HF_IdlTag::Display_SeeAlsoAtTag( const csi::dsapi::DT_SeeAlsoAtTag & i_rTag ) ...@@ -123,7 +123,7 @@ HF_IdlTag::Display_SeeAlsoAtTag( const csi::dsapi::DT_SeeAlsoAtTag & i_rTag )
csv_assert( pTitleOut != 0 ); csv_assert( pTitleOut != 0 );
*pTitleOut << "See also"; *pTitleOut << "See also";
HF_IdlTypeText aLinkText(Env(),aTextOut.CurOut(),true, &aTextOut.ScopeGivingCe()); HF_IdlTypeText aLinkText(Env(),aTextOut.CurOut(), &aTextOut.ScopeGivingCe());
aLinkText.Produce_byData( i_rTag.LinkText() ); aLinkText.Produce_byData( i_rTag.LinkText() );
aTextOut.CurOut() << new Html::LineBreak; aTextOut.CurOut() << new Html::LineBreak;
...@@ -316,7 +316,7 @@ HF_IdlDocuTextDisplay::CreateTypeLink() ...@@ -316,7 +316,7 @@ HF_IdlDocuTextDisplay::CreateTypeLink()
CurOut() << sLinkToken; CurOut() << sLinkToken;
return; return;
} }
HF_IdlTypeText aLink(Env(), CurOut(), true, &ScopeGivingCe()); HF_IdlTypeText aLink(Env(), CurOut(), &ScopeGivingCe());
aLink.Produce_LinkInDocu(sScope, sLinkToken, String::Null_()); aLink.Produce_LinkInDocu(sScope, sLinkToken, String::Null_());
} }
...@@ -324,7 +324,7 @@ void ...@@ -324,7 +324,7 @@ void
HF_IdlDocuTextDisplay::CreateMemberLink() HF_IdlDocuTextDisplay::CreateMemberLink()
{ {
HF_IdlTypeText aLink(Env(), CurOut(), true, &ScopeGivingCe()); HF_IdlTypeText aLink(Env(), CurOut(), &ScopeGivingCe());
const char * const char *
sSplit = strchr(sLinkToken,':'); sSplit = strchr(sLinkToken,':');
......
...@@ -64,7 +64,7 @@ HF_IdlTypedef::Produce_byData( const client & i_ce ) const ...@@ -64,7 +64,7 @@ HF_IdlTypedef::Produce_byData( const client & i_ce ) const
aTopList.Produce_Term("Defining Type"); aTopList.Produce_Term("Defining Type");
HF_IdlTypeText HF_IdlTypeText
aDefinition( Env(), aTopList.Produce_Definition(), true ); aDefinition( Env(), aTopList.Produce_Definition() );
aDefinition.Produce_byData( TypedefAttr::DefiningType(i_ce) ); aDefinition.Produce_byData( TypedefAttr::DefiningType(i_ce) );
CurOut() << new Html::HorizontalLine; CurOut() << new Html::HorizontalLine;
......
...@@ -55,19 +55,16 @@ HF_IdlTypeText::referingCe() const ...@@ -55,19 +55,16 @@ HF_IdlTypeText::referingCe() const
HF_IdlTypeText::HF_IdlTypeText( Environment & io_rEnv, HF_IdlTypeText::HF_IdlTypeText( Environment & io_rEnv,
Xml::Element & o_rOut, Xml::Element & o_rOut,
bool i_bWithLink,
const client * i_pScopeGivingCe ) const client * i_pScopeGivingCe )
: HtmlFactory_Idl(io_rEnv, &o_rOut), : HtmlFactory_Idl(io_rEnv, &o_rOut),
pReferingCe( i_pScopeGivingCe ), pReferingCe( i_pScopeGivingCe )
bWithLink(i_bWithLink)
{ {
} }
HF_IdlTypeText::HF_IdlTypeText( Environment & io_rEnv, HF_IdlTypeText::HF_IdlTypeText( Environment & io_rEnv,
E_Index ) E_Index )
: HtmlFactory_Idl(io_rEnv, 0), : HtmlFactory_Idl(io_rEnv, 0),
pReferingCe( 0 ), pReferingCe( 0 )
bWithLink(true)
{ {
} }
...@@ -726,7 +723,7 @@ HF_IdlTypeText::write_TemplateParameterList( ...@@ -726,7 +723,7 @@ HF_IdlTypeText::write_TemplateParameterList(
return; return;
HF_IdlTypeText HF_IdlTypeText
aTemplateParamWriter(Env(), CurOut(), true, pReferingCe); aTemplateParamWriter(Env(), CurOut(), pReferingCe);
CurOut() << "< "; CurOut() << "< ";
std::vector<ary::idl::Type_id>::const_iterator std::vector<ary::idl::Type_id>::const_iterator
it = i_templateParameters.begin(); it = i_templateParameters.begin();
......
...@@ -44,7 +44,6 @@ class HF_IdlTypeText : public HtmlFactory_Idl ...@@ -44,7 +44,6 @@ class HF_IdlTypeText : public HtmlFactory_Idl
HF_IdlTypeText( HF_IdlTypeText(
Environment & io_rEnv, Environment & io_rEnv,
Xml::Element & o_rOut, Xml::Element & o_rOut,
bool i_bWithLink,
const client * i_pScopeGivingCe = 0 ); const client * i_pScopeGivingCe = 0 );
HF_IdlTypeText( HF_IdlTypeText(
Environment & io_rEnv, Environment & io_rEnv,
...@@ -143,7 +142,6 @@ class HF_IdlTypeText : public HtmlFactory_Idl ...@@ -143,7 +142,6 @@ class HF_IdlTypeText : public HtmlFactory_Idl
// DATA // DATA
mutable const client * mutable const client *
pReferingCe; pReferingCe;
bool bWithLink;
}; };
......
...@@ -136,7 +136,7 @@ HF_IdlXrefs::Produce_List( const char * i_title, ...@@ -136,7 +136,7 @@ HF_IdlXrefs::Produce_List( const char * i_title,
Xml::Element & Xml::Element &
rOutCell = aList.Add_Row() >>* new Html::TableCell; rOutCell = aList.Add_Row() >>* new Html::TableCell;
HF_IdlTypeText HF_IdlTypeText
aTypeWriter(Env(), rOutCell, true, pClient); aTypeWriter(Env(), rOutCell, pClient);
for ( ce_list & it = i_iterator; it; ++it ) for ( ce_list & it = i_iterator; it; ++it )
{ {
aTypeWriter.Produce_byData(*it); aTypeWriter.Produce_byData(*it);
...@@ -239,7 +239,7 @@ HF_IdlXrefs::recursive_make_ListInTree( Xml::Element & o_rDisplay, ...@@ -239,7 +239,7 @@ HF_IdlXrefs::recursive_make_ListInTree( Xml::Element & o_rDisplay,
const char * sLevelIndentation = " "; const char * sLevelIndentation = " ";
HF_IdlTypeText HF_IdlTypeText
aTypeWriter(Env(), o_rDisplay, true, &i_ce); aTypeWriter(Env(), o_rDisplay, &i_ce);
for ( ; i_iterator.operator bool(); ++i_iterator ) for ( ; i_iterator.operator bool(); ++i_iterator )
{ {
for (uintt i = 0; i < i_level; ++i) for (uintt i = 0; i < i_level; ++i)
......
...@@ -280,7 +280,7 @@ HtmlFactory_Idl::recursive_ShowBases( Xml::Element & o_screen, ...@@ -280,7 +280,7 @@ HtmlFactory_Idl::recursive_ShowBases( Xml::Element & o_screen,
if (pCe == 0) if (pCe == 0)
{ {
HF_IdlTypeText HF_IdlTypeText
aText( Env(), o_screen, false ); aText( Env(), o_screen );
aText.Produce_byData( i_baseType ); aText.Produce_byData( i_baseType );
o_screen o_screen
<< "\n"; << "\n";
...@@ -289,7 +289,7 @@ HtmlFactory_Idl::recursive_ShowBases( Xml::Element & o_screen, ...@@ -289,7 +289,7 @@ HtmlFactory_Idl::recursive_ShowBases( Xml::Element & o_screen,
} }
HF_IdlTypeText HF_IdlTypeText
aBaseLink( Env(), o_screen, true ); aBaseLink( Env(), o_screen );
aBaseLink.Produce_byData(pCe->CeId()); aBaseLink.Produce_byData(pCe->CeId());
o_screen o_screen
<< "\n"; << "\n";
......
...@@ -399,32 +399,32 @@ Context_UidlCode::SetupStateMachine() ...@@ -399,32 +399,32 @@ Context_UidlCode::SetupStateMachine()
= new StmArrayStatu2( C_nStatusSize, A_nBezeichnerStatus, 0, true); = new StmArrayStatu2( C_nStatusSize, A_nBezeichnerStatus, 0, true);
DYN StmBoundsStatu2 * dpBst_finErr DYN StmBoundsStatu2 * dpBst_finErr
= new StmBoundsStatu2( *this, TkpContext_Null2_(), nF_fin_Error, true ); = new StmBoundsStatu2( TkpContext_Null2_(), nF_fin_Error, true );
DYN StmBoundsStatu2 * dpBst_finIgn DYN StmBoundsStatu2 * dpBst_finIgn
= new StmBoundsStatu2( *this, *this, nF_fin_Ignore, true ); = new StmBoundsStatu2( *this, nF_fin_Ignore, true );
DYN StmBoundsStatu2 * dpBst_finBez DYN StmBoundsStatu2 * dpBst_finBez
= new StmBoundsStatu2( *this, *this, nF_fin_Identifier, true ); = new StmBoundsStatu2( *this, nF_fin_Identifier, true );
DYN StmBoundsStatu2 * dpBst_finKeyw DYN StmBoundsStatu2 * dpBst_finKeyw
= new StmBoundsStatu2( *this, *this, nF_fin_Keyword, false ); = new StmBoundsStatu2( *this, nF_fin_Keyword, false );
DYN StmBoundsStatu2 * dpBst_finPunct DYN StmBoundsStatu2 * dpBst_finPunct
= new StmBoundsStatu2( *this, *this, nF_fin_Punctuation, false ); = new StmBoundsStatu2( *this, nF_fin_Punctuation, false );
DYN StmBoundsStatu2 * dpBst_finEOL DYN StmBoundsStatu2 * dpBst_finEOL
= new StmBoundsStatu2( *this, *this, nF_fin_EOL, false ); = new StmBoundsStatu2( *this, nF_fin_EOL, false );
DYN StmBoundsStatu2 * dpBst_finEOF DYN StmBoundsStatu2 * dpBst_finEOF
= new StmBoundsStatu2( *this, TkpContext_Null2_(), nF_fin_EOF, false ); = new StmBoundsStatu2( TkpContext_Null2_(), nF_fin_EOF, false );
DYN StmBoundsStatu2 * dpBst_gotoMld DYN StmBoundsStatu2 * dpBst_gotoMld
= new StmBoundsStatu2( *this, *pDocuContext, nF_goto_MLDocu, false ); = new StmBoundsStatu2( *pDocuContext, nF_goto_MLDocu, false );
DYN StmBoundsStatu2 * dpBst_gotoSld DYN StmBoundsStatu2 * dpBst_gotoSld
= new StmBoundsStatu2( *this, *pDocuContext, nF_goto_SLDocu, false ); = new StmBoundsStatu2( *pDocuContext, nF_goto_SLDocu, false );
DYN StmBoundsStatu2 * dpBst_gotoMlc DYN StmBoundsStatu2 * dpBst_gotoMlc
= new StmBoundsStatu2( *this, *dpContext_MLComment, nF_goto_MLComment, false ); = new StmBoundsStatu2( *dpContext_MLComment, nF_goto_MLComment, false );
DYN StmBoundsStatu2 * dpBst_gotoSlc DYN StmBoundsStatu2 * dpBst_gotoSlc
= new StmBoundsStatu2( *this, *dpContext_SLComment, nF_goto_SLComment, false ); = new StmBoundsStatu2( *dpContext_SLComment, nF_goto_SLComment, false );
DYN StmBoundsStatu2 * dpBst_gotoPrp DYN StmBoundsStatu2 * dpBst_gotoPrp
= new StmBoundsStatu2( *this, *dpContext_Preprocessor, nF_goto_Praeprocessor, false ); = new StmBoundsStatu2( *dpContext_Preprocessor, nF_goto_Praeprocessor, false );
DYN StmBoundsStatu2 * dpBst_gotoAsg DYN StmBoundsStatu2 * dpBst_gotoAsg
= new StmBoundsStatu2( *this, *dpContext_Assignment, nF_goto_Assignment, false ); = new StmBoundsStatu2( *dpContext_Assignment, nF_goto_Assignment, false );
// construct dpMain: // construct dpMain:
aStateMachine.AddStatus(dpStatusTop); aStateMachine.AddStatus(dpStatusTop);
......
...@@ -74,7 +74,6 @@ TokenDistributor::ProcessingData::ProcessingData( ...@@ -74,7 +74,6 @@ TokenDistributor::ProcessingData::ProcessingData(
// itCurToken // itCurToken
// aCurResult // aCurResult
nTryCount(0), nTryCount(0),
bFinished(false),
rRepository(io_rRepository), rRepository(io_rRepository),
rParserInfo(io_rParserInfo), rParserInfo(io_rParserInfo),
pDocuProcessor(&i_rDocuProcessor), pDocuProcessor(&i_rDocuProcessor),
......
...@@ -63,8 +63,6 @@ class FileParsePerformers ...@@ -63,8 +63,6 @@ class FileParsePerformers
aDistributor; aDistributor;
Dyn<csi::uidl::PE_File> Dyn<csi::uidl::PE_File>
pFileParseEnvironment; pFileParseEnvironment;
ary::Repository &
rRepository;
ParserInfo & rParserInfo; ParserInfo & rParserInfo;
}; };
...@@ -121,7 +119,6 @@ FileParsePerformers::FileParsePerformers( ary::Repository & io_rRepository, ...@@ -121,7 +119,6 @@ FileParsePerformers::FileParsePerformers( ary::Repository & io_rRepository,
ParserInfo & io_rParserInfo ) ParserInfo & io_rParserInfo )
: pTokens(0), : pTokens(0),
aDistributor(io_rRepository, io_rParserInfo), aDistributor(io_rRepository, io_rParserInfo),
rRepository( io_rRepository ),
rParserInfo(io_rParserInfo) rParserInfo(io_rParserInfo)
{ {
DYN csi::dsapi::Context_Docu * DYN csi::dsapi::Context_Docu *
......
...@@ -386,37 +386,37 @@ Context_Docu::SetupStateMachine() ...@@ -386,37 +386,37 @@ Context_Docu::SetupStateMachine()
= new StmArrayStatu2( C_nStatusSize, A_nWordStatus, 0, true); = new StmArrayStatu2( C_nStatusSize, A_nWordStatus, 0, true);
DYN StmBoundsStatu2 * dpBst_goto_EoHtml DYN StmBoundsStatu2 * dpBst_goto_EoHtml
= new StmBoundsStatu2( *this, *pCx_EoHtml, nF_goto_EoHtml, true ); = new StmBoundsStatu2( *pCx_EoHtml, nF_goto_EoHtml, true );
DYN StmBoundsStatu2 * dpBst_goto_EoXmlConst DYN StmBoundsStatu2 * dpBst_goto_EoXmlConst
= new StmBoundsStatu2( *this, *pCx_EoXmlConst, nF_goto_EoXmlConst, true ); = new StmBoundsStatu2( *pCx_EoXmlConst, nF_goto_EoXmlConst, true );
DYN StmBoundsStatu2 * dpBst_goto_EoXmlLink_BeginTag DYN StmBoundsStatu2 * dpBst_goto_EoXmlLink_BeginTag
= new StmBoundsStatu2( *this, *pCx_EoXmlLink_BeginTag, nF_goto_EoXmlLink_BeginTag, true ); = new StmBoundsStatu2( *pCx_EoXmlLink_BeginTag, nF_goto_EoXmlLink_BeginTag, true );
DYN StmBoundsStatu2 * dpBst_goto_EoXmlLink_EndTag DYN StmBoundsStatu2 * dpBst_goto_EoXmlLink_EndTag
= new StmBoundsStatu2( *this, *pCx_EoXmlLink_EndTag, nF_goto_EoXmlLink_EndTag, true ); = new StmBoundsStatu2( *pCx_EoXmlLink_EndTag, nF_goto_EoXmlLink_EndTag, true );
DYN StmBoundsStatu2 * dpBst_goto_EoXmlFormat_BeginTag DYN StmBoundsStatu2 * dpBst_goto_EoXmlFormat_BeginTag
= new StmBoundsStatu2( *this, *pCx_EoXmlFormat_BeginTag, nF_goto_EoXmlFormat_BeginTag, true ); = new StmBoundsStatu2( *pCx_EoXmlFormat_BeginTag, nF_goto_EoXmlFormat_BeginTag, true );
DYN StmBoundsStatu2 * dpBst_goto_EoXmlFormat_EndTag DYN StmBoundsStatu2 * dpBst_goto_EoXmlFormat_EndTag
= new StmBoundsStatu2( *this, *pCx_EoXmlFormat_EndTag, nF_goto_EoXmlFormat_EndTag, true ); = new StmBoundsStatu2( *pCx_EoXmlFormat_EndTag, nF_goto_EoXmlFormat_EndTag, true );
DYN StmBoundsStatu2 * dpBst_goto_CheckStar DYN StmBoundsStatu2 * dpBst_goto_CheckStar
= new StmBoundsStatu2( *this, *pCx_CheckStar, nF_goto_CheckStar, true ); = new StmBoundsStatu2( *pCx_CheckStar, nF_goto_CheckStar, true );
DYN StmBoundsStatu2 * dpBst_finError DYN StmBoundsStatu2 * dpBst_finError
= new StmBoundsStatu2( *this, TkpContext_Null2_(), nF_fin_Error, true ); = new StmBoundsStatu2( TkpContext_Null2_(), nF_fin_Error, true );
DYN StmBoundsStatu2 * dpBst_finIgnore DYN StmBoundsStatu2 * dpBst_finIgnore
= new StmBoundsStatu2( *this, *this, nF_fin_Ignore, true); = new StmBoundsStatu2( *this, nF_fin_Ignore, true);
DYN StmBoundsStatu2 * dpBst_finEof DYN StmBoundsStatu2 * dpBst_finEof
= new StmBoundsStatu2( *this, TkpContext_Null2_(), nF_fin_Eof, false); = new StmBoundsStatu2( TkpContext_Null2_(), nF_fin_Eof, false);
DYN StmBoundsStatu2 * dpBst_finAnyWord DYN StmBoundsStatu2 * dpBst_finAnyWord
= new StmBoundsStatu2( *this, *this, nF_fin_AnyWord, true); = new StmBoundsStatu2( *this, nF_fin_AnyWord, true);
DYN StmBoundsStatu2 * dpBst_finAtTag DYN StmBoundsStatu2 * dpBst_finAtTag
= new StmBoundsStatu2( *this, *this, nF_fin_AtTag, false); = new StmBoundsStatu2( *this, nF_fin_AtTag, false);
DYN StmBoundsStatu2 * dpBst_finEndSign DYN StmBoundsStatu2 * dpBst_finEndSign
= new StmBoundsStatu2( *this, *pParentContext, nF_fin_EndSign, false); = new StmBoundsStatu2( *pParentContext, nF_fin_EndSign, false);
DYN StmBoundsStatu2 * dpBst_fin_Comma DYN StmBoundsStatu2 * dpBst_fin_Comma
= new StmBoundsStatu2( *this, *this, nF_fin_Comma, false ); = new StmBoundsStatu2( *this, nF_fin_Comma, false );
DYN StmBoundsStatu2 * dpBst_finWhite DYN StmBoundsStatu2 * dpBst_finWhite
= new StmBoundsStatu2( *this, *this, nF_fin_White, false); = new StmBoundsStatu2( *this, nF_fin_White, false);
// construct dpMain: // construct dpMain:
......
...@@ -161,7 +161,6 @@ class TokenDistributor : private TokenProcessing_Types ...@@ -161,7 +161,6 @@ class TokenDistributor : private TokenProcessing_Types
TokenProcessing_Result TokenProcessing_Result
aCurResult; aCurResult;
uintt nTryCount; uintt nTryCount;
bool bFinished;
ary::Repository & ary::Repository &
rRepository; rRepository;
ParserInfo & rParserInfo; ParserInfo & rParserInfo;
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
class TkpContext; class TkpContext;
class StateMachineContext;
/** /**
**/ **/
...@@ -37,8 +36,6 @@ class StmBoundsStatu2 : public StmStatu2 ...@@ -37,8 +36,6 @@ class StmBoundsStatu2 : public StmStatu2
public: public:
// LIFECYCLE // LIFECYCLE
StmBoundsStatu2( StmBoundsStatu2(
StateMachineContext &
o_rOwner,
TkpContext & i_rFollowUpContext, TkpContext & i_rFollowUpContext,
uintt i_nStatusFunctionNr, uintt i_nStatusFunctionNr,
bool i_bIsDefault ); bool i_bIsDefault );
...@@ -52,8 +49,6 @@ class StmBoundsStatu2 : public StmStatu2 ...@@ -52,8 +49,6 @@ class StmBoundsStatu2 : public StmStatu2
AsBounds(); AsBounds();
private: private:
StateMachineContext *
pOwner;
TkpContext * pFollowUpContext; TkpContext * pFollowUpContext;
uintt nStatusFunctionNr; uintt nStatusFunctionNr;
bool bIsDefault; bool bIsDefault;
......
...@@ -25,13 +25,10 @@ ...@@ -25,13 +25,10 @@
#include <tokens/tkpcont2.hxx> #include <tokens/tkpcont2.hxx>
StmBoundsStatu2::StmBoundsStatu2( StateMachineContext & StmBoundsStatu2::StmBoundsStatu2( TkpContext & i_rFollowUpContext,
o_rOwner,
TkpContext & i_rFollowUpContext,
uintt i_nStatusFunctionNr, uintt i_nStatusFunctionNr,
bool i_bIsDefault ) bool i_bIsDefault )
: pOwner(&o_rOwner), : pFollowUpContext(&i_rFollowUpContext),
pFollowUpContext(&i_rFollowUpContext),
nStatusFunctionNr(i_nStatusFunctionNr), nStatusFunctionNr(i_nStatusFunctionNr),
bIsDefault(i_bIsDefault) bIsDefault(i_bIsDefault)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment