* Finilize version 1.0.4 (version numbers, copyrights and such rubbish).

[ginac.git] / ginac / flags.h

diff --git a/ginac/flags.h b/ginac/flags.h
index 93506f107d9adb125db7231d664143653727b4a2..60c10fed2034862ade164e5cee32be8a9b4d11e9 100644 (file)
--- a/ginac/flags.h
+++ b/ginac/flags.h
@@ -3,7 +3,7 @@
  *  Collection of all flags used through the GiNaC framework. */
 
 /*
- *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2002 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
@@ -28,7 +28,9 @@ namespace GiNaC {
 class expand_options {
 public:
        enum {
-               expand_trigonometric = 0x0001
+               expand_trigonometric = 0x0001,
+               expand_indexed = 0x0002,
+               expand_function_args = 0x0004
        };
 };
 
@@ -68,9 +70,9 @@ public:
 class status_flags {
 public:
        enum {
-               dynallocated    = 0x0001,       ///< Heap-allocated (i.e. created by new if we want to be clever and bypass the stack)
+               dynallocated    = 0x0001,       ///< Heap-allocated (i.e. created by new if we want to be clever and bypass the stack, @see ex::construct_from_basic() )
                evaluated       = 0x0002,       ///< .eval() has already done its job
-               expanded        = 0x0004,       ///< .expand() has already done its job
+               expanded        = 0x0004,       ///< .expand(0) has already done its job (other expand() options ignore this flag)
                hash_calculated = 0x0008        ///< .calchash() has already done its job
        };
 };
@@ -128,13 +130,7 @@ public:
                has_indices,  // object has at least one index
 
                // answered by class idx
-               idx,
-
-               // answered by class coloridx
-               coloridx,
-
-               // answered by class lorentzidx
-               lorentzidx
+               idx
        };
 };
 
@@ -147,15 +143,6 @@ public:
        };
 };
 
-class csrc_types {
-public:
-       enum {
-               ctype_float,
-               ctype_double,
-               ctype_cl_N
-       };
-};
-
 /** Strategies how to clean up the function remember cache.
  *  @see remember_table */
 class remember_strategies {