songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Get rid of io_impl.h

This commit is contained in:
Mael Rouxel-Labbé 2020-01-20 11:54:00 +01:00
parent 0e82e7f9ee
commit 75581cad76
3 changed files with 175 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

194
Stream_support/include/CGAL/IO/io.h
View File

@ -298,21 +298,156 @@ Benchmark_rep<T> bmformat( const T& t) { return Benchmark_rep<T>(t); }
template <class T, class F> template <class T, class F>
Benchmark_rep<T,F> bmformat( const T& t, F) { return Benchmark_rep<T,F>(t); } Benchmark_rep<T,F> bmformat( const T& t, F) { return Benchmark_rep<T,F>(t); }
CGAL_EXPORT IO::Mode get_mode(std::ios& i); /*!
\ingroup PkgStreamSupportRef
CGAL_EXPORT IO::Mode set_ascii_mode(std::ios& i); returns the printing mode of the %IO stream `s`.
CGAL_EXPORT IO::Mode set_binary_mode(std::ios& i); \sa `CGAL::IO::Mode`
\sa `CGAL::set_mode()`
\sa `CGAL::set_ascii_mode()`
\sa `CGAL::set_binary_mode()`
\sa `CGAL::set_pretty_mode()`
\sa `CGAL::is_ascii()`
\sa `CGAL::is_binary()`
\sa `CGAL::is_pretty()`
*/
IO::Mode get_mode(std::ios& i) { return static_cast<IO::Mode>(i.iword(IO::Static::get_mode())); }
CGAL_EXPORT IO::Mode set_pretty_mode(std::ios& i); /*!
\ingroup PkgStreamSupportRef
CGAL_EXPORT IO::Mode set_mode(std::ios& i, IO::Mode m); sets the mode of the %IO stream `s` to be the `IO::ASCII` mode.
Returns the previous mode of `s`.
CGAL_EXPORT bool is_pretty(std::ios& i); \sa `CGAL::IO::Mode`
\sa `CGAL::set_mode()`
\sa `CGAL::set_binary_mode()`
\sa `CGAL::set_pretty_mode()`
\sa `CGAL::get_mode()`
\sa `CGAL::is_ascii()`
\sa `CGAL::is_binary()`
\sa `CGAL::is_pretty()`
*/
IO::Mode set_ascii_mode(std::ios& i)
{
IO::Mode m = get_mode(i);
i.iword(IO::Static::get_mode()) = IO::ASCII;
return m;
}
CGAL_EXPORT bool is_ascii(std::ios& i); /*!
\ingroup PkgStreamSupportRef
CGAL_EXPORT bool is_binary(std::ios& i); sets the mode of the %IO stream `s` to be the `IO::BINARY` mode.
Returns the previous mode of `s`.
\sa `CGAL::IO::Mode`
\sa `CGAL::set_mode()`
\sa `CGAL::set_ascii_mode()`
\sa `CGAL::set_pretty_mode()`
\sa `CGAL::get_mode()`
\sa `CGAL::is_ascii()`
\sa `CGAL::is_binary()`
\sa `CGAL::is_pretty()`
*/
IO::Mode set_binary_mode(std::ios& i)
{
IO::Mode m = get_mode(i);
i.iword(IO::Static::get_mode()) = IO::BINARY;
return m;
}
/*!
\ingroup PkgStreamSupportRef
sets the mode of the %IO stream `s` to be the `IO::PRETTY` mode.
Returns the previous mode of `s`.
\sa `CGAL::IO::Mode`
\sa `CGAL::set_mode()`
\sa `CGAL::set_ascii_mode()`
\sa `CGAL::set_binary_mode()`
\sa `CGAL::get_mode()`
\sa `CGAL::is_ascii()`
\sa `CGAL::is_binary()`
\sa `CGAL::is_pretty()`
*/
IO::Mode set_pretty_mode(std::ios& i)
{
IO::Mode m = get_mode(i);
i.iword(IO::Static::get_mode()) = IO::PRETTY;
return m;
}
/*!
\ingroup PkgStreamSupportRef
sets the printing mode of the %IO stream `s`.
\sa `CGAL::IO::Mode`
\sa `CGAL::set_ascii_mode()`
\sa `CGAL::set_binary_mode()`
\sa `CGAL::set_pretty_mode()`
\sa `CGAL::get_mode()`
\sa `CGAL::is_ascii()`
\sa `CGAL::is_binary()`
\sa `CGAL::is_pretty()`
*/
IO::Mode set_mode(std::ios& i, IO::Mode m)
{
IO::Mode old = get_mode(i);
i.iword(IO::Static::get_mode()) = m;
return old;
}
/*!
\ingroup PkgStreamSupportRef
checks if the %IO stream `s` is in `IO::PRETTY` mode.
\sa `CGAL::IO::Mode`
\sa `CGAL::set_mode()`
\sa `CGAL::set_ascii_mode()`
\sa `CGAL::set_binary_mode()`
\sa `CGAL::set_pretty_mode()`
\sa `CGAL::get_mode()`
\sa `CGAL::is_ascii()`
\sa `CGAL::is_binary()`
*/
bool is_pretty(std::ios& i) { return i.iword(IO::Static::get_mode()) == IO::PRETTY; }
/*!
\ingroup PkgStreamSupportRef
checks if the %IO stream `s` is in `IO::ASCII` mode.
\sa `CGAL::IO::Mode`
\sa `CGAL::set_mode()`
\sa `CGAL::set_ascii_mode()`
\sa `CGAL::set_binary_mode()`
\sa `CGAL::set_pretty_mode()`
\sa `CGAL::get_mode()`
\sa `CGAL::is_binary()`
\sa `CGAL::is_pretty()`
*/
bool is_ascii(std::ios& i) { return i.iword(IO::Static::get_mode()) == IO::BINARY; }
/*!
\ingroup PkgStreamSupportRef
checks if the %IO stream `s` is in `IO::BINARY` mode.
\sa `CGAL::IO::Mode`
\sa `CGAL::set_mode()`
\sa `CGAL::set_ascii_mode()`
\sa `CGAL::set_binary_mode()`
\sa `CGAL::set_pretty_mode()`
\sa `CGAL::get_mode()`
\sa `CGAL::is_ascii()`
\sa `CGAL::is_pretty()`
*/
bool is_binary(std::ios& i) { return i.iword(IO::Static::get_mode()) == IO::BINARY; }
template < class T > template < class T >
inline void write(std::ostream& os, const T& t, const io_Read_write&) inline void write(std::ostream& os, const T& t, const io_Read_write&)
@ -412,12 +547,37 @@ inline std::istream &operator>>(std::istream &is, Color& col)
return is; return is;
} }
CGAL_EXPORT const char* mode_name( IO::Mode m ); const char* mode_name( IO::Mode m )
{
static const char* const names[] = {"ASCII", "PRETTY", "BINARY" };
CGAL_assertion( IO::ASCII <= m && m <= IO::BINARY );
return names[m];
}
// From polynomial.h TODO: Where to put this? // From polynomial.h TODO: Where to put this?
CGAL_EXPORT void swallow(std::istream &is, char d); void swallow(std::istream &is, char d)
{
char c;
do { is.get(c); } while(isspace(c));
if(c != d)
{
std::stringstream msg;
msg << "input error: expected '" << d << "' but got '" << c << "'";
CGAL_error_msg( msg.str().c_str() );
}
}
CGAL_EXPORT void swallow(std::istream &is, const std::string& s ); void swallow(std::istream &is, const std::string& s)
{
std::string t;
is >> t;
if(s != t)
{
std::stringstream msg;
msg << "input error: expected '" << s << "' but got '" << t << "'";
CGAL_error_msg( msg.str().c_str() );
}
}
namespace internal { namespace internal {
@ -427,7 +587,7 @@ inline void eat_white_space(std::istream &is)
do do
{ {
c = is.peek(); c = is.peek();
if(c== std::istream::traits_type::eof()) if(c == std::istream::traits_type::eof())
{ {
return; return;
} }
@ -465,7 +625,7 @@ inline bool is_digit(const std::istream& /*is*/, std::istream::int_type c)
{ {
CGAL_assertion(c != std::istream::traits_type::eof()); CGAL_assertion(c != std::istream::traits_type::eof());
return std::isdigit(static_cast<std::istream::char_type>(c), return std::isdigit(static_cast<std::istream::char_type>(c),
std::locale::classic() ); std::locale::classic());
} }
inline std::istream::int_type peek(std::istream& is) inline std::istream::int_type peek(std::istream& is)
@ -515,7 +675,7 @@ inline void read_float_or_quotient(std::istream& is, Rat &z)
is.get(); is.get();
negative = (c == '-'); negative = (c == '-');
internal::eat_white_space(is); internal::eat_white_space(is);
c=internal::peek(is); c = internal::peek(is);
} }
// read n (could be empty) // read n (could be empty)
@ -552,7 +712,7 @@ inline void read_float_or_quotient(std::istream& is, Rat &z)
is >> d; is >> d;
is.flags(old_flags); is.flags(old_flags);
if(!is.fail()) if(!is.fail())
z = negative? compose(-n,d): compose(n,d); z = negative? compose(-n,d) : compose(n,d);
return; return;
} }
@ -603,10 +763,6 @@ inline void read_float_or_quotient(std::istream& is, Rat &z)
} // namespace CGAL } // namespace CGAL
#ifdef CGAL_HEADER_ONLY
#include <CGAL/IO/io_impl.h>
#endif // CGAL_HEADER_ONLY
#include <CGAL/enable_warnings.h> #include <CGAL/enable_warnings.h>
#endif // CGAL_IO_H #endif // CGAL_IO_H

127
Stream_support/include/CGAL/IO/io_impl.h
View File

@ -1,127 +0,0 @@
// Copyright (c) 1997
// Utrecht University (The Netherlands),
// ETH Zurich (Switzerland),
// INRIA Sophia-Antipolis (France),
// Max-Planck-Institute Saarbruecken (Germany),
// and Tel-Aviv University (Israel). All rights reserved.
//
// This file is part of CGAL (www.cgal.org)
//
// $URL$
// $Id$
// SPDX-License-Identifier: LGPL-3.0-or-later OR LicenseRef-Commercial
//
//
// Author(s) : Andreas Fabri
#ifdef CGAL_HEADER_ONLY
#define CGAL_INLINE_FUNCTION inline
#else
#define CGAL_INLINE_FUNCTION
#endif
#include <CGAL/assertions.h>
#include <sstream>
#include <string>
namespace CGAL {
CGAL_INLINE_FUNCTION
IO::Mode
get_mode(std::ios& i)
{
return static_cast<IO::Mode>(i.iword(IO::Static::get_mode()));
}
CGAL_INLINE_FUNCTION
IO::Mode
set_ascii_mode(std::ios& i)
{
IO::Mode m = get_mode(i);
i.iword(IO::Static::get_mode()) = IO::ASCII;
return m;
}
CGAL_INLINE_FUNCTION
IO::Mode
set_binary_mode(std::ios& i)
{
IO::Mode m = get_mode(i);
i.iword(IO::Static::get_mode()) = IO::BINARY;
return m;
}
CGAL_INLINE_FUNCTION
IO::Mode
set_pretty_mode(std::ios& i)
{
IO::Mode m = get_mode(i);
i.iword(IO::Static::get_mode()) = IO::PRETTY;
return m;
}
CGAL_INLINE_FUNCTION
IO::Mode
set_mode(std::ios& i, IO::Mode m)
{
IO::Mode old = get_mode(i);
i.iword(IO::Static::get_mode()) = m;
return old;
}
CGAL_INLINE_FUNCTION
bool
is_pretty(std::ios& i)
{
return i.iword(IO::Static::get_mode()) == IO::PRETTY;
}
CGAL_INLINE_FUNCTION
bool
is_ascii(std::ios& i)
{
return i.iword(IO::Static::get_mode()) == IO::ASCII;
}
CGAL_INLINE_FUNCTION
bool
is_binary(std::ios& i)
{
return i.iword(IO::Static::get_mode()) == IO::BINARY;
}
CGAL_INLINE_FUNCTION
const char*
mode_name( IO::Mode m) {
static const char* const names[] = {"ASCII", "PRETTY", "BINARY" };
CGAL_assertion( IO::ASCII <= m && m <= IO::BINARY );
return names[m];
}
CGAL_INLINE_FUNCTION
void
swallow(std::istream &is, char d) {
char c;
do is.get(c); while (isspace(c));
if (c != d) {
std::stringstream msg;
msg << "input error: expected '" << d << "' but got '" << c << "'";
CGAL_error_msg( msg.str().c_str() );
}
}
CGAL_INLINE_FUNCTION
void
swallow(std::istream &is, const std::string& s ) {
std::string t;
is >> t;
if (s != t) {
std::stringstream msg;
msg << "input error: expected '" << s << "' but got '" << t << "'";
CGAL_error_msg( msg.str().c_str() );
}
}
} //namespace CGAL

22
Stream_support/src/CGAL/io.cpp
View File

@ -1,22 +0,0 @@
// Copyright (c) 1997
// Utrecht University (The Netherlands),
// ETH Zurich (Switzerland),
// INRIA Sophia-Antipolis (France),
// Max-Planck-Institute Saarbruecken (Germany),
// and Tel-Aviv University (Israel). All rights reserved.
//
// This file is part of CGAL (www.cgal.org)
//
// $URL$
// $Id$
// SPDX-License-Identifier: LGPL-3.0-or-later OR LicenseRef-Commercial
//
//
// Author(s) : Andreas Fabri
#ifndef CGAL_HEADER_ONLY
#include <CGAL/IO/io.h>
#include <CGAL/IO/io_impl.h>
#endif