Add scope modes instead of a flag.
This commit is contained in:
parent
763cfdd7a3
commit
88ec979ba5
|
@ -8,6 +8,16 @@
|
|||
|
||||
struct libab_s;
|
||||
|
||||
/**
|
||||
* Scope moe used to determine how the interpreter handles
|
||||
* scoping.
|
||||
*/
|
||||
enum libab_interpreter_scope_mode_e {
|
||||
SCOPE_NORMAL,
|
||||
SCOPE_FORCE,
|
||||
SCOPE_NONE
|
||||
};
|
||||
|
||||
/**
|
||||
* The interpreter struct used to encapsulate
|
||||
* any interpreter-specific data.
|
||||
|
@ -20,6 +30,7 @@ struct libab_interpreter_s {
|
|||
libab_ref value_unit;
|
||||
};
|
||||
|
||||
typedef enum libab_interpreter_scope_mode_e libab_interpreter_scope_mode;
|
||||
typedef struct libab_interpreter_s libab_interpreter;
|
||||
|
||||
/**
|
||||
|
@ -32,11 +43,13 @@ libab_result libab_interpreter_init(libab_interpreter* intr, struct libab_s* ab)
|
|||
* Uses the interpreter to run the given parse tree.
|
||||
* @param intr the interpreter to use to run the code.
|
||||
* @param tree the tree to run.
|
||||
* @param mode the scope mode to use.
|
||||
* @param into the reference into which the result of the execution will be
|
||||
* stored.
|
||||
* @return the result of the execution.
|
||||
*/
|
||||
libab_result libab_interpreter_run(libab_interpreter* intr, libab_tree* tree,
|
||||
libab_interpreter_scope_mode mode,
|
||||
libab_ref* into);
|
||||
/**
|
||||
* Calls a function with the given parameters.
|
||||
|
|
|
@ -849,7 +849,7 @@ libab_result _interpreter_try_call(struct interpreter_state* state,
|
|||
|
||||
libab_result _interpreter_run(struct interpreter_state* state, libab_tree* tree,
|
||||
libab_ref* into, libab_ref* scope,
|
||||
int force_scope);
|
||||
libab_interpreter_scope_mode scope_mode);
|
||||
|
||||
libab_result _interpreter_require_value(libab_ref* scope, const char* name,
|
||||
libab_ref* into) {
|
||||
|
@ -878,7 +878,7 @@ libab_result _interpreter_call_operator(struct interpreter_state* state,
|
|||
if (result == LIBAB_SUCCESS) {
|
||||
/* Get first parameter. */
|
||||
result =
|
||||
_interpreter_run(state, va_arg(args, libab_tree*), &temp, scope, 0);
|
||||
_interpreter_run(state, va_arg(args, libab_tree*), &temp, scope, SCOPE_NORMAL);
|
||||
|
||||
if (result == LIBAB_SUCCESS) {
|
||||
result = libab_ref_vec_insert(¶ms, &temp);
|
||||
|
@ -889,7 +889,7 @@ libab_result _interpreter_call_operator(struct interpreter_state* state,
|
|||
/* If infix, get second parameter. */
|
||||
if (result == LIBAB_SUCCESS && to_call->variant == OPERATOR_INFIX) {
|
||||
result = _interpreter_run(state, va_arg(args, libab_tree*), &temp,
|
||||
scope, 0);
|
||||
scope, SCOPE_NORMAL);
|
||||
|
||||
if (result == LIBAB_SUCCESS) {
|
||||
result = libab_ref_vec_insert(¶ms, &temp);
|
||||
|
@ -915,7 +915,7 @@ libab_result _interpreter_call_operator(struct interpreter_state* state,
|
|||
return result;
|
||||
}
|
||||
|
||||
libab_result _interpreter_run_function_node(struct interpreter_state* state,
|
||||
libab_result _interpreter_run_call_node(struct interpreter_state* state,
|
||||
libab_tree* tree, libab_ref* into,
|
||||
libab_ref* scope) {
|
||||
libab_result result = LIBAB_SUCCESS;
|
||||
|
@ -931,7 +931,7 @@ libab_result _interpreter_run_function_node(struct interpreter_state* state,
|
|||
count++) {
|
||||
libab_ref_free(¶m);
|
||||
child = vec_index(&tree->children, count);
|
||||
result = _interpreter_run(state, child, ¶m, scope, 0);
|
||||
result = _interpreter_run(state, child, ¶m, scope, SCOPE_NORMAL);
|
||||
|
||||
if (result == LIBAB_SUCCESS) {
|
||||
result = libab_ref_vec_insert(¶ms, ¶m);
|
||||
|
@ -946,7 +946,7 @@ libab_result _interpreter_run_function_node(struct interpreter_state* state,
|
|||
if (result == LIBAB_SUCCESS) {
|
||||
result = _interpreter_run(
|
||||
state, vec_index(&tree->children, tree->children.size - 1), &callee,
|
||||
scope, 0);
|
||||
scope, SCOPE_NORMAL);
|
||||
if (result != LIBAB_SUCCESS) {
|
||||
libab_ref_vec_free(¶ms);
|
||||
}
|
||||
|
@ -1071,10 +1071,11 @@ libab_result _interpreter_create_function_value(
|
|||
|
||||
libab_result _interpreter_run(struct interpreter_state* state, libab_tree* tree,
|
||||
libab_ref* into, libab_ref* scope,
|
||||
int force_scope) {
|
||||
libab_interpreter_scope_mode mode) {
|
||||
libab_result result = LIBAB_SUCCESS;
|
||||
libab_ref new_scope;
|
||||
int needs_scope = libab_tree_has_scope(tree->variant) || force_scope;
|
||||
int needs_scope = (mode == SCOPE_FORCE) ||
|
||||
(mode == SCOPE_NORMAL && libab_tree_has_scope(tree->variant));
|
||||
|
||||
if (needs_scope) {
|
||||
result = libab_create_table(&new_scope, scope);
|
||||
|
@ -1089,7 +1090,7 @@ libab_result _interpreter_run(struct interpreter_state* state, libab_tree* tree,
|
|||
while (result == LIBAB_SUCCESS && index < tree->children.size) {
|
||||
libab_ref_free(into);
|
||||
result = _interpreter_run(state, vec_index(&tree->children, index),
|
||||
into, scope, 0);
|
||||
into, scope, SCOPE_NORMAL);
|
||||
index++;
|
||||
}
|
||||
} else if (tree->variant == TREE_NUM) {
|
||||
|
@ -1099,7 +1100,7 @@ libab_result _interpreter_run(struct interpreter_state* state, libab_tree* tree,
|
|||
} else if (tree->variant == TREE_ID) {
|
||||
result = _interpreter_require_value(scope, tree->string_value, into);
|
||||
} else if (tree->variant == TREE_CALL) {
|
||||
result = _interpreter_run_function_node(state, tree, into, scope);
|
||||
result = _interpreter_run_call_node(state, tree, into, scope);
|
||||
} else if (tree->variant == TREE_OP) {
|
||||
libab_operator* to_call = libab_table_search_operator(
|
||||
libab_ref_get(scope), tree->string_value, OPERATOR_INFIX);
|
||||
|
@ -1144,12 +1145,13 @@ libab_result _interpreter_run(struct interpreter_state* state, libab_tree* tree,
|
|||
}
|
||||
|
||||
libab_result libab_interpreter_run(libab_interpreter* intr, libab_tree* tree,
|
||||
libab_interpreter_scope_mode mode,
|
||||
libab_ref* into) {
|
||||
struct interpreter_state state;
|
||||
libab_result result;
|
||||
|
||||
_interpreter_init(&state, intr);
|
||||
result = _interpreter_run(&state, tree, into, &state.ab->table, 1);
|
||||
result = _interpreter_run(&state, tree, into, &state.ab->table, mode);
|
||||
_interpreter_free(&state);
|
||||
|
||||
return result;
|
||||
|
|
|
@ -394,7 +394,7 @@ libab_result libab_run(libab* ab, const char* string, libab_ref* value) {
|
|||
|
||||
if (result == LIBAB_SUCCESS) {
|
||||
libab_ref_free(value);
|
||||
result = libab_interpreter_run(&ab->intr, root, value);
|
||||
result = libab_interpreter_run(&ab->intr, root, SCOPE_NORMAL, value);
|
||||
libab_tree_free_recursive(root);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user