Skip to content

R
riscv-gcc-1
Commit 8339896e by Benjamin Kosnik Committed by Benjamin Kosnik
Options

stdexcept: Remove extra spacing. 

2007-05-11  Benjamin Kosnik  <bkoz@redhat.com>

       * include/std/stdexcept: Remove extra spacing.

        * testsuite/19_diagnostics/stdexceptions.cc: Break into...
        * testsuite/19_diagnostics/bad_exception: ...this. Populate.
        * testsuite/19_diagnostics/logic_error: ... this.
        * testsuite/19_diagnostics/logic_error/what-1.cc: ...this.
        * testsuite/19_diagnostics/logic_error/what-2.cc: ...this.
        * testsuite/19_diagnostics/runtime_error: ...this.
        * testsuite/19_diagnostics/runtime_error/what-1.cc: ...this.
        * testsuite/19_diagnostics/runtime_error/what-2.cc: ...this.
        * testsuite/19_diagnostics/runtime_error/what-3.cc: ...this.
        * testsuite/19_diagnostics/23591_thread-1.c: Move...
        * testsuite/19_diagnostics/bad_exception/23591_thread-1.c: ...here.

From-SVN: r124621
parent 23f24034
Showing with 239 additions and 59 deletions
libstdc++-v3/ChangeLog
2007-05-11 Benjamin Kosnik <bkoz@redhat.com>
* include/std/stdexcept: Remove extra spacing.
* testsuite/19_diagnostics/stdexceptions.cc: Break into...
* testsuite/19_diagnostics/bad_exception: ...this. Populate.
* testsuite/19_diagnostics/logic_error: ... this.
* testsuite/19_diagnostics/logic_error/what-1.cc: ...this.
* testsuite/19_diagnostics/logic_error/what-2.cc: ...this.
* testsuite/19_diagnostics/runtime_error: ...this.
* testsuite/19_diagnostics/runtime_error/what-1.cc: ...this.
* testsuite/19_diagnostics/runtime_error/what-2.cc: ...this.
* testsuite/19_diagnostics/runtime_error/what-3.cc: ...this.
* testsuite/19_diagnostics/23591_thread-1.c: Move...
* testsuite/19_diagnostics/bad_exception/23591_thread-1.c: ...here.
2007-05-10 Paolo Carlini <pcarlini@suse.de>
* 27_io/objects/wchar_t/11.cc: Include <cstring>.
......
libstdc++-v3/include/std/stdexcept
// Standard exception classes -*- C++ -*-
// Copyright (C) 2001, 2002, 2005 Free Software Foundation, Inc.
// Copyright (C) 2001, 2002, 2005, 2007 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
......@@ -57,7 +57,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
public:
/** Takes a character string describing the error. */
explicit
logic_error(const string& __arg);
logic_error(const string& __arg);
virtual
~logic_error() throw();
......@@ -73,14 +73,14 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
class domain_error : public logic_error
{
public:
explicit domain_error(const string& __arg);
explicit domain_error(const string& __arg);
};
/** Thrown to report invalid arguments to functions. */
class invalid_argument : public logic_error
{
public:
explicit invalid_argument(const string& __arg);
explicit invalid_argument(const string& __arg);
};
/** Thrown when an object is constructed that would exceed its maximum
......@@ -88,7 +88,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
class length_error : public logic_error
{
public:
explicit length_error(const string& __arg);
explicit length_error(const string& __arg);
};
/** This represents an argument whose value is not within the expected
......@@ -96,7 +96,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
class out_of_range : public logic_error
{
public:
explicit out_of_range(const string& __arg);
explicit out_of_range(const string& __arg);
};
/** Runtime errors represent problems outside the scope of a program;
......@@ -111,7 +111,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
public:
/** Takes a character string describing the error. */
explicit
runtime_error(const string& __arg);
runtime_error(const string& __arg);
virtual
~runtime_error() throw();
......@@ -126,21 +126,21 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
class range_error : public runtime_error
{
public:
explicit range_error(const string& __arg);
explicit range_error(const string& __arg);
};
/** Thrown to indicate arithmetic overflow. */
class overflow_error : public runtime_error
{
public:
explicit overflow_error(const string& __arg);
explicit overflow_error(const string& __arg);
};
/** Thrown to indicate arithmetic underflow. */
class underflow_error : public runtime_error
{
public:
explicit underflow_error(const string& __arg);
explicit underflow_error(const string& __arg);
};
_GLIBCXX_END_NAMESPACE
......
libstdc++-v3/testsuite/19_diagnostics/logic_error/what-1.cc 0 → 100644
// 2001-02-26 Benjamin Kosnik <bkoz@redhat.com>
// Copyright (C) 2001, 2002, 2007 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
// USA.
// 19.1 Exception classes
#include <string>
#include <stdexcept>
#include <testsuite_hooks.h>
// libstdc++/1972
void test01()
{
bool test __attribute__((unused)) = true;
std::string s("lack of sunlight, no water error");
// 1
std::logic_error obj1 = std::logic_error(s);
// 2
std::logic_error obj2(s);
VERIFY( std::strcmp(obj1.what(), s.data()) == 0 );
VERIFY( std::strcmp(obj2.what(), s.data()) == 0 );
}
void test02()
{
bool test __attribute__((unused)) = true;
std::string s("lack of sunlight error");
std::domain_error x(s);
VERIFY( std::strcmp(x.what(), s.data()) == 0 );
}
int main(void)
{
test01();
test02();
return 0;
}
libstdc++-v3/testsuite/19_diagnostics/logic_error/what-2.cc 0 → 100644
// 2001-02-26 Benjamin Kosnik <bkoz@redhat.com>
// Copyright (C) 2001, 2002, 2007 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
// USA.
// 19.1 Exception classes
#include <string>
#include <stdexcept>
#include <testsuite_hooks.h>
// libstdc++/2089
class fuzzy_logic : public std::logic_error
{
public:
fuzzy_logic() : std::logic_error("whoa") { }
};
void test03()
{
bool test __attribute__((unused)) = true;
try
{ throw fuzzy_logic(); }
catch(const fuzzy_logic& obj)
{ VERIFY( std::strcmp("whoa", obj.what()) == 0 ); }
catch(...)
{ VERIFY( false ); }
}
int main(void)
{
test03();
return 0;
}
libstdc++-v3/testsuite/19_diagnostics/runtime_error/what-1.cc 0 → 100644
// 2001-02-26 Benjamin Kosnik <bkoz@redhat.com>
// Copyright (C) 2001, 2002, 2007 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
// USA.
// 19.1 Exception classes
#include <string>
#include <stdexcept>
#include <testsuite_hooks.h>
// libstdc++/1972
void test01()
{
bool test __attribute__((unused)) = true;
std::string s("lack of sunlight, no water error");
// 1
std::runtime_error obj1 = std::runtime_error(s);
// 2
std::runtime_error obj2(s);
VERIFY( std::strcmp(obj1.what(), s.data()) == 0 );
VERIFY( std::strcmp(obj2.what(), s.data()) == 0 );
}
void test02()
{
bool test __attribute__((unused)) = true;
std::string s("lack of sunlight error");
std::range_error x(s);
VERIFY( std::strcmp(x.what(), s.data()) == 0 );
}
int main(void)
{
test01();
test02();
return 0;
}
libstdc++-v3/testsuite/19_diagnostics/runtime_error/what-2.cc 0 → 100644
// 2001-02-26 Benjamin Kosnik <bkoz@redhat.com>
// Copyright (C) 2001, 2002, 2007 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
// USA.
// 19.1 Exception classes
#include <string>
#include <stdexcept>
#include <testsuite_hooks.h>
// libstdc++/2089
class fuzzy_logic : public std::runtime_error
{
public:
fuzzy_logic() : std::runtime_error("whoa") { }
};
void test03()
{
bool test __attribute__((unused)) = true;
try
{ throw fuzzy_logic(); }
catch(const fuzzy_logic& obj)
{ VERIFY( std::strcmp("whoa", obj.what()) == 0 ); }
catch(...)
{ VERIFY( false ); }
}
int main(void)
{
test03();
return 0;
}
libstdc++-v3/testsuite/19_diagnostics/stdexceptions.cc → libstdc++-v3/testsuite/19_diagnostics/runtime_error/what-3.cc
// 2001-02-26 Benjamin Kosnik <bkoz@redhat.com>
// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
// Free Software Foundation, Inc.
// Copyright (C) 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
......@@ -22,52 +21,9 @@
// 19.1 Exception classes
#include <string>
#include <cstring>
#include <stdexcept>
#include <testsuite_hooks.h>
// libstdc++/1972
void test01()
{
bool test __attribute__((unused)) = true;
std::string s("lack of sunlight, no water error");
// 1
std::logic_error obj = std::logic_error(s);
// 2
// std::logic_error obj((std::string)strlit);
VERIFY( std::strcmp(obj.what(), s.data()) == 0 );
}
void test02()
{
bool test __attribute__((unused)) = true;
std::string s("lack of sunlight error");
std::domain_error x(s);
VERIFY( std::strcmp(x.what(), s.data()) == 0 );
}
// libstdc++/2089
class fuzzy_logic : public std::logic_error
{
public:
fuzzy_logic() : std::logic_error("whoa") { }
};
void test03()
{
bool test __attribute__((unused)) = true;
try
{ throw fuzzy_logic(); }
catch(const fuzzy_logic& obj)
{ VERIFY( std::strcmp("whoa", obj.what()) == 0 ); }
catch(...)
{ VERIFY( false ); }
}
// test copy ctors and assignment operators
// libstdc++/1972
// via Greg Bumgardner <bumgard@roguewave.com>
......@@ -107,10 +63,6 @@ void test04()
int main(void)
{
test01();
test02();
test03();
test04();
return 0;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment