COPYING @@ -5,6 +5,7 @@ #include <boost/filesystem/fstream.hpp> #include <boost/filesystem/convenience.hpp> #include <boost/tokenizer.hpp> +#include <iostream> #include <cctype> @@ -62,13 +63,17 @@ extern int cataparse(); void cataerror(const char *err) { // XXX: we may leak here - memory pools? - throw creaturesException(err); + throw catalogueException(err); +} +void catalogueParseError(int lineno) { + std::ostringstream oss; + oss << "Catalogue parse error at line " << lineno << std::endl; + + throw catalogueException(oss.str()); } std::istream &operator >> (std::istream &s, Catalogue &c) { catalogueFlexLexer lex(&s); - assert(!catalexer); - assert(!parsing_cat); catalexer = &lex; parsing_cat = &c; @@ -91,9 +96,11 @@ void Catalogue::initFrom(fs::path path) { std::cout << "Catalogue is reading " << path.native_directory_string() << std::endl; fs::directory_iterator end; + std::string file; for (fs::directory_iterator i(path); i != end; ++i) { try { if ((!fs::is_directory(*i)) && (fs::extension(*i) == ".catalogue")) { + file = (*i).string(); std::string x = fs::basename(*i); // TODO: '-en-GB' exists too, this doesn't work for that if ((x.size() > 3) && (x[x.size() - 3] == '-')) { @@ -104,7 +111,11 @@ void Catalogue::initFrom(fs::path path) { fs::ifstream f(*i); f >> *this; } - } catch (const std::exception &ex) { + } + catch (const catalogueException &ex) { + std::cerr << "Error reading catalogue file " << file << ":" << std::endl << '\t' << ex.what() << std::endl; + } + catch (const std::exception &ex) { std::cerr << "directory_iterator died on '" << i->leaf() << "' with " << ex.what() << std::endl; } } Catalogue.cpp @@ -5,6 +5,15 @@ #include <istream> #include <boost/filesystem/path.hpp> #include <list> +#include "exceptions.h" + +class catalogueException : public creaturesException { + public: + catalogueException(const char *s) throw() + : creaturesException(s) {} + catalogueException(const std::string &s) throw() + : creaturesException(s) {} +}; class Catalogue { //protected: Catalogue.h SDLMain.m @@ -5,7 +5,10 @@ #include "Catalogue.h" #include <cstring> #include "catalogue.tab.hpp" + #include "openc2e.h" static std::string cat_str; + + extern void catalogueParseError(int lineno); %% \#[^\n\r]*[\n\r]* // comment \*[^\n\r]*[\n\r]* // comment @@ -14,7 +17,10 @@ ARRAY return CTOK_ARRAY; OVERRIDE return CTOK_OVERRIDE; [0-9]+ { catalval.number = atoi(yytext); return CTOK_INT; } \" cat_str = ""; BEGIN(CAT_STRING); +[ \t\n\r] // yum, whitespace + <CAT_STRING>\\. cat_str += catalogue_descape(yytext[1]); <CAT_STRING>\" BEGIN(INITIAL); catalval.string = new std::string(cat_str); return CTOK_STR; <CAT_STRING>. cat_str += yytext[0]; -[ \t\n\r] // yum, whitespace + +. catalogueParseError(yylineno); catalogue.l cc3b5608314840cc6969e4851addaa56d6c2ea09 Bryan Donlan bdonlan@gmail.com http://github.com/ccdevnet/openc2e/commit/0adf41e234e6e7ec06e742eba2914890fa035542 0adf41e234e6e7ec06e742eba2914890fa035542 2005-12-28T15:18:26-08:00 2005-12-28T15:18:26-08:00 * Remove spurious svn:executable properties * Make catalogue parse errors throw a catalogueException instead of aborting ede59d329c55f8bc0c55ac35f785078a366260ea Bryan Donlan bdonlan@gmail.com