diff --git a/ase/ase.bdsgroup b/ase/ase.bdsgroup index d5e7bf1a..44e8e71c 100644 --- a/ase/ase.bdsgroup +++ b/ase/ase.bdsgroup @@ -13,9 +13,9 @@ awk\aseawk.bdsproj awk\aseawk++.bdsproj utl\aseutl.bdsproj - test\awk\asetestawk.bdsproj - test\awk\asetestawk++.bdsproj - asecmn.lib aseawk.lib aseawk++.lib aseutl.lib asetestawk.exe asetestawk++.exe + test\awk\aseawk.bdsproj + test\awk\aseawk++.bdsproj + asecmn.lib aseawk.lib aseawk++.lib aseutl.lib aseawk.exe aseawk++.exe diff --git a/ase/awk/Awk.cpp b/ase/awk/Awk.cpp index fac412f5..0c95a53a 100644 --- a/ase/awk/Awk.cpp +++ b/ase/awk/Awk.cpp @@ -1,5 +1,5 @@ /* - * $Id: Awk.cpp,v 1.41 2007/06/16 13:34:47 bacon Exp $ + * $Id: Awk.cpp,v 1.42 2007/06/19 03:59:38 bacon Exp $ */ #include @@ -574,6 +574,19 @@ namespace ASE return ase_awk_getmaxdepth (awk, id); } + int Awk::setWord (const ase_char_t* ow, const ase_char_t* nw) + { + return setWord (ow, ase_strlen(ow), nw, ase_strlen(nw)); + } + + int Awk::setWord ( + const ase_char_t* ow, ase_size_t owl, + const ase_char_t* nw, ase_size_t nwl) + { + ASE_ASSERT (awk != ASE_NULL); + return ase_awk_setword (awk, ow, owl, nw, nwl); + } + int Awk::parse () { ASE_ASSERT (awk != ASE_NULL); diff --git a/ase/awk/Awk.hpp b/ase/awk/Awk.hpp index 8826ed27..9e03680e 100644 --- a/ase/awk/Awk.hpp +++ b/ase/awk/Awk.hpp @@ -1,5 +1,5 @@ /* - * $Id: Awk.hpp,v 1.39 2007/06/16 13:34:47 bacon Exp $ + * $Id: Awk.hpp,v 1.40 2007/06/19 03:59:38 bacon Exp $ */ #ifndef _ASE_AWK_AWK_HPP_ @@ -411,6 +411,12 @@ namespace ASE virtual void setMaxDepth (int ids, size_t depth); virtual int getMaxDepth (int id) const; + virtual int setWord ( + const ase_char_t* ow, const ase_char_t* nw); + virtual int setWord ( + const ase_char_t* ow, ase_size_t owl, + const ase_char_t* nw, ase_size_t nwl); + virtual int parse (); virtual int run (const char_t* main = ASE_NULL, const char_t** args = ASE_NULL, size_t nargs = 0); diff --git a/ase/awk/aseawk++.bdsproj b/ase/awk/aseawk++.bdsproj index 7dc3d36e..76287d1e 100644 --- a/ase/awk/aseawk++.bdsproj +++ b/ase/awk/aseawk++.bdsproj @@ -28,6 +28,7 @@ + @@ -56,7 +57,6 @@ - diff --git a/ase/awk/aseawk.bdsproj b/ase/awk/aseawk.bdsproj index e6b0cd25..f50cbfce 100644 --- a/ase/awk/aseawk.bdsproj +++ b/ase/awk/aseawk.bdsproj @@ -13,10 +13,264 @@ awk.c - FalseFalse1000FalseFalseFalseFalseFalse103312521.0.0.01.0.0.0FalseFalseFalseTrueFalse + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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)..\release\lib mkdir $(PROJECTDIR)..\debug\lib - + + + diff --git a/ase/cmn/asecmn.bdsproj b/ase/cmn/asecmn.bdsproj index d386cf49..fb34d0b4 100644 --- a/ase/cmn/asecmn.bdsproj +++ b/ase/cmn/asecmn.bdsproj @@ -28,6 +28,7 @@ + @@ -63,7 +64,8 @@ - + + @@ -236,11 +238,11 @@ - - mkdir $(PROJECTDIR)..\release\lib + + mkdir $(PROJECTDIR)..\release\lib mkdir $(PROJECTDIR)..\debug\lib - - + + diff --git a/ase/test/awk/asetestawk++.bdsproj b/ase/test/awk/aseawk++.bdsproj similarity index 98% rename from ase/test/awk/asetestawk++.bdsproj rename to ase/test/awk/aseawk++.bdsproj index e0d708ba..3cee365f 100644 --- a/ase/test/awk/asetestawk++.bdsproj +++ b/ase/test/awk/aseawk++.bdsproj @@ -28,7 +28,8 @@ - + + @@ -51,7 +52,7 @@ - + @@ -250,12 +251,7 @@ - - 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/aseawk.bdsproj similarity index 97% rename from ase/test/awk/asetestawk.bdsproj rename to ase/test/awk/aseawk.bdsproj index ae5457e0..fcce37b1 100644 --- a/ase/test/awk/asetestawk.bdsproj +++ b/ase/test/awk/aseawk.bdsproj @@ -28,7 +28,8 @@ - + + @@ -51,7 +52,10 @@ - + + + + @@ -249,11 +253,6 @@ - mkdir $(PROJECTDIR)..\..\release\win32\bds -mkdir $(PROJECTDIR)..\..\debug\win32\bds - - - mkdir $(PROJECTDIR)..\release\bin mkdir $(PROJECTDIR)..\debug\bin diff --git a/ase/utl/aseutl.bdsproj b/ase/utl/aseutl.bdsproj index c962dde7..0de242dd 100644 --- a/ase/utl/aseutl.bdsproj +++ b/ase/utl/aseutl.bdsproj @@ -28,6 +28,7 @@ + @@ -63,7 +64,8 @@ - + + @@ -236,11 +238,11 @@ - - mkdir $(PROJECTDIR)..\release\lib + + mkdir $(PROJECTDIR)..\release\lib mkdir $(PROJECTDIR)..\debug\lib - - + +