merging 1.2 branch into main trunk

[ginac.git] / ginac / exprseq.cpp

diff --git a/ginac/exprseq_suppl.cpp b/ginac/exprseq.cpp
similarity index 75%
rename from ginac/exprseq_suppl.cpp
rename to ginac/exprseq.cpp
index 29bb549ad61caa66e07d0fc747a48966390ff57b..9593b2c61103e99f4e7105560a408ec6ffb11c3f 100644 (file)
--- a/ginac/exprseq_suppl.cpp
+++ b/ginac/exprseq.cpp
@@ -1,7 +1,6 @@
-/** @file exprseq_suppl.cpp
+/** @file exprseq.cpp
  *
- *  Supplement to exprseq.cpp, contains the parts which were not automatically
- *  generated. */
+ *  Implementation of GiNaC's exprseq. */
 
 /*
  *  GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany
@@ -22,23 +21,18 @@
  */
 
 #include "exprseq.h"
-#include "ex.h"
 
 namespace GiNaC {
 
-bool exprseq::info(unsigned inf) const
-{
-       if (inf==info_flags::exprseq)
-               return 1;
-       return basic::info(inf);
-}
+GINAC_IMPLEMENT_REGISTERED_CLASS(exprseq, basic)
 
-ex & exprseq::let_op(int i)
+/** Specialization of container::info() for exprseq. */
+bool exprseq::info(unsigned inf) const
 {
-       GINAC_ASSERT(i>=0);
-       GINAC_ASSERT(i<nops());
-       
-       return seq[i];
+       if (inf == info_flags::exprseq)
+               return true;
+       else
+               return inherited::info(inf);
 }
 
 } // namespace GiNaC