improve error handling

mpictor · mpictor · commit 379c3359506f · 2013-01-21T20:21:25.000-05:00
diff --git a/src/cllazyfile/lazyDataSectionReader.cc b/src/cllazyfile/lazyDataSectionReader.cc
@@ -7,6 +7,5 @@ lazyDataSectionReader::lazyDataSectionReader( lazyFileReader * parent, std::ifst
     _sectionID = _lazyFile->getInstMgr()->registerDataSection( this );
     _sectionIdentifier = "";
     std::cerr << "FIXME set _sectionIdentifier" << std::endl;
-    error = true;     std::cerr << "FIXME read file, set `error` correctly, ..." << std::endl;
-
+    _error = false;
 }
diff --git a/src/cllazyfile/lazyDataSectionReader.h b/src/cllazyfile/lazyDataSectionReader.h
@@ -19,7 +19,7 @@
  */
 class lazyDataSectionReader: public sectionReader {
 protected:
-    bool error, completelyLoaded;
+    bool _error, _completelyLoaded;
 //     lazyFileReader* parent;
     std::string _sectionIdentifier;
 
@@ -28,7 +28,7 @@ class lazyDataSectionReader: public sectionReader {
 public:
     virtual ~lazyDataSectionReader() {}
     bool success() {
-        return !error;
+        return !_error;
     }
 //     SDAI_Application_instance* getRealInstance( std::streampos start, std::streampos end );
 };
diff --git a/src/cllazyfile/lazyInstMgr.cc b/src/cllazyfile/lazyInstMgr.cc
@@ -6,6 +6,7 @@ lazyInstMgr::lazyInstMgr() {
     _headerRegistry = new Registry( HeaderSchemaInit );
     _lazyInstanceCount = 0;
     _longestTypeNameLen = 0;
+    _errors = new ErrorDescriptor();
 }
 
 sectionID lazyInstMgr::registerDataSection( lazyDataSectionReader * sreader ) {
@@ -38,3 +39,8 @@ unsigned long lazyInstMgr::getNumTypes() /*const*/ {
     }
     return n ;
 }
+
+void lazyInstMgr::openFile( std::string fname ) {
+    //  lazyFileReader adds itself to the file list - good idea or bad?
+    /*_files.push_back( */new lazyFileReader( fname, this ) /*)*/;
+}
diff --git a/src/cllazyfile/lazyInstMgr.h b/src/cllazyfile/lazyInstMgr.h
@@ -40,6 +40,7 @@ class lazyInstMgr {
     lazyFileReaderVec_t _files;
 
     Registry * _headerRegistry, * _mainRegistry;
+    ErrorDescriptor * _errors;
 
     unsigned long _lazyInstanceCount;
     int _longestTypeNameLen;
@@ -49,13 +50,9 @@ class lazyInstMgr {
 public:
     lazyInstMgr();
     void addSchema( void (*initFn) () ); //?
-    void openFile( std::string fname ) {
-        //  lazyFileReader adds itself to the file list - good idea or bad?
-        /*_files.push_back( */new lazyFileReader( fname, this ) /*)*/;
-    }
+    void openFile( std::string fname );
 
     void addLazyInstance( namedLazyInstance inst );
-    void addDataSection( lazyDataSectionReader* d, lazyFileReader* f );   ///< only used by lazy file reader functions
 
     /// FIXME don't return something that can be modified; also, template references will cause problems on windows
     instanceRefMMap_range getReferentInstances( instanceID id ) {
@@ -87,6 +84,10 @@ class lazyInstMgr {
     sectionID registerDataSection( lazyDataSectionReader * sreader );
     fileID registerLazyFile( lazyFileReader * freader );
 
+    ErrorDescriptor * getErrorDesc() {
+        return _errors;
+    }
+
     /* TODO impliment these
      *    void normalizeInstanceIds();
      *    void eliminateDuplicates();
diff --git a/src/cllazyfile/lazyP21DataSectionReader.cc b/src/cllazyfile/lazyP21DataSectionReader.cc
@@ -6,6 +6,10 @@ lazyP21DataSectionReader::lazyP21DataSectionReader( lazyFileReader * parent, std
                                                     lazyDataSectionReader( parent, file, start ) {
     findSectionStart();
     findSectionEnd();
+    if( _sectionEnd < 0 ) {
+        _error = true;
+        return;
+    }
     _file.seekg( _sectionStart );
     namedLazyInstance nl;
     while( nl = nextInstance(), ( nl.loc.end != nl.loc.begin ) ) {
@@ -46,7 +50,7 @@ const namedLazyInstance lazyP21DataSectionReader::nextInstance() {
     i.name = getDelimitedKeyword(";( /\\");
     i.loc.end = seekInstanceEnd();
 
-    if( i.loc.end >= _sectionEnd ) {
+    if( ( i.loc.end < 0 ) || ( i.loc.end >= _sectionEnd ) ) {
         //invalid instance, so clear everything
         i.loc.end = i.loc.begin;
         delete i.name;
diff --git a/src/cllazyfile/lazyTypes.h b/src/cllazyfile/lazyTypes.h
@@ -30,6 +30,7 @@ typedef struct {
     unmodified, simply copy it from the input file to the output file */
 } lazyInstanceLoc;
 
+/// used when populating the instance type map \sa lazyInstMgr::_instanceTypeMMap
 typedef struct {
     lazyInstanceLoc loc;
     std::string * name;

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,5 @@ lazyDataSectionReader::lazyDataSectionReader( lazyFileReader * parent, std::ifst`
`7`	`7`	`_sectionID = _lazyFile->getInstMgr()->registerDataSection( this );`
`8`	`8`	`_sectionIdentifier = "";`
`9`	`9`	`std::cerr << "FIXME set _sectionIdentifier" << std::endl;`
`10`		- error = true; std::cerr << "FIXME read file, set `error` correctly, ..." << std::endl;
`11`		`-`
	`10`	`+ _error = false;`
`12`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ lazyInstMgr::lazyInstMgr() {`
`6`	`6`	`_headerRegistry = new Registry( HeaderSchemaInit );`
`7`	`7`	`_lazyInstanceCount = 0;`
`8`	`8`	`_longestTypeNameLen = 0;`
	`9`	`+ _errors = new ErrorDescriptor();`
`9`	`10`	`}`
`10`	`11`
`11`	`12`	`sectionID lazyInstMgr::registerDataSection( lazyDataSectionReader * sreader ) {`
`@@ -38,3 +39,8 @@ unsigned long lazyInstMgr::getNumTypes() /const/ {`
`38`	`39`	`}`
`39`	`40`	`return n ;`
`40`	`41`	`}`
	`42`	`+`
	`43`	`+void lazyInstMgr::openFile( std::string fname ) {`
	`44`	`+ // lazyFileReader adds itself to the file list - good idea or bad?`
	`45`	`+ /_files.push_back( /new lazyFileReader( fname, this ) /)/;`
	`46`	`+}`