- info(info_flags::has_indices) now works for sums and products. It

[ginac.git] / ginac / flags.h

diff --git a/ginac/flags.h b/ginac/flags.h
index 0cef2bb04e85fb6f5301d13a0e544f72bb377fb0..372b89932ec995a4f8fe1c2de6c778163cb02150 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-2005 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2007 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
@@ -34,6 +34,14 @@ public:
        };
 };
 
+/** Flags to control the behavior of has(). */
+class has_options {
+public:
+       enum {
+               algebraic = 0x0001,              ///< enable algebraic matching
+       };
+};
+
 /** Flags to control the behavior of subs(). */
 class subs_options {
 public:
@@ -42,8 +50,13 @@ public:
                subs_no_pattern = 0x0001, // for backwards compatibility
                algebraic = 0x0002,              ///< enable algebraic substitutions
                subs_algebraic = 0x0002,  // for backwards compatibility
-        pattern_is_product = 0x0004,     ///< used internally by expairseq::subschildren()
-        pattern_is_not_product = 0x0008  ///< used internally by expairseq::subschildren()
+               pattern_is_product = 0x0004,     ///< used internally by expairseq::subschildren()
+               pattern_is_not_product = 0x0008, ///< used internally by expairseq::subschildren()
+               no_index_renaming = 0x0010,
+               // To indicate that we want to substitue an index by something that is
+               // is not an index. Without this flag the index value would be
+               // substituted in that case.
+               really_subs_idx = 0x0020
        };
 };
 
@@ -52,7 +65,8 @@ class domain {
 public:
        enum {
                complex,
-               real
+               real,
+               positive
        };
 };
 
@@ -179,7 +193,9 @@ public:
                evaluated       = 0x0002, ///< .eval() 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
-               not_shareable   = 0x0010  ///< don't share instances of this object between different expressions unless explicitly asked to (used by ex::compare())
+               not_shareable   = 0x0010, ///< don't share instances of this object between different expressions unless explicitly asked to (used by ex::compare())
+               has_indices     = 0x0020,
+               has_no_indices  = 0x0040  // ! (has_indices || has_no_indices) means "don't know"
        };
 };
 
@@ -187,7 +203,7 @@ public:
 class info_flags {
 public:
        enum {
-               // answered by class numeric
+               // answered by class numeric and symbols/constants in particular domains
                numeric,
                real,
                rational,
@@ -236,7 +252,10 @@ public:
                has_indices,  // object has at least one index
 
                // answered by class idx
-               idx
+               idx,
+
+               // answered by classes numeric, symbol, add, mul, power
+               expanded
        };
 };