This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[Patch] Fix unary operators and operator != for valarrays


The following patch fixes PR libstdc++/9234 (the unary operators for
valarrays were broken) and the operator!= for valarrays which was also
broken.

The part about the unary operator was approved by Gaby (see PR 9234).
I committed the part the broken operator!= as obvious.
I committed the patch to mainline and the 3.3-branch (where it
applies to valarray_meta.h instead of valarray_before.h).
Previous branches were not affected.


2003-02-03  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>

	PR libstdc++/9234
	* include/bits/valarray_before.h (_UnBase::operator[]): Apply unary
	operator.

	* include/bits/valarray_before.h (__not_equal_to): Use != instead of ==.

	* testsuite/26_numerics/valarray_operators.cc: New test.


===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/bits/valarray_before.h,v
retrieving revision 1.1
diff -u -p -r1.1 valarray_before.h
--- include/bits/valarray_before.h	24 Jan 2003 16:32:11 -0000	1.1
+++ include/bits/valarray_before.h	3 Feb 2003 10:37:53 -0000
@@ -270,7 +270,7 @@ namespace std
   {
     template<typename _Tp>
       bool operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x == __y; }
+      { return __x != __y; }
   };
 
   struct __less
@@ -459,7 +459,7 @@ namespace std
       _UnBase(const _Arg& __e) : _M_expr(__e) {}
 
       value_type operator[](size_t __i) const
-      { return _M_expr[__i]; }
+      { return _Oper()(_M_expr[__i]); }
 
       size_t size() const { return _M_expr.size(); }
===================================================================
 


Here's the testcase:
===================================================================
// { dg-do run }
// 2003-02-03  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>

// Copyright (C) 2003 Free Software Foundation
//
// 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.

#include <valarray>
#include <testsuite_hooks.h>

void test01() // check unary operators
{
  std::valarray<int> u(1);
  u[0]=1;

  VERIFY( (+u)[0] == +1 );
  VERIFY( (-u)[0] == -1 );
  VERIFY( (!u)[0] == !1 );
  VERIFY( (~u)[0] == ~1 );
}

void test02() // check binary operators
{
  std::valarray<int> u(1), v(1);
  u[0]=1;
  v[0]=3;

  VERIFY( (u+ v)[0] == (1+ 3) );
  VERIFY( (u- v)[0] == (1- 3) );
  VERIFY( (u* v)[0] == (1* 3) );
  VERIFY( (u/ v)[0] == (1/ 3) );
  VERIFY( (u% v)[0] == (1% 3) );
  VERIFY( (u^ v)[0] == (1^ 3) );
  VERIFY( (u& v)[0] == (1& 3) );
  VERIFY( (u| v)[0] == (1| 3) );
  VERIFY( (u<<v)[0] == (1<<3) );
  VERIFY( (u>>v)[0] == (1>>3) );
  VERIFY( (u&&v)[0] == (1&&3) );
  VERIFY( (u||v)[0] == (1||3) );
  VERIFY( (u==v)[0] == (1==3) );
  VERIFY( (u!=v)[0] == (1!=3) );
  VERIFY( (u< v)[0] == (1< 3) );
  VERIFY( (u> v)[0] == (1> 3) );
  VERIFY( (u<=v)[0] == (1<=3) );
  VERIFY( (u>=v)[0] == (1>=3) );
}

int main()
{
  test01();
  test02();
  return 0;
}
===================================================================

Regards,
Volker



Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]