Compare commits
3
Commits
7f7893d4d1
...
79296debb1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
79296debb1 | ||
|
|
6999c3ac37 | ||
|
|
c3e4fd8457 |
+30
-1
@@ -69,10 +69,12 @@ typedef struct hawk_tree_t hawk_tree_t;
|
|||||||
#define HAWK_ENABLE_ATOMIC_SIG
|
#define HAWK_ENABLE_ATOMIC_SIG
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
#if defined(HAVE_UCONTEXT_H)
|
#if defined(HAVE_UCONTEXT_H)
|
||||||
#include <ucontext.h>
|
#include <ucontext.h>
|
||||||
#define HAWK_ENABLE_UCONTEXT
|
#define HAWK_ENABLE_UCONTEXT
|
||||||
#endif
|
#endif
|
||||||
|
*/
|
||||||
|
|
||||||
/* Use iterative (heap-stack) expression evaluation instead of C recursion.
|
/* Use iterative (heap-stack) expression evaluation instead of C recursion.
|
||||||
* eval_expression, eval_expression0, and hawk_rtx_evalcall automatically
|
* eval_expression, eval_expression0, and hawk_rtx_evalcall automatically
|
||||||
@@ -473,7 +475,10 @@ enum hawk_ef_state_t
|
|||||||
HAWK_EF_LAND_LEFT, /* logical AND: awaiting left result */
|
HAWK_EF_LAND_LEFT, /* logical AND: awaiting left result */
|
||||||
HAWK_EF_LAND_RIGHT, /* logical AND: left done and true (val=left), awaiting right */
|
HAWK_EF_LAND_RIGHT, /* logical AND: left done and true (val=left), awaiting right */
|
||||||
HAWK_EF_LOR_LEFT, /* logical OR: awaiting left result */
|
HAWK_EF_LOR_LEFT, /* logical OR: awaiting left result */
|
||||||
HAWK_EF_LOR_RIGHT /* logical OR: left done and false (val=left), awaiting right */
|
HAWK_EF_LOR_RIGHT, /* logical OR: left done and false (val=left), awaiting right */
|
||||||
|
#if defined(HAWK_ENABLE_XSTACK_EVAL)
|
||||||
|
HAWK_EF_FNCALL_FUN_AWAIT /* user fn body executing on exec_stack; aux=exec_body_base */
|
||||||
|
#endif
|
||||||
};
|
};
|
||||||
typedef enum hawk_ef_state_t hawk_ef_state_t;
|
typedef enum hawk_ef_state_t hawk_ef_state_t;
|
||||||
|
|
||||||
@@ -482,9 +487,24 @@ struct hawk_eframe_t
|
|||||||
hawk_ef_state_t state;
|
hawk_ef_state_t state;
|
||||||
hawk_nde_t* nde; /* composite node being processed */
|
hawk_nde_t* nde; /* composite node being processed */
|
||||||
hawk_val_t* val; /* intermediate value (refcount incremented) */
|
hawk_val_t* val; /* intermediate value (refcount incremented) */
|
||||||
|
hawk_oow_t aux; /* FNCALL_FUN_AWAIT: exec_stack size when body frames were pushed */
|
||||||
};
|
};
|
||||||
typedef struct hawk_eframe_t hawk_eframe_t;
|
typedef struct hawk_eframe_t hawk_eframe_t;
|
||||||
|
|
||||||
|
#if defined(HAWK_ENABLE_XSTACK_EVAL)
|
||||||
|
/* call frame: saves context for a user-defined function call made from within
|
||||||
|
* expression evaluation. stored in the call_stack. */
|
||||||
|
struct hawk_call_frame_t
|
||||||
|
{
|
||||||
|
hawk_nde_fncall_t* call; /* call-site node */
|
||||||
|
hawk_fun_t* fun; /* resolved function */
|
||||||
|
hawk_oow_t saved_stack_top; /* rtx->stack_top before the call */
|
||||||
|
hawk_oow_t saved_stack_base;/* rtx->stack_base before the call */
|
||||||
|
hawk_oow_t nargs; /* actual argument count pushed */
|
||||||
|
};
|
||||||
|
typedef struct hawk_call_frame_t hawk_call_frame_t;
|
||||||
|
#endif
|
||||||
|
|
||||||
struct hawk_rtx_t
|
struct hawk_rtx_t
|
||||||
{
|
{
|
||||||
HAWK_RTX_HDR;
|
HAWK_RTX_HDR;
|
||||||
@@ -509,6 +529,15 @@ struct hawk_rtx_t
|
|||||||
hawk_oow_t eframe_stack_size;
|
hawk_oow_t eframe_stack_size;
|
||||||
hawk_oow_t eframe_stack_limit;
|
hawk_oow_t eframe_stack_limit;
|
||||||
|
|
||||||
|
#if defined(HAWK_ENABLE_XSTACK_EVAL)
|
||||||
|
/* heap-based call frame stack: user-defined function calls from eframe evaluation */
|
||||||
|
hawk_call_frame_t* call_stack;
|
||||||
|
hawk_oow_t call_stack_size;
|
||||||
|
hawk_oow_t call_stack_limit;
|
||||||
|
/* result register: eframe eval result delivered to exec AFTER_EVAL frames */
|
||||||
|
hawk_val_t* driver_eval_result;
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(HAVE_UCONTEXT_H)
|
#if defined(HAVE_UCONTEXT_H)
|
||||||
/* pool of reusable C stacks for coroutine-based function calls */
|
/* pool of reusable C stacks for coroutine-based function calls */
|
||||||
struct
|
struct
|
||||||
|
|||||||
@@ -1922,12 +1922,14 @@ static HAWK_INLINE void hawk_geterruinf (hawk_t* hawk, hawk_erruinf_t* errinf) {
|
|||||||
* it automatically formatted.
|
* it automatically formatted.
|
||||||
*/
|
*/
|
||||||
#if defined(HAWK_HAVE_INLINE)
|
#if defined(HAWK_HAVE_INLINE)
|
||||||
|
static HAWK_INLINE void hawk_clrerror (hawk_t* hawk) { hawk_gem_seterrnum(hawk_getgem(hawk), HAWK_NULL, HAWK_ENOERR); }
|
||||||
static HAWK_INLINE void hawk_seterrnum (hawk_t* hawk, const hawk_loc_t* errloc, hawk_errnum_t errnum) { hawk_gem_seterrnum(hawk_getgem(hawk), errloc, errnum); }
|
static HAWK_INLINE void hawk_seterrnum (hawk_t* hawk, const hawk_loc_t* errloc, hawk_errnum_t errnum) { hawk_gem_seterrnum(hawk_getgem(hawk), errloc, errnum); }
|
||||||
static HAWK_INLINE void hawk_seterrinf (hawk_t* hawk, const hawk_errinf_t* errinf) { hawk_gem_seterrinf(hawk_getgem(hawk), errinf); }
|
static HAWK_INLINE void hawk_seterrinf (hawk_t* hawk, const hawk_errinf_t* errinf) { hawk_gem_seterrinf(hawk_getgem(hawk), errinf); }
|
||||||
static HAWK_INLINE void hawk_seterror (hawk_t* hawk, const hawk_loc_t* errloc, hawk_errnum_t errnum, const hawk_oocs_t* errarg) { hawk_gem_seterror(hawk_getgem(hawk), errloc, errnum, errarg); }
|
static HAWK_INLINE void hawk_seterror (hawk_t* hawk, const hawk_loc_t* errloc, hawk_errnum_t errnum, const hawk_oocs_t* errarg) { hawk_gem_seterror(hawk_getgem(hawk), errloc, errnum, errarg); }
|
||||||
static HAWK_INLINE const hawk_ooch_t* hawk_backuperrmsg (hawk_t* hawk) { return hawk_gem_backuperrmsg(hawk_getgem(hawk)); }
|
static HAWK_INLINE const hawk_ooch_t* hawk_backuperrmsg (hawk_t* hawk) { return hawk_gem_backuperrmsg(hawk_getgem(hawk)); }
|
||||||
static HAWK_INLINE void hawk_geterror (hawk_t* hawk, hawk_errnum_t* errnum, const hawk_ooch_t** errmsg, hawk_loc_t* errloc) { return hawk_gem_geterror(hawk_getgem(hawk), errnum, errmsg, errloc); }
|
static HAWK_INLINE void hawk_geterror (hawk_t* hawk, hawk_errnum_t* errnum, const hawk_ooch_t** errmsg, hawk_loc_t* errloc) { return hawk_gem_geterror(hawk_getgem(hawk), errnum, errmsg, errloc); }
|
||||||
#else
|
#else
|
||||||
|
#define hawk_clrerror(hawk) hawk_gem_seterrnum(hawk_getgem(hawk), HAWK_NULL, HAWK_ENOERR)
|
||||||
#define hawk_seterrnum(hawk, errloc, errnum) hawk_gem_seterrnum(hawk_getgem(hawk), errloc, errnum)
|
#define hawk_seterrnum(hawk, errloc, errnum) hawk_gem_seterrnum(hawk_getgem(hawk), errloc, errnum)
|
||||||
#define hawk_seterrinf(hawk, errinf) hawk_gem_seterrinf(hawk_getgem(hawk), errinf)
|
#define hawk_seterrinf(hawk, errinf) hawk_gem_seterrinf(hawk_getgem(hawk), errinf)
|
||||||
#define hawk_seterror(hawk, errloc, errnum, errarg) hawk_gem_seterror(hawk_getgem(hawk), errloc, errnum, errarg)
|
#define hawk_seterror(hawk, errloc, errnum, errarg) hawk_gem_seterror(hawk_getgem(hawk), errloc, errnum, errarg)
|
||||||
@@ -3119,11 +3121,13 @@ static HAWK_INLINE void hawk_rtx_geterror (hawk_rtx_t* rtx, hawk_errnum_t* errnu
|
|||||||
* The hawk_rtx_seterrinf() function sets error information.
|
* The hawk_rtx_seterrinf() function sets error information.
|
||||||
*/
|
*/
|
||||||
#if defined(HAWK_HAVE_INLINE)
|
#if defined(HAWK_HAVE_INLINE)
|
||||||
|
static HAWK_INLINE void hawk_rtx_clrerror (hawk_rtx_t* rtx) { hawk_gem_seterrnum(hawk_rtx_getgem(rtx), HAWK_NULL, HAWK_ENOERR); }
|
||||||
static HAWK_INLINE void hawk_rtx_seterrnum (hawk_rtx_t* rtx, const hawk_loc_t* errloc, hawk_errnum_t errnum) { hawk_gem_seterrnum (hawk_rtx_getgem(rtx), errloc, errnum); }
|
static HAWK_INLINE void hawk_rtx_seterrnum (hawk_rtx_t* rtx, const hawk_loc_t* errloc, hawk_errnum_t errnum) { hawk_gem_seterrnum (hawk_rtx_getgem(rtx), errloc, errnum); }
|
||||||
static HAWK_INLINE void hawk_rtx_seterrinf (hawk_rtx_t* rtx, const hawk_errinf_t* errinf) { hawk_gem_seterrinf (hawk_rtx_getgem(rtx), errinf); }
|
static HAWK_INLINE void hawk_rtx_seterrinf (hawk_rtx_t* rtx, const hawk_errinf_t* errinf) { hawk_gem_seterrinf (hawk_rtx_getgem(rtx), errinf); }
|
||||||
static HAWK_INLINE void hawk_rtx_seterror (hawk_rtx_t* rtx, const hawk_loc_t* errloc, hawk_errnum_t errnum, const hawk_oocs_t* errarg) { hawk_gem_seterror(hawk_rtx_getgem(rtx), errloc, errnum, errarg); }
|
static HAWK_INLINE void hawk_rtx_seterror (hawk_rtx_t* rtx, const hawk_loc_t* errloc, hawk_errnum_t errnum, const hawk_oocs_t* errarg) { hawk_gem_seterror(hawk_rtx_getgem(rtx), errloc, errnum, errarg); }
|
||||||
static HAWK_INLINE const hawk_ooch_t* hawk_rtx_backuperrmsg (hawk_rtx_t* rtx) { return hawk_gem_backuperrmsg(hawk_rtx_getgem(rtx)); }
|
static HAWK_INLINE const hawk_ooch_t* hawk_rtx_backuperrmsg (hawk_rtx_t* rtx) { return hawk_gem_backuperrmsg(hawk_rtx_getgem(rtx)); }
|
||||||
#else
|
#else
|
||||||
|
#define hawk_rtx_clrerror(rtx) hawk_gem_seterrnum(hawk_rtx_getgem(rtx), HAWK_NULL, HAWK_ENOERR)
|
||||||
#define hawk_rtx_seterrnum(rtx, errloc, errnum) hawk_gem_seterrnum(hawk_rtx_getgem(rtx), errloc, errnum)
|
#define hawk_rtx_seterrnum(rtx, errloc, errnum) hawk_gem_seterrnum(hawk_rtx_getgem(rtx), errloc, errnum)
|
||||||
#define hawk_rtx_seterrinf(rtx, errinf) hawk_gem_seterrinf(hawk_rtx_getgem(rtx), errinf)
|
#define hawk_rtx_seterrinf(rtx, errinf) hawk_gem_seterrinf(hawk_rtx_getgem(rtx), errinf)
|
||||||
#define hawk_rtx_seterror(rtx, errloc, errnum, errarg) hawk_gem_seterror(hawk_rtx_getgem(rtx), errloc, errnum, errarg)
|
#define hawk_rtx_seterror(rtx, errloc, errnum, errarg) hawk_gem_seterror(hawk_rtx_getgem(rtx), errloc, errnum, errarg)
|
||||||
|
|||||||
+1
-1
@@ -30,10 +30,10 @@ enum hawk_assop_type_t
|
|||||||
/* if you change this, you have to change assop_str in tree.c.
|
/* if you change this, you have to change assop_str in tree.c.
|
||||||
* synchronize it wit:
|
* synchronize it wit:
|
||||||
* - binop_func in eval_assignment of run.c
|
* - binop_func in eval_assignment of run.c
|
||||||
|
* - binop_func in eval_expression0_xstack in run.c
|
||||||
* - assop in assing_to_opcode of parse.c
|
* - assop in assing_to_opcode of parse.c
|
||||||
* - TOK_XXX_ASSN in tok_t in parse.c
|
* - TOK_XXX_ASSN in tok_t in parse.c
|
||||||
* - assop_str in tree.c
|
* - assop_str in tree.c
|
||||||
* - ass_binop in eval_expression0_xstack in run.c
|
|
||||||
*/
|
*/
|
||||||
HAWK_ASSOP_NONE,
|
HAWK_ASSOP_NONE,
|
||||||
HAWK_ASSOP_PLUS, /* += */
|
HAWK_ASSOP_PLUS, /* += */
|
||||||
|
|||||||
Reference in New Issue
Block a user