Implemented macro caching.

Macros up to a certain size (currently hard-coded to 65536 characters per macro) are now cached in memory, improving parsing speed of invocations, especially when the macro in question is defined in a different file.

Author: c-lipka

changes.txt

@@ -49,6 +49,10 @@ Prior to the release of 3.7.1, the following items still need urgent attention:
 New Features
 ------------
 
+- Macros up to a certain size (currently hard-coded to 65536 characters per
+  macro) are now cached in memory, improving parsing speed of invocations,
+  especially when the macro in question is defined in a different file.
+
 - All instances of `gray` in keywords or INI file options can now alternatively
   be spelt `grey`. Previously this was only the case inside function
   definitions (where it applied only to the `.gray` colour pseudo-component).

source/base/animation/animation.cpp

@@ -279,7 +279,7 @@ Image *Animation::ReadFrame(IStream *file)
     else if(file->tellg() > (prepos + bytes))
         throw POV_EXCEPTION(kInvalidDataSizeErr, "Frame decompressor read more bytes than expected. The input file may be corrupted!");
 
-    file->seekg(prepos + bytes, SEEK_END);
+    file->seekg(prepos + bytes, IOBase::seek_end);
 
     switch(fileType)
     {

source/base/animation/moov.cpp

@@ -172,11 +172,11 @@ void PostWriteFrame(OStream *file, POV_LONG bytes, const Animation::WriteOptions
 
     // update mdat size
 
-    file->seekg(0, SEEK_END);
+    file->seekg(0, IOBase::seek_end);
     pd->mdatsize = file->tellg() + 16;
-    file->seekg(8, SEEK_SET);
+    file->seekg(8, IOBase::seek_set);
     WriteInt8(file, pd->mdatsize);
-    file->seekg(0, SEEK_END);
+    file->seekg(0, IOBase::seek_end);
 
     if(bytes > 2147483647) // 2^31 - 1
         throw POV_EXCEPTION(kInvalidDataSizeErr, "Cannot handle frame data larger than 2^31 bytes!");
@@ -387,9 +387,9 @@ void ReadAtomHeader(IStream *file, Type& type, POV_LONG& size)
         ReadType(file, type);
 
         POV_LONG t = file->tellg();
-        file->seekg(0, IOBase::SEEK_END);
+        file->seekg(0, IOBase::seek_end);
         size = file->tellg() - t + 8;
-        file->seekg(t, IOBase::SEEK_SET);
+        file->seekg(t, IOBase::seek_set);
     }
     else if(size == 1) // atom sizes is outside 32-bit range
     {