From eaa89657ee5d2bcf37b710fde445e8a0a14fde63 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Thu, 6 Feb 2014 18:08:46 +0000 Subject: [PATCH] general cleaning of the code (particularly IO) --- configure.ac | 2 +- latan/Io.cpp | 62 ++++++++++++++-------- latan/Io.hpp | 113 ++++++++++++++++++---------------------- latan/IoAsciiLexer.lpp | 6 +-- latan/IoAsciiParser.ypp | 5 +- latan/IoObject.hpp | 4 +- latan/Mat.cpp | 2 +- latan/Mat.hpp | 4 +- latan/Math.hpp | 4 +- latan/ParserState.hpp | 2 +- 10 files changed, 106 insertions(+), 98 deletions(-) diff --git a/configure.ac b/configure.ac index 12f488c..7431e52 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ AC_PREREQ([2.64]) AC_INIT([LatAnalyze],[3.0alpha1],[antonin.portelli@me.com],[latan]) AC_CONFIG_AUX_DIR([.buildutils]) AC_CONFIG_SRCDIR([latan/Global.cpp]) -AC_CONFIG_SRCDIR([examples/ex_test.cpp]) +AC_CONFIG_SRCDIR([examples/exMathInterpreter.cpp]) AC_CONFIG_MACRO_DIR([.buildutils/m4]) AM_INIT_AUTOMAKE([-Wall -Werror]) AM_SILENT_RULES([yes]) diff --git a/latan/Io.cpp b/latan/Io.cpp index 7bc7d1f..6d18be0 100644 --- a/latan/Io.cpp +++ b/latan/Io.cpp @@ -4,9 +4,6 @@ using namespace std; using namespace Latan; -// ASCII data format Bison/Flex parser declaration -int _ioAscii_parse(AsciiParserState* state); - /****************************************************************************** * File implementation * ******************************************************************************/ @@ -17,7 +14,7 @@ File::File(void) , data_() {} -File::File(const string name, const unsigned int mode) +File::File(const string &name, const unsigned int mode) : name_(name) , mode_(mode) , data_() @@ -25,7 +22,9 @@ File::File(const string name, const unsigned int mode) // destructor ////////////////////////////////////////////////////////////////// File::~File(void) -{} +{ + deleteData(); +} // access ////////////////////////////////////////////////////////////////////// string File::getName(void) const @@ -54,15 +53,15 @@ void File::deleteData(void) * AsciiParserState implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// -AsciiParserState::AsciiParserState(istream* stream, string* name, - IoDataTable* data) +AsciiFile::AsciiParserState::AsciiParserState(istream* stream, string* name, + IoDataTable* data) : ParserState(stream, name, data) { initScanner(); } // destructor ////////////////////////////////////////////////////////////////// -AsciiParserState::~AsciiParserState(void) +AsciiFile::AsciiParserState::~AsciiParserState(void) { destroyScanner(); } @@ -77,7 +76,7 @@ AsciiFile::AsciiFile(void) , state_(NULL) {} -AsciiFile::AsciiFile(const string name, const unsigned int mode) +AsciiFile::AsciiFile(const string &name, const unsigned int mode) { openAscii(name, mode); } @@ -85,7 +84,7 @@ AsciiFile::AsciiFile(const string name, const unsigned int mode) // destructor ////////////////////////////////////////////////////////////////// AsciiFile::~AsciiFile(void) { - clear(); + closeAscii(); } // tests /////////////////////////////////////////////////////////////////////// @@ -97,10 +96,11 @@ bool AsciiFile::isOpen() const // IO ////////////////////////////////////////////////////////////////////////// void AsciiFile::close(void) { - clear(); + closeAscii(); + deleteData(); } -void AsciiFile::open(const string name, const unsigned int mode) +void AsciiFile::open(const string &name, const unsigned int mode) { if (isOpen()) { @@ -114,19 +114,12 @@ void AsciiFile::save(void) LATAN_ERROR(Implementation, "saving Ascii files not implemented yet"); } -void AsciiFile::saveAs(const string name __dumb) +void AsciiFile::saveAs(const string &name __dumb) { LATAN_ERROR(Implementation, "saving Ascii files not implemented yet"); } -// internal functions ////////////////////////////////////////////////////////// -void AsciiFile::clear() -{ - deleteData(); - closeAscii(); -} - -void AsciiFile::openAscii(const string name, const unsigned int mode) +void AsciiFile::openAscii(const string &name, const unsigned int mode) { if (!isOpen()) { @@ -161,6 +154,33 @@ void AsciiFile::closeAscii(void) isParsed_ = false; } +void AsciiFile::load(const string &name __dumb) +{ + if ((mode_ & FileMode::read)&&(isOpen())) + { + if (!isParsed_) + { + parse(); + } + } + else + { + if (isOpen()) + { + LATAN_ERROR(Io, "file '" + name_ + "' is not opened in read mode"); + } + else + { + LATAN_ERROR(Io, "file not opened"); + } + } +} + +// parser ////////////////////////////////////////////////////////////////////// + +// Bison/Flex parser declaration +int _ioAscii_parse(AsciiFile::AsciiParserState* state); + void AsciiFile::parse() { _ioAscii_parse(state_); diff --git a/latan/Io.hpp b/latan/Io.hpp index 51860b8..69d9c9e 100644 --- a/latan/Io.hpp +++ b/latan/Io.hpp @@ -36,24 +36,28 @@ public: public: // constructors File(void); - File(const std::string name, const unsigned int mode); + File(const std::string &name, const unsigned int mode); // destructor virtual ~File(void); // access std::string getName(void) const; unsigned int getMode(void) const; + template + const IoT& read(const std::string &name); // tests virtual bool isOpen(void) const = 0; - // Io - virtual void close(void) = 0; - virtual void open(const std::string name, const unsigned int mode) = 0; - virtual void save(void) = 0; - virtual void saveAs(const std::string name) = 0; + // IO + virtual void close(void) = 0; + virtual void open(const std::string &name, const unsigned int mode) = 0; + virtual void save(void) = 0; + virtual void saveAs(const std::string &name) = 0; protected: // data access void deleteData(void); template - const IoT& getData(const std::string dataName); + const IoT& getData(const std::string &name) const; + // IO + virtual void load(const std::string &name) = 0; protected: std::string name_; unsigned int mode_; @@ -62,60 +66,69 @@ protected: // Template implementations template -const IoT& File::getData(const std::string dataName) +const IoT& File::read(const std::string &name) { - if (keyExists(dataName, data_)) + load(name); + + return getData(name); +} + +template +const IoT& File::getData(const std::string &name) const +{ + IoDataTable::const_iterator i = data_.find(name); + + if (i != data_.end()) { - return dynamic_cast(*(data_[dataName])); + return dynamic_cast(*(i->second)); } else { - LATAN_ERROR(Range, "no data with name '" + dataName + "'"); + LATAN_ERROR(Definition, "no data with name '" + name + "'"); } } /****************************************************************************** * ASCII datafile class * ******************************************************************************/ -class AsciiParserState: public ParserState -{ -public: - // constructor - explicit AsciiParserState(std::istream* stream, std::string* name,\ - IoDataTable* data); - // destructor - virtual ~AsciiParserState(void); - // public members - std::stack dMatBuf; - std::stack doubleBuf; -private: - // allocation/deallocation functions defined in IoAsciiLexer.lpp - virtual void initScanner(void); - virtual void destroyScanner(void); -}; - class AsciiFile: public File { +public: + class AsciiParserState: public ParserState + { + public: + // constructor + explicit AsciiParserState(std::istream* stream, std::string* name,\ + IoDataTable* data); + // destructor + virtual ~AsciiParserState(void); + // public members + std::stack dMatBuf; + std::stack doubleBuf; + private: + // allocation/deallocation functions defined in IoAsciiLexer.lpp + virtual void initScanner(void); + virtual void destroyScanner(void); + }; public: // constructors AsciiFile(void); - AsciiFile(const std::string name, const unsigned int mode); + AsciiFile(const std::string &name, const unsigned int mode); // destructor virtual ~AsciiFile(void); - // access - template - const IoT& read(const std::string name); // tests virtual bool isOpen(void) const; - // Io + // IO virtual void close(void); - virtual void open(const std::string name, const unsigned int mode); + virtual void open(const std::string &name, const unsigned int mode); virtual void save(void); - virtual void saveAs(const std::string name); + virtual void saveAs(const std::string &name); private: - void clear(void); - void openAscii(const std::string name, const unsigned int mode); + // IO + void openAscii(const std::string &name, const unsigned int mode); void closeAscii(void); + virtual void load(const std::string &name); + // parser void parse(void); private: std::fstream fileStream_; @@ -123,32 +136,6 @@ private: AsciiParserState* state_; }; -// Template implementations -template -const IoT& AsciiFile::read(const std::string dataName) -{ - if ((mode_ & FileMode::read)&&(isOpen())) - { - if (!isParsed_) - { - parse(); - } - - return getData(dataName); - } - else - { - if (isOpen()) - { - LATAN_ERROR(Io,"file '" + name_ + "' is not opened in read mode"); - } - else - { - LATAN_ERROR(Io,"file not opened"); - } - } -} - LATAN_END_CPPDECL #endif diff --git a/latan/IoAsciiLexer.lpp b/latan/IoAsciiLexer.lpp index 9777443..83b711b 100644 --- a/latan/IoAsciiLexer.lpp +++ b/latan/IoAsciiLexer.lpp @@ -16,7 +16,7 @@ using namespace std; using namespace Latan; - #define YY_EXTRA_TYPE AsciiParserState* + #define YY_EXTRA_TYPE AsciiFile::AsciiParserState* #define YY_USER_ACTION \ yylloc->first_line = yylloc->last_line = yylineno;\ yylloc->first_column = yylloc->last_column + 1;\ @@ -62,13 +62,13 @@ BLANK [ \t] %% -void AsciiParserState::initScanner() +void AsciiFile::AsciiParserState::initScanner() { yylex_init(&scanner); yyset_extra(this, scanner); } -void AsciiParserState::destroyScanner() +void AsciiFile::AsciiParserState::destroyScanner() { yylex_destroy(scanner); } diff --git a/latan/IoAsciiParser.ypp b/latan/IoAsciiParser.ypp index 9966e12..892b2b0 100644 --- a/latan/IoAsciiParser.ypp +++ b/latan/IoAsciiParser.ypp @@ -15,7 +15,7 @@ %locations %defines %error-verbose -%parse-param { Latan::AsciiParserState* state } +%parse-param { Latan::AsciiFile::AsciiParserState* state } %initial-action {yylloc.last_column = 0;} %lex-param { void* scanner } @@ -38,7 +38,8 @@ %{ int _ioAscii_lex(YYSTYPE* lvalp, YYLTYPE* llocp, void* scanner); - void _ioAscii_error(YYLTYPE* locp, AsciiParserState* state, const char* err) + void _ioAscii_error(YYLTYPE* locp, AsciiFile::AsciiParserState* state, + const char* err) { stringstream buf; diff --git a/latan/IoObject.hpp b/latan/IoObject.hpp index c326d7f..2155d09 100644 --- a/latan/IoObject.hpp +++ b/latan/IoObject.hpp @@ -20,8 +20,8 @@ public: }; }; public: - virtual ~IoObject(void) = 0; - virtual unsigned int getType(void) = 0; + virtual ~IoObject(void) {}; + virtual unsigned int getType(void) const = 0; }; LATAN_END_CPPDECL diff --git a/latan/Mat.cpp b/latan/Mat.cpp index b9fc121..4bef84a 100644 --- a/latan/Mat.cpp +++ b/latan/Mat.cpp @@ -20,7 +20,7 @@ DMat::DMat(const unsigned int nRow, const unsigned int nCol) : DMatBase(nRow,nCol) {} -unsigned int DMat::getType(void) +unsigned int DMat::getType(void) const { return IoType::dMat; } diff --git a/latan/Mat.hpp b/latan/Mat.hpp index f788ce4..6a164eb 100644 --- a/latan/Mat.hpp +++ b/latan/Mat.hpp @@ -21,9 +21,9 @@ public: DMat(const DMat& M); DMat(const unsigned int nRow, const unsigned int nCol); // IO - virtual unsigned int getType(void); + virtual unsigned int getType(void) const; }; LATAN_END_CPPDECL -#endif \ No newline at end of file +#endif diff --git a/latan/Math.hpp b/latan/Math.hpp index 8246f1b..64b78e2 100644 --- a/latan/Math.hpp +++ b/latan/Math.hpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include LATAN_BEGIN_CPPDECL @@ -70,4 +70,4 @@ namespace STDMATH_NAMESPACE LATAN_END_CPPDECL -#endif \ No newline at end of file +#endif diff --git a/latan/ParserState.hpp b/latan/ParserState.hpp index a4e001f..ddf5c9e 100644 --- a/latan/ParserState.hpp +++ b/latan/ParserState.hpp @@ -43,4 +43,4 @@ ParserState::~ParserState(void) LATAN_END_CPPDECL -#endif \ No newline at end of file +#endif