try const string for delimit retval

mpictor · mpictor · commit be446f265760 · 2013-01-21T20:21:25.000-05:00
diff --git a/src/cllazyfile/lazyInstMgr.cc b/src/cllazyfile/lazyInstMgr.cc
@@ -21,13 +21,14 @@ fileID lazyInstMgr::registerLazyFile( lazyFileReader * freader ) {
 
 void lazyInstMgr::addLazyInstance( namedLazyInstance inst ) {
     _lazyInstanceCount++;
-    if( inst.name->length() > _longestTypeNameLen ) {
-        _longestTypeNameLen = inst.name->length();
+    int len = inst.name->length();
+    if( len > _longestTypeNameLen ) {
+        _longestTypeNameLen = len;
         _longestTypeName = *inst.name;
     }
     _instanceStreamPosMMap.insert( instanceStreamPosMMap_pair( inst.loc.instance, inst.loc ) );
     _instanceTypeMMap.insert( instanceTypeMMap_pair( *inst.name, inst.loc.instance ) );
-    delete inst.name;
+//     delete inst.name;
 }
 
 unsigned long lazyInstMgr::getNumTypes() /*const*/ {
diff --git a/src/cllazyfile/lazyP21DataSectionReader.cc b/src/cllazyfile/lazyP21DataSectionReader.cc
@@ -56,7 +56,7 @@ const namedLazyInstance lazyP21DataSectionReader::nextInstance() {
     if( ( !_file.good() ) || ( end == -1 ) ) {
         //invalid instance, so clear everything
         i.loc.begin = -1;
-        delete i.name;
+//         delete i.name;
         i.name = 0;
     }
     return i;
diff --git a/src/cllazyfile/lazyTypes.h b/src/cllazyfile/lazyTypes.h
@@ -34,7 +34,7 @@ typedef struct {
 /// used when populating the instance type map \sa lazyInstMgr::_instanceTypeMMap
 typedef struct {
     lazyInstanceLoc loc;
-    std::string * name;
+    const std::string * name;
 } namedLazyInstance;
 
 // instanceRefMMap - multimap between an instanceID and instances that refer to it
diff --git a/src/cllazyfile/p21HeaderSectionReader.cc b/src/cllazyfile/p21HeaderSectionReader.cc
@@ -50,7 +50,7 @@ const namedLazyInstance p21HeaderSectionReader::nextInstance() {
         if( (end == -1 ) || ( end >= _sectionEnd ) ) {
             //invalid instance, so clear everything
             i.loc.begin = -1;
-            delete i.name;
+//             delete i.name;
             i.name = 0;
         }
     }
diff --git a/src/cllazyfile/sectionReader.cc b/src/cllazyfile/sectionReader.cc
@@ -73,16 +73,17 @@ std::streampos sectionReader::findNormalString( const std::string& str, bool sem
 }
 
 //NOTE different behavior than const char * GetKeyword( istream & in, const char * delims, ErrorDescriptor & err ) in read_func.cc
-std::string * sectionReader::getDelimitedKeyword( const char * delimiters ) {
-    std::string * str = new std::string;
+const std::string * sectionReader::getDelimitedKeyword( const char * delimiters ) {
+    static std::string str;
     char c;
-    str->reserve(10); //seems to be faster and require less memory than no reserve or 20.
+//     str->reserve(10); //seems to be faster and require less memory than no reserve or 20.
+    str.clear();
     skipWS();
     while( c = _file.get(), _file.good() ) {
         if( c == '-' || c == '_' || isupper( c ) || isdigit( c ) ||
-            ( c == '!' && str->length() == 0 ) ) {
-            str->append( 1, c );
-        } else if( ( c == '/' ) && ( _file.peek() == '*' ) && ( str->length() == 0 ) ) {
+            ( c == '!' && str.length() == 0 ) ) {
+            str.append( 1, c );
+        } else if( ( c == '/' ) && ( _file.peek() == '*' ) && ( str.length() == 0 ) ) {
             //push past comment
             findNormalString( "*/" );
             skipWS();
@@ -94,10 +95,10 @@ std::string * sectionReader::getDelimitedKeyword( const char * delimiters ) {
     }
     c = _file.peek();
     if( !strchr( delimiters, c ) ) {
-        std::cerr << __PRETTY_FUNCTION__ << ": missing delimiter. Found " << c << ", expected one of " << delimiters << " at end of keyword " << *str << ". File offset: " << _file.tellg() << std::endl;
+        std::cerr << __PRETTY_FUNCTION__ << ": missing delimiter. Found " << c << ", expected one of " << delimiters << " at end of keyword " << str << ". File offset: " << _file.tellg() << std::endl;
         abort();
     }
-    return str;
+    return &str;
 }
 
 std::streampos sectionReader::seekInstanceEnd() {
diff --git a/src/cllazyfile/sectionReader.h b/src/cllazyfile/sectionReader.h
@@ -39,7 +39,7 @@ class sectionReader {
 
     /** Get a keyword ending with one of delimiters.
      */
-    std::string * getDelimitedKeyword( const char * delimiters );
+    const std::string * getDelimitedKeyword( const char * delimiters );
 
     /** Seek to the end of the current instance */
     std::streampos seekInstanceEnd();

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ const namedLazyInstance lazyP21DataSectionReader::nextInstance() {`
`56`	`56`	`if( ( !_file.good() ) \|\| ( end == -1 ) ) {`
`57`	`57`	`//invalid instance, so clear everything`
`58`	`58`	`i.loc.begin = -1;`
`59`		`- delete i.name;`
	`59`	`+// delete i.name;`
`60`	`60`	`i.name = 0;`
`61`	`61`	`}`
`62`	`62`	`return i;`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ const namedLazyInstance p21HeaderSectionReader::nextInstance() {`
`50`	`50`	`if( (end == -1 ) \|\| ( end >= _sectionEnd ) ) {`
`51`	`51`	`//invalid instance, so clear everything`
`52`	`52`	`i.loc.begin = -1;`
`53`		`- delete i.name;`
	`53`	`+// delete i.name;`
`54`	`54`	`i.name = 0;`
`55`	`55`	`}`
`56`	`56`	`}`