what appears to be a working version, at least when called with -repp…

…=common

git-svn-id: https://pet.opendfki.de/repos/pet/branches/repp@789 4200e16c-5112-0410-ac55-d7fb557a720a

cheap/repp.cpp

@@ -52,12 +52,11 @@ tReppTokenizer::tReppTokenizer()
       file = find_file(name, SET_EXT, 
                        cheap_settings->base() + SET_SUBDIRECTORY + PATH_SEP);
 
-    if(file.empty()) {
-      cerr << "Unable to locate REPP configuration '" << name << "'." << endl;
-      exit(1);
-    } // if
+    if(file.empty())
+      throw tError("Unable to locate REPP configuration '" + name + "'.");
+
     _path = dir_name(file);
-    _update = new settings(file, _path, "reading");
+    _update = new settings(raw_name(file), _path, "reading");
     cheap_settings->install(_update);
   } // if
 
@@ -84,11 +83,10 @@ tReppTokenizer::~tReppTokenizer()
     iter != _repps.end(); ++iter)
     delete iter->second;
 
-// uninstall hangs, memory should be freed anyway?
-//  if (cheap_settings != NULL && _update != NULL) {
-//    cheap_settings->uninstall(_update);
-//    delete _update;
-//  }
+  if (cheap_settings != NULL && _update != NULL) {
+    cheap_settings->uninstall(_update);
+    delete _update;
+  } // if
 }
 
 tRepp::tRepp(string name, tReppTokenizer *parent) :_id(name), _parent(parent)

common/settings.cpp

@@ -31,7 +31,7 @@
 using std::string;
 
 settings::settings(string name, string base_dir, const char *message)
-  : _lloc(0), _li_cache(), _updates() {
+  : _valid(false), _lloc(0), _li_cache(), _updates() {
   _n = 0;
   _set = new setting*[SET_TABLE_SIZE];
 
@@ -45,13 +45,13 @@ settings::settings(string name, string base_dir, const char *message)
     lexer_idchars = "_+-*?$";
     parse();
     lexer_idchars = sv;
-
+    _valid = true;
   }
 }
 
 
 settings::settings(const std::string &input)
-  : _lloc(0), _li_cache(), _updates() {
+  : _valid(false), _lloc(0), _li_cache(), _updates() {
   _n = 0;
   _set = new setting*[SET_TABLE_SIZE];
 
@@ -60,6 +60,7 @@ settings::settings(const std::string &input)
   lexer_idchars = "_+-*?$";
   parse();
   lexer_idchars = sv;
+  _valid = true;
 }
 
 

common/settings.h

@@ -51,6 +51,7 @@ class settings
   settings(const std::string &input);
   ~settings();
 
+  bool valid() { return _valid; }
   const std::string &base() { return _base; }
   setting *lookup(const char *name);
 
@@ -81,6 +82,7 @@ class settings
   bool uninstall(settings *);
 
  private:
+  bool _valid;
   int _n;
   setting **_set;
   std::string _fname, _prefix, _base;