diff --git a/ase/ase.bdsgroup b/ase/ase.bdsgroup deleted file mode 100644 index ea545f0f..00000000 --- a/ase/ase.bdsgroup +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - awk\aseawk.bdsproj - test\awk\aseawk.bdsproj - lsp\aselsp.bdsproj - test\lsp\aselsp.bdsproj - aseawk.lib aseawk.exe aselsp.lib aselsp.exe - - - - - - - - diff --git a/ase/ase.dsw b/ase/ase.dsw index 7a75efea..15f743e9 100644 --- a/ase/ase.dsw +++ b/ase/ase.dsw @@ -3,6 +3,30 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ############################################################################### +Project: "cmn.lib"=.\cmn\cmn.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "utl.lib"=.\utl\utl.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "ase.com"=.\com\ase.dsp - Package Owner=<4> Package=<5> diff --git a/ase/awk/aseawk.bdsproj b/ase/awk/aseawk.bdsproj deleted file mode 100644 index 79daef5f..00000000 --- a/ase/awk/aseawk.bdsproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - awk.c - - - FalseFalse1000FalseFalseFalseFalseFalse103312521.0.0.01.0.0.0FalseFalseFalseTrueFalse - - mkdir $(PROJECTDIR)..\release\win32\bds -mkdir $(PROJECTDIR)..\debug\win32\bds - - - diff --git a/ase/awk/awk.dsp b/ase/awk/awk.dsp index 018bc3bd..d41e0b58 100644 --- a/ase/awk/awk.dsp +++ b/ase/awk/awk.dsp @@ -1,4 +1,4 @@ -# Microsoft Developer Studio Project File - Name="awk" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="awk.lib" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** @@ -135,10 +135,6 @@ SOURCE=.\run.c # End Source File # Begin Source File -SOURCE=.\str.c -# End Source File -# Begin Source File - SOURCE=.\tab.c # End Source File # Begin Source File @@ -187,10 +183,6 @@ SOURCE=.\run.h # End Source File # Begin Source File -SOURCE=.\str.h -# End Source File -# Begin Source File - SOURCE=.\tab.h # End Source File # Begin Source File diff --git a/ase/awk/awk_i.h b/ase/awk/awk_i.h index 00c1a5d4..d1c69eaa 100644 --- a/ase/awk/awk_i.h +++ b/ase/awk/awk_i.h @@ -1,5 +1,5 @@ /* - * $Id: awk_i.h,v 1.102 2007-02-23 08:17:49 bacon Exp $ + * $Id: awk_i.h,v 1.103 2007-02-23 15:18:36 bacon Exp $ * * {License} */ @@ -40,9 +40,18 @@ typedef struct ase_awk_tree_t ase_awk_tree_t; #define ASE_AWK_MAX_LOCALS 9999 #define ASE_AWK_MAX_PARAMS 9999 -#define ASE_AWK_MALLOC(awk,size) ASE_MALLOC(&(awk)->prmfns.mmgr,size) -#define ASE_AWK_REALLOC(awk,ptr,size) ASE_REALLOC(&(awk)->prmfns.mmgr,ptr,size) -#define ASE_AWK_FREE(awk,ptr) ASE_FREE(&(awk)->prmfns.mmgr,ptr) +#if defined(_WIN32) && defined(_MSC_VER) && defined(_DEBUG) + #define _CRTDBG_MAP_ALLOC + #include + + #define ASE_AWK_MALLOC(awk,size) malloc (size) + #define ASE_AWK_REALLOC(awk,ptr,size) realloc (ptr, size) + #define ASE_AWK_FREE(awk,ptr) free (ptr) +#else + #define ASE_AWK_MALLOC(awk,size) ASE_MALLOC(&(awk)->prmfns.mmgr,size) + #define ASE_AWK_REALLOC(awk,ptr,size) ASE_REALLOC(&(awk)->prmfns.mmgr,ptr,size) + #define ASE_AWK_FREE(awk,ptr) ASE_FREE(&(awk)->prmfns.mmgr,ptr) +#endif #define ASE_AWK_ISUPPER(awk,c) ASE_ISUPPER(&(awk)->prmfns.ccls,c) #define ASE_AWK_ISLOWER(awk,c) ASE_ISLOWER(&(awk)->prmfns.ccls,c) diff --git a/ase/lsp/aselsp.bdsproj b/ase/lsp/aselsp.bdsproj deleted file mode 100644 index 198718b4..00000000 --- a/ase/lsp/aselsp.bdsproj +++ /dev/null @@ -1,221 +0,0 @@ - - - - - - - - - - - - lsp.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 - - - - - - - - - - diff --git a/ase/lsp/lsp_i.h b/ase/lsp/lsp_i.h index fb54653c..41ff46fe 100644 --- a/ase/lsp/lsp_i.h +++ b/ase/lsp/lsp_i.h @@ -1,5 +1,5 @@ /* - * $Id: lsp_i.h,v 1.9 2007-02-23 10:53:38 bacon Exp $ + * $Id: lsp_i.h,v 1.10 2007-02-23 15:22:36 bacon Exp $ * * {License} */ @@ -22,10 +22,18 @@ #pragma warning (disable: 4996) #endif +#if defined(_WIN32) && defined(_MSC_VER) && defined(_DEBUG) + #define _CRTDBG_MAP_ALLOC + #include -#define ASE_LSP_MALLOC(lsp,size) ASE_MALLOC(&(lsp)->prmfns.mmgr,size) -#define ASE_LSP_REALLOC(lsp,ptr,size) ASE_REALLOC(&(lsp)->prmfns.mmgr,ptr,size) -#define ASE_LSP_FREE(lsp,ptr) ASE_FREE(&(lsp)->prmfns.mmgr,ptr) + #define ASE_LSP_MALLOC(lsp,size) malloc (size) + #define ASE_LSP_REALLOC(lsp,ptr,size) realloc (ptr, size) + #define ASE_LSP_FREE(lsp,ptr) free (ptr) +#else + #define ASE_LSP_MALLOC(lsp,size) ASE_MALLOC(&(lsp)->prmfns.mmgr,size) + #define ASE_LSP_REALLOC(lsp,ptr,size) ASE_REALLOC(&(lsp)->prmfns.mmgr,ptr,size) + #define ASE_LSP_FREE(lsp,ptr) ASE_FREE(&(lsp)->prmfns.mmgr,ptr) +#endif #define ASE_LSP_ISUPPER(lsp,c) ASE_ISUPPER(&(lsp)->prmfns.ccls,c) #define ASE_LSP_ISLOWER(lsp,c) ASE_ISLOWER(&(lsp)->prmfns.ccls,c) diff --git a/ase/macros.h b/ase/macros.h index 21abea3b..1a8c1beb 100644 --- a/ase/macros.h +++ b/ase/macros.h @@ -1,5 +1,5 @@ /* - * $Id: macros.h,v 1.52 2007-02-23 08:17:48 bacon Exp $ + * $Id: macros.h,v 1.53 2007-02-23 15:18:35 bacon Exp $ * * {License} */ @@ -96,18 +96,9 @@ #define ASE_END_PACKED_STRUCT() }; #endif -#if defined(_WIN32) && defined(_MSC_VER) && defined(_DEBUG) - #define _CRTDBG_MAP_ALLOC - #include - - #define ASE_MALLOC(mmgr,size) malloc (size) - #define ASE_REALLOC(mmgr,ptr,size) realloc (ptr, size) - #define ASE_FREE(mmgr,ptr) free (ptr) -#else - #define ASE_MALLOC(mmgr,size) (mmgr)->malloc (mmgr, size) - #define ASE_REALLOC(mmgr,ptr,size) (mmgr)->realloc (mmgr, ptr, size) - #define ASE_FREE(mmgr,ptr) (mmgr)->free (mmgr, ptr) -#endif +#define ASE_MALLOC(mmgr,size) (mmgr)->malloc (mmgr, size) +#define ASE_REALLOC(mmgr,ptr,size) (mmgr)->realloc (mmgr, ptr, size) +#define ASE_FREE(mmgr,ptr) (mmgr)->free (mmgr, ptr) #define ASE_ISUPPER(ccls,c) (ccls)->is_upper (ccls, c) #define ASE_ISLOWER(ccls,c) (ccls)->is_lower (ccls, c) diff --git a/ase/test/awk/aseawk.bdsproj b/ase/test/awk/aseawk.bdsproj deleted file mode 100644 index 3d89485b..00000000 --- a/ase/test/awk/aseawk.bdsproj +++ /dev/null @@ -1,238 +0,0 @@ - - - - - - - - - - - - awk.c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - - - - - - - - mkdir $(PROJECTDIR)..\..\release\win32\bds -mkdir $(PROJECTDIR)..\..\debug\win32\bds - - - - - diff --git a/ase/test/awk/awk.dsp b/ase/test/awk/awk.dsp index 5a904ed0..28f0ac75 100644 --- a/ase/test/awk/awk.dsp +++ b/ase/test/awk/awk.dsp @@ -50,7 +50,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 aseawk.lib user32.lib kernel32.lib /nologo /subsystem:console /machine:I386 /out:"../../release/win32/vs60/aseawk.exe" /libpath:"$(OutDir)" +# ADD LINK32 asecmn.lib aseawk.lib aseutl.lib user32.lib kernel32.lib /nologo /subsystem:console /machine:I386 /out:"../../release/win32/vs60/aseawk.exe" /libpath:"$(OutDir)" !ELSEIF "$(CFG)" == "awk.test - Win32 Debug" @@ -74,7 +74,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 aseawk.lib user32.lib kernel32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../debug/win32/vs60/aseawk.exe" /pdbtype:sept /libpath:"$(OutDir)" +# ADD LINK32 asecmn.lib aseawk.lib aseutl.lib user32.lib kernel32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../debug/win32/vs60/aseawk.exe" /pdbtype:sept /libpath:"$(OutDir)" !ENDIF diff --git a/ase/test/lsp/aselsp.bdsproj b/ase/test/lsp/aselsp.bdsproj deleted file mode 100644 index 969520ee..00000000 --- a/ase/test/lsp/aselsp.bdsproj +++ /dev/null @@ -1,238 +0,0 @@ - - - - - - - - - - - - lsp.c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 1033 - 1252 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - - - - - /memory=100000 /increment=1000 - - True - C:\projects\ase\test\lsp - - - - - - False - - False - - True - False - - - - - - - - - - - mkdir $(PROJECTDIR)..\..\release\win32\bds -mkdir $(PROJECTDIR)..\..\debug\win32\bds - - - - -