diff --git a/ase/test/lsp/lsp.c b/ase/test/lsp/lsp.c index 22a60030..07706a27 100644 --- a/ase/test/lsp/lsp.c +++ b/ase/test/lsp/lsp.c @@ -279,10 +279,10 @@ int lsp_main (int argc, ase_char_t* argv[]) return -1; } - ase_printf (ASE_T("LSP 0.0001\n")); + ase_printf (ASE_T("ASELSP 0.0001\n")); - ase_lsp_attach_input (lsp, get_input, ASE_NULL); - ase_lsp_attach_output (lsp, put_output, ASE_NULL); + ase_lsp_attinput (lsp, get_input, ASE_NULL); + ase_lsp_attoutput (lsp, put_output, ASE_NULL); while (1) { @@ -292,19 +292,21 @@ int lsp_main (int argc, ase_char_t* argv[]) obj = ase_lsp_read (lsp); if (obj == ASE_NULL) { - int errnum = ase_lsp_geterrnum(lsp); - const ase_char_t* errstr; + int errnum; + const ase_char_t* errmsg; + + ase_lsp_geterror (lsp, &errnum, &errmsg); if (errnum != ASE_LSP_EEND && errnum != ASE_LSP_EEXIT) { - errstr = ase_lsp_geterrstr(errnum); ase_printf ( ASE_T("error in read: [%d] %s\n"), - errnum, errstr); + errnum, errmsg); } - if (errnum < ASE_LSP_ESYNTAX) break; + /* TODO: change the following check */ + if (errnum < ASE_LSP_ESYNTAX) break; continue; } @@ -316,15 +318,14 @@ int lsp_main (int argc, ase_char_t* argv[]) else { int errnum; - const ase_char_t* errstr; + const ase_char_t* errmsg; - errnum = ase_lsp_geterrnum(lsp); + ase_lsp_geterror (lsp, &errnum, &errmsg); if (errnum == ASE_LSP_EEXIT) break; - errstr = ase_lsp_geterrstr(errnum); ase_printf ( - ASE_T("error in eval: [%d] %s\n"), - errnum, errstr); + ASE_T("error in eval: [%d] %s\n"), + errnum, errmsg); } } diff --git a/ase/test/lsp/lsp.dsp b/ase/test/lsp/lsp.dsp index 56ee9b0a..fb7f844b 100644 --- a/ase/test/lsp/lsp.dsp +++ b/ase/test/lsp/lsp.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\.." /I "\projects\xpkit" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_UNICODE" /D _WIN32_WINNT=0x0400 /D "__STAND_ALONE" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_UNICODE" /D _WIN32_WINNT=0x0400 /D "__STAND_ALONE" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -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 aselsp.lib xpbas.lib user32.lib kernel32.lib /nologo /subsystem:console /machine:I386 /out:"../../release/win32/vs60/aselsp.exe" /libpath:"$(OutDir)" /libpath:"\projects\xpkit\release" +# ADD LINK32 aselsp.lib xpbas.lib user32.lib kernel32.lib /nologo /subsystem:console /machine:I386 /out:"../../release/win32/vs60/aselsp.exe" /libpath:"$(OutDir)" !ELSEIF "$(CFG)" == "lsp.test - Win32 Debug" @@ -66,7 +66,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\.." /I "\projects\xpkit" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_UNICODE" /D _WIN32_WINNT=0x0400 /D "__STAND_ALONE" /FR /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_UNICODE" /D _WIN32_WINNT=0x0400 /D "__STAND_ALONE" /FR /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -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 aselsp.lib xpbas.lib user32.lib kernel32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../debug/win32/vs60/aselsp.exe" /pdbtype:sept /libpath:"$(OutDir)" /libpath:"\projects\xpkit\debug" +# 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)" !ENDIF diff --git a/ase/test/lsp/makefile.in b/ase/test/lsp/makefile.in index 6926f36f..05d05a86 100644 --- a/ase/test/lsp/makefile.in +++ b/ase/test/lsp/makefile.in @@ -2,9 +2,9 @@ SRCS = lsp.c OUTS = $(SRCS:.c=.x) CC = @CC@ -CFLAGS = @CFLAGS@ -I@abs_top_builddir@/.. -I$(XPKIT) -LDFLAGS = @LDFLAGS@ -L@abs_top_builddir@/lsp -L$(XPKIT)/xp/bas -LIBS = @LIBS@ -lxpbas -laselsp +CFLAGS = @CFLAGS@ -I@abs_top_builddir@/.. +LDFLAGS = @LDFLAGS@ -L@abs_top_builddir@/lsp +LIBS = @LIBS@ -laselsp all: $(OUTS)