diff --git a/ase/com/Awk.cpp b/ase/com/Awk.cpp index 5757d0be..35ec7c5d 100644 --- a/ase/com/Awk.cpp +++ b/ase/com/Awk.cpp @@ -54,9 +54,7 @@ CAwk::CAwk (): { /* TODO: what is the best default option? */ option = - ASE_AWK_IMPLICIT | - ASE_AWK_UNIQUEFN | - ASE_AWK_SHADING | + ASE_AWK_IMPLICIT | ASE_AWK_EXTIO | ASE_AWK_BLOCKLESS | ASE_AWK_BASEONE | @@ -1153,36 +1151,6 @@ STDMETHODIMP CAwk::put_ExplicitVariable(VARIANT_BOOL newVal) return S_OK; } -STDMETHODIMP CAwk::get_UniqueFunction(VARIANT_BOOL *pVal) -{ - if (handle != NULL) option = ase_awk_getoption (handle); - *pVal = (option & ASE_AWK_UNIQUEFN) == 1; - return S_OK; -} - -STDMETHODIMP CAwk::put_UniqueFunction(VARIANT_BOOL newVal) -{ - if (newVal) option = option | ASE_AWK_UNIQUEFN; - else option = option & ~ASE_AWK_UNIQUEFN; - if (handle != NULL) ase_awk_setoption (handle, option); - return S_OK; -} - -STDMETHODIMP CAwk::get_VariableShading(VARIANT_BOOL *pVal) -{ - if (handle != NULL) option = ase_awk_getoption (handle); - *pVal = (option & ASE_AWK_SHADING) == 1; - return S_OK; -} - -STDMETHODIMP CAwk::put_VariableShading(VARIANT_BOOL newVal) -{ - if (newVal) option = option | ASE_AWK_SHADING; - else option = option & ~ASE_AWK_SHADING; - if (handle != NULL) ase_awk_setoption (handle, option); - return S_OK; -} - STDMETHODIMP CAwk::get_ShiftOperators(VARIANT_BOOL *pVal) { if (handle != NULL) option = ase_awk_getoption (handle); diff --git a/ase/com/Awk.h b/ase/com/Awk.h index 60a9a8cc..30107fde 100644 --- a/ase/com/Awk.h +++ b/ase/com/Awk.h @@ -167,10 +167,6 @@ public: STDMETHOD(put_IdivOperator)(/*[in]*/ VARIANT_BOOL newVal); STDMETHOD(get_ShiftOperators)(/*[out, retval]*/ VARIANT_BOOL *pVal); STDMETHOD(put_ShiftOperators)(/*[in]*/ VARIANT_BOOL newVal); - STDMETHOD(get_VariableShading)(/*[out, retval]*/ VARIANT_BOOL *pVal); - STDMETHOD(put_VariableShading)(/*[in]*/ VARIANT_BOOL newVal); - STDMETHOD(get_UniqueFunction)(/*[out, retval]*/ VARIANT_BOOL *pVal); - STDMETHOD(put_UniqueFunction)(/*[in]*/ VARIANT_BOOL newVal); STDMETHOD(get_ExplicitVariable)(/*[out, retval]*/ VARIANT_BOOL *pVal); STDMETHOD(put_ExplicitVariable)(/*[in]*/ VARIANT_BOOL newVal); STDMETHOD(get_ImplicitVariable)(/*[out, retval]*/ VARIANT_BOOL *pVal); diff --git a/ase/com/asecom.idl b/ase/com/asecom.idl index 8a825e7c..a802628c 100644 --- a/ase/com/asecom.idl +++ b/ase/com/asecom.idl @@ -62,16 +62,6 @@ interface IAwk : IDispatch [propput, id(14), helpstring("property ExplicitVariable")] HRESULT ExplicitVariable([in] VARIANT_BOOL newVal); - [propget, id(15), helpstring("property UniqueFunction")] - HRESULT UniqueFunction([out,retval] VARIANT_BOOL *pVal); - [propput, id(15), helpstring("property UniqueFunction")] - HRESULT UniqueFunction([in] VARIANT_BOOL newVal); - - [propget, id(16), helpstring("property VariableShading")] - HRESULT VariableShading([out,retval] VARIANT_BOOL *pVal); - [propput, id(16), helpstring("property VariableShading")] - HRESULT VariableShading([in] VARIANT_BOOL newVal); - [propget, id(17), helpstring("property ShiftOperators")] HRESULT ShiftOperators([out,retval] VARIANT_BOOL *pVal); [propput, id(17), helpstring("property ShiftOperators")] diff --git a/ase/net/Awk.hpp b/ase/net/Awk.hpp index d40031a4..8c052cb0 100644 --- a/ase/net/Awk.hpp +++ b/ase/net/Awk.hpp @@ -31,8 +31,6 @@ public: NONE = 0, IMPLICIT = ASE::Awk::OPT_IMPLICIT, EXPLICIT = ASE::Awk::OPT_EXPLICIT, - UNIQUEFN = ASE::Awk::OPT_UNIQUEFN, - SHADING = ASE::Awk::OPT_SHADING, SHIFT = ASE::Awk::OPT_SHIFT, IDIV = ASE::Awk::OPT_IDIV, STRCONCAT = ASE::Awk::OPT_STRCONCAT, diff --git a/ase/test/com/Awk.cs b/ase/test/com/Awk.cs index 57967e77..58b1e7fc 100644 --- a/ase/test/com/Awk.cs +++ b/ase/test/com/Awk.cs @@ -100,18 +100,6 @@ namespace ase.com set { awk.ExplicitVariable = value; } } - public bool UniqueFunction - { - get { return awk.UniqueFunction; } - set { awk.UniqueFunction = value; } - } - - public bool VariableShading - { - get { return awk.VariableShading; } - set { awk.VariableShading = value; } - } - public bool ShiftOperators { get { return awk.ShiftOperators; } diff --git a/ase/test/net/AwkForm.cs b/ase/test/net/AwkForm.cs index 63ede221..cf45e673 100644 Binary files a/ase/test/net/AwkForm.cs and b/ase/test/net/AwkForm.cs differ