Changeset 6021

Timestamp:

2003-11-28T16:40:56+13:00 (20 years ago)

Author:

sjboddie

Message:

Added an unloaddefaultmacros() function to displayclass to allow us to
unload all the macros before reloading them again from the macro files.

Location:

trunk/gsdl/lib

Files:

• display.cpp (modified) (3 diffs)
• display.h (modified) (2 diffs)

trunk/gsdl/lib/display.cpp

@@ -22 +22 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id$
- *
  *********************************************************************/
 
-/*
-   $Log$
-   Revision 1.26  2002/02/26 23:01:31  jrm21
-   istream.get(char&) caused funny problems with gcc3 so they've been replaced
-   with char=istream.get() instead.
-
-   Revision 1.25  2002/02/12 22:46:47  jrm21
-   Allow nested _If_ macros. We now count '(' and ')' characters, so you can now
-   do _If_(_foo_, _If_(_bar_,FOOBAR,FOONOBAR), _If_(_bar_,NOFOOBAR,NOFOONOBAR) )
-   inside a macro file. If you want to display a bracket, you can escape it.
-   Previously we had assumed that a ',' marked the end of a toplevel argument.
-
-   Revision 1.24  2001/01/25 18:26:44  cs025
-   Included CORBA branch for first time
-
-   Revision 1.17.2.1  2000/04/04 15:02:28  cs025
-   Corba first commit
-
-   Revision 1.17  2000/02/29 21:00:38  sjboddie
-   fixed some compiler warnings
-
-   Revision 1.16  1999/11/25 21:53:08  sjboddie
-   fixed bug in logout
-
-   Revision 1.15  1999/09/24 02:25:35  rjmcnab
-   removed limitation on the number of arguments that a macro can have
-
-   Revision 1.14  1999/09/07 04:57:41  sjboddie
-   added gpl notice
-
-   Revision 1.13  1999/08/31 07:59:11  rjmcnab
-   Generalised spaces to unicode spaces, added ability to automatically detect
-   whether the input file is Unicode or UTF-8 and read the file in the
-   appropriate way, and improved the error messages slightly.
-
-   Revision 1.12  1999/07/21 20:46:12  rjmcnab
-   fixed small bug
-
-   Revision 1.11  1999/07/21 07:26:30  rjmcnab
-   Added more operators to _If_, changed quoting of parameters so that
-   ' can be used to quote but it is removed, and made slight optimisation
-   so that macros that don't contain other macros aren't expanded.
-
-   Revision 1.10  1999/03/01 20:39:54  sjboddie
-
-   Added eq and ne functionality to _If_
-
-   Revision 1.9  1999/03/01 01:18:09  sjboddie
-
-   Fixed bug in _If_ when value being tested was only one character
-   long (e.g. "0" or "1")
-
-   Revision 1.8  1999/02/28 23:15:29  rjmcnab
-
-   Made _If_ recognise 'false' and '0' as being false.
-
-   Revision 1.7  1999/02/08 01:26:11  rjmcnab
-
-   Improved the error reporting.
-
-   Revision 1.6  1999/01/19 08:30:23  rjmcnab
-
-   Added a method to determine whether a macro has been defined.
-
-   Revision 1.5  1999/01/19 01:38:12  rjmcnab
-
-   Made the source more portable.
-
-   Revision 1.4  1999/01/12 01:50:57  rjmcnab
-
-   Standard header.
-
-   Revision 1.3  1999/01/08 02:33:13  rjmcnab
-
-   Added standard header to source files.
-
- */
 #include "display.h"
 #include "gsdlunicode.h"
@@ -661 +582 @@
   outc = NULL;
 
-  logout = &cerr;
+  logout = NULL;
 }
 
@@ -985 +906 @@
 }
 
+void displayclass::unloaddefaultmacros () {
+  defaultmacros->clear();
+}
 
 // prepares to create a page.

trunk/gsdl/lib/display.h

@@ -185 +185 @@
   //        -1 an error occurred while trying to load the file
   int loaddefaultmacros (text_t thisfilename);
+
+  // unloads all default macros
+  void unloaddefaultmacros ();
   
   // prepares to create a page: deletes all macros set with
@@ -216 +219 @@
   // say where any error logging goes, this can be NULL
   // if no error logging is desired - returns previous value
-  ostream *setlogout (ostream *thelogout);
+  ostream *displayclass::setlogout (ostream *thelogout);
 
   // debug stuff