diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-01-24 11:08:48 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-01-24 16:53:56 +0000 |
commit | 17ecf0036d44657b954de6c8f7efd536ab5c4809 (patch) | |
tree | 313962191e32e2ab611e3e25b8237b6ad76a329b /autodoc/source/parser | |
parent | 45350532879f8b33741fa1ac012aa43a776ebdf5 (diff) |
callcatcher: update list, remove newly unused methods
Diffstat (limited to 'autodoc/source/parser')
-rw-r--r-- | autodoc/source/parser/inc/tokens/stmstate.hxx | 3 | ||||
-rw-r--r-- | autodoc/source/parser/inc/tokens/stmstfin.hxx | 82 | ||||
-rw-r--r-- | autodoc/source/parser/inc/tokens/tkp.hxx | 8 | ||||
-rw-r--r-- | autodoc/source/parser/inc/tokens/tkpcontx.hxx | 4 | ||||
-rw-r--r-- | autodoc/source/parser/inc/tokens/tkpstama.hxx | 125 | ||||
-rw-r--r-- | autodoc/source/parser/tokens/makefile.mk | 2 | ||||
-rw-r--r-- | autodoc/source/parser/tokens/stmstate.cxx | 7 | ||||
-rw-r--r-- | autodoc/source/parser/tokens/stmstfin.cxx | 63 | ||||
-rw-r--r-- | autodoc/source/parser/tokens/tkp.cxx | 15 | ||||
-rw-r--r-- | autodoc/source/parser/tokens/tkpcontx.cxx | 10 | ||||
-rw-r--r-- | autodoc/source/parser/tokens/tkpstama.cxx | 175 |
11 files changed, 0 insertions, 494 deletions
diff --git a/autodoc/source/parser/inc/tokens/stmstate.hxx b/autodoc/source/parser/inc/tokens/stmstate.hxx index e966b4740b75..9a60f73446d7 100644 --- a/autodoc/source/parser/inc/tokens/stmstate.hxx +++ b/autodoc/source/parser/inc/tokens/stmstate.hxx @@ -34,7 +34,6 @@ // COMPONENTS // PARAMETERS class StmArrayStatus; -class StmBoundsStatus; /** A StmStatus is a state within a StateMachine. There are two kinds of it. Either its an array of pointers to @@ -55,8 +54,6 @@ class StmStatus // := "State machine status" // OPERATIONS virtual StmArrayStatus * AsArray(); - virtual StmBoundsStatus * - AsBounds(); // INQUIRY virtual bool IsADefault() const = 0; diff --git a/autodoc/source/parser/inc/tokens/stmstfin.hxx b/autodoc/source/parser/inc/tokens/stmstfin.hxx deleted file mode 100644 index 7ded64933bb5..000000000000 --- a/autodoc/source/parser/inc/tokens/stmstfin.hxx +++ /dev/null @@ -1,82 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * 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 - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef ADC_STMSTFIN_HXX -#define ADC_STMSTFIN_HXX - -// USED SERVICES - // BASE CLASSES -#include <tokens/stmstate.hxx> - // COMPONENTS - // PARAMETERS - - -class TkpContext; -class StateMachineContext; - -/** -**/ -class StmBoundsStatus : public StmStatus -{ - public: - // LIFECYCLE - StmBoundsStatus( - StateMachineContext & - o_rOwner, - TkpContext & i_rFollowUpContext, - uintt i_nStatusFunctionNr, - bool i_bIsDefault ); - // INQUIRY - TkpContext * FollowUpContext(); - uintt StatusFunctionNr() const; - virtual bool IsADefault() const; - - // ACCESS - virtual StmBoundsStatus * - AsBounds(); - - private: - StateMachineContext * - pOwner; - TkpContext * pFollowUpContext; - uintt nStatusFunctionNr; - bool bIsDefault; -}; - -inline TkpContext * -StmBoundsStatus::FollowUpContext() - { return pFollowUpContext; } -inline uintt -StmBoundsStatus::StatusFunctionNr() const - { return nStatusFunctionNr; } - - -#endif - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/inc/tokens/tkp.hxx b/autodoc/source/parser/inc/tokens/tkp.hxx index 97fc9578ae5c..4105dafaf9ec 100644 --- a/autodoc/source/parser/inc/tokens/tkp.hxx +++ b/autodoc/source/parser/inc/tokens/tkp.hxx @@ -42,9 +42,6 @@ class TkpContext; a text. Start() starts to parse the text from the given i_rSource. - GetNextToken() returns a Token on the heap as long as there are - still characters in the text left. This can be checked by - HasMore(). The algorithms for parsing tokens from the text are an issue of the derived classes. @@ -65,11 +62,6 @@ class TokenParser CharacterSource & i_rSource ); - /** @short Gets the next identifiable token out of the - source code. - */ - void GetNextToken(); - /// @return true, if there are more tokens to parse. bool HasMore() const { return bHasMore; } diff --git a/autodoc/source/parser/inc/tokens/tkpcontx.hxx b/autodoc/source/parser/inc/tokens/tkpcontx.hxx index c8818b4bfc20..dda63d00abe1 100644 --- a/autodoc/source/parser/inc/tokens/tkpcontx.hxx +++ b/autodoc/source/parser/inc/tokens/tkpcontx.hxx @@ -88,9 +88,6 @@ class TkpContext virtual bool PassNewToken() = 0; virtual TkpContext & FollowUpContext() = 0; - - static TkpNullContext & - Null_(); }; class StateMachineContext @@ -100,7 +97,6 @@ class StateMachineContext virtual ~StateMachineContext() {} - /// Is used by StmBoundsStatus only. virtual void PerformStatusFunction( uintt i_nStatusSignal, F_CRTOK i_fTokenCreateFunction, diff --git a/autodoc/source/parser/inc/tokens/tkpstama.hxx b/autodoc/source/parser/inc/tokens/tkpstama.hxx deleted file mode 100644 index 9c09ba6bc808..000000000000 --- a/autodoc/source/parser/inc/tokens/tkpstama.hxx +++ /dev/null @@ -1,125 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * 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 - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef ADC_TKPSTAMA_HXX -#define ADC_TKPSTAMA_HXX - -// USED SERVICES - // BASE CLASSES -#include <tokens/tkpcontx.hxx> - // COMPONENTS -#include <tokens/stmstarr.hxx> -#include <tokens/stmstfin.hxx> - -/** @descr - This state-machine models state transitions from one state to another - per indices of branches. If the indices represent ascii-char-values, - the state-machine can be used for recognising tokens of text. - - The state-machine can be a status itself. - - StateMachine needs the array-size of all stati as a guess, how many stati - the state machine will contain, when at work. - - -**/ -class StateMachine -{ - public: - // Types - typedef StmStatus::Branch Branch; - typedef StmStatus * * StatusList; - - //# Interface self - // LIFECYCLE - StateMachine( - intt in_nStatusSize, - intt in_nInitial_StatusListSize ); /// The user of the constructor should guess - /// the approximate number of stati here to - /// avoid multiple reallocations. - /// @#AddStatus - intt AddStatus( /// @return the new #Status' ID - DYN StmStatus * let_dpStatus); - /// @#AddToken - void AddToken( - const char * in_sToken, - TextToken::F_CRTOK in_fTokenCreateFunction, - const INT16 * in_aBranches, - INT16 in_nBoundsStatus ); - ~StateMachine(); - - - // OPERATIONS - StmBoundsStatus & - GetCharChain( - TextToken::F_CRTOK & - o_nTokenCreateFunction, - CharacterSource & io_rText ); - private: - // SERVICE FUNCTIONS - StmStatus & Status( - intt in_nStatusNr) const; - StmArrayStatus & - CurrentStatus() const; - StmBoundsStatus * - BoundsStatus() const; - - /// Sets the PeekedStatus. - void Peek( - intt in_nBranch); - - void ResizeStati(); // Adds space for 32 stati. - - // DATA - StatusList pStati; /// List of Status, implemented as simple C-array of length #nStatiSpace - /// with nStatiLength valid members (beginning from zero). - intt nCurrentStatus; - intt nPeekedStatus; - - intt nStatusSize; /// Size of the branch array of a single status. - - intt nNrofStati; /// Nr of Stati so far. - intt nStatiSpace; /// Size of allocated array for #pStati (size in items). -}; - - - -/** @#AddToken - @descr - Adds a token, which will be recogniszeds by the - statemachine. - - -**/ - - - -#endif - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/tokens/makefile.mk b/autodoc/source/parser/tokens/makefile.mk index beb3207154fb..32bfac814998 100644 --- a/autodoc/source/parser/tokens/makefile.mk +++ b/autodoc/source/parser/tokens/makefile.mk @@ -47,8 +47,6 @@ PRJINC=$(PRJ)$/source OBJFILES= \ $(OBJ)$/stmstarr.obj \ $(OBJ)$/stmstate.obj \ - $(OBJ)$/stmstfin.obj \ - $(OBJ)$/tkpstama.obj \ $(OBJ)$/tkp.obj \ $(OBJ)$/tkpcontx.obj \ $(OBJ)$/tokdeal.obj diff --git a/autodoc/source/parser/tokens/stmstate.cxx b/autodoc/source/parser/tokens/stmstate.cxx index 6530ebbbe838..9063b6128f67 100644 --- a/autodoc/source/parser/tokens/stmstate.cxx +++ b/autodoc/source/parser/tokens/stmstate.cxx @@ -38,11 +38,4 @@ StmStatus::AsArray() return 0; } -StmBoundsStatus * -StmStatus::AsBounds() -{ - return 0; -} - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/tokens/stmstfin.cxx b/autodoc/source/parser/tokens/stmstfin.cxx deleted file mode 100644 index 84b7a9cf39e9..000000000000 --- a/autodoc/source/parser/tokens/stmstfin.cxx +++ /dev/null @@ -1,63 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * 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 - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <precomp.h> -#include <tokens/stmstfin.hxx> - - -// NOT FULLY DECLARED SERVICES -#include <tokens/tkpcontx.hxx> - - -StmBoundsStatus::StmBoundsStatus( StateMachineContext & - o_rOwner, - TkpContext & i_rFollowUpContext, - uintt i_nStatusFunctionNr, - bool i_bIsDefault ) - : pOwner(&o_rOwner), - pFollowUpContext(&i_rFollowUpContext), - nStatusFunctionNr(i_nStatusFunctionNr), - bIsDefault(i_bIsDefault) -{ -} - -bool -StmBoundsStatus::IsADefault() const -{ - return bIsDefault; -} - -StmBoundsStatus * -StmBoundsStatus::AsBounds() -{ - return this; -} - - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/tokens/tkp.cxx b/autodoc/source/parser/tokens/tkp.cxx index 7be7bcb55842..8d90ff0f6755 100644 --- a/autodoc/source/parser/tokens/tkp.cxx +++ b/autodoc/source/parser/tokens/tkp.cxx @@ -48,21 +48,6 @@ TokenParser::Start( CharacterSource & i_rSource ) } void -TokenParser::GetNextToken() -{ - csv_assert(pChars != 0); - - bHasMore = NOT pChars->IsFinished(); - - for ( bool bDone = NOT bHasMore; NOT bDone; ) - { - CurrentContext().ReadCharChain(*pChars); - bDone = CurrentContext().PassNewToken(); - SetCurrentContext(CurrentContext().FollowUpContext()); - } -} - -void TokenParser::InitSource( CharacterSource & i_rSource ) { pChars = &i_rSource; diff --git a/autodoc/source/parser/tokens/tkpcontx.cxx b/autodoc/source/parser/tokens/tkpcontx.cxx index c1979bfe6c44..06f4da58565d 100644 --- a/autodoc/source/parser/tokens/tkpcontx.cxx +++ b/autodoc/source/parser/tokens/tkpcontx.cxx @@ -31,16 +31,6 @@ // NOT FULLY DECLARED SERVICES - - -TkpNullContext G_aNullContext; - -TkpNullContext & -TkpContext::Null_() -{ - return G_aNullContext; -} - TkpNullContext::~TkpNullContext() { } diff --git a/autodoc/source/parser/tokens/tkpstama.cxx b/autodoc/source/parser/tokens/tkpstama.cxx deleted file mode 100644 index f3e88b323040..000000000000 --- a/autodoc/source/parser/tokens/tkpstama.cxx +++ /dev/null @@ -1,175 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * 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 - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <precomp.h> -#include <tokens/tkpstama.hxx> - -// NOT FULLY DECLARED SERVICES -#include <tokens/stmstarr.hxx> -#include <tools/tkpchars.hxx> - -const intt C_nStatuslistResizeValue = 32; -const intt C_nTopStatus = 0; - -StateMachine::StateMachine( intt in_nStatusSize, - intt in_nInitial_StatusListSize ) - : pStati(new StmStatus*[in_nInitial_StatusListSize]), - nCurrentStatus(C_nTopStatus), - nPeekedStatus(C_nTopStatus), - nStatusSize(in_nStatusSize), - nNrofStati(0), - nStatiSpace(in_nInitial_StatusListSize) -{ - csv_assert(in_nStatusSize > 0); - csv_assert(in_nInitial_StatusListSize > 0); - - memset(pStati, 0, sizeof(StmStatus*) * nStatiSpace); -} - -intt -StateMachine::AddStatus(StmStatus * let_dpStatus) -{ - if (nNrofStati == nStatiSpace) - { - ResizeStati(); - } - pStati[nNrofStati] = let_dpStatus; - return nNrofStati++; -} - -void -StateMachine::AddToken( const char * in_sToken, - TextToken::F_CRTOK in_fTokenCreateFunction, - const INT16 * in_aBranches, - INT16 in_nBoundsStatus ) -{ - if (csv::no_str(in_sToken)) - return; - - - nCurrentStatus = 0; - nPeekedStatus = 0; - - for ( const char * pChar = in_sToken; - *pChar != NULCH; - ++pChar ) - { - Peek(*pChar); - StmStatus & rPst = Status(nPeekedStatus); - if ( rPst.IsADefault() OR rPst.AsBounds() != 0 ) - { - nPeekedStatus = AddStatus( new StmArrayStatus(nStatusSize, in_aBranches, 0, false ) ); - CurrentStatus().SetBranch( *pChar, nPeekedStatus ); - } - nCurrentStatus = nPeekedStatus; - } // end for - StmArrayStatus & rLastStatus = CurrentStatus(); - rLastStatus.SetTokenCreateFunction(in_fTokenCreateFunction); - for (intt i = 0; i < nStatusSize; i++) - { - if (Status(rLastStatus.NextBy(i)).AsBounds() != 0) - rLastStatus.SetBranch(i,in_nBoundsStatus); - } // end for -} - -StateMachine::~StateMachine() -{ - for (intt i = 0; i < nNrofStati; i++) - { - delete pStati[i]; - } - delete [] pStati; -} - -StmBoundsStatus & -StateMachine::GetCharChain( TextToken::F_CRTOK & o_nTokenCreateFunction, - CharacterSource & io_rText ) -{ - nCurrentStatus = C_nTopStatus; - - Peek(io_rText.CurChar()); - while (BoundsStatus() == 0) - { - nCurrentStatus = nPeekedStatus; - Peek(io_rText.MoveOn()); - } - o_nTokenCreateFunction = CurrentStatus().TokenCreateFunction(); - - return *BoundsStatus(); -} - -void -StateMachine::ResizeStati() -{ - intt nNewSize = nStatiSpace + C_nStatuslistResizeValue; - intt i = 0; - StatusList pNewStati = new StmStatus*[nNewSize]; - - for ( ; i < nNrofStati; i++) - { - pNewStati[i] = pStati[i]; - } - memset( pNewStati+i, - 0, - (nNewSize-i) * sizeof(StmStatus*) ); - - delete [] pStati; - pStati = pNewStati; - nStatiSpace = nNewSize; -} - -StmStatus & -StateMachine::Status(intt in_nStatusNr) const -{ - csv_assert( csv::in_range(intt(0), in_nStatusNr, intt(nNrofStati)) ); - return *pStati[in_nStatusNr]; -} - -StmArrayStatus & -StateMachine::CurrentStatus() const -{ - StmArrayStatus * pCurSt = Status(nCurrentStatus).AsArray(); - - csv_assert(pCurSt != 0); - return *pCurSt; -} - -StmBoundsStatus * -StateMachine::BoundsStatus() const -{ - return Status(nPeekedStatus).AsBounds(); -} - -void -StateMachine::Peek(intt in_nBranch) -{ - StmArrayStatus & rSt = CurrentStatus(); - nPeekedStatus = rSt.NextBy(in_nBranch); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |