*** empty log message ***

This commit is contained in:
hyung-hwan 2007-02-23 15:34:26 +00:00
parent c5a6d2e388
commit 9d4383cd7b
4 changed files with 55 additions and 69 deletions

View File

@ -27,18 +27,6 @@ Package=<4>
############################################################################### ###############################################################################
Project: "ase.com"=.\com\ase.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "awk.lib"=.\awk\awk.dsp - Package Owner=<4> Project: "awk.lib"=.\awk\awk.dsp - Package Owner=<4>
Package=<5> Package=<5>
@ -63,6 +51,18 @@ Package=<4>
############################################################################### ###############################################################################
Project: "ase.com"=.\com\ase.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "awk.test"=.\test\awk\awk.dsp - Package Owner=<4> Project: "awk.test"=.\test\awk\awk.dsp - Package Owner=<4>
Package=<5> Package=<5>

View File

@ -1,5 +1,5 @@
/* /*
* $Id: Awk.cpp,v 1.24 2007-02-03 10:52:11 bacon Exp $ * $Id: Awk.cpp,v 1.25 2007-02-23 15:34:26 bacon Exp $
* *
* {License} * {License}
*/ */
@ -15,6 +15,10 @@
#include <wctype.h> #include <wctype.h>
#include <stdio.h> #include <stdio.h>
#include <ase/cmn/str.h>
#include <ase/utl/stdio.h>
#include <ase/utl/ctype.h>
#define DBGOUT(x) do { if (debug) OutputDebugString (x); } while(0) #define DBGOUT(x) do { if (debug) OutputDebugString (x); } while(0)
#define DBGOUT2(awk,x) do { if (awk->debug) OutputDebugString (x); } while(0) #define DBGOUT2(awk,x) do { if (awk->debug) OutputDebugString (x); } while(0)
@ -88,17 +92,17 @@ CAwk::~CAwk ()
} }
} }
static void* awk_malloc (ase_size_t n, void* custom_data) static void* awk_malloc (ase_mmgr_t* mmgr, ase_size_t n)
{ {
return malloc (n); return malloc (n);
} }
static void* awk_realloc (void* ptr, ase_size_t n, void* custom_data) static void* awk_realloc (ase_mmgr_t* mmgr, void* ptr, ase_size_t n)
{ {
return realloc (ptr, n); return realloc (ptr, n);
} }
static void awk_free (void* ptr, void* custom_data) static void awk_free (ase_mmgr_t* mmgr, void* ptr)
{ {
free (ptr); free (ptr);
} }
@ -113,23 +117,6 @@ static void awk_abort (void* custom_data)
abort (); abort ();
} }
static int awk_sprintf (
ase_char_t* buf, ase_size_t len, const ase_char_t* fmt, ...)
{
int n;
va_list ap;
va_start (ap, fmt);
n = _vsntprintf (buf, len, fmt, ap);
if (n < 0 || (ase_size_t)n >= len)
{
if (len > 0) buf[len-1] = ASE_T('\0');
n = -1;
}
va_end (ap);
return n;
}
static void awk_aprintf (const ase_char_t* fmt, ...) static void awk_aprintf (const ase_char_t* fmt, ...)
{ {
va_list ap; va_list ap;
@ -418,37 +405,36 @@ HRESULT CAwk::Parse (int* ret)
ase_awk_prmfns_t prmfns; ase_awk_prmfns_t prmfns;
memset (&prmfns, 0, sizeof(prmfns)); memset (&prmfns, 0, sizeof(prmfns));
prmfns.malloc = awk_malloc;
prmfns.realloc = awk_realloc;
prmfns.free = awk_free;
prmfns.is_upper = iswupper; prmfns.mmgr.malloc = awk_malloc;
prmfns.is_lower = iswlower; prmfns.mmgr.realloc = awk_realloc;
prmfns.is_alpha = iswalpha; prmfns.mmgr.free = awk_free;
prmfns.is_digit = iswdigit;
prmfns.is_xdigit = iswxdigit;
prmfns.is_alnum = iswalnum;
prmfns.is_space = iswspace;
prmfns.is_print = iswprint;
prmfns.is_graph = iswgraph;
prmfns.is_cntrl = iswcntrl;
prmfns.is_punct = iswpunct;
prmfns.to_upper = towupper;
prmfns.to_lower = towlower;
prmfns.memcpy = memcpy; prmfns.ccls.is_upper = ase_isupper;
prmfns.memset = memset; prmfns.ccls.is_lower = ase_islower;
prmfns.pow = awk_pow; prmfns.ccls.is_alpha = ase_isalpha;
prmfns.sprintf = awk_sprintf; prmfns.ccls.is_digit = ase_isdigit;
prmfns.aprintf = awk_aprintf; prmfns.ccls.is_xdigit = ase_isxdigit;
prmfns.dprintf = awk_dprintf; prmfns.ccls.is_alnum = ase_isalnum;
prmfns.abort = awk_abort; prmfns.ccls.is_space = ase_isspace;
prmfns.ccls.is_print = ase_isprint;
prmfns.ccls.is_graph = ase_isgraph;
prmfns.ccls.is_cntrl = ase_iscntrl;
prmfns.ccls.is_punct = ase_ispunct;
prmfns.ccls.to_upper = ase_toupper;
prmfns.ccls.to_lower = ase_tolower;
prmfns.misc.pow = awk_pow;
prmfns.misc.sprintf = ase_sprintf;
prmfns.misc.aprintf = awk_aprintf;
prmfns.misc.dprintf = awk_dprintf;
prmfns.misc.abort = awk_abort;
handle = ase_awk_open (&prmfns, NULL, &errnum); handle = ase_awk_open (&prmfns, NULL, &errnum);
if (handle == NULL) if (handle == NULL)
{ {
errlin = 0; errlin = 0;
ase_awk_strxcpy ( ase_strxcpy (
errmsg, ASE_COUNTOF(errmsg), errmsg, ASE_COUNTOF(errmsg),
ase_awk_geterrstr(errnum)); ase_awk_geterrstr(errnum));
@ -489,7 +475,7 @@ HRESULT CAwk::Parse (int* ret)
DBGOUT (_T("cannot add the builtin function")); DBGOUT (_T("cannot add the builtin function"));
ase_awk_geterror (handle, &errnum, &errlin, &msg); ase_awk_geterror (handle, &errnum, &errlin, &msg);
ase_awk_strxcpy (errmsg, ASE_COUNTOF(errmsg), msg); ase_strxcpy (errmsg, ASE_COUNTOF(errmsg), msg);
*ret = -1; *ret = -1;
return S_OK; return S_OK;
@ -507,7 +493,7 @@ HRESULT CAwk::Parse (int* ret)
const ase_char_t* msg; const ase_char_t* msg;
ase_awk_geterror (handle, &errnum, &errlin, &msg); ase_awk_geterror (handle, &errnum, &errlin, &msg);
ase_awk_strxcpy (errmsg, ASE_COUNTOF(errmsg), msg); ase_strxcpy (errmsg, ASE_COUNTOF(errmsg), msg);
DBGOUT (_T("cannot parse the source code")); DBGOUT (_T("cannot parse the source code"));
@ -712,7 +698,7 @@ HRESULT CAwk::Run (int* ret)
const ase_char_t* msg; const ase_char_t* msg;
ase_awk_geterror (handle, &errnum, &errlin, &msg); ase_awk_geterror (handle, &errnum, &errlin, &msg);
ase_awk_strxcpy (errmsg, ASE_COUNTOF(errmsg), msg); ase_strxcpy (errmsg, ASE_COUNTOF(errmsg), msg);
DBGOUT (_T("cannot run the program")); DBGOUT (_T("cannot run the program"));
*ret = -1; *ret = -1;
@ -732,7 +718,7 @@ STDMETHODIMP CAwk::AddBuiltinFunction (
for (bfn = bfn_list; bfn != NULL; bfn = bfn->next) for (bfn = bfn_list; bfn != NULL; bfn = bfn->next)
{ {
if (ase_awk_strxncmp ( if (ase_strxncmp (
bfn->name.ptr, bfn->name.len, bfn->name.ptr, bfn->name.len,
name, name_len) == 0) name, name_len) == 0)
{ {
@ -753,7 +739,7 @@ STDMETHODIMP CAwk::AddBuiltinFunction (
{ {
errnum = ASE_AWK_ENOMEM; errnum = ASE_AWK_ENOMEM;
errlin = 0; errlin = 0;
ase_awk_strxcpy ( ase_strxcpy (
errmsg, ASE_COUNTOF(errmsg), errmsg, ASE_COUNTOF(errmsg),
ase_awk_geterrstr(errnum)); ase_awk_geterrstr(errnum));
@ -769,7 +755,7 @@ STDMETHODIMP CAwk::AddBuiltinFunction (
errnum = ASE_AWK_ENOMEM; errnum = ASE_AWK_ENOMEM;
errlin = 0; errlin = 0;
ase_awk_strxcpy ( ase_strxcpy (
errmsg, ASE_COUNTOF(errmsg), errmsg, ASE_COUNTOF(errmsg),
ase_awk_geterrstr(errnum)); ase_awk_geterrstr(errnum));
@ -796,7 +782,7 @@ STDMETHODIMP CAwk::DeleteBuiltinFunction (BSTR name, int* ret)
{ {
next = bfn->next; next = bfn->next;
if (ase_awk_strxncmp ( if (ase_strxncmp (
bfn->name.ptr, bfn->name.len, bfn->name.ptr, bfn->name.len,
name, name_len) == 0) name, name_len) == 0)
{ {
@ -815,7 +801,7 @@ STDMETHODIMP CAwk::DeleteBuiltinFunction (BSTR name, int* ret)
errnum = ASE_AWK_ENOENT; errnum = ASE_AWK_ENOENT;
errlin = 0; errlin = 0;
ase_awk_strxcpy ( ase_strxcpy (
errmsg, ASE_COUNTOF(errmsg), errmsg, ASE_COUNTOF(errmsg),
ase_awk_geterrstr(errnum)); ase_awk_geterrstr(errnum));

View File

@ -51,7 +51,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo /o"debug/win32/vs60/ase.bsc" # ADD BSC32 /nologo /o"debug/win32/vs60/ase.bsc"
LINK32=link.exe 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 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept # 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 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 aseawk.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:windows /dll /debug /machine:I386 /implib:"debug/win32/vs60/ase.lib" /pdbtype:sept /libpath:"$(OutDir)" # ADD LINK32 aseawk.lib asecmn.lib aseutl.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:windows /dll /debug /machine:I386 /implib:"debug/win32/vs60/ase.lib" /pdbtype:sept /libpath:"$(OutDir)"
# Begin Custom Build - Performing registration # Begin Custom Build - Performing registration
IntDir=.\debug/win32/vs60 IntDir=.\debug/win32/vs60
OutDir=.\../debug/win32/vs60 OutDir=.\../debug/win32/vs60
@ -94,7 +94,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo /o"release/win32/vs60/awk.bsc" # ADD BSC32 /nologo /o"release/win32/vs60/awk.bsc"
LINK32=link.exe 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 /nologo /subsystem:windows /dll /machine:I386 # 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 /nologo /subsystem:windows /dll /machine:I386
# ADD LINK32 aseawk.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:windows /dll /machine:I386 /implib:"release/win32/vs60/ase.lib" /libpath:"$(OutDir)" # ADD LINK32 aseawk.lib asecmn.lib aseutl.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:windows /dll /machine:I386 /implib:"release/win32/vs60/ase.lib" /libpath:"$(OutDir)"
# Begin Custom Build - Performing registration # Begin Custom Build - Performing registration
IntDir=.\release/win32/vs60 IntDir=.\release/win32/vs60
OutDir=.\../release/win32/vs60 OutDir=.\../release/win32/vs60

View File

@ -50,7 +50,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe 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 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 aselsp.lib xpbas.lib user32.lib kernel32.lib /nologo /subsystem:console /machine:I386 /out:"../../release/win32/vs60/aselsp.exe" /libpath:"$(OutDir)" # ADD LINK32 aselsp.lib asecmn.lib aseutl.lib user32.lib kernel32.lib /nologo /subsystem:console /machine:I386 /out:"../../release/win32/vs60/aselsp.exe" /libpath:"$(OutDir)"
!ELSEIF "$(CFG)" == "lsp.test - Win32 Debug" !ELSEIF "$(CFG)" == "lsp.test - Win32 Debug"
@ -74,7 +74,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe 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 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 aselsp.lib xpbas.lib user32.lib kernel32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../debug/win32/vs60/aselsp.exe" /pdbtype:sept /libpath:"$(OutDir)" # ADD LINK32 aselsp.lib asecmn.lib aseutl.lib user32.lib kernel32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../debug/win32/vs60/aselsp.exe" /pdbtype:sept /libpath:"$(OutDir)"
!ENDIF !ENDIF