From 5435ea6a5517a64b378f68bd026c846be8e356ed Mon Sep 17 00:00:00 2001
From: Tomas Oberhuber <tomas.oberhuber@fjfi.cvut.cz>
Date: Wed, 18 Nov 2009 16:34:47 +0000
Subject: [PATCH] Renaming mConfigDescription to tnlConfigDescription.
---
src/core/Makefile.am | 22 ++--
src/core/create-config-description-parser | 4 +-
src/core/mConfigDescriptionScanner.l | 70 ------------
src/core/mParameterContainer.cpp | 4 +-
src/core/mParameterContainer.h | 4 +-
src/core/parse.cc | 28 ++---
...scription.cpp => tnlConfigDescription.cpp} | 48 ++++----
...igDescription.h => tnlConfigDescription.h} | 54 ++++-----
...ser.cpp => tnlConfigDescriptionParser.cpp} | 46 ++++----
...nParser.h => tnlConfigDescriptionParser.h} | 28 ++---
...arser.ih => tnlConfigDescriptionParser.ih} | 6 +-
...nParser.y => tnlConfigDescriptionParser.y} | 4 +-
...ase.h => tnlConfigDescriptionParserbase.h} | 22 ++--
...er.cpp => tnlConfigDescriptionScanner.cpp} | 106 +++++++++---------
...canner.h => tnlConfigDescriptionScanner.h} | 8 +-
src/core/tnlConfigDescriptionScanner.l | 70 ++++++++++++
tools/src/mcurve2gnuplot.cpp | 2 +-
tools/src/mdiff-err-norms.cpp | 4 +-
tools/src/mgrid-view.cpp | 4 +-
tools/src/mgrid2gnuplot.cpp | 2 +-
20 files changed, 268 insertions(+), 268 deletions(-)
delete mode 100644 src/core/mConfigDescriptionScanner.l
rename src/core/{mConfigDescription.cpp => tnlConfigDescription.cpp} (77%)
rename src/core/{mConfigDescription.h => tnlConfigDescription.h} (78%)
rename src/core/{mConfigDescriptionParser.cpp => tnlConfigDescriptionParser.cpp} (81%)
rename src/core/{mConfigDescriptionParser.h => tnlConfigDescriptionParser.h} (73%)
rename src/core/{mConfigDescriptionParser.ih => tnlConfigDescriptionParser.ih} (53%)
rename src/core/{mConfigDescriptionParser.y => tnlConfigDescriptionParser.y} (98%)
rename src/core/{mConfigDescriptionParserbase.h => tnlConfigDescriptionParserbase.h} (76%)
rename src/core/{mConfigDescriptionScanner.cpp => tnlConfigDescriptionScanner.cpp} (93%)
rename src/core/{mConfigDescriptionScanner.h => tnlConfigDescriptionScanner.h} (98%)
create mode 100644 src/core/tnlConfigDescriptionScanner.l
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 0a9cfcd067..42aeae9b87 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -6,12 +6,12 @@
#SUBDIRS =
#endif
-EXTRA_DIST = mConfigDescriptionParser.y \
- mConfigDescriptionScanner.l \
- FlexLexer.h
+EXTRA_DIST = tnlConfigDescriptionParser.y \
+ tnlConfigDescriptionScanner.l \
+ FlexLexer.h
headers = \
- mConfigDescription.h \
+ tnlConfigDescription.h \
mCurve.h \
mDataElement.h \
mField1D.h \
@@ -23,10 +23,10 @@ headers = \
mLogger.h \
tnlObject.h \
tnlString.h \
- mConfigDescriptionParser.h \
- mConfigDescriptionParserbase.h \
- mConfigDescriptionParser.ih \
- mConfigDescriptionScanner.h \
+ tnlConfigDescriptionParser.h \
+ tnlConfigDescriptionParserbase.h \
+ tnlConfigDescriptionParser.ih \
+ tnlConfigDescriptionScanner.h \
mParameterContainer.h \
mTimerCPU.h \
mTimerRT.h \
@@ -37,12 +37,12 @@ headers = \
mpi-supp.h \
param-types.h
-sources = mConfigDescription.cpp \
+sources = tnlConfigDescription.cpp \
mLogger.cpp \
tnlObject.cpp \
tnlString.cpp \
- mConfigDescriptionScanner.cpp \
- mConfigDescriptionParser.cpp \
+ tnlConfigDescriptionScanner.cpp \
+ tnlConfigDescriptionParser.cpp \
mParameterContainer.cpp \
mTimerCPU.cpp \
mTimerRT.cpp \
diff --git a/src/core/create-config-description-parser b/src/core/create-config-description-parser
index 807beb6985..3a794e9e47 100755
--- a/src/core/create-config-description-parser
+++ b/src/core/create-config-description-parser
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#cd src
-bisonc++ mConfigDescriptionParser.y
-flex++ mConfigDescriptionScanner.l
+bisonc++ tnlConfigDescriptionParser.y
+flex++ tnlConfigDescriptionScanner.l
#cd ..
diff --git a/src/core/mConfigDescriptionScanner.l b/src/core/mConfigDescriptionScanner.l
deleted file mode 100644
index f3f500caa7..0000000000
--- a/src/core/mConfigDescriptionScanner.l
+++ /dev/null
@@ -1,70 +0,0 @@
-%{
- //#define _SKIP_YYFLEXLEXER_
- //#include "scanner.ih"
-
- #include "mConfigDescriptionParser.h"
- #include <iostream>
- int yywrap();
-%}
-
-%option c++ outfile="mConfigDescriptionScanner.cpp" header-file="mConfigDescriptionScanner.h" prefix="mCDS" debug
-
-
-BOOL_TRUE "YES"|"Yes"|"yes"|"TRUE"|"True"|"true"
-BOOL_FALSE "NO"|"No"|"no"|"FALSE"|"False"|"false"
-EXP "E"|"e"
-DIGIT [0-9]
-DECIMAL "."
-SIGN "+"|"-"
-ID [A-Za-z][A-Za-z0-9-]*
-STRING .*
-
-%%
-group { //cout << "GROUP" << endl;
- return mConfigDescriptionParser :: GROUP; }
-string { //cout << "STRING_KEYWORD" << endl;
- return mConfigDescriptionParser :: STRING_KEYWORD; }
-integer { //cout << "INTEGER_KEYWORD" << endl;
- return mConfigDescriptionParser :: INTEGER_KEYWORD; }
-real { //cout << "REAL_KEYWORD" << endl;
- return mConfigDescriptionParser :: REAL_KEYWORD; }
-bool { //cout << "REAL_KEYWORD" << endl;
- return mConfigDescriptionParser :: BOOLEAN_KEYWORD; }
-"list of" { return mConfigDescriptionParser :: LIST_OF_KEYWORD; }
-{BOOL_TRUE} { mConfigDescriptionParser :: current_parser -> setBVal( true );
- return mConfigDescriptionParser :: BOOLEAN; }
-{BOOL_FALSE} { mConfigDescriptionParser :: current_parser -> setBVal( false );
- return mConfigDescriptionParser :: BOOLEAN; }
-\"{STRING}\" { //cout << "STRING " << yytext << endl;
- mConfigDescriptionParser :: current_parser -> setSVal( yytext );
- return mConfigDescriptionParser :: STRING; }
-\[.*\] { //cout << "COMMENT " << yytext << endl;
- mConfigDescriptionParser :: current_parser ->
- setSVal( yytext );
- return mConfigDescriptionParser :: COMMENT; }
-{ID} { //cout << "IDENTIFIER " << yytext << endl;
- mConfigDescriptionParser :: current_parser ->
- setSVal( yytext );
- return mConfigDescriptionParser :: IDENTIFIER; }
-{DIGIT}+ { //cout << "INTEGER " << yytext << endl;
- mConfigDescriptionParser :: current_parser ->
- setIVal( yytext );
- return mConfigDescriptionParser :: INTEGER; }
-{DIGIT}+{DECIMAL}{DIGIT}* { //cout << "REAL " << yytext << endl;
- mConfigDescriptionParser :: current_parser ->
- setDVal( yytext );
- return mConfigDescriptionParser :: REAL; }
-{DIGIT}+{DECIMAL}{DIGIT}*{EXP}{SIGN}?{DIGIT}+ { //cout << "REAL " << yytext << endl;
- mConfigDescriptionParser :: current_parser ->
- setDVal( yytext );
- return mConfigDescriptionParser :: REAL; }
-\n { mConfigDescriptionParser :: current_parser -> newLine(); }
-#.*\n { mConfigDescriptionParser :: current_parser -> newLine(); }
-[ \t]
-. { return yytext[ 0 ]; }
-%%
-
-int yywrap()
-{
- return 1;
-}
diff --git a/src/core/mParameterContainer.cpp b/src/core/mParameterContainer.cpp
index e5519c0600..dccdc06e19 100644
--- a/src/core/mParameterContainer.cpp
+++ b/src/core/mParameterContainer.cpp
@@ -157,7 +157,7 @@ void mParameterContainer :: MPIBcast( int root, MPI_Comm mpi_comm )
}
//--------------------------------------------------------------------------
bool ParseCommandLine( int argc, char* argv[],
- const mConfigDescription& config_description,
+ const tnlConfigDescription& config_description,
mParameterContainer& parameters )
{
int i;
@@ -173,7 +173,7 @@ bool ParseCommandLine( int argc, char* argv[],
}
const char* option = _option + 2;
- const mConfigEntryType* entry_type;
+ const tnlConfigEntryType* entry_type;
if( ! ( entry_type = config_description. GetEntryType( option ) ) )
{
cerr << "Unknown parameter " << option << "." << endl;
diff --git a/src/core/mParameterContainer.h b/src/core/mParameterContainer.h
index 6ee6259fc4..20b10927d2 100644
--- a/src/core/mParameterContainer.h
+++ b/src/core/mParameterContainer.h
@@ -19,7 +19,7 @@
#define mParameterContainerH
#include "tnlList.h"
-#include "mConfigDescription.h"
+#include "tnlConfigDescription.h"
#include "mpi-supp.h"
#include "param-types.h"
@@ -113,7 +113,7 @@ class mParameterContainer
};
bool ParseCommandLine( int argc, char* argv[],
- const mConfigDescription& config_description,
+ const tnlConfigDescription& config_description,
mParameterContainer& parameters );
template< class T > bool mParameterContainer :: AddParameter( const char* name,
diff --git a/src/core/parse.cc b/src/core/parse.cc
index b4254d4edc..f87d4f11d2 100644
--- a/src/core/parse.cc
+++ b/src/core/parse.cc
@@ -1,7 +1,7 @@
// Generated by Bisonc++ V2.4.7 on Thu, 05 Nov 2009 14:48:55 +0100
// $insert class.ih
-#include "mConfigDescriptionParser.ih"
+#include "tnlConfigDescriptionParser.ih"
// The FIRST element of SR arrays shown below uses `d_type', defining the
// state's type, and `d_lastIdx' containing the last element's index. If
@@ -934,7 +934,7 @@ SR__ *s_state[] =
// ACCEPT and ABORT from anywhere, even from within members called by actions,
// simply throwing the appropriate exceptions.
-mConfigDescriptionParserBase::mConfigDescriptionParserBase()
+tnlConfigDescriptionParserBase::tnlConfigDescriptionParserBase()
:
d_stackIdx__(-1),
// $insert debuginit
@@ -948,12 +948,12 @@ mConfigDescriptionParserBase::mConfigDescriptionParserBase()
{}
-void mConfigDescriptionParserBase::clearin()
+void tnlConfigDescriptionParserBase::clearin()
{
d_token__ = d_nextToken__ = _UNDETERMINED_;
}
-void mConfigDescriptionParserBase::push__(size_t state)
+void tnlConfigDescriptionParserBase::push__(size_t state)
{
if (static_cast<size_t>(d_stackIdx__ + 1) == d_stateStack__.size())
{
@@ -966,7 +966,7 @@ void mConfigDescriptionParserBase::push__(size_t state)
*(d_vsp__ = &d_valueStack__[d_stackIdx__]) = d_val__;
}
-void mConfigDescriptionParserBase::popToken__()
+void tnlConfigDescriptionParserBase::popToken__()
{
d_token__ = d_nextToken__;
@@ -976,14 +976,14 @@ void mConfigDescriptionParserBase::popToken__()
d_nextToken__ = _UNDETERMINED_;
}
-void mConfigDescriptionParserBase::pushToken__(int token)
+void tnlConfigDescriptionParserBase::pushToken__(int token)
{
d_nextToken__ = d_token__;
d_nextVal__ = d_val__;
d_token__ = token;
}
-void mConfigDescriptionParserBase::pop__(size_t count)
+void tnlConfigDescriptionParserBase::pop__(size_t count)
{
if (d_stackIdx__ < static_cast<int>(count))
{
@@ -995,12 +995,12 @@ void mConfigDescriptionParserBase::pop__(size_t count)
d_vsp__ = &d_valueStack__[d_stackIdx__];
}
-inline size_t mConfigDescriptionParserBase::top__() const
+inline size_t tnlConfigDescriptionParserBase::top__() const
{
return d_stateStack__[d_stackIdx__];
}
-void mConfigDescriptionParser::executeAction(int production)
+void tnlConfigDescriptionParser::executeAction(int production)
{
if (d_token__ != _UNDETERMINED_)
pushToken__(d_token__); // save an already available token
@@ -1200,7 +1200,7 @@ void mConfigDescriptionParser::executeAction(int production)
}
}
-inline void mConfigDescriptionParserBase::reduce__(PI__ const &pi)
+inline void tnlConfigDescriptionParserBase::reduce__(PI__ const &pi)
{
d_token__ = pi.d_nonTerm;
pop__(pi.d_size);
@@ -1209,7 +1209,7 @@ inline void mConfigDescriptionParserBase::reduce__(PI__ const &pi)
// If d_token__ is _UNDETERMINED_ then if d_nextToken__ is _UNDETERMINED_ another
// token is obtained from lex(). Then d_nextToken__ is assigned to d_token__.
-void mConfigDescriptionParser::nextToken()
+void tnlConfigDescriptionParser::nextToken()
{
if (d_token__ != _UNDETERMINED_) // no need for a token: got one
return; // already
@@ -1232,7 +1232,7 @@ void mConfigDescriptionParser::nextToken()
// if the final transition is negative, then we should reduce by the rule
// given by its positive value. Note that the `recovery' parameter is only
// used with the --debug option
-int mConfigDescriptionParser::lookup(bool recovery)
+int tnlConfigDescriptionParser::lookup(bool recovery)
{
// $insert threading
SR__ *sr = s_state[d_state__]; // get the appropriate state-table
@@ -1273,7 +1273,7 @@ int mConfigDescriptionParser::lookup(bool recovery)
// If EOF is encountered without being appropriate for the current state,
// then the error recovery will fall back to the default recovery mode.
// (i.e., parsing terminates)
-void mConfigDescriptionParser::errorRecovery()
+void tnlConfigDescriptionParser::errorRecovery()
try
{
if (d_acceptedTokens__ >= d_requiredTokens__)// only generate an error-
@@ -1390,7 +1390,7 @@ catch (ErrorRecovery__) // This is: DEFAULT_RECOVERY_MODE
// default reduction. Error handling was described at the top of this
// file.
-int mConfigDescriptionParser::parse()
+int tnlConfigDescriptionParser::parse()
try
{
push__(0); // initial state
diff --git a/src/core/mConfigDescription.cpp b/src/core/tnlConfigDescription.cpp
similarity index 77%
rename from src/core/mConfigDescription.cpp
rename to src/core/tnlConfigDescription.cpp
index 8926d4132d..8ecaf96411 100644
--- a/src/core/mConfigDescription.cpp
+++ b/src/core/tnlConfigDescription.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- mConfigDescription.cpp - description
+ tnlConfigDescription.cpp - description
-------------------
begin : 2007/06/09
copyright : (C) 2007 by Tomá¹ Oberhuber
@@ -17,38 +17,38 @@
#include <fstream>
#include <iomanip>
-#include "mConfigDescriptionParser.h"
-#include "mConfigDescription.h"
+#include "tnlConfigDescriptionParser.h"
+#include "tnlConfigDescription.h"
#include "mParameterContainer.h"
#include "mfuncs.h"
//--------------------------------------------------------------------------
-mConfigDescription :: mConfigDescription()
+tnlConfigDescription :: tnlConfigDescription()
{
}
//--------------------------------------------------------------------------
-mConfigDescription :: ~mConfigDescription()
+tnlConfigDescription :: ~tnlConfigDescription()
{
groups. DeepEraseAll();
entries. DeepEraseAll();
}
//--------------------------------------------------------------------------
-void mConfigDescription :: AddGroup( const char* name,
+void tnlConfigDescription :: AddGroup( const char* name,
const char* description )
{
- groups. Append( new mConfigGroup( name, description ) );
+ groups. Append( new tnlConfigGroup( name, description ) );
}
//--------------------------------------------------------------------------
-void mConfigDescription :: AddEntry( const char* name,
- const mConfigEntryType& type,
+void tnlConfigDescription :: AddEntry( const char* name,
+ const tnlConfigEntryType& type,
const char* group,
const char* comment,
bool required )
{
- entries. Append( new mConfigEntryBase( name, type, group, comment, required ) );
+ entries. Append( new tnlConfigEntryBase( name, type, group, comment, required ) );
}
//--------------------------------------------------------------------------
-const mConfigEntryType* mConfigDescription :: GetEntryType( const char* name ) const
+const tnlConfigEntryType* tnlConfigDescription :: GetEntryType( const char* name ) const
{
int i;
const int size = entries. Size();
@@ -58,7 +58,7 @@ const mConfigEntryType* mConfigDescription :: GetEntryType( const char* name ) c
return NULL;
}
//--------------------------------------------------------------------------
-void mConfigDescription :: PrintUsage( const char* program_name )
+void tnlConfigDescription :: PrintUsage( const char* program_name )
{
cout << "Usage of: " << program_name << endl << endl;
int i, j;
@@ -90,13 +90,13 @@ void mConfigDescription :: PrintUsage( const char* program_name )
{
cout << " DEFAULT VALUE IS: ";
if( entries[ j ] -> type. basic_type == "string" )
- cout << ( ( mConfigEntry< tnlString >* ) entries[ j ] ) -> default_value;
+ cout << ( ( tnlConfigEntry< tnlString >* ) entries[ j ] ) -> default_value;
if( entries[ j ] -> type. basic_type == "integer" )
- cout << ( ( mConfigEntry< int >* ) entries[ j ] ) -> default_value;
+ cout << ( ( tnlConfigEntry< int >* ) entries[ j ] ) -> default_value;
if( entries[ j ] -> type. basic_type == "real" )
- cout << ( ( mConfigEntry< double >* ) entries[ j ] ) -> default_value;
+ cout << ( ( tnlConfigEntry< double >* ) entries[ j ] ) -> default_value;
if( entries[ j ] -> type. basic_type == "bool" )
- if( ( ( mConfigEntry< bool >* ) entries[ j ] ) -> default_value )
+ if( ( ( tnlConfigEntry< bool >* ) entries[ j ] ) -> default_value )
cout << "yes";
else cout << "no";
}
@@ -109,9 +109,9 @@ void mConfigDescription :: PrintUsage( const char* program_name )
}
}
//--------------------------------------------------------------------------
-bool mConfigDescription :: ParseConfigDescription( const char* file_name )
+bool tnlConfigDescription :: ParseConfigDescription( const char* file_name )
{
- mConfigDescriptionParser parser;
+ tnlConfigDescriptionParser parser;
fstream in_file;
in_file. open( file_name, ios :: in );
if( ! in_file )
@@ -124,7 +124,7 @@ bool mConfigDescription :: ParseConfigDescription( const char* file_name )
return true;
}
//--------------------------------------------------------------------------
-void mConfigDescription :: AddMissingEntries( mParameterContainer& parameter_container ) const
+void tnlConfigDescription :: AddMissingEntries( mParameterContainer& parameter_container ) const
{
int i;
const int size = entries. Size();
@@ -138,35 +138,35 @@ void mConfigDescription :: AddMissingEntries( mParameterContainer& parameter_con
{
parameter_container. AddParameter< tnlString >(
entry_name,
- ( ( mConfigEntry< tnlString >* ) entries[ i ] ) -> default_value );
+ ( ( tnlConfigEntry< tnlString >* ) entries[ i ] ) -> default_value );
continue;
}
if( entries[ i ] -> type. basic_type == "bool" )
{
parameter_container. AddParameter< bool >(
entry_name,
- ( ( mConfigEntry< bool >* ) entries[ i ] ) -> default_value );
+ ( ( tnlConfigEntry< bool >* ) entries[ i ] ) -> default_value );
continue;
}
if( entries[ i ] -> type. basic_type == "integer" )
{
parameter_container. AddParameter< int >(
entry_name,
- ( ( mConfigEntry< int >* ) entries[ i ] ) -> default_value );
+ ( ( tnlConfigEntry< int >* ) entries[ i ] ) -> default_value );
continue;
}
if( entries[ i ] -> type. basic_type == "real" )
{
parameter_container. AddParameter< double >(
entry_name,
- ( ( mConfigEntry< double >* ) entries[ i ] ) -> default_value );
+ ( ( tnlConfigEntry< double >* ) entries[ i ] ) -> default_value );
continue;
}
}
}
}
//--------------------------------------------------------------------------
-bool mConfigDescription :: CheckMissingEntries( mParameterContainer& parameter_container ) const
+bool tnlConfigDescription :: CheckMissingEntries( mParameterContainer& parameter_container ) const
{
int i;
const int size = entries. Size();
diff --git a/src/core/mConfigDescription.h b/src/core/tnlConfigDescription.h
similarity index 78%
rename from src/core/mConfigDescription.h
rename to src/core/tnlConfigDescription.h
index 572410febf..50490ba5f5 100644
--- a/src/core/mConfigDescription.h
+++ b/src/core/tnlConfigDescription.h
@@ -1,5 +1,5 @@
/***************************************************************************
- mConfigDescription.h - description
+ tnlConfigDescription.h - description
-------------------
begin : 2007/06/09
copyright : (C) 2007 by Tomá¹ Oberhuber
@@ -15,35 +15,35 @@
* *
***************************************************************************/
-#ifndef mConfigDescriptionH
-#define mConfigDescriptionH
+#ifndef tnlConfigDescriptionH
+#define tnlConfigDescriptionH
#include "tnlString.h"
#include "tnlList.h"
class mParameterContainer;
-struct mConfigGroup
+struct tnlConfigGroup
{
tnlString name;
tnlString comment;
- mConfigGroup( const char* _name,
+ tnlConfigGroup( const char* _name,
const char* _comment )
: name( _name ),
comment( _comment ){};
};
-struct mConfigEntryType
+struct tnlConfigEntryType
{
tnlString basic_type;
bool list_entry;
- mConfigEntryType(){};
+ tnlConfigEntryType(){};
- mConfigEntryType( const tnlString& _basic_type,
+ tnlConfigEntryType( const tnlString& _basic_type,
const bool _list_entry )
: basic_type( _basic_type ),
list_entry( _list_entry ){}
@@ -55,11 +55,11 @@ struct mConfigEntryType
};
};
-struct mConfigEntryBase
+struct tnlConfigEntryBase
{
tnlString name;
- mConfigEntryType type;
+ tnlConfigEntryType type;
tnlString group;
@@ -69,8 +69,8 @@ struct mConfigEntryBase
bool has_default_value;
- mConfigEntryBase( const char* _name,
- const mConfigEntryType& _type,
+ tnlConfigEntryBase( const char* _name,
+ const tnlConfigEntryType& _type,
const char* _group,
const char* _comment,
bool _required )
@@ -83,17 +83,17 @@ struct mConfigEntryBase
};
-template< class T > struct mConfigEntry : public mConfigEntryBase
+template< class T > struct tnlConfigEntry : public tnlConfigEntryBase
{
T default_value;
public:
- mConfigEntry( const char* _name,
- const mConfigEntryType& _type,
+ tnlConfigEntry( const char* _name,
+ const tnlConfigEntryType& _type,
const char* _group,
const char* _description,
const T& _default_value )
- : mConfigEntryBase( _name,
+ : tnlConfigEntryBase( _name,
_type,
_group,
_description,
@@ -106,28 +106,28 @@ template< class T > struct mConfigEntry : public mConfigEntryBase
};
//! Class containing description of the configuration parameters
-class mConfigDescription
+class tnlConfigDescription
{
public:
- mConfigDescription();
+ tnlConfigDescription();
void AddGroup( const char* name,
const char* description );
void AddEntry( const char* name,
- const mConfigEntryType& type,
+ const tnlConfigEntryType& type,
const char* group,
const char* comment,
bool required );
template< class T > void AddEntryWithDefaultValue( const char* name,
- const mConfigEntryType& type,
+ const tnlConfigEntryType& type,
const char* group,
const char* comment,
const T& default_value )
{
- entries. Append( new mConfigEntry< T >( name,
+ entries. Append( new tnlConfigEntry< T >( name,
type,
group,
comment,
@@ -136,7 +136,7 @@ class mConfigDescription
//! Returns zero if given entry does not exist
- const mConfigEntryType* GetEntryType( const char* name ) const;
+ const tnlConfigEntryType* GetEntryType( const char* name ) const;
//! Returns zero pointer if there is no default value
template< class T > const T* GetDefaultValue( const char* name ) const
@@ -146,7 +146,7 @@ class mConfigDescription
for( i = 0; i < entries_num; i ++ )
if( entries[ i ] -> name == name )
if( entries[ i ] -> has_default_value )
- return ( ( mConfigEntry< T > * ) entries[ i ] ) -> default_value;
+ return ( ( tnlConfigEntry< T > * ) entries[ i ] ) -> default_value;
else return NULL;
cerr << "Asking for the default value of uknown parameter." << endl;
return NULL;
@@ -160,7 +160,7 @@ class mConfigDescription
for( i = 0; i < entries_num; i ++ )
if( entries[ i ] -> name == name )
if( entries[ i ] -> has_default_value )
- return ( ( mConfigEntry< T > * ) entries[ i ] ) -> default_value;
+ return ( ( tnlConfigEntry< T > * ) entries[ i ] ) -> default_value;
else return NULL;
cerr << "Asking for the default value of uknown parameter." << endl;
return NULL;
@@ -178,13 +178,13 @@ class mConfigDescription
bool ParseConfigDescription( const char* file_name );
- ~mConfigDescription();
+ ~tnlConfigDescription();
protected:
- tnlList< mConfigGroup* > groups;
+ tnlList< tnlConfigGroup* > groups;
- tnlList< mConfigEntryBase* > entries;
+ tnlList< tnlConfigEntryBase* > entries;
};
diff --git a/src/core/mConfigDescriptionParser.cpp b/src/core/tnlConfigDescriptionParser.cpp
similarity index 81%
rename from src/core/mConfigDescriptionParser.cpp
rename to src/core/tnlConfigDescriptionParser.cpp
index 282274878a..7797301207 100644
--- a/src/core/mConfigDescriptionParser.cpp
+++ b/src/core/tnlConfigDescriptionParser.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- mConfigDescriptionParser.cpp - description
+ tnlConfigDescriptionParser.cpp - description
-------------------
begin : 2007/06/13
copyright : (C) 2007 by Tomá¹ Oberhuber
@@ -15,31 +15,31 @@
* *
***************************************************************************/
-#include "mConfigDescriptionParser.h"
-#include "mConfigDescriptionScanner.h"
+#include "tnlConfigDescriptionParser.h"
+#include "tnlConfigDescriptionScanner.h"
#include "debug.h"
#include <assert.h>
-mConfigDescriptionParser* mConfigDescriptionParser :: current_parser;
+tnlConfigDescriptionParser* tnlConfigDescriptionParser :: current_parser;
//--------------------------------------------------------------------------
-mConfigDescriptionParser :: mConfigDescriptionParser()
+tnlConfigDescriptionParser :: tnlConfigDescriptionParser()
{
scanner = new mCDSFlexLexer();
}
//--------------------------------------------------------------------------
-mConfigDescriptionParser :: ~mConfigDescriptionParser()
+tnlConfigDescriptionParser :: ~tnlConfigDescriptionParser()
{
assert( scanner );
delete scanner;
}
//--------------------------------------------------------------------------
-void mConfigDescriptionParser :: setScanner( istream* in_stream )
+void tnlConfigDescriptionParser :: setScanner( istream* in_stream )
{
scanner -> switch_streams( in_stream, 0 );
}
//--------------------------------------------------------------------------
-int mConfigDescriptionParser :: runParsing( mConfigDescription* conf_desc )
+int tnlConfigDescriptionParser :: runParsing( tnlConfigDescription* conf_desc )
{
config_description = conf_desc;
current_parser = this;
@@ -48,47 +48,47 @@ int mConfigDescriptionParser :: runParsing( mConfigDescription* conf_desc )
return parse();
}
//--------------------------------------------------------------------------
-int mConfigDescriptionParser :: lex()
+int tnlConfigDescriptionParser :: lex()
{
return scanner -> yylex();
}
//--------------------------------------------------------------------------
-void mConfigDescriptionParser :: newLine()
+void tnlConfigDescriptionParser :: newLine()
{
line ++;
//cout << "New line " << line << endl;
}
//--------------------------------------------------------------------------
-void mConfigDescriptionParser :: setSVal( char* s )
+void tnlConfigDescriptionParser :: setSVal( char* s )
{
d_val__. s_val = s;
//cout << " d_val. s_val is " << d_val. s_val << endl;
}
//--------------------------------------------------------------------------
-void mConfigDescriptionParser :: setIVal( char* s )
+void tnlConfigDescriptionParser :: setIVal( char* s )
{
d_val__. i_val = atoi( s );
//cout << " d_val. i_val is " << d_val. i_val << endl;
}
//--------------------------------------------------------------------------
-void mConfigDescriptionParser :: setDVal( char* s )
+void tnlConfigDescriptionParser :: setDVal( char* s )
{
d_val__. d_val = atof( s );
//cout << " d_val. d_val is " << d_val. d_val << endl;
}
//--------------------------------------------------------------------------
-void mConfigDescriptionParser :: setBVal( bool b )
+void tnlConfigDescriptionParser :: setBVal( bool b )
{
d_val__. b_val = b;
//cout << " d_val. d_val is " << d_val. d_val << endl;
}
//--------------------------------------------------------------------------
-void mConfigDescriptionParser :: SetCurrentGroupId( const char* id )
+void tnlConfigDescriptionParser :: SetCurrentGroupId( const char* id )
{
current_group_name. SetString( id );
}
//--------------------------------------------------------------------------
-void mConfigDescriptionParser :: SetCurrentGroupComment( const char* comment )
+void tnlConfigDescriptionParser :: SetCurrentGroupComment( const char* comment )
{
current_group_comment. SetString( comment,
1, // prefix cut off for '['
@@ -96,7 +96,7 @@ void mConfigDescriptionParser :: SetCurrentGroupComment( const char* comment )
);
}
//--------------------------------------------------------------------------
-void mConfigDescriptionParser :: AddCurrentGroup()
+void tnlConfigDescriptionParser :: AddCurrentGroup()
{
//cout << "Adding group with ID " << current_group_name <<
// " and comment " << current_group_comment << endl;
@@ -106,22 +106,22 @@ void mConfigDescriptionParser :: AddCurrentGroup()
current_group_comment. SetString( 0 );
}
//--------------------------------------------------------------------------
-void mConfigDescriptionParser :: SetCurrentEntryTypeName( const char* _basic_type )
+void tnlConfigDescriptionParser :: SetCurrentEntryTypeName( const char* _basic_type )
{
current_entry_type. basic_type. SetString( _basic_type );
}
//--------------------------------------------------------------------------
-void mConfigDescriptionParser :: SetCurrentEntryTypeIsList( const bool _list_entry )
+void tnlConfigDescriptionParser :: SetCurrentEntryTypeIsList( const bool _list_entry )
{
current_entry_type. list_entry = _list_entry;
}
//--------------------------------------------------------------------------
-void mConfigDescriptionParser :: SetCurrentEntryId( const char* id )
+void tnlConfigDescriptionParser :: SetCurrentEntryId( const char* id )
{
current_entry_name. SetString( id );
}
//--------------------------------------------------------------------------
-void mConfigDescriptionParser :: SetCurrentEntryComment( const char* comment )
+void tnlConfigDescriptionParser :: SetCurrentEntryComment( const char* comment )
{
current_entry_comment. SetString( comment,
1, // prefix cut off for '['
@@ -129,7 +129,7 @@ void mConfigDescriptionParser :: SetCurrentEntryComment( const char* comment )
);
}
//--------------------------------------------------------------------------
-void mConfigDescriptionParser :: AddCurrentEntry( bool required )
+void tnlConfigDescriptionParser :: AddCurrentEntry( bool required )
{
config_description -> AddEntry( current_entry_name. Data(),
current_entry_type,
@@ -139,7 +139,7 @@ void mConfigDescriptionParser :: AddCurrentEntry( bool required )
current_entry_type. Reset();
}
//--------------------------------------------------------------------------
-void mConfigDescriptionParser :: AddCurrentEntryWithDefaultValue()
+void tnlConfigDescriptionParser :: AddCurrentEntryWithDefaultValue()
{
if( current_entry_type. basic_type == "string" )
{
diff --git a/src/core/mConfigDescriptionParser.h b/src/core/tnlConfigDescriptionParser.h
similarity index 73%
rename from src/core/mConfigDescriptionParser.h
rename to src/core/tnlConfigDescriptionParser.h
index 91ddfb1df3..892689834e 100644
--- a/src/core/mConfigDescriptionParser.h
+++ b/src/core/tnlConfigDescriptionParser.h
@@ -1,27 +1,27 @@
-#ifndef mConfigDescriptionParser_h_included
-#define mConfigDescriptionParser_h_included
+#ifndef tnlConfigDescriptionParser_h_included
+#define tnlConfigDescriptionParser_h_included
// for error()'s inline implementation
#include <iostream>
// $insert baseclass
-#include "mConfigDescriptionParserbase.h"
-#include "mConfigDescription.h"
+#include "tnlConfigDescriptionParserbase.h"
+#include "tnlConfigDescription.h"
-#undef mConfigDescriptionParser
+#undef tnlConfigDescriptionParser
class mCDSFlexLexer;
using namespace std;
-class mConfigDescriptionParser: public mConfigDescriptionParserBase
+class tnlConfigDescriptionParser: public tnlConfigDescriptionParserBase
{
public:
- mConfigDescriptionParser();
+ tnlConfigDescriptionParser();
void setScanner( istream* in_stream );
- int runParsing( mConfigDescription* conf_desc );
+ int runParsing( tnlConfigDescription* conf_desc );
int parse();
@@ -36,7 +36,7 @@ class mConfigDescriptionParser: public mConfigDescriptionParserBase
void setBVal( bool b );
- static mConfigDescriptionParser* current_parser;
+ static tnlConfigDescriptionParser* current_parser;
//Methods for the parsing
void SetCurrentGroupId( const char* id );
@@ -57,13 +57,13 @@ class mConfigDescriptionParser: public mConfigDescriptionParserBase
void AddCurrentEntryWithDefaultValue();
- ~mConfigDescriptionParser();
+ ~tnlConfigDescriptionParser();
protected:
mCDSFlexLexer* scanner;
- mConfigDescription* config_description;
+ tnlConfigDescription* config_description;
int line;
@@ -73,7 +73,7 @@ class mConfigDescriptionParser: public mConfigDescriptionParserBase
tnlString current_entry_name;
- mConfigEntryType current_entry_type;
+ tnlConfigEntryType current_entry_type;
tnlString current_entry_comment;
@@ -102,14 +102,14 @@ class mConfigDescriptionParser: public mConfigDescriptionParserBase
void nextToken();
};
-inline void mConfigDescriptionParser :: error(char const *msg)
+inline void tnlConfigDescriptionParser :: error(char const *msg)
{
std::cerr << msg << " at line " << line << std::endl;
}
// $insert lex
-inline void mConfigDescriptionParser :: print() // use d_token, d_loc
+inline void tnlConfigDescriptionParser :: print() // use d_token, d_loc
{}
diff --git a/src/core/mConfigDescriptionParser.ih b/src/core/tnlConfigDescriptionParser.ih
similarity index 53%
rename from src/core/mConfigDescriptionParser.ih
rename to src/core/tnlConfigDescriptionParser.ih
index afba698b02..45fbe35d7d 100644
--- a/src/core/mConfigDescriptionParser.ih
+++ b/src/core/tnlConfigDescriptionParser.ih
@@ -1,10 +1,10 @@
- // Include this file in the sources of the class mConfigDescriptionParser.
+ // Include this file in the sources of the class tnlConfigDescriptionParser.
// $insert class.h
-#include "mConfigDescriptionParser.h"
+#include "tnlConfigDescriptionParser.h"
// Add below here any includes etc. that are only
- // required for the compilation of mConfigDescriptionParser's sources.
+ // required for the compilation of tnlConfigDescriptionParser's sources.
diff --git a/src/core/mConfigDescriptionParser.y b/src/core/tnlConfigDescriptionParser.y
similarity index 98%
rename from src/core/mConfigDescriptionParser.y
rename to src/core/tnlConfigDescriptionParser.y
index 0b20f774df..d8fbd2ae21 100644
--- a/src/core/mConfigDescriptionParser.y
+++ b/src/core/tnlConfigDescriptionParser.y
@@ -1,5 +1,5 @@
-%filenames mConfigDescriptionParser
-%class-name mConfigDescriptionParser
+%filenames tnlConfigDescriptionParser
+%class-name tnlConfigDescriptionParser
%union{
char* s_val;
diff --git a/src/core/mConfigDescriptionParserbase.h b/src/core/tnlConfigDescriptionParserbase.h
similarity index 76%
rename from src/core/mConfigDescriptionParserbase.h
rename to src/core/tnlConfigDescriptionParserbase.h
index 0a17940658..02b4b61c05 100644
--- a/src/core/mConfigDescriptionParserbase.h
+++ b/src/core/tnlConfigDescriptionParserbase.h
@@ -1,7 +1,7 @@
-// Generated by Bisonc++ V2.4.7 on Thu, 05 Nov 2009 14:48:55 +0100
+// Generated by Bisonc++ V2.4.7 on Wed, 18 Nov 2009 17:15:05 +0100
-#ifndef mConfigDescriptionParserBase_h_included
-#define mConfigDescriptionParserBase_h_included
+#ifndef tnlConfigDescriptionParserBase_h_included
+#define tnlConfigDescriptionParserBase_h_included
#include <vector>
#include <iostream>
@@ -13,7 +13,7 @@ namespace // anonymous
}
-class mConfigDescriptionParserBase
+class tnlConfigDescriptionParserBase
{
public:
// $insert tokens
@@ -73,7 +73,7 @@ union STYPE__
STYPE__ d_val__;
STYPE__ d_nextVal__;
- mConfigDescriptionParserBase();
+ tnlConfigDescriptionParserBase();
void ABORT() const;
void ACCEPT() const;
@@ -92,27 +92,27 @@ union STYPE__
void setDebug(bool mode);
};
-inline bool mConfigDescriptionParserBase::debug() const
+inline bool tnlConfigDescriptionParserBase::debug() const
{
return d_debug__;
}
-inline void mConfigDescriptionParserBase::setDebug(bool mode)
+inline void tnlConfigDescriptionParserBase::setDebug(bool mode)
{
d_debug__ = mode;
}
-inline void mConfigDescriptionParserBase::ABORT() const
+inline void tnlConfigDescriptionParserBase::ABORT() const
{
throw PARSE_ABORT__;
}
-inline void mConfigDescriptionParserBase::ACCEPT() const
+inline void tnlConfigDescriptionParserBase::ACCEPT() const
{
throw PARSE_ACCEPT__;
}
-inline void mConfigDescriptionParserBase::ERROR() const
+inline void tnlConfigDescriptionParserBase::ERROR() const
{
throw UNEXPECTED_TOKEN__;
}
@@ -120,7 +120,7 @@ inline void mConfigDescriptionParserBase::ERROR() const
// As a convenience, when including ParserBase.h its symbols are available as
// symbols in the class Parser, too.
-#define mConfigDescriptionParser mConfigDescriptionParserBase
+#define tnlConfigDescriptionParser tnlConfigDescriptionParserBase
#endif
diff --git a/src/core/mConfigDescriptionScanner.cpp b/src/core/tnlConfigDescriptionScanner.cpp
similarity index 93%
rename from src/core/mConfigDescriptionScanner.cpp
rename to src/core/tnlConfigDescriptionScanner.cpp
index 7ef2cec389..f8dfbe093b 100644
--- a/src/core/mConfigDescriptionScanner.cpp
+++ b/src/core/tnlConfigDescriptionScanner.cpp
@@ -1,6 +1,6 @@
-#line 2 "mConfigDescriptionScanner.cpp"
+#line 2 "tnlConfigDescriptionScanner.cpp"
-#line 4 "mConfigDescriptionScanner.cpp"
+#line 4 "tnlConfigDescriptionScanner.cpp"
#define YY_INT_ALIGNED short int
@@ -552,15 +552,15 @@ static yyconst flex_int16_t yy_rule_linenum[19] =
#define yymore() yymore_used_but_not_detected
#define YY_MORE_ADJ 0
#define YY_RESTORE_YY_MORE_OFFSET
-#line 1 "mConfigDescriptionScanner.l"
-#line 2 "mConfigDescriptionScanner.l"
+#line 1 "tnlConfigDescriptionScanner.l"
+#line 2 "tnlConfigDescriptionScanner.l"
//#define _SKIP_YYFLEXLEXER_
//#include "scanner.ih"
- #include "mConfigDescriptionParser.h"
+ #include "tnlConfigDescriptionParser.h"
#include <iostream>
int yywrap();
-#line 564 "mConfigDescriptionScanner.cpp"
+#line 564 "tnlConfigDescriptionScanner.cpp"
#define INITIAL 0
@@ -722,9 +722,9 @@ YY_DECL
register int yy_act;
/* %% [7.0] user's declarations go here */
-#line 22 "mConfigDescriptionScanner.l"
+#line 22 "tnlConfigDescriptionScanner.l"
-#line 728 "mConfigDescriptionScanner.cpp"
+#line 728 "tnlConfigDescriptionScanner.cpp"
if ( !(yy_init) )
{
@@ -839,126 +839,126 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
YY_RULE_SETUP
-#line 23 "mConfigDescriptionScanner.l"
+#line 23 "tnlConfigDescriptionScanner.l"
{ //cout << "GROUP" << endl;
- return mConfigDescriptionParser :: GROUP; }
+ return tnlConfigDescriptionParser :: GROUP; }
YY_BREAK
case 2:
YY_RULE_SETUP
-#line 25 "mConfigDescriptionScanner.l"
+#line 25 "tnlConfigDescriptionScanner.l"
{ //cout << "STRING_KEYWORD" << endl;
- return mConfigDescriptionParser :: STRING_KEYWORD; }
+ return tnlConfigDescriptionParser :: STRING_KEYWORD; }
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 27 "mConfigDescriptionScanner.l"
+#line 27 "tnlConfigDescriptionScanner.l"
{ //cout << "INTEGER_KEYWORD" << endl;
- return mConfigDescriptionParser :: INTEGER_KEYWORD; }
+ return tnlConfigDescriptionParser :: INTEGER_KEYWORD; }
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 29 "mConfigDescriptionScanner.l"
+#line 29 "tnlConfigDescriptionScanner.l"
{ //cout << "REAL_KEYWORD" << endl;
- return mConfigDescriptionParser :: REAL_KEYWORD; }
+ return tnlConfigDescriptionParser :: REAL_KEYWORD; }
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 31 "mConfigDescriptionScanner.l"
+#line 31 "tnlConfigDescriptionScanner.l"
{ //cout << "REAL_KEYWORD" << endl;
- return mConfigDescriptionParser :: BOOLEAN_KEYWORD; }
+ return tnlConfigDescriptionParser :: BOOLEAN_KEYWORD; }
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 33 "mConfigDescriptionScanner.l"
-{ return mConfigDescriptionParser :: LIST_OF_KEYWORD; }
+#line 33 "tnlConfigDescriptionScanner.l"
+{ return tnlConfigDescriptionParser :: LIST_OF_KEYWORD; }
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 34 "mConfigDescriptionScanner.l"
-{ mConfigDescriptionParser :: current_parser -> setBVal( true );
- return mConfigDescriptionParser :: BOOLEAN; }
+#line 34 "tnlConfigDescriptionScanner.l"
+{ tnlConfigDescriptionParser :: current_parser -> setBVal( true );
+ return tnlConfigDescriptionParser :: BOOLEAN; }
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 36 "mConfigDescriptionScanner.l"
-{ mConfigDescriptionParser :: current_parser -> setBVal( false );
- return mConfigDescriptionParser :: BOOLEAN; }
+#line 36 "tnlConfigDescriptionScanner.l"
+{ tnlConfigDescriptionParser :: current_parser -> setBVal( false );
+ return tnlConfigDescriptionParser :: BOOLEAN; }
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 38 "mConfigDescriptionScanner.l"
+#line 38 "tnlConfigDescriptionScanner.l"
{ //cout << "STRING " << yytext << endl;
- mConfigDescriptionParser :: current_parser -> setSVal( yytext );
- return mConfigDescriptionParser :: STRING; }
+ tnlConfigDescriptionParser :: current_parser -> setSVal( yytext );
+ return tnlConfigDescriptionParser :: STRING; }
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 41 "mConfigDescriptionScanner.l"
+#line 41 "tnlConfigDescriptionScanner.l"
{ //cout << "COMMENT " << yytext << endl;
- mConfigDescriptionParser :: current_parser ->
+ tnlConfigDescriptionParser :: current_parser ->
setSVal( yytext );
- return mConfigDescriptionParser :: COMMENT; }
+ return tnlConfigDescriptionParser :: COMMENT; }
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 45 "mConfigDescriptionScanner.l"
+#line 45 "tnlConfigDescriptionScanner.l"
{ //cout << "IDENTIFIER " << yytext << endl;
- mConfigDescriptionParser :: current_parser ->
+ tnlConfigDescriptionParser :: current_parser ->
setSVal( yytext );
- return mConfigDescriptionParser :: IDENTIFIER; }
+ return tnlConfigDescriptionParser :: IDENTIFIER; }
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 49 "mConfigDescriptionScanner.l"
+#line 49 "tnlConfigDescriptionScanner.l"
{ //cout << "INTEGER " << yytext << endl;
- mConfigDescriptionParser :: current_parser ->
+ tnlConfigDescriptionParser :: current_parser ->
setIVal( yytext );
- return mConfigDescriptionParser :: INTEGER; }
+ return tnlConfigDescriptionParser :: INTEGER; }
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 53 "mConfigDescriptionScanner.l"
+#line 53 "tnlConfigDescriptionScanner.l"
{ //cout << "REAL " << yytext << endl;
- mConfigDescriptionParser :: current_parser ->
+ tnlConfigDescriptionParser :: current_parser ->
setDVal( yytext );
- return mConfigDescriptionParser :: REAL; }
+ return tnlConfigDescriptionParser :: REAL; }
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 57 "mConfigDescriptionScanner.l"
+#line 57 "tnlConfigDescriptionScanner.l"
{ //cout << "REAL " << yytext << endl;
- mConfigDescriptionParser :: current_parser ->
+ tnlConfigDescriptionParser :: current_parser ->
setDVal( yytext );
- return mConfigDescriptionParser :: REAL; }
+ return tnlConfigDescriptionParser :: REAL; }
YY_BREAK
case 15:
/* rule 15 can match eol */
YY_RULE_SETUP
-#line 61 "mConfigDescriptionScanner.l"
-{ mConfigDescriptionParser :: current_parser -> newLine(); }
+#line 61 "tnlConfigDescriptionScanner.l"
+{ tnlConfigDescriptionParser :: current_parser -> newLine(); }
YY_BREAK
case 16:
/* rule 16 can match eol */
YY_RULE_SETUP
-#line 62 "mConfigDescriptionScanner.l"
-{ mConfigDescriptionParser :: current_parser -> newLine(); }
+#line 62 "tnlConfigDescriptionScanner.l"
+{ tnlConfigDescriptionParser :: current_parser -> newLine(); }
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 63 "mConfigDescriptionScanner.l"
+#line 63 "tnlConfigDescriptionScanner.l"
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 64 "mConfigDescriptionScanner.l"
+#line 64 "tnlConfigDescriptionScanner.l"
{ return yytext[ 0 ]; }
YY_BREAK
case 19:
YY_RULE_SETUP
-#line 65 "mConfigDescriptionScanner.l"
+#line 65 "tnlConfigDescriptionScanner.l"
ECHO;
YY_BREAK
-#line 962 "mConfigDescriptionScanner.cpp"
+#line 962 "tnlConfigDescriptionScanner.cpp"
case YY_STATE_EOF(INITIAL):
yyterminate();
@@ -2006,7 +2006,7 @@ void mCDSfree (void * ptr )
/* %ok-for-header */
-#line 65 "mConfigDescriptionScanner.l"
+#line 65 "tnlConfigDescriptionScanner.l"
diff --git a/src/core/mConfigDescriptionScanner.h b/src/core/tnlConfigDescriptionScanner.h
similarity index 98%
rename from src/core/mConfigDescriptionScanner.h
rename to src/core/tnlConfigDescriptionScanner.h
index 37036b313a..54dcad1f49 100644
--- a/src/core/mConfigDescriptionScanner.h
+++ b/src/core/tnlConfigDescriptionScanner.h
@@ -2,9 +2,9 @@
#define mCDSHEADER_H 1
#define mCDSIN_HEADER 1
-#line 6 "mConfigDescriptionScanner.h"
+#line 6 "tnlConfigDescriptionScanner.h"
-#line 8 "mConfigDescriptionScanner.h"
+#line 8 "tnlConfigDescriptionScanner.h"
#define YY_INT_ALIGNED short int
@@ -380,9 +380,9 @@ static int yy_flex_strlen (yyconst char * );
#undef YY_DECL
#endif
-#line 65 "mConfigDescriptionScanner.l"
+#line 65 "tnlConfigDescriptionScanner.l"
-#line 387 "mConfigDescriptionScanner.h"
+#line 387 "tnlConfigDescriptionScanner.h"
#undef mCDSIN_HEADER
#endif /* mCDSHEADER_H */
diff --git a/src/core/tnlConfigDescriptionScanner.l b/src/core/tnlConfigDescriptionScanner.l
new file mode 100644
index 0000000000..bea864f740
--- /dev/null
+++ b/src/core/tnlConfigDescriptionScanner.l
@@ -0,0 +1,70 @@
+%{
+ //#define _SKIP_YYFLEXLEXER_
+ //#include "scanner.ih"
+
+ #include "tnlConfigDescriptionParser.h"
+ #include <iostream>
+ int yywrap();
+%}
+
+%option c++ outfile="tnlConfigDescriptionScanner.cpp" header-file="tnlConfigDescriptionScanner.h" prefix="mCDS" debug
+
+
+BOOL_TRUE "YES"|"Yes"|"yes"|"TRUE"|"True"|"true"
+BOOL_FALSE "NO"|"No"|"no"|"FALSE"|"False"|"false"
+EXP "E"|"e"
+DIGIT [0-9]
+DECIMAL "."
+SIGN "+"|"-"
+ID [A-Za-z][A-Za-z0-9-]*
+STRING .*
+
+%%
+group { //cout << "GROUP" << endl;
+ return tnlConfigDescriptionParser :: GROUP; }
+string { //cout << "STRING_KEYWORD" << endl;
+ return tnlConfigDescriptionParser :: STRING_KEYWORD; }
+integer { //cout << "INTEGER_KEYWORD" << endl;
+ return tnlConfigDescriptionParser :: INTEGER_KEYWORD; }
+real { //cout << "REAL_KEYWORD" << endl;
+ return tnlConfigDescriptionParser :: REAL_KEYWORD; }
+bool { //cout << "REAL_KEYWORD" << endl;
+ return tnlConfigDescriptionParser :: BOOLEAN_KEYWORD; }
+"list of" { return tnlConfigDescriptionParser :: LIST_OF_KEYWORD; }
+{BOOL_TRUE} { tnlConfigDescriptionParser :: current_parser -> setBVal( true );
+ return tnlConfigDescriptionParser :: BOOLEAN; }
+{BOOL_FALSE} { tnlConfigDescriptionParser :: current_parser -> setBVal( false );
+ return tnlConfigDescriptionParser :: BOOLEAN; }
+\"{STRING}\" { //cout << "STRING " << yytext << endl;
+ tnlConfigDescriptionParser :: current_parser -> setSVal( yytext );
+ return tnlConfigDescriptionParser :: STRING; }
+\[.*\] { //cout << "COMMENT " << yytext << endl;
+ tnlConfigDescriptionParser :: current_parser ->
+ setSVal( yytext );
+ return tnlConfigDescriptionParser :: COMMENT; }
+{ID} { //cout << "IDENTIFIER " << yytext << endl;
+ tnlConfigDescriptionParser :: current_parser ->
+ setSVal( yytext );
+ return tnlConfigDescriptionParser :: IDENTIFIER; }
+{DIGIT}+ { //cout << "INTEGER " << yytext << endl;
+ tnlConfigDescriptionParser :: current_parser ->
+ setIVal( yytext );
+ return tnlConfigDescriptionParser :: INTEGER; }
+{DIGIT}+{DECIMAL}{DIGIT}* { //cout << "REAL " << yytext << endl;
+ tnlConfigDescriptionParser :: current_parser ->
+ setDVal( yytext );
+ return tnlConfigDescriptionParser :: REAL; }
+{DIGIT}+{DECIMAL}{DIGIT}*{EXP}{SIGN}?{DIGIT}+ { //cout << "REAL " << yytext << endl;
+ tnlConfigDescriptionParser :: current_parser ->
+ setDVal( yytext );
+ return tnlConfigDescriptionParser :: REAL; }
+\n { tnlConfigDescriptionParser :: current_parser -> newLine(); }
+#.*\n { tnlConfigDescriptionParser :: current_parser -> newLine(); }
+[ \t]
+. { return yytext[ 0 ]; }
+%%
+
+int yywrap()
+{
+ return 1;
+}
diff --git a/tools/src/mcurve2gnuplot.cpp b/tools/src/mcurve2gnuplot.cpp
index ff0c2246c5..19e9f76705 100644
--- a/tools/src/mcurve2gnuplot.cpp
+++ b/tools/src/mcurve2gnuplot.cpp
@@ -26,7 +26,7 @@
int main( int argc, char* argv[] )
{
mParameterContainer parameters;
- mConfigDescription conf_desc;
+ tnlConfigDescription conf_desc;
if( conf_desc. ParseConfigDescription( CONFIG_DESCRIPTION_FILE ) != 0 )
return 1;
if( ! ParseCommandLine( argc, argv, conf_desc, parameters ) )
diff --git a/tools/src/mdiff-err-norms.cpp b/tools/src/mdiff-err-norms.cpp
index ab1ad45a64..c598cc2e4b 100644
--- a/tools/src/mdiff-err-norms.cpp
+++ b/tools/src/mdiff-err-norms.cpp
@@ -24,7 +24,7 @@
#include <diff/mGrid2D.h>
#include <diff/drawGrid1D.h>
#include <diff/drawGrid2D.h>
-#include <core/mConfigDescription.h>
+#include <core/tnlConfigDescription.h>
#include <core/mParameterContainer.h>
#include <core/mCurve.h>
@@ -146,7 +146,7 @@ int main( int argc, char* argv[] )
dbgFunctionName( "", "main" );
dbgInit( "mdiff-err-norms.dbg" );
mParameterContainer parameters;
- mConfigDescription conf_desc;
+ tnlConfigDescription conf_desc;
dbgCout( "Parsing config description file ... " );
if( conf_desc. ParseConfigDescription( CONFIG_DESCRIPTION_FILE ) != 0 )
diff --git a/tools/src/mgrid-view.cpp b/tools/src/mgrid-view.cpp
index 59c4ba73d9..bf9cfd0e6f 100644
--- a/tools/src/mgrid-view.cpp
+++ b/tools/src/mgrid-view.cpp
@@ -19,7 +19,7 @@
#include <core/compress-file.h>
#include <core/mCurve.h>
-#include <core/mConfigDescription.h>
+#include <core/tnlConfigDescription.h>
#include <core/mParameterContainer.h>
#include <diff/curve-ident.h>
#include <diff/drawGrid2D.h>
@@ -171,7 +171,7 @@ bool ProcessmGrid3D( const tnlString& file_name,
int main( int argc, char* argv[] )
{
mParameterContainer parameters;
- mConfigDescription conf_desc;
+ tnlConfigDescription conf_desc;
if( conf_desc. ParseConfigDescription( MGRID_VIEW_CONFIG_DESCRIPTION_FILE ) != 0 )
return 1;
if( ! ParseCommandLine( argc, argv, conf_desc, parameters ) )
diff --git a/tools/src/mgrid2gnuplot.cpp b/tools/src/mgrid2gnuplot.cpp
index 0458d02c61..80f19a4d2b 100644
--- a/tools/src/mgrid2gnuplot.cpp
+++ b/tools/src/mgrid2gnuplot.cpp
@@ -25,7 +25,7 @@
int main( int argc, char* argv[] )
{
mParameterContainer parameters;
- mConfigDescription conf_desc;
+ tnlConfigDescription conf_desc;
if( conf_desc. ParseConfigDescription( CONFIG_DESCRIPTION_FILE ) != 0 )
return 1;
if( ! ParseCommandLine( argc, argv, conf_desc, parameters ) )
--
GitLab