diff --git a/ase/ase.bdsgroup b/ase/ase.bdsgroup index b9e21dfd..ddc23fe5 100644 --- a/ase/ase.bdsgroup +++ b/ase/ase.bdsgroup @@ -11,9 +11,11 @@ cmn\asecmn.bdsproj awk\aseawk.bdsproj + awk\aseawk++.bdsproj utl\aseutl.bdsproj test\awk\asetestawk.bdsproj - asecmn.lib aseawk.lib aseutl.lib asetestawk.exe + test\awk\asetestawk++.bdsproj + asecmn.lib aseawk.lib aseawk++.lib aseutl.lib asetestawk.exe asetestawk++.exe diff --git a/ase/awk/Awk.cpp b/ase/awk/Awk.cpp index e8af1757..fac412f5 100644 --- a/ase/awk/Awk.cpp +++ b/ase/awk/Awk.cpp @@ -1,5 +1,5 @@ /* - * $Id: Awk.cpp,v 1.40 2007/05/28 13:53:31 bacon Exp $ + * $Id: Awk.cpp,v 1.41 2007/06/16 13:34:47 bacon Exp $ */ #include @@ -163,6 +163,7 @@ namespace ASE return (char*)ptr+ASE_SIZEOF(awk); } +#if !defined(__BORLANDC__) void Awk::Argument::operator delete (void* ptr, awk_t* awk) { ase_awk_free (awk, (char*)ptr-ASE_SIZEOF(awk)); @@ -172,6 +173,7 @@ namespace ASE { ase_awk_free (awk, (char*)ptr-ASE_SIZEOF(awk)); } +#endif void Awk::Argument::operator delete (void* ptr) { diff --git a/ase/awk/Awk.hpp b/ase/awk/Awk.hpp index bf283325..8826ed27 100644 --- a/ase/awk/Awk.hpp +++ b/ase/awk/Awk.hpp @@ -1,5 +1,5 @@ /* - * $Id: Awk.hpp,v 1.38 2007/05/28 13:53:31 bacon Exp $ + * $Id: Awk.hpp,v 1.39 2007/06/16 13:34:47 bacon Exp $ */ #ifndef _ASE_AWK_AWK_HPP_ @@ -136,9 +136,11 @@ namespace ASE void* operator new (size_t n, awk_t* awk) throw (); void* operator new[] (size_t n, awk_t* awk) throw (); + #if !defined(__BORLANDC__) // deletion when initialization fails void operator delete (void* p, awk_t* awk); void operator delete[] (void* p, awk_t* awk); + #endif // normal deletion void operator delete (void* p); diff --git a/ase/awk/aseawk++.bdsproj b/ase/awk/aseawk++.bdsproj new file mode 100644 index 00000000..7dc3d36e --- /dev/null +++ b/ase/awk/aseawk++.bdsproj @@ -0,0 +1,265 @@ + + + + + + + + + + + + Awk.cpp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + False + 1 + 0 + 0 + 0 + False + False + False + False + False + 1033 + 1252 + + + + + 1.0.0.0 + + + + + + 1.0.0.0 + + + + + + + + + False + + + + + + + False + + False + + True + False + + + + + + + + + + + mkdir $(PROJECTDIR)..\release\lib +mkdir $(PROJECTDIR)..\debug\lib + + + + + diff --git a/ase/awk/aseawk.bdsproj b/ase/awk/aseawk.bdsproj index 6217f18e..2f59ed0b 100644 --- a/ase/awk/aseawk.bdsproj +++ b/ase/awk/aseawk.bdsproj @@ -56,6 +56,7 @@ + @@ -263,11 +264,11 @@ - - mkdir $(PROJECTDIR)..\release\lib + + mkdir $(PROJECTDIR)..\release\lib mkdir $(PROJECTDIR)..\debug\lib - - + + diff --git a/ase/change.log b/ase/change.log index 362576fb..b4f2d92b 100644 --- a/ase/change.log +++ b/ase/change.log @@ -1,3 +1,7 @@ +[0.2.1] + +* changed the wrong macro name WIN32 to _WIN32 in utl/stdio.h + [0.2.0] * fixed bug (nextofile shown as nextfile in source output) diff --git a/ase/cmn/asecmn.bdsproj b/ase/cmn/asecmn.bdsproj index 8bbdd25b..d386cf49 100644 --- a/ase/cmn/asecmn.bdsproj +++ b/ase/cmn/asecmn.bdsproj @@ -63,6 +63,7 @@ + @@ -235,11 +236,11 @@ - - mkdir $(PROJECTDIR)..\release\lib + + mkdir $(PROJECTDIR)..\release\lib mkdir $(PROJECTDIR)..\debug\lib - - + + diff --git a/ase/test/awk/Awk.cpp b/ase/test/awk/Awk.cpp index 14630fd3..ca8595bd 100644 --- a/ase/test/awk/Awk.cpp +++ b/ase/test/awk/Awk.cpp @@ -1,5 +1,5 @@ /* - * $Id: Awk.cpp,v 1.23 2007/05/26 10:23:52 bacon Exp $ + * $Id: Awk.cpp,v 1.25 2007/06/16 14:09:48 bacon Exp $ */ #include @@ -40,12 +40,12 @@ public: if (heap == ASE_NULL) return -1; #endif - int n = StdAwk::open (); + int n = ASE::StdAwk::open (); - if (addFunction (ASE_T("sleep"), 1, 1, + if (addFunction (ASE_T("sleep"), 1, 1, (FunctionHandler)&TestAwk::sleep) == -1) { - StdAwk::close (); + ASE::StdAwk::close (); #ifdef _WIN32 HeapDestroy (heap); heap = ASE_NULL; @@ -58,7 +58,7 @@ public: void close () { - StdAwk::close (); + ASE::StdAwk::close (); numConInFiles = 0; numConOutFiles = 0; @@ -105,7 +105,7 @@ public: { srcInName = in; srcOutName = out; - return StdAwk::parse (); + return ASE::StdAwk::parse (); } protected: @@ -221,24 +221,24 @@ protected: // console io handlers int openConsole (Console& io) { - Awk::Console::Mode mode = io.getMode(); + ASE::Awk::Console::Mode mode = io.getMode(); FILE* fp = ASE_NULL; const char_t* fn = ASE_NULL; switch (mode) { - case Awk::Console::READ: + case ASE::Awk::Console::READ: if (numConInFiles == 0) fp = stdin; - else + else { fn = conInFile[0]; fp = ase_fopen (fn, ASE_T("r")); } break; - case Awk::Console::WRITE: + case ASE::Awk::Console::WRITE: if (numConOutFiles == 0) fp = stdout; - else + else { fn = conOutFile[0]; fp = ase_fopen (fn, ASE_T("w")); @@ -335,7 +335,7 @@ protected: int nextConsole (Console& io) { - Awk::Console::Mode mode = io.getMode(); + ASE::Awk::Console::Mode mode = io.getMode(); ConTrack* t = (ConTrack*)io.getHandle(); FILE* ofp = t->handle; FILE* nfp = ASE_NULL; @@ -343,13 +343,13 @@ protected: switch (mode) { - case Awk::Console::READ: + case ASE::Awk::Console::READ: if (t->nextConIdx >= numConInFiles) return 0; fn = conInFile[t->nextConIdx]; nfp = ase_fopen (fn, ASE_T("r")); break; - case Awk::Console::WRITE: + case ASE::Awk::Console::WRITE: if (t->nextConIdx >= numConOutFiles) return 0; fn = conOutFile[t->nextConIdx]; nfp = ase_fopen (fn, ASE_T("w")); @@ -358,7 +358,7 @@ protected: if (nfp == ASE_NULL) return -1; - if (fn != ASE_NULL) + if (fn != ASE_NULL) { if (io.setFileName (fn) == -1) { @@ -619,7 +619,7 @@ int awk_main (int argc, ase_char_t* argv[]) return 0; } -int ase_main (int argc, ase_achar_t* argv[]) +extern "C" int ase_main (int argc, ase_achar_t* argv[]) { int n; diff --git a/ase/test/awk/asetestawk++.bdsproj b/ase/test/awk/asetestawk++.bdsproj new file mode 100644 index 00000000..e0d708ba --- /dev/null +++ b/ase/test/awk/asetestawk++.bdsproj @@ -0,0 +1,265 @@ + + + + + + + + + + + + Awk.cpp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + False + 1 + 0 + 0 + 0 + False + False + False + False + False + 1033 + 1252 + + + + + 1.0.0.0 + + + + + + 1.0.0.0 + + + + + + + arg.awk "" + + True + C:\projects\ase\test\awk + + + + + + False + + False + + True + False + + + Borland InterBase Express Components + Intraweb 8.0 Design Package for Borland Development Studio 2006 + Internet Direct Version 9 (Indy) Property and Component Editors + Borland C++Builder Office XP Servers Package + Borland Sample Controls Design Time Package + Borland C++Builder Internet Explorer 5 Components Package + TeeChart Components + + + + + + + + + + + mkdir $(PROJECTDIR)..\..\release\win32\bds +mkdir $(PROJECTDIR)..\..\debug\win32\bds + + + + mkdir $(PROJECTDIR)..\release\bin +mkdir $(PROJECTDIR)..\debug\bin + + + + + diff --git a/ase/test/awk/asetestawk.bdsproj b/ase/test/awk/asetestawk.bdsproj index 1c8d23e0..5c392e98 100644 --- a/ase/test/awk/asetestawk.bdsproj +++ b/ase/test/awk/asetestawk.bdsproj @@ -51,6 +51,7 @@ + @@ -247,16 +248,16 @@ - - mkdir $(PROJECTDIR)..\..\release\win32\bds + + mkdir $(PROJECTDIR)..\..\release\win32\bds mkdir $(PROJECTDIR)..\..\debug\win32\bds - - - mkdir $(PROJECTDIR)..\release\bin + + + mkdir $(PROJECTDIR)..\release\bin mkdir $(PROJECTDIR)..\debug\bin - - + + diff --git a/ase/utl/aseutl.bdsproj b/ase/utl/aseutl.bdsproj new file mode 100644 index 00000000..c962dde7 --- /dev/null +++ b/ase/utl/aseutl.bdsproj @@ -0,0 +1,246 @@ + + + + + + + + + + + + main.c + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + False + 1 + 0 + 0 + 0 + False + False + False + False + False + 1033 + 1252 + + + + + 1.0.0.0 + + + + + + 1.0.0.0 + + + + + + + + + False + + + + + + + False + + False + + True + False + + + + + + + + + + + mkdir $(PROJECTDIR)..\release\lib +mkdir $(PROJECTDIR)..\debug\lib + + + + + diff --git a/ase/utl/stdio.c b/ase/utl/stdio.c index 9b89f715..1766b731 100644 --- a/ase/utl/stdio.c +++ b/ase/utl/stdio.c @@ -1,5 +1,5 @@ /* - * $Id: stdio.c,v 1.3 2007/04/30 08:32:50 bacon Exp $ + * $Id: stdio.c,v 1.4 2007/06/16 13:34:47 bacon Exp $ * * {License} */ @@ -261,7 +261,7 @@ static ase_char_t* __adjust_format (const ase_char_t* format) } else if (ch == ASE_T('C') || ch == ASE_T('S')) { -#ifdef _WIN32 +#if defined(_WIN32) ADDC (buf, ch); #else #ifdef ASE_CHAR_IS_MCHAR diff --git a/ase/utl/stdio.h b/ase/utl/stdio.h index 6f6150a4..e2c27116 100644 --- a/ase/utl/stdio.h +++ b/ase/utl/stdio.h @@ -1,5 +1,5 @@ /* - * $Id: stdio.h,v 1.4 2007/05/12 17:05:07 bacon Exp $ + * $Id: stdio.h,v 1.5 2007/06/16 13:34:47 bacon Exp $ */ #ifndef _ASE_UTL_STDIO_H_ @@ -43,7 +43,7 @@ extern "C" { int ase_vsprintf (ase_char_t* buf, size_t size, const ase_char_t* fmt, va_list ap); int ase_sprintf (ase_char_t* buf, size_t size, const ase_char_t* fmt, ...); -#if !defined(WIN32) +#if !defined(_WIN32) int ase_vfprintf (FILE *stream, const ase_char_t* fmt, va_list ap); int ase_vprintf (const ase_char_t* fmt, va_list ap); int ase_fprintf (FILE* file, const ase_char_t* fmt, ...);