* color.cpp: remove duplicated default args.

[ginac.git] / ginac / structure.h

diff --git a/ginac/structure.h b/ginac/structure.h
index 3478887507c11b20067c606650cd1cc14e25703a..62848b227a86b4f931ec9642ea453c3d1ef14ad4 100644 (file)
--- a/ginac/structure.h
+++ b/ginac/structure.h
@@ -3,7 +3,7 @@
  *  Interface to 'abstract' class structure. */
 
 /*
- *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -23,67 +23,37 @@
 #ifndef __GINAC_STRUCTURE_H__
 #define __GINAC_STRUCTURE_H__
 
-#include <ginac/basic.h>
+#include "basic.h"
 
 namespace GiNaC {
 
 struct registered_structure_info {
-    char const * name;
+       const char * name;
 };
 
 /** The class structure is used to implement user defined classes
-    with named members which behave similar to ordinary C structs.
-    structure is an 'abstract' base class (it is possible but not
-    meaningful to make instances), the user defined structures
-    will be create by the perl script structure.pl */
+       with named members which behave similar to ordinary C structs.
+       structure is an 'abstract' base class (it is possible but not
+       meaningful to make instances), the user defined structures
+       will be create by the perl script structure.pl */
 
 class structure : public basic
 {
-// member functions
-
-    // default constructor, destructor, copy constructor assignment operator and helpers
-public:
-    structure();
-    ~structure();
-    structure(structure const & other);
-    structure const & operator=(structure const & other);
-protected:
-    void copy(structure const & other);
-    void destroy(bool call_parent);
-
-    // other constructors
-    // none
-
-    // functions overriding virtual functions from bases classes
+       GINAC_DECLARE_REGISTERED_CLASS(structure, basic)
+       
+       // functions overriding virtual functions from bases classes
 public:
-    basic * duplicate() const;
-    void printraw(ostream & os) const; 
-    void print(ostream & os, unsigned upper_precedence=0) const;
-    void printtree(ostream & os, unsigned indent) const;
-    void printcsrc(ostream & os, unsigned type, unsigned upper_precedence=0) const;
+       void print(const print_context & c, unsigned level=0) const;
 protected:
-    int compare_same_type(basic const & other) const;
-    bool is_equal_same_type(basic const & other) const;
-    
-    // new virtual functions which can be overridden by derived classes
-    // none
-    
-    // non-virtual functions in this class
+       bool is_equal_same_type(const basic & other) const;
+       
+       // non-virtual functions in this class
 protected:
-    static vector<registered_structure_info> & registered_structures(void);
+       static std::vector<registered_structure_info> & registered_structures(void);
 public:
-    static unsigned register_new(char const * nm);
-
-// member variables
-// none
-
+       static unsigned register_new(const char * nm);
 };
 
-// global constants
-
-extern const structure some_structure;
-extern type_info const & typeid_structure;
-
 } // namespace GiNaC
 
 #endif // ndef __GINAC_STRUCTURE_H__