X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fflags.h;h=f147fc03612f3def4af2018a9b32f052e84b585e;hp=7c51b75d2ecd7d29cb29dcb8c3b3fe35240e9208;hb=3c3275884e65193743d4b2bcd98637949791aef8;hpb=ea5d361d94e49ca3f3b73db8c9812ee519f0633f

diff --git a/ginac/flags.h b/ginac/flags.h
index 7c51b75d..f147fc03 100644
--- 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
@@ -30,7 +30,16 @@ class expand_options {
 public:
 	enum {
 		expand_indexed = 0x0001,      ///< expands (a+b).i to a.i+b.i
-		expand_function_args = 0x0002 ///< expands the arguments of functions
+		expand_function_args = 0x0002, ///< expands the arguments of functions
+		expand_rename_idx = 0x0004 ///< used internally by mul::expand()
+	};
+};
+
+/** Flags to control the behavior of has(). */
+class has_options {
+public:
+	enum {
+		algebraic = 0x0001              ///< enable algebraic matching
 	};
 };
 
@@ -44,7 +53,11 @@ public:
 		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()
-		no_index_renaming = 0x0010
+		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
 	};
 };
 
@@ -53,7 +66,8 @@ class domain {
 public:
 	enum {
 		complex,
-		real
+		real,
+		positive
 	};
 };
 
@@ -180,7 +194,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"
 	};
 };
 
@@ -188,7 +204,7 @@ public:
 class info_flags {
 public:
 	enum {
-		// answered by class numeric
+		// answered by class numeric and symbols/constants in particular domains
 		numeric,
 		real,
 		rational,
@@ -237,7 +253,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
 	};
 };