--- parser3/src/include/pa_common.h 2001/10/08 09:04:08 1.52 +++ parser3/src/include/pa_common.h 2001/11/14 11:26:17 1.63 @@ -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.52 2001/10/08 09:04:08 parser Exp $ + $Id: pa_common.h,v 1.63 2001/11/14 11:26:17 paf Exp $ */ #ifndef PA_COMMON_H @@ -16,27 +16,6 @@ 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 -#endif - #ifndef vsnprintf int __vsnprintf(char *, size_t, const char *, va_list); # define vsnprintf __vsnprintf @@ -46,6 +25,16 @@ int __snprintf(char *, size_t, const cha # define snprintf __snprintf #endif +#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 #define X_OK 1 @@ -68,6 +57,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 +114,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 +160,7 @@ inline int min(int a,int b){ return a @@ -159,7 +181,6 @@ void back_slashes_to_slashes(char *s); #endif bool StrEqNc(const char *s1, const char *s2, bool strict=true); -char *unquote(char*& current, char stop_at); #define SECS_PER_DAY (60*60*24) int getMonthDays(int year, int month);