Changeset 7386

Timestamp:

2004-05-24T16:39:27+12:00 (20 years ago)

Author:

davidb

Message:

Modifications to macro data-structures to support collection specific
macros that override existing macros and allow for the introduction
of new collection specific ones.

Main change has been to rename 'defaultmacro_t' to 'parammacro_t' since
there are now two member fields in displayclass that use this: one
for default macros, and another for collection macros.

Location:

trunk/gsdl/lib

Files:

• display.cpp (modified) (20 diffs)
• display.h (modified) (5 diffs)

trunk/gsdl/lib/display.cpp

@@ -43 +43 @@
 
 
-// macro value structure
-struct mvalue
-{
-  text_t filename;
-  text_t value;
-};
 
 inline bool operator==(const mvalue &x, const mvalue &y) {
@@ -62 +56 @@
 
 /////////////////////////////////////
-// stuff for defaultmacros_t
+// stuff for parammacros_t
 /////////////////////////////////////
   
@@ -69 +63 @@
 typedef map<text_t, defmacromap, lttext_t> defpackagemap;
 
-// all methods in defaultmacros_t assume the parameters
+// all methods in parammacros_t assume the parameters
 // and packages in a standard form and not empty
-class defaultmacros_t
+class parammacros_t
 {
 protected:
@@ -118 +112 @@
 //            -3 if it redefined a macro and hid a Global macro
 //            -4 if either a package, macroname, or params were not supplied
-int defaultmacros_t::setmacro(const text_t &package,
+int parammacros_t::setmacro(const text_t &package,
              const text_t &macroname, 
              const text_t &params, 
@@ -158 +152 @@
 }
 
-void defaultmacros_t::delmacro(const text_t &package,
+void parammacros_t::delmacro(const text_t &package,
                  const text_t &macroname, 
                  const text_t &params)
@@ -177 +171 @@
 }
 
-defmacromap *defaultmacros_t::package_find (const text_t &packagename)
+defmacromap *parammacros_t::package_find (const text_t &packagename)
 {
   if (packagename.empty()) return NULL;
@@ -187 +181 @@
 }
 
-defparammap *defaultmacros_t::macro_find (const text_t &packagename, 
+defparammap *parammacros_t::macro_find (const text_t &packagename, 
                            const text_t &macroname)
 {
@@ -199 +193 @@
 }
 
-mvalue *defaultmacros_t::parameter_find (const text_t &packagename, 
+mvalue *parammacros_t::parameter_find (const text_t &packagename, 
                      const text_t &macroname,
                      const text_t &parametername)
@@ -574 +568 @@
 displayclass::displayclass ()
 {
-  defaultmacros = new defaultmacros_t;
-  defaultfiles = new fileinfomap;
+  defaultmacros    = new parammacros_t;
+  collectionmacros = new parammacros_t;
+  defaultfiles     = new fileinfomap;
   
   orderparamlist = new paramspeclist;
@@ -589 +584 @@
 {
   delete defaultmacros;
+  delete collectionmacros;
   delete defaultfiles;
   
@@ -602 +598 @@
 //        -4 if no macroname was supplied
 int displayclass::setdefaultmacro (text_t package, const text_t &macroname, 
-                  text_t params, const text_t &macrovalue) 
-{
+                   text_t params, const text_t &macrovalue) 
+{
+  // **** Looks to me like the last two parameters are the wrong way around!!!
   return setdefaultmacro (macroname, package, params, macrovalue, "memory");
 }
@@ -686 +683 @@
 
 
-// loads a default macro file (if it isn't already loaded)
+// loads a macro file into the specified macrotable datastructure
 // returns 0 if didn't need to load the file (it was already loaded)
 //         1 if was (re)loaded
 //        -1 an error occurred while trying to load the file
-int displayclass::loaddefaultmacros (text_t thisfilename) {
+int displayclass::loadparammacros (parammacros_t* macrotable, text_t thisfilename) {
   // convert the filename to a C string
   char *filenamestr = thisfilename.getcstr();
@@ -835 +832 @@
       
       // define the macro
-      err = setdefaultmacro (macropackage, macroname, macroparameters,
-                 thisfilename, macrovalue);
+
+      err = setparammacro (macrotable, macropackage, macroname, macroparameters,
+                   thisfilename, macrovalue);
       if ((err == -1 || err == -3) && logout != NULL) {
         (*logout) << text_t2ascii << "Warning: redefinition of _" << 
@@ -906 +904 @@
 }
 
+
+// loads a default macro file (if it isn't already loaded)
+// returns 0 if didn't need to load the file (it was already loaded)
+//         1 if was (re)loaded
+//        -1 an error occurred while trying to load the file
+int displayclass::loaddefaultmacros (text_t thisfilename) 
+{
+  return loadparammacros(defaultmacros,thisfilename);
+}
+
+// loads a collection specific macro file 
+// returns 0 if didn't need to load the file (it was already loaded)
+//         1 if was (re)loaded
+//        -1 an error occurred while trying to load the file
+int displayclass::loadcollectionmacros (text_t thisfilename) 
+{
+  return loadparammacros(collectionmacros,thisfilename);
+}
+
+
 void displayclass::unloaddefaultmacros () {
   defaultmacros->clear();
+}
+
+void displayclass::unloadcollectionmacros () {
+  collectionmacros->clear();
 }
 
@@ -977 +999 @@
 //        -4 if no macroname was supplied
 int displayclass::setmacro (const text_t &macroname, 
-               text_t package, 
-               const text_t &macrovalue)
+                text_t package, 
+                const text_t &macrovalue)
 {
   // make sure a macroname was supplied
@@ -1216 +1238 @@
 
 
+// setparammacro adds an entry to the list of default macros 
+// returns 0 if there was no error,
+//        -1 if it redefined a macro
+//        -2 if it hid a Global macro
+//        -3 if it redefined a macro and hid a Global macro
+//        -4 if no macroname was supplied
+int displayclass::setparammacro (parammacros_t* macrotable, 
+                 text_t package, const text_t &macroname, 
+                 text_t params, const text_t &filename,
+                 const text_t &macrovalue) 
+{
+  // make sure a macroname was supplied
+  if (macroname.empty()) return -4;
+
+  // put the parameters in a standard form
+  paramhashtype paramhash;
+  if (params.empty()) params = "ignore=yes";
+  splitparams (params, paramhash);
+  joinparams (paramhash, params);
+
+  // make package "Global" if it doesn't point to anything yet
+  if (package.empty()) package = "Global";
+
+  // remember these parameters
+  allparams.insert (params);
+
+  // remember this filename (this part isn't finished yet -- Rodger).
+
+  // set the macro
+  return macrotable->setmacro(package, macroname, params, filename, macrovalue);
+}
+
 // setdefaultmacro adds an entry to the list of default macros 
 // returns 0 if there was no error,
@@ -1223 +1277 @@
 //        -4 if no macroname was supplied
 int displayclass::setdefaultmacro (text_t package, const text_t &macroname, 
-                  text_t params, const text_t &filename,
-                  const text_t &macrovalue) 
-{
-  // make sure a macroname was supplied
-  if (macroname.empty()) return -4;
-
-  // put the parameters in a standard form
-  paramhashtype paramhash;
-  if (params.empty()) params = "ignore=yes";
-  splitparams (params, paramhash);
-  joinparams (paramhash, params);
-
-  // make package "Global" if it doesn't point to anything yet
-  if (package.empty()) package = "Global";
-
-  // remember these parameters
-  allparams.insert (params);
-
-  // remember this filename (this part isn't finished yet -- Rodger).
-
-  // set the macro
-  return defaultmacros->setmacro(package, macroname, params, filename, macrovalue);
+                   text_t params, const text_t &filename,
+                   const text_t &macrovalue) 
+{
+  return setparammacro(defaultmacros,package,macroname,params,filename,macrovalue);
+}
+
+
+// setcollectionmacro adds an entry to the list of collection specific macros 
+// returns 0 if there was no error,
+//        -1 if it redefined a macro
+//        -2 if it hid a Global macro
+//        -3 if it redefined a macro and hid a Global macro
+//        -4 if no macroname was supplied
+int displayclass::setcollectionmacro (text_t package, const text_t &macroname, 
+                      text_t params, const text_t &filename,
+                      const text_t &macrovalue) 
+{
+  return setparammacro(collectionmacros,package,macroname,params,filename,macrovalue);
 }
 
@@ -1326 +1376 @@
 
   return result;
+}
+
+
+mvalue* displayclass::macro_find (parammacros_t* macrotable, text_t packagename,
+                  const text_t &macroname)
+{
+  mvalue *macrovalue = NULL;
+
+  // next look in the named parammacros for the named package
+  if (macrotable->macro_find (packagename, macroname) != NULL)
+    {
+      paramspeclist::iterator paramhere, paramend;
+
+      paramhere = orderparamlist->begin(); paramend = orderparamlist->end();
+      while ((macrovalue == NULL) && (paramhere != paramend))
+    {
+      macrovalue = macrotable->parameter_find(packagename, macroname,
+                          (*paramhere).param);
+      paramhere++;
+    }
+    }
+
+  return macrovalue;
 }
 
@@ -1462 +1535 @@
   packagelist.push_back ("Global");
 
-  paramspeclist::iterator paramhere, paramend;
   text_tlist::iterator packagehere = packagelist.begin();
   text_tlist::iterator packageend = packagelist.end();
@@ -1473 +1545 @@
     macrovalue = currentmacros->macro_find("Style", macroname);
 
+      // look in the collection specific macros
+      if (macrovalue == NULL) {
+    macrovalue = macro_find(collectionmacros,*packagehere,macroname);
+      }
+
+      // and again in the collection specific package "Style"
+      if (macrovalue == NULL) {
+    macrovalue = macro_find(collectionmacros,(char*)"Style",macroname);
+      }
+
       // look in the default macros
-      if (macrovalue == NULL) 
-    {
-      // next look in the defaultmacros
-      if (defaultmacros->macro_find (*packagehere, macroname) != NULL)
-        {
-          paramhere = orderparamlist->begin(); paramend = orderparamlist->end();
-          while ((macrovalue == NULL) && (paramhere != paramend))
-        {
-//        cerr << text_t2ascii << "\npackage: " << *packagehere << "\n";
-//        cerr << text_t2ascii << "macroname: " << macroname << "\n";
-//        cerr << text_t2ascii << "param: " << (*paramhere).param << "\n";
-//        cerr << "spec: " << (int)((*paramhere).spec) << "\n";
-          macrovalue = defaultmacros->parameter_find(*packagehere, macroname,
-                                 (*paramhere).param);
-          paramhere++;
-        }
-        }
-    }
+      if (macrovalue == NULL) {
+    macrovalue = macro_find(defaultmacros,*packagehere,macroname);
+      }
 
       // and again in the package "Style"
-      if (macrovalue == NULL) 
-    {
-      // next look in the defaultmacros
-      if (defaultmacros->macro_find ("Style", macroname) != NULL)
-        {
-          paramhere = orderparamlist->begin(); paramend = orderparamlist->end();
-          while ((macrovalue == NULL) && (paramhere != paramend))
-        {
-          macrovalue = defaultmacros->parameter_find("Style", macroname,
-                                 (*paramhere).param);
-          paramhere++;
-        }
-        }
-    }
+      if (macrovalue == NULL) {
+    macrovalue = macro_find(defaultmacros,(char*)"Style",macroname);
+      }
+
       if (macrovalue == NULL) packagehere++;
     }

trunk/gsdl/lib/display.h

@@ -87 +87 @@
 
 // class prototypes
-class defaultmacros_t;
+class parammacros_t;
 class currentmacros_t;
 
@@ -96 +96 @@
 {
   int otherinfo;
+};
+
+// macro value structure
+struct mvalue
+{
+  text_t filename;
+  text_t value;
 };
 
@@ -186 +193 @@
   int loaddefaultmacros (text_t thisfilename);
 
+  // loads a collection specific macro file 
+  // returns 0 if didn't need to load the file (it was already loaded)
+  //         1 if was (re)loaded
+  //        -1 an error occurred while trying to load the file
+  int loadcollectionmacros (text_t thisfilename);
+
   // unloads all default macros
   void unloaddefaultmacros ();
+
+  // unloads all collection specific macros
+  void unloadcollectionmacros ();
   
   // prepares to create a page: deletes all macros set with
@@ -230 +246 @@
 
   // general variables
-  text_tset allparams;  // possible parameter combinations
-  defaultmacros_t *defaultmacros;
-  fileinfomap *defaultfiles;
+  text_tset        allparams;  // possible parameter combinations
+  parammacros_t *defaultmacros;
+  parammacros_t *collectionmacros;
+  fileinfomap     *defaultfiles;
   
   // variables to do with a page expansion
@@ -248 +265 @@
   int checkdefaultmacrofiles ();
 
+  int loadparammacros (parammacros_t* macrotable, text_t thisfilename);
+
+  int setparammacro (parammacros_t* macrotable,
+             text_t package, const text_t &macroname, 
+             text_t params, const text_t &filename,
+             const text_t &macrovalue); 
+
   int setdefaultmacro (text_t package, const text_t &macroname, 
                text_t params, const text_t &filename,
                const text_t &macrovalue); 
 
+  int setcollectionmacro (text_t package, const text_t &macroname, 
+              text_t params, const text_t &filename,
+              const text_t &macrovalue); 
+
   // evaluates a boolean expression
   bool boolexpr (text_t package, const text_t &expr, int recursiondepth);
+
+  mvalue* macro_find (parammacros_t* macrotable, text_t packagename,
+              const text_t &macroname);
 
   // (recursively) expand out a macro