Makefile.am (bits_headers): Remove slice.h

	* include/Makefile.am (bits_headers): Remove slice.h
	* include/Makefile.in: Regenerate.
	* include/bits/slice.h (slice): move to include/bits/slice_array.h
	* include/bits/slice.h Remove.
	* include/std/std_valarray.h: Don't #include bits/slice.h anymore.
	* include/bits/slice_array.h: Comply to official coding styles.
	* testsuite/26_numerics/slice.cc: New test.
:w
:q

From-SVN: r55470

libstdc++-v3/ChangeLog

+2002-07-16  Gabriel Dos Reis  <gdr@nerim.net>
+
+	* include/Makefile.am (bits_headers): Remove slice.h
+	* include/Makefile.in: Regenerate.
+	* include/bits/slice.h (slice): move to include/bits/slice_array.h
+	* include/bits/slice.h Remove.
+	* include/std/std_valarray.h: Don't #include bits/slice.h anymore.
+	* include/bits/slice_array.h: Comply to official coding styles.
+	* testsuite/26_numerics/slice.cc: New test.
+
 2002-07-15  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
 
 	* config/os/solaris/solaris2.5/ctype_base.h (ctype_base): Fix

libstdc++-v3/include/Makefile.am

@@ -62,7 +62,6 @@ bits_headers = \
 	${bits_srcdir}/pthread_allocimpl.h \
 	${bits_srcdir}/stream_iterator.h \
 	${bits_srcdir}/streambuf_iterator.h \
-	${bits_srcdir}/slice.h \
 	${bits_srcdir}/slice_array.h \
 	${bits_srcdir}/sstream.tcc \
 	${bits_srcdir}/stl_algo.h \

libstdc++-v3/include/bits/slice.h

-// The template and inlines for the -*- C++ -*- slice class.
-
-// Copyright (C) 1997-1999, 2001 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-// Written by Gabriel Dos Reis <Gabriel.Dos-Reis@DPTMaths.ENS-Cachan.Fr>
-
-/** @file slice.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _CPP_BITS_SLICE_H
-#define _CPP_BITS_SLICE_H 1
-
-#pragma GCC system_header
-
-namespace std
-{
-
-class slice
-{
-public:
-    slice ();
-    slice (size_t, size_t, size_t);
-
-    size_t start () const;
-    size_t size () const;
-    size_t stride () const;
-
-private:
-    size_t _M_off;                      // offset
-    size_t _M_sz;			// size
-    size_t _M_st;			// stride unit
-};
-
-inline slice::slice () {}
-
-inline slice::slice (size_t __o, size_t __d, size_t __s)
-        : _M_off (__o), _M_sz (__d), _M_st (__s) {}
-
-inline size_t
-slice::start () const
-  { return _M_off; }
-
-inline size_t
-slice::size () const
-  { return _M_sz; }
-
-inline size_t
-slice::stride () const
-  { return _M_st; }
-
-} // std::
-
-
-#endif /* _CPP_BITS_SLICE_H */
-
-// Local Variables:
-// mode:c++
-// End:

libstdc++-v3/include/bits/slice_array.h

 // The template and inlines for the -*- C++ -*- slice_array class.
 
-// Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -41,120 +41,156 @@
 
 namespace std
 {
+  class slice
+  {
+  public:
+    slice();
+    slice(size_t, size_t, size_t);
+    
+    size_t start() const;
+    size_t size() const;
+    size_t stride() const;
     
-    template<typename _Tp>
+  private:
+    size_t _M_off;                      // offset
+    size_t _M_sz;			// size
+    size_t _M_st;			// stride unit
+  };
+
+  // The default constructor constructor is not required to initialize
+  // data members with any meaningful values, so we choose to do nothing.
+  inline 
+  slice::slice() {}
+  
+  inline 
+  slice::slice(size_t __o, size_t __d, size_t __s)
+    : _M_off(__o), _M_sz(__d), _M_st(__s) {}
+  
+  inline size_t
+  slice::start() const
+  { return _M_off; }
+  
+  inline size_t
+  slice::size() const
+  { return _M_sz; }
+  
+  inline size_t
+  slice::stride() const
+  { return _M_st; }
+
+  template<typename _Tp>
     class slice_array
     {
     public:
-        typedef _Tp value_type;
+      typedef _Tp value_type;
 
       // This constructor is implemented since we need to return a value.
-      slice_array (const slice_array&);
+      slice_array(const slice_array&);
 
       // This operator must be public.  See DR-253.
-      slice_array& operator= (const slice_array&);
-
-        void operator=   (const valarray<_Tp>&) const;
-        void operator*=  (const valarray<_Tp>&) const;
-        void operator/=  (const valarray<_Tp>&) const;
-        void operator%=  (const valarray<_Tp>&) const;
-        void operator+=  (const valarray<_Tp>&) const;
-        void operator-=  (const valarray<_Tp>&) const;
-        void operator^=  (const valarray<_Tp>&) const;
-        void operator&=  (const valarray<_Tp>&) const;
-        void operator|=  (const valarray<_Tp>&) const;
-        void operator<<= (const valarray<_Tp>&) const;
-        void operator>>= (const valarray<_Tp>&) const;
-        void operator= (const _Tp &);
-        //        ~slice_array ();
-        
-        template<class _Dom>
-        void operator=   (const _Expr<_Dom,_Tp>&) const;
-        template<class _Dom>
-        void operator*=  (const _Expr<_Dom,_Tp>&) const;
-        template<class _Dom>
-        void operator/=  (const _Expr<_Dom,_Tp>&) const;
-        template<class _Dom>
-        void operator%=  (const _Expr<_Dom,_Tp>&) const;
-        template<class _Dom>
-        void operator+=  (const _Expr<_Dom,_Tp>&) const;
-        template<class _Dom>
-        void operator-=  (const _Expr<_Dom,_Tp>&) const;
-        template<class _Dom>
-        void operator^=  (const _Expr<_Dom,_Tp>&) const;
-        template<class _Dom>
-        void operator&=  (const _Expr<_Dom,_Tp>&) const;
-        template<class _Dom>
-        void operator|=  (const _Expr<_Dom,_Tp>&) const;
-        template<class _Dom>
-        void operator<<= (const _Expr<_Dom,_Tp>&) const;
-        template<class _Dom>
-        void operator>>= (const _Expr<_Dom,_Tp>&) const;
-        
+      slice_array& operator=(const slice_array&);
+
+      void operator=(const valarray<_Tp>&) const;
+      void operator*=(const valarray<_Tp>&) const;
+      void operator/=(const valarray<_Tp>&) const;
+      void operator%=(const valarray<_Tp>&) const;
+      void operator+=(const valarray<_Tp>&) const;
+      void operator-=(const valarray<_Tp>&) const;
+      void operator^=(const valarray<_Tp>&) const;
+      void operator&=(const valarray<_Tp>&) const;
+      void operator|=(const valarray<_Tp>&) const;
+      void operator<<=(const valarray<_Tp>&) const;
+      void operator>>=(const valarray<_Tp>&) const;
+      void operator=(const _Tp &);
+      //        ~slice_array ();
+
+      template<class _Dom>
+	void operator=(const _Expr<_Dom,_Tp>&) const;
+      template<class _Dom>
+	void operator*=(const _Expr<_Dom,_Tp>&) const;
+      template<class _Dom>
+	void operator/=(const _Expr<_Dom,_Tp>&) const;
+      template<class _Dom>
+	void operator%=(const _Expr<_Dom,_Tp>&) const;
+      template<class _Dom>
+	void operator+=(const _Expr<_Dom,_Tp>&) const;
+      template<class _Dom>
+	void operator-=(const _Expr<_Dom,_Tp>&) const;
+      template<class _Dom>
+	void operator^=(const _Expr<_Dom,_Tp>&) const;
+      template<class _Dom>
+	void operator&=(const _Expr<_Dom,_Tp>&) const;
+      template<class _Dom>
+	void operator|=(const _Expr<_Dom,_Tp>&) const;
+      template<class _Dom>
+	void operator<<=(const _Expr<_Dom,_Tp>&) const;
+      template<class _Dom>
+	void operator>>=(const _Expr<_Dom,_Tp>&) const;
+
     private:
-        friend class valarray<_Tp>;
-        slice_array(_Array<_Tp>, const slice&);
-        
-        const size_t     _M_sz;
-        const size_t     _M_stride;
-        const _Array<_Tp> _M_array;
+      friend class valarray<_Tp>;
+      slice_array(_Array<_Tp>, const slice&);
+
+      const size_t     _M_sz;
+      const size_t     _M_stride;
+      const _Array<_Tp> _M_array;
 
-        // not implemented
-        slice_array ();
+      // not implemented
+      slice_array();
     };
 
-    template<typename _Tp>
-    inline slice_array<_Tp>::slice_array (_Array<_Tp> __a, const slice& __s)
-            : _M_sz (__s.size ()), _M_stride (__s.stride ()),
-              _M_array (__a.begin () + __s.start ()) {}
+  template<typename _Tp>
+    inline 
+    slice_array<_Tp>::slice_array(_Array<_Tp> __a, const slice& __s)
+      : _M_sz(__s.size()), _M_stride(__s.stride()),
+	_M_array(__a.begin() + __s.start()) {}
 
+  template<typename _Tp>
+    inline 
+    slice_array<_Tp>::slice_array(const slice_array<_Tp>& a)
+      : _M_sz(a._M_sz), _M_stride(a._M_stride), _M_array(a._M_array) {}
     
-    template<typename _Tp>
-    inline slice_array<_Tp>::slice_array(const slice_array<_Tp>& a)
-            : _M_sz(a._M_sz), _M_stride(a._M_stride), _M_array(a._M_array) {}
-    
-    //    template<typename _Tp>
-    //    inline slice_array<_Tp>::~slice_array () {}
+  //    template<typename _Tp>
+  //    inline slice_array<_Tp>::~slice_array () {}
 
   template<typename _Tp>
-  inline slice_array<_Tp>&
-  slice_array<_Tp>::operator=(const slice_array<_Tp>& __a)
-  {
-    __valarray_copy(_M_array, _M_sz, _M_stride, __a._M_array, __a._M_stride);
-    return *this;
-  }
-
+    inline slice_array<_Tp>&
+    slice_array<_Tp>::operator=(const slice_array<_Tp>& __a)
+    {
+      __valarray_copy(_M_array, _M_sz, _M_stride, __a._M_array, __a._M_stride);
+      return *this;
+    }
 
-    template<typename _Tp>
+  template<typename _Tp>
     inline void
-    slice_array<_Tp>::operator= (const _Tp& __t) 
-    { __valarray_fill (_M_array, _M_sz, _M_stride, __t); }
+    slice_array<_Tp>::operator=(const _Tp& __t) 
+    { __valarray_fill(_M_array, _M_sz, _M_stride, __t); }
     
-    template<typename _Tp>
+  template<typename _Tp>
     inline void
-    slice_array<_Tp>::operator= (const valarray<_Tp>& __v) const
+    slice_array<_Tp>::operator=(const valarray<_Tp>& __v) const
     { __valarray_copy (_Array<_Tp> (__v), _M_array, _M_sz, _M_stride); }
     
-    template<typename _Tp>
-    template<class _Dom>
+  template<typename _Tp>
+  template<class _Dom>
     inline void
-    slice_array<_Tp>::operator= (const _Expr<_Dom,_Tp>& __e) const
+    slice_array<_Tp>::operator=(const _Expr<_Dom,_Tp>& __e) const
     { __valarray_copy (__e, _M_sz, _M_array, _M_stride); }
 
 #undef _DEFINE_VALARRAY_OPERATOR
-#define _DEFINE_VALARRAY_OPERATOR(op, name)				\
+#define _DEFINE_VALARRAY_OPERATOR(_Op,_Nname)				\
 template<typename _Tp>							\
 inline void								\
-slice_array<_Tp>::operator op##= (const valarray<_Tp>& __v) const	\
+slice_array<_Tp>::operator _Op##= (const valarray<_Tp>& __v) const	\
 {									\
-  _Array_augmented_##name (_M_array, _M_sz, _M_stride, _Array<_Tp> (__v));\
+  _Array_augmented_##_Name (_M_array, _M_sz, _M_stride, _Array<_Tp> (__v));\
 }									\
 									\
 template<typename _Tp> template<class _Dom>				\
 inline void								\
-slice_array<_Tp>::operator op##= (const _Expr<_Dom,_Tp>& __e) const	\
+slice_array<_Tp>::operator _Op##= (const _Expr<_Dom,_Tp>& __e) const	\
 {									\
-    _Array_augmented_##name (_M_array, _M_stride, __e, _M_sz);		\
+    _Array_augmented_##_Name (_M_array, _M_stride, __e, _M_sz);		\
 }
         
 

libstdc++-v3/include/std/std_valarray.h

@@ -254,7 +254,6 @@ namespace std
 
 } // std::
       
-#include <bits/slice.h>
 #include <bits/slice_array.h>
 #include <bits/gslice.h>
 #include <bits/gslice_array.h>

libstdc++-v3/testsuite/26_numerics/slice.cc

+// 20020717 gdr
+
+// Copyright (C) 2002 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// Test slice class invariants
+
+#include <valarray>
+#include <cstdlib>
+#include <testsuite_hooks.h>
+
+bool
+construction(int start, int size, int stride)
+{
+  std::slice s(start, size, stride);
+  return s.start() == start && s.size() == size && s.stride() == stride;
+}
+
+bool
+copy(int start, int size, int stride)
+{
+  std::slice s(start, size, stride);
+  std::slice t = s;
+  return t.start() == start && t.size() == size && t.stride() == stride;
+}
+
+bool
+assignment(int start, int size, int stride)
+{
+  std::slice s(start, size, stride);
+  std::slice t;
+  t = s;
+  return t.start() == start && t.size() == size && t.stride() == stride;
+}
+
+
+int main()
+{
+  std::srand(20020717);         using std::rand;
+  VERIFY(construction(rand(), rand(), rand()));
+
+  VERIFY(copy(rand(), rand(), rand()));
+
+  VERIFY(assignment(rand(), rand(), rand()));
+
+  return 0;
+}