summaryrefslogtreecommitdiff
path: root/autodoc/source/parser
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2009-06-04 15:47:31 +0000
committerKurt Zenker <kz@openoffice.org>2009-06-04 15:47:31 +0000
commitc60ba8c007d730f9553e50b70de5696632166392 (patch)
tree12e20440c86363994fe77fc4aad4dce3f1dd623e /autodoc/source/parser
parent4fbb6a8a259b4b3203e5d7d9272531e2ca8bc308 (diff)
CWS-TOOLING: integrate CWS cmcfixes59
2009-05-18 10:10:11 +0200 cmc r272001 : #i102012# remove extensions warnings, and set as warnings-free 2009-05-16 17:29:59 +0200 cmc r271981 : #i101990# silence warning, logic is unchanged 2009-05-16 17:13:59 +0200 cmc r271980 : #i100412 remove warning, logic is unchanged 2009-05-16 17:08:57 +0200 cmc r271979 : #i100412 remove warning, logic is unchanged, matches comments for intent 2009-05-16 17:01:08 +0200 cmc r271978 : #i86576# remove uncallable code 2009-05-16 15:41:46 +0200 cmc r271977 : #i101988# fix up consts for warning-free
Diffstat (limited to 'autodoc/source/parser')
-rw-r--r--autodoc/source/parser/cpp/c_rcode.cxx7
-rw-r--r--autodoc/source/parser/cpp/c_rcode.hxx2
-rw-r--r--autodoc/source/parser/cpp/cpp_pe.cxx2
-rw-r--r--autodoc/source/parser/cpp/cx_c_sub.cxx2
-rw-r--r--autodoc/source/parser/cpp/pe_file.cxx6
-rw-r--r--autodoc/source/parser/cpp/pe_file.hxx2
-rw-r--r--autodoc/source/parser/cpp/pe_param.cxx6
-rw-r--r--autodoc/source/parser/cpp/pe_param.hxx1
-rw-r--r--autodoc/source/parser/inc/semantic/parseenv.hxx5
-rw-r--r--autodoc/source/parser/inc/tokens/stmstarr.hxx4
-rw-r--r--autodoc/source/parser/inc/tokens/tkpstama.hxx3
-rw-r--r--autodoc/source/parser/semantic/parseenv.cxx14
-rw-r--r--autodoc/source/parser/tokens/stmstarr.cxx15
-rw-r--r--autodoc/source/parser/tokens/tkpstama.cxx31
14 files changed, 1 insertions, 99 deletions
diff --git a/autodoc/source/parser/cpp/c_rcode.cxx b/autodoc/source/parser/cpp/c_rcode.cxx
index 8b507b1f5690..e8f688168d3f 100644
--- a/autodoc/source/parser/cpp/c_rcode.cxx
+++ b/autodoc/source/parser/cpp/c_rcode.cxx
@@ -153,13 +153,6 @@ CodeExplorer::AcknowledgeResult()
} // end switch(CurResult().eStackAction)
}
-ary::loc::Le_id
-CodeExplorer::CurFile() const
-{
- // KORR_FUTURE
- return ary::loc::Le_id(0);
-}
-
const Token &
CodeExplorer::CurToken() const
{
diff --git a/autodoc/source/parser/cpp/c_rcode.hxx b/autodoc/source/parser/cpp/c_rcode.hxx
index f180e83bf191..28a2785de917 100644
--- a/autodoc/source/parser/cpp/c_rcode.hxx
+++ b/autodoc/source/parser/cpp/c_rcode.hxx
@@ -73,8 +73,6 @@ class CodeExplorer : private TokenProcessing_Types
void StartNewFile();
void Process_Token(
DYN cpp::Token & let_drToken );
- ary::loc::Le_id CurFile() const;
-
// ACCESS
FileScope_EventHandler &
FileEventHandler() { return aGlobalParseContext; }
diff --git a/autodoc/source/parser/cpp/cpp_pe.cxx b/autodoc/source/parser/cpp/cpp_pe.cxx
index 49a8ce7d465c..858bea64612e 100644
--- a/autodoc/source/parser/cpp/cpp_pe.cxx
+++ b/autodoc/source/parser/cpp/cpp_pe.cxx
@@ -67,8 +67,6 @@ Cpp_PE::Cpp_PE( EnvData & i_rEnv )
void
Cpp_PE::StdHandlingOfSyntaxError( const char * )
{
-// GlobalHandlingOfSyntaxError(i_sText, Env().CurFileName(), Env().LineCount());
-
SetTokenResult(not_done, pop_failure);
}
diff --git a/autodoc/source/parser/cpp/cx_c_sub.cxx b/autodoc/source/parser/cpp/cx_c_sub.cxx
index 87b7a4139cc7..e45f121efb66 100644
--- a/autodoc/source/parser/cpp/cx_c_sub.cxx
+++ b/autodoc/source/parser/cpp/cx_c_sub.cxx
@@ -139,7 +139,7 @@ Context_ConstNumeric::ReadCharChain(CharacterSource & io_rText)
do {
do {
cNext = static_cast<char>( tolower(io_rText.MoveOn()) );
- } while (cNext != 'e' AND isalnum(cNext) OR cNext == '.');
+ } while ( (cNext != 'e' AND isalnum(cNext)) OR cNext == '.');
if (cNext == 'e')
{
cNext = io_rText.MoveOn();
diff --git a/autodoc/source/parser/cpp/pe_file.cxx b/autodoc/source/parser/cpp/pe_file.cxx
index 32bd888e4487..af2924d8adeb 100644
--- a/autodoc/source/parser/cpp/pe_file.cxx
+++ b/autodoc/source/parser/cpp/pe_file.cxx
@@ -100,12 +100,6 @@ PE_File::Handle_ChildFailure()
return &pSpuIgnoreFailure->Child();
}
-ary::cpp::Gate &
-PE_File::AryGate() const
-{
- return const_cast< PE_File& >(*this).access_Env().AryGate();
-}
-
void
PE_File::Setup_StatusFunctions()
{
diff --git a/autodoc/source/parser/cpp/pe_file.hxx b/autodoc/source/parser/cpp/pe_file.hxx
index 120a1f49dce8..b24c2ee292cf 100644
--- a/autodoc/source/parser/cpp/pe_file.hxx
+++ b/autodoc/source/parser/cpp/pe_file.hxx
@@ -79,8 +79,6 @@ class PE_File : public Cpp_PE
const cpp::Token & i_rTok );
virtual Cpp_PE * Handle_ChildFailure();
- ary::cpp::Gate & AryGate() const;
-
private:
typedef SubPe< PE_File, PE_Namespace> SP_Namespace;
typedef SubPe< PE_File, PE_Typedef> SP_Typedef;
diff --git a/autodoc/source/parser/cpp/pe_param.cxx b/autodoc/source/parser/cpp/pe_param.cxx
index 16eb50e4e078..9a5d88c2fa06 100644
--- a/autodoc/source/parser/cpp/pe_param.cxx
+++ b/autodoc/source/parser/cpp/pe_param.cxx
@@ -235,12 +235,6 @@ PE_Parameter::On_expectName_Comma(const char * i_sText)
}
void
-PE_Parameter::On_expectName_Assign(const char * i_sText)
-{
- On_afterName_Assign(i_sText);
-}
-
-void
PE_Parameter::On_afterName_ArrayBracket_Left(const char *)
{
pSpuVariable->Push(not_done);
diff --git a/autodoc/source/parser/cpp/pe_param.hxx b/autodoc/source/parser/cpp/pe_param.hxx
index 0deb16f84d1f..40a4bf85f714 100644
--- a/autodoc/source/parser/cpp/pe_param.hxx
+++ b/autodoc/source/parser/cpp/pe_param.hxx
@@ -97,7 +97,6 @@ class PE_Parameter : public Cpp_PE
void On_expectName_ArrayBracket_Left(const char * i_sText);
void On_expectName_Bracket_Right(const char * i_sText);
void On_expectName_Comma(const char * i_sText);
- void On_expectName_Assign(const char * i_sText);
void On_afterName_ArrayBracket_Left(const char * i_sText);
void On_afterName_Bracket_Right(const char * i_sText);
diff --git a/autodoc/source/parser/inc/semantic/parseenv.hxx b/autodoc/source/parser/inc/semantic/parseenv.hxx
index 4981ffce6d8e..a001a6f1f80c 100644
--- a/autodoc/source/parser/inc/semantic/parseenv.hxx
+++ b/autodoc/source/parser/inc/semantic/parseenv.hxx
@@ -74,11 +74,6 @@ class ParseEnvironment : protected TokenProcessing_Types
ParseEnvironment(
ParseEnvironment * i_pParent );
const SubPeUseIfc * CurSubPeUse() const;
- void GlobalHandlingOfSyntaxError(
- const char * i_sTokenText,
- const char * i_sFileName,
- uintt i_nLineCount );
-
private:
virtual void InitData() = 0;
virtual void TransferData() = 0;
diff --git a/autodoc/source/parser/inc/tokens/stmstarr.hxx b/autodoc/source/parser/inc/tokens/stmstarr.hxx
index b70b131d1f7d..cf6586729e82 100644
--- a/autodoc/source/parser/inc/tokens/stmstarr.hxx
+++ b/autodoc/source/parser/inc/tokens/stmstarr.hxx
@@ -62,10 +62,6 @@ class StmArrayStatus : public StmStatus
// ACCESS
virtual StmArrayStatus *
AsArray();
- void SetBranches(
- intt in_nStartBranchIx,
- StmStatus::Branch * in_aBranchValues,
- intt in_nNrofValues );
bool SetBranch(
intt in_nBranchIx,
StmStatus::Branch in_nBranch );
diff --git a/autodoc/source/parser/inc/tokens/tkpstama.hxx b/autodoc/source/parser/inc/tokens/tkpstama.hxx
index f1c2560a2062..79391154ff72 100644
--- a/autodoc/source/parser/inc/tokens/tkpstama.hxx
+++ b/autodoc/source/parser/inc/tokens/tkpstama.hxx
@@ -76,9 +76,6 @@ class StateMachine
~StateMachine();
- // FOR TESTS ONLY:
- void PrintOut();
-
// OPERATIONS
StmBoundsStatus &
GetCharChain(
diff --git a/autodoc/source/parser/semantic/parseenv.cxx b/autodoc/source/parser/semantic/parseenv.cxx
index 0407af29d822..5ba364086944 100644
--- a/autodoc/source/parser/semantic/parseenv.cxx
+++ b/autodoc/source/parser/semantic/parseenv.cxx
@@ -87,17 +87,3 @@ ParseEnvironment::ParseEnvironment( ParseEnvironment * i_pParent )
pCurSubPe(0)
{
}
-
-void
-ParseEnvironment::GlobalHandlingOfSyntaxError( const char * i_sTokenText,
- const char * i_sFileName,
- uintt i_nLineCount )
-{
- throw X_Parser( X_Parser::x_UnexpectedToken,
- i_sTokenText,
- i_sFileName,
- i_nLineCount );
-}
-
-
-
diff --git a/autodoc/source/parser/tokens/stmstarr.cxx b/autodoc/source/parser/tokens/stmstarr.cxx
index 372c49f2f1e7..fe9444375e70 100644
--- a/autodoc/source/parser/tokens/stmstarr.cxx
+++ b/autodoc/source/parser/tokens/stmstarr.cxx
@@ -63,21 +63,6 @@ StmArrayStatus::~StmArrayStatus()
delete [] dpBranches;
}
-void
-StmArrayStatus::SetBranches( intt in_nStartBranchIx,
- StmStatus::Branch * in_aBranchValues,
- intt in_nNrofValues )
-{
- csv_assert(in_nStartBranchIx >= 0);
- csv_assert(in_aBranchValues != 0);
- csv_assert( in_nNrofValues > 0
- AND in_nStartBranchIx + in_nNrofValues <= nNrOfBranches );
-
- memcpy(&dpBranches[in_nStartBranchIx],in_aBranchValues,in_nNrofValues);
-}
-
-
-
bool
StmArrayStatus::SetBranch( intt in_nBranchIx,
StmStatus::Branch in_nBranch )
diff --git a/autodoc/source/parser/tokens/tkpstama.cxx b/autodoc/source/parser/tokens/tkpstama.cxx
index 6410f7c28e10..8a141a16eb3f 100644
--- a/autodoc/source/parser/tokens/tkpstama.cxx
+++ b/autodoc/source/parser/tokens/tkpstama.cxx
@@ -178,34 +178,3 @@ StateMachine::Peek(intt in_nBranch)
StmArrayStatus & rSt = CurrentStatus();
nPeekedStatus = rSt.NextBy(in_nBranch);
}
-
-void
-StateMachine::PrintOut()
-{
- const intt anzahl = nNrofStati;
- for (int i = 0; i < anzahl; i++)
- {
- Cout() << i << ':';
- StmArrayStatus * pArrSt = pStati[i]->AsArray();
- if (pArrSt != 0)
- {
- Cout() << Endl();
- for (int b = 0; b < 128; b++)
- {
- Cout().width(4);
- Cout() << pArrSt->NextBy(b);
- if (b%16 == 15)
- Cout() << Endl();
- }
- }
- else if (pStati[i]->AsBounds() != 0)
- {
- Cout() << "Bounds ";
- }
- else
- Cout() << "Error! ";
- Cout() << (pStati[i]->IsADefault() ? "DEF" : "---")
- << Endl();
- } // for
-}
-