--- parser3/src/include/pa_common.h 2001/10/08 15:14:07 1.53 +++ parser3/src/include/pa_common.h 2001/11/14 13:10:30 1.65 @@ -2,9 +2,9 @@ Parser: commonly used functions. Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) + Author: Alexander Petrosyan (http://paf.design.ru) - $Id: pa_common.h,v 1.53 2001/10/08 15:14:07 parser Exp $ + $Id: pa_common.h,v 1.65 2001/11/14 13:10:30 paf Exp $ */ #ifndef PA_COMMON_H @@ -17,34 +17,29 @@ class Value; #if _MSC_VER - -#ifndef open -# define open _open -#endif -#ifndef close -# define close _close -#endif -#ifndef read -# define read _read -#endif -#ifndef write -# define write _write -#endif -#ifndef stat -# define stat _stat -#endif -#ifndef lseek -# define lseek _lseek +// system one called "_snprintf" +#else +// remember system one +inline int _vsnprintf(char *b, size_t s, const char *f, va_list l) { return snprintf(b, s, f, l); } #endif -#ifndef vsnprintf +// replace system s*nprintf with our versions +#undef vsnpritnf int __vsnprintf(char *, size_t, const char *, va_list); -# define vsnprintf __vsnprintf -#endif -#ifndef snprintf +#define vsnprintf __vsnprintf +#undef snprintf int __snprintf(char *, size_t, const char *, ...); -# define snprintf __snprintf -#endif +#define snprintf __snprintf + +#if _MSC_VER +/* +inline int open( const char *filename, int oflag ) { return _open(filename, oflag); } +inline int close( int handle ) { return _close(handle); } +inline int read( int handle, void *buffer, unsigned int count ) { return _read(handle,buffer,count); } +inline int write( int handle, const void *buffer, unsigned int count ) { return _write(handle,buffer,count); } +inline int stat( const char *path, struct _stat *buffer ) { return _stat(path, buffer); } +inline long lseek( int handle, long offset, int origin ) { return _lseek(handle, offset, origin); } +*/ //access #define F_OK 0 @@ -68,6 +63,38 @@ int __snprintf(char *, size_t, const cha #endif +#ifdef HAVE_TRUNC +# ifndef trunc +extern "C" double trunc(double); +# endif +#else +inline double trunc(double param) { return param > 0? floor(param) : ceil(param); } +#endif + +#ifdef HAVE_ROUND +# ifndef round +extern "C" double round(double); +# endif +#else +inline double round(double param) { return floor(param+0.5); } +#endif +#ifdef HAVE_SIGN +# ifndef sign +extern "C" double sign(double); +# endif +#else +inline double sign(double param) { return param > 0 ? 1 : ( param < 0 ? -1 : 0 ); } +#endif + + +/** under WIN32 "t" mode fixes DOS chars OK, + can't say that about other systems/ line break styles +*/ +void fix_line_breaks( + char *buf, + size_t& size ///< may change! used to speedup next actions + ); + /** read specified text file using pool, if fail_on_read_problem is true[default] throws an exception @@ -93,7 +120,8 @@ bool file_read(Pool& pool, const String& void file_write(Pool& pool, const String& file_spec, const void *data, size_t size, - bool as_text/*, + bool as_text, + bool do_append=false/*, bool exclusive=false*/); /** @@ -138,7 +166,7 @@ inline int min(int a,int b){ return a