hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
hyung-hwan 2007-04-14 15:30:14 +00:00
parent 7e7e88dc5b
commit 10e4d27cf2
7 changed files with 75 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ase/com/Awk.cpp
View File

@ -1,5 +1,5 @@
/* /*
* $Id: Awk.cpp,v 1.30 2007-03-24 05:18:31 bacon Exp $ * $Id: Awk.cpp,v 1.31 2007-04-14 15:30:14 bacon Exp $
* *
* {License} * {License}
*/ */
@ -442,7 +442,7 @@ static int __handle_bfn (
} }
ase_awk_val_t* ret; ase_awk_val_t* ret;
int n = awk->Fire_HandleBuiltinFunction (run, name, aa, &ret); int n = awk->Fire_HandleFunction (run, name, aa, &ret);
if (n == 1) if (n == 1)
{ {
ase_char_t buf[128]; ase_char_t buf[128];
@ -471,7 +471,7 @@ static int __handle_bfn (
return -1; return -1;
} }
/* name and aa are destroyed in HandleBuiltinFunction */ /* name and aa are destroyed in HandleFunction */
//SafeArrayDestroy (aa); //SafeArrayDestroy (aa);
//SysFreeString (name); //SysFreeString (name);
@ -788,7 +788,7 @@ HRESULT CAwk::Run (int* ret)
return S_OK; return S_OK;
} }
STDMETHODIMP CAwk::AddBuiltinFunction ( STDMETHODIMP CAwk::AddFunction (
BSTR name, int min_args, int max_args, int* ret) BSTR name, int min_args, int max_args, int* ret)
{ {
bfn_t* bfn; bfn_t* bfn;
@ -851,7 +851,7 @@ STDMETHODIMP CAwk::AddBuiltinFunction (
return S_OK; return S_OK;
} }
STDMETHODIMP CAwk::DeleteBuiltinFunction (BSTR name, int* ret) STDMETHODIMP CAwk::DeleteFunction (BSTR name, int* ret)
{ {
size_t name_len = SysStringLen(name); size_t name_len = SysStringLen(name);
bfn_t* bfn, * next, * prev = NULL; bfn_t* bfn, * next, * prev = NULL;

6
ase/com/Awk.h
View File

@ -1,5 +1,5 @@
/* /*
* $Id: Awk.h,v 1.17 2007-03-24 05:18:32 bacon Exp $ * $Id: Awk.h,v 1.18 2007-04-14 15:30:14 bacon Exp $
* *
* {License} * {License}
*/ */
@ -152,8 +152,8 @@ public:
STDMETHOD(get_ErrorMessage)(/*[out, retval]*/ BSTR *pVal); STDMETHOD(get_ErrorMessage)(/*[out, retval]*/ BSTR *pVal);
STDMETHOD(get_ErrorLine)(/*[out, retval]*/ int *pVal); STDMETHOD(get_ErrorLine)(/*[out, retval]*/ int *pVal);
STDMETHOD(get_ErrorCode)(/*[out, retval]*/ int *pVal); STDMETHOD(get_ErrorCode)(/*[out, retval]*/ int *pVal);
STDMETHOD(DeleteBuiltinFunction)(/*[in]*/ BSTR name, /*[out, retval]*/ int* ret); STDMETHOD(DeleteFunction)(/*[in]*/ BSTR name, /*[out, retval]*/ int* ret);
STDMETHOD(AddBuiltinFunction)(/*[in]*/ BSTR name, /*[in]*/ int min_args, /*[in]*/ int max_args, /*[out, retval]*/ int* ret); STDMETHOD(AddFunction)(/*[in]*/ BSTR name, /*[in]*/ int min_args, /*[in]*/ int max_args, /*[out, retval]*/ int* ret);
STDMETHOD(get_UseLongLong)(/*[out, retval]*/ BOOL *pVal); STDMETHOD(get_UseLongLong)(/*[out, retval]*/ BOOL *pVal);
HRESULT __stdcall Parse (/*[out, retval]*/ int* ret); HRESULT __stdcall Parse (/*[out, retval]*/ int* ret);
HRESULT __stdcall Run (/*[out, retval]*/ int* ret); HRESULT __stdcall Run (/*[out, retval]*/ int* ret);

43
ase/com/asecom.idl
View File

@ -1,5 +1,5 @@
/* /*
* $Id: asecom.idl,v 1.1 2007-03-24 05:18:32 bacon Exp $ * $Id: asecom.idl,v 1.2 2007-04-14 15:30:14 bacon Exp $
*/ */
import "oaidl.idl"; import "oaidl.idl";
@ -21,11 +21,11 @@ interface IAwk : IDispatch
[id(2), helpstring("method Run")] [id(2), helpstring("method Run")]
HRESULT Run([out,retval] int* ret); HRESULT Run([out,retval] int* ret);
[id(3), helpstring("method AddBuiltinFunction")] [id(3), helpstring("method AddFunction")]
HRESULT AddBuiltinFunction([in] BSTR name, [in] int min_args, [in] int max_args, [out, retval] int* ret); HRESULT AddFunction([in] BSTR name, [in] int min_args, [in] int max_args, [out,retval] int* ret);
[id(4), helpstring("method DeleteBuiltinFunction")] [id(4), helpstring("method DeleteFunction")]
HRESULT DeleteBuiltinFunction([in] BSTR name, [out, retval] int* ret); HRESULT DeleteFunction([in] BSTR name, [out,retval] int* ret);
[propget, id(5), helpstring("property ErrorCode")] [propget, id(5), helpstring("property ErrorCode")]
HRESULT ErrorCode([out,retval] int *pVal); HRESULT ErrorCode([out,retval] int *pVal);
@ -158,7 +158,14 @@ library ASELib
importlib("stdole32.tlb"); importlib("stdole32.tlb");
importlib("stdole2.tlb"); importlib("stdole2.tlb");
[helpstring("AwkExtio tpe")] [helpstring("Awk source mode")]
typedef [v1_enum] enum AwkSourceMode
{
AWK_SOURCE_READ = 0,
AWK_SOURCE_WRITE = 1
} AwkSourceMode;
[helpstring("AwkExtio type")]
typedef [v1_enum] enum AwkExtioType typedef [v1_enum] enum AwkExtioType
{ {
AWK_EXTIO_PIPE = 0, AWK_EXTIO_PIPE = 0,
@ -237,37 +244,37 @@ library ASELib
properties: properties:
methods: methods:
[id(1), helpstring("open the source code")] [id(1), helpstring("open the source code")]
int OpenSource([in] int mode); HRESULT OpenSource([in] AwkSourceMode mode, [out,retval] int* ret);
[id(2), helpstring("close the source code")] [id(2), helpstring("close the source code")]
int CloseSource([in] int mode); HRESULT CloseSource([in] AwkSourceMode mode, [out,retval] int* ret);
[id(3), helpstring("read the source code")] [id(3), helpstring("read the source code")]
int ReadSource([in] IBuffer* buf); HRESULT ReadSource([in] IBuffer* buf, [out,retval] int* ret);
[id(4), helpstring("write the source code")] [id(4), helpstring("write the source code")]
int WriteSource([in] IBuffer* buf); HRESULT WriteSource([in] IBuffer* buf, [out,retval] int* ret);
[id(5), helpstring("method OpenExtio")] [id(5), helpstring("method OpenExtio")]
int OpenExtio([in] IAwkExtio* extio); HRESULT OpenExtio([in] IAwkExtio* extio, [out,retval] int* ret);
[id(6), helpstring("method CloseExtio")] [id(6), helpstring("method CloseExtio")]
int CloseExtio([in] IAwkExtio* extio); HRESULT CloseExtio([in] IAwkExtio* extio, [out,retval] int* ret);
[id(7), helpstring("method ReadExtio")] [id(7), helpstring("method ReadExtio")]
int ReadExtio([in] IAwkExtio* extio, [in] IBuffer* buf); HRESULT ReadExtio([in] IAwkExtio* extio, [in] IBuffer* buf, [out,retval] int* ret);
[id(8), helpstring("method WriteExtio")] [id(8), helpstring("method WriteExtio")]
int WriteExtio([in] IAwkExtio* extio, [in] IBuffer* buf); HRESULT WriteExtio([in] IAwkExtio* extio, [in] IBuffer* buf, [out,retval] int* ret);
[id(9), helpstring("method FlushExtio")] [id(9), helpstring("method FlushExtio")]
int FlushExtio([in] IAwkExtio* extio); HRESULT FlushExtio([in] IAwkExtio* extio, [out,retval] int* ret);
[id(10), helpstring("method NextExtio")] [id(10), helpstring("method NextExtio")]
int NextExtio([in] IAwkExtio* extio); HRESULT NextExtio([in] IAwkExtio* extio, [out,retval] int* ret);
[id(11), helpstring("method HandleBuiltinFunction")] [id(11), helpstring("method HandleFunction")]
int HandleBuiltinFunction([in] BSTR name, [in] VARIANT argarray, [out, retval] VARIANT* ret); HRESULT HandleFunction([in] BSTR name, [in] VARIANT argarray, [out,retval] VARIANT* ret);
}; };
/* Awk */ /* Awk */

5
ase/com/awk_cp.h
View File

@ -1,5 +1,5 @@
/* /*
* $Id: awk_cp.h,v 1.9 2007-02-03 10:52:12 bacon Exp $ * $Id: awk_cp.h,v 1.10 2007-04-14 15:30:14 bacon Exp $
* *
* {License} * {License}
*/ */
@ -506,7 +506,7 @@ public:
return -1; return -1;
} }
int Fire_HandleBuiltinFunction ( int Fire_HandleFunction (
ase_awk_run_t* run, BSTR name, SAFEARRAY* argarray, ase_awk_val_t** retv) ase_awk_run_t* run, BSTR name, SAFEARRAY* argarray, ase_awk_val_t** retv)
{ {
T* pT = static_cast<T*>(this); T* pT = static_cast<T*>(this);
@ -595,7 +595,6 @@ public:
return 2; /* no proper handler */ return 2; /* no proper handler */
} }
}; };
#endif #endif

4
ase/lsp/mem.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: mem.c,v 1.35 2007-04-13 10:06:25 bacon Exp $ * $Id: mem.c,v 1.36 2007-04-14 15:30:14 bacon Exp $
* *
* {License} * {License}
*/ */
@ -350,6 +350,7 @@ static void __sweep_unmarked_objs (ase_lsp_mem_t* mem)
ASE_LSP_PERM(obj) == 0) ASE_LSP_PERM(obj) == 0)
{ {
/* dispose of unused objects */ /* dispose of unused objects */
/*
if (i == ASE_LSP_OBJ_INT) if (i == ASE_LSP_OBJ_INT)
ase_printf (ASE_T("disposing....%d [%d]\n"), i, (int)ASE_LSP_IVAL(obj)); ase_printf (ASE_T("disposing....%d [%d]\n"), i, (int)ASE_LSP_IVAL(obj));
if (i == ASE_LSP_OBJ_REAL) if (i == ASE_LSP_OBJ_REAL)
@ -360,6 +361,7 @@ else if (i == ASE_LSP_OBJ_STR)
ase_printf (ASE_T("disposing....%d [%s]\n"), i, ASE_LSP_STRPTR(obj)); ase_printf (ASE_T("disposing....%d [%s]\n"), i, ASE_LSP_STRPTR(obj));
else else
ase_printf (ASE_T("disposing....%d\n"), i); ase_printf (ASE_T("disposing....%d\n"), i);
*/
ase_lsp_dispose (mem, prev, obj); ase_lsp_dispose (mem, prev, obj);
} }
else else

8
ase/test/com/AwkForm.frm
View File

@ -184,7 +184,7 @@ Private Sub Execute_Click()
Exit Sub Exit Sub
End If End If
Call Awk.AddBuiltinFunction("tan", 1, 1) Call Awk.AddBuiltinFunction("tan", 1, 1)
Call Awk.AddBuiltinFunction("sqr", 1, 1) Call Awk.AddBuiltinFunction("sqrt", 1, 1)
Call Awk.AddBuiltinFunction("trim", 1, 1) Call Awk.AddBuiltinFunction("trim", 1, 1)
'Call Awk.DeleteBuiltinFunction("tan") 'Call Awk.DeleteBuiltinFunction("tan")
@ -201,11 +201,11 @@ Private Sub Execute_Click()
End Sub End Sub
Function Awk_OpenSource(ByVal mode As Long) As Long Function Awk_OpenSource(ByVal mode As ASELib.AwkSourceMode) As Long
Awk_OpenSource = 1 Awk_OpenSource = 1
End Function End Function
Function Awk_CloseSource(ByVal mode As Long) As Long Function Awk_CloseSource(ByVal mode As ASELib.AwkSourceMode) As Long
Awk_CloseSource = 0 Awk_CloseSource = 0
End Function End Function
@ -435,7 +435,7 @@ Function Awk_HandleBuiltinFunction(ByVal name As String, ByVal args As Variant)
ElseIf TypeName(args(0)) = "Null" Then ElseIf TypeName(args(0)) = "Null" Then
Awk_HandleBuiltinFunction = Tan(0) Awk_HandleBuiltinFunction = Tan(0)
End If End If
ElseIf name = "sqr" Then ElseIf name = "sqrt" Then
If IsNull(args(0)) Then If IsNull(args(0)) Then
Awk_HandleBuiltinFunction = Sqr(0) Awk_HandleBuiltinFunction = Sqr(0)
ElseIf IsNumeric(args(0)) Then ElseIf IsNumeric(args(0)) Then

2
ase/test/com/ase.vbp
View File

@ -1,6 +1,6 @@
Type=Exe Type=Exe
Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\WINDOWS\System32\stdole2.tlb#OLE Automation Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\WINDOWS\System32\stdole2.tlb#OLE Automation
Reference=*\G{F9C69806-16A1-4162-998A-876B33C470BF}#1.0#0#..\..\debug\ase.dll#ASE Awk 1.0 Type Library Reference=*\G{F9C69806-16A1-4162-998A-876B33C470BF}#1.0#0#..\..\release\lib\asecom.dll#ASE Awk 1.0 Type Library
Form=AwkForm.frm Form=AwkForm.frm
Class=AwkExtioConsole; AwkExtioConsole.cls Class=AwkExtioConsole; AwkExtioConsole.cls
IconForm="AwkForm" IconForm="AwkForm"