rename func / process to interpret

in preparation for adding compile / parse functions to the
unlang_op_t structure

diff --git a/src/lib/unlang/base.c b/src/lib/unlang/base.c
index 87f96789c4dd10494f6d629a405289ee5dac0d50..384591438f308145ef12118a38a5b1db5a1faaeb 100644 (file)
--- a/src/lib/unlang/base.c
+++ b/src/lib/unlang/base.c
@@ -37,12 +37,7 @@ RCSID("$Id$")
  */
 bool unlang_section(CONF_SECTION *cs)
 {
-       unlang_t        *instruction = NULL;
-
-       instruction = (unlang_t *)cf_data_value(cf_data_find(cs, unlang_group_t, NULL));
-       if (instruction) return true;
-
-       return false;
+       return (cf_data_find(cs, unlang_group_t, NULL) != NULL);
 }
 
 /** Register an operation with the interpreter

diff --git a/src/lib/unlang/call.c b/src/lib/unlang/call.c
index b7a3881b60a7d8b1add48f906d14fe6109a12060..2b5e4ed9b49b81ae6d43d741f8f38b37525e2ecd 100644 (file)
--- a/src/lib/unlang/call.c
+++ b/src/lib/unlang/call.c
@@ -40,7 +40,7 @@ static void unlang_call_signal(REQUEST *request, fr_state_signal_t action)
 }
 
 
-static unlang_action_t unlang_call_run(REQUEST *request, rlm_rcode_t *presult)
+static unlang_action_t unlang_call_child(REQUEST *request, rlm_rcode_t *presult)
 {
        unlang_stack_t                  *stack = request->stack;
        unlang_stack_frame_t            *frame = &stack->frame[stack->depth];
@@ -78,8 +78,8 @@ static unlang_action_t unlang_call_process(REQUEST *request, rlm_rcode_t *presul
                return UNLANG_ACTION_YIELD;
        }
 
-       frame->process = unlang_call_run;
-       return unlang_call_run(request, presult);
+       frame->interpret = unlang_call_child;
+       return unlang_call_child(request, presult);
 }
 
 static unlang_action_t unlang_call(REQUEST *request, rlm_rcode_t *presult)
@@ -222,7 +222,7 @@ static unlang_action_t unlang_call(REQUEST *request, rlm_rcode_t *presult)
         */
        unlang_interpret_push(child, g->children, frame->result,
                              UNLANG_NEXT_SIBLING, UNLANG_TOP_FRAME);
-       frame->process = unlang_call_process;
+       frame->interpret = unlang_call_process;
        frame->state = child;
        return unlang_call_process(request, presult);
 }
@@ -233,7 +233,7 @@ void unlang_call_init(void)
        unlang_register(UNLANG_TYPE_CALL,
                           &(unlang_op_t){
                                .name = "call",
-                               .func = unlang_call,
+                               .interpret = unlang_call,
                                .signal = unlang_call_signal,
                                .debug_braces = true
                           });

diff --git a/src/lib/unlang/condition.c b/src/lib/unlang/condition.c
index 70fcaaebcca625f910b4d71085c6532dad220bff..e215571ea6bdd3d258112e6072c76a52d48d1d81 100644 (file)
--- a/src/lib/unlang/condition.c
+++ b/src/lib/unlang/condition.c
@@ -83,21 +83,21 @@ void unlang_condition_init(void)
        unlang_register(UNLANG_TYPE_IF,
                           &(unlang_op_t){
                                .name = "if",
-                               .func = unlang_if,
+                               .interpret = unlang_if,
                                .debug_braces = true
                           });
 
        unlang_register(UNLANG_TYPE_ELSE,
                           &(unlang_op_t){
                                .name = "else",
-                               .func = unlang_group,
+                               .interpret = unlang_group,
                                .debug_braces = true
                           });
 
        unlang_register(UNLANG_TYPE_ELSIF,
                           &(unlang_op_t){
                                .name = "elseif",
-                               .func = unlang_if,
+                               .interpret = unlang_if,
                                .debug_braces = true
                           });
 }

diff --git a/src/lib/unlang/foreach.c b/src/lib/unlang/foreach.c
index 0d1ab4c34cb5bffe882471a2fc6b0aa070be5dfb..00636bff43f36c60f54dae4a26ee361ce89f42e2 100644 (file)
--- a/src/lib/unlang/foreach.c
+++ b/src/lib/unlang/foreach.c
@@ -180,7 +180,7 @@ static unlang_action_t unlang_foreach(REQUEST *request, rlm_rcode_t *presult)
 #endif
        talloc_set_destructor(foreach, _free_unlang_frame_state_foreach);
 
-       frame->process = unlang_foreach_next;
+       frame->interpret = unlang_foreach_next;
        return unlang_foreach_next(request, presult);
 }
 
@@ -229,14 +229,14 @@ void unlang_foreach_init(void)
        unlang_register(UNLANG_TYPE_FOREACH,
                           &(unlang_op_t){
                                .name = "foreach",
-                               .func = unlang_foreach,
+                               .interpret = unlang_foreach,
                                .debug_braces = true
                           });
 
        unlang_register(UNLANG_TYPE_BREAK,
                           &(unlang_op_t){
                                .name = "break",
-                               .func = unlang_break,
+                               .interpret = unlang_break,
                           });
 }
 

diff --git a/src/lib/unlang/function.c b/src/lib/unlang/function.c
index 03d55a1bf80ea499221ee320756a695f29489830..38369dc90be13d229807b9ac2e77acded3151ae8 100644 (file)
--- a/src/lib/unlang/function.c
+++ b/src/lib/unlang/function.c
@@ -128,7 +128,7 @@ void unlang_function_init(void)
        unlang_register(UNLANG_TYPE_FUNCTION,
                           &(unlang_op_t){
                                .name = "function",
-                               .func = unlang_function_call,
+                               .interpret = unlang_function_call,
                                .debug_braces = false,
                                .frame_state_size = sizeof(unlang_frame_state_func_t),
                                .frame_state_name = "unlang_frame_state_func_t",

diff --git a/src/lib/unlang/group.c b/src/lib/unlang/group.c
index 84991bfbd2931dcf35d75f7a5202a386154f8664..d8e3cb6c94cdbbe0e5bfad2c522be6a129398788 100644 (file)
--- a/src/lib/unlang/group.c
+++ b/src/lib/unlang/group.c
@@ -69,14 +69,14 @@ void unlang_group_init(void)
        unlang_register(UNLANG_TYPE_GROUP,
                           &(unlang_op_t){
                                .name = "group",
-                               .func = unlang_group,
+                               .interpret = unlang_group,
                                .debug_braces = true
                           });
 
        unlang_register(UNLANG_TYPE_POLICY,
                           &(unlang_op_t){
                                .name = "policy",
-                               .func = unlang_policy,
+                               .interpret = unlang_policy,
                                .debug_braces = true
                           });
 }

diff --git a/src/lib/unlang/interpret.c b/src/lib/unlang/interpret.c
index 39f645d2dd95d76fe779bfab28bcbe0cc29ff7ae..12ac1e72e98951cf9e7cad61447654114cfbff83 100644 (file)
--- a/src/lib/unlang/interpret.c
+++ b/src/lib/unlang/interpret.c
@@ -113,7 +113,7 @@ static inline void frame_state_init(unlang_stack_t *stack, unlang_stack_frame_t
 
        op = &unlang_ops[instruction->type];
 
-       frame->process = op->func;
+       frame->interpret = op->interpret;
        frame->signal = op->signal;
 
        /*
@@ -451,8 +451,8 @@ static inline unlang_frame_action_t frame_eval(REQUEST *request, unlang_stack_fr
                RDEBUG4("** [%i] %s >> %s", stack->depth, __FUNCTION__,
                        unlang_ops[instruction->type].name);
 
-               rad_assert(frame->process != NULL);
-               action = frame->process(request, result);
+               rad_assert(frame->interpret != NULL);
+               action = frame->interpret(request, result);
 
                RDEBUG4("** [%i] %s << %s (%d)", stack->depth, __FUNCTION__,
                        fr_table_str_by_value(unlang_action_table, action, "<INVALID>"), *priority);

diff --git a/src/lib/unlang/interpret.h b/src/lib/unlang/interpret.h
index dd7ed0359a7c68da6f8a95256e3129258d003d6f..511dc3bb24a817dfc284cb35667f61b9bf815329 100644 (file)
--- a/src/lib/unlang/interpret.h
+++ b/src/lib/unlang/interpret.h
@@ -33,19 +33,19 @@ extern "C" {
 #define UNLANG_TOP_FRAME (true)
 #define UNLANG_SUB_FRAME (false)
 
-/** Function to call when first evaluating a frame
+/** Function to call when interpreting a frame
  *
  * @param[in] request          The current request.
  * @param[in,out] presult      Pointer to the current rcode, may be modified by the function.
  * @return an action for the interpreter to perform.
  */
-typedef unlang_action_t (*unlang_op_call_t)(REQUEST *request, rlm_rcode_t *presult);
+typedef unlang_action_t (*unlang_op_interpret_t)(REQUEST *request, rlm_rcode_t *presult);
 
 /** Function to call if the initial function yielded and the request was signalled
  *
  * This is the operation specific cancellation function.  This function will usually
  * either call a more specialised cancellation function set when something like a module yielded,
- * or just cleanup the state of the original #unlang_op_call_t.
+ * or just cleanup the state of the original #unlang_op_interpret_t.
  *
  * @param[in] request          The current request.
  * @param[in] action           We're being signalled with.
@@ -70,10 +70,9 @@ typedef unlang_action_t (*unlang_function_t)(REQUEST *request, rlm_rcode_t *pres
 typedef struct {
        char const              *name;                          //!< Name of the operation.
 
-       unlang_op_call_t        func;                           //!< Called when we start the operation.
+       unlang_op_interpret_t   interpret;                      //!< Function to interpret the keyword
 
-       unlang_op_signal_t      signal;                         //!< Called if the request is to be destroyed
-                                                               ///< and we need to cleanup any residual state.
+       unlang_op_signal_t      signal;                         //!< Function to signal stop / dup / whatever
 
        bool                    debug_braces;                   //!< Whether the operation needs to print braces
                                                                ///< in debug mode.

diff --git a/src/lib/unlang/load_balance.c b/src/lib/unlang/load_balance.c
index 9fb774b67da6795a1a51405a30a83ea66a01dd67..9cdd90c248e9096b2a66e84428ba0b3f6076b646 100644 (file)
--- a/src/lib/unlang/load_balance.c
+++ b/src/lib/unlang/load_balance.c
@@ -235,7 +235,7 @@ static unlang_action_t unlang_load_balance(REQUEST *request, rlm_rcode_t *presul
         */
        redundant->child = NULL;
 
-       frame->process = unlang_load_balance_next;
+       frame->interpret = unlang_load_balance_next;
        return unlang_load_balance_next(request, presult);
 }
 
@@ -244,7 +244,7 @@ void unlang_load_balance_init(void)
        unlang_register(UNLANG_TYPE_LOAD_BALANCE,
                           &(unlang_op_t){
                                .name = "load-balance group",
-                               .func = unlang_load_balance,
+                               .interpret = unlang_load_balance,
                                .debug_braces = true,
                                .frame_state_size = sizeof(unlang_frame_state_redundant_t),
                                .frame_state_name = "unlang_frame_state_redundant_t",
@@ -253,7 +253,7 @@ void unlang_load_balance_init(void)
        unlang_register(UNLANG_TYPE_REDUNDANT_LOAD_BALANCE,
                           &(unlang_op_t){
                                .name = "redundant-load-balance group",
-                               .func = unlang_redundant_load_balance,
+                               .interpret = unlang_redundant_load_balance,
                                .debug_braces = true,
                                .frame_state_size = sizeof(unlang_frame_state_redundant_t),
                                .frame_state_name = "unlang_frame_state_redundant_t",

diff --git a/src/lib/unlang/map.c b/src/lib/unlang/map.c
index d3fd7707df0458a6d1041325ff4dbff56a96a4ee..09f9dc14343d394269706e3cf7024a8a7c0fed64 100644 (file)
--- a/src/lib/unlang/map.c
+++ b/src/lib/unlang/map.c
@@ -262,7 +262,7 @@ static unlang_action_t unlang_update_state_init(REQUEST *request, rlm_rcode_t *p
        /*
         *      Call list_mod_create
         */
-       frame->process = list_mod_create;
+       frame->interpret = list_mod_create;
        return list_mod_create(request, presult);
 }
 
@@ -310,7 +310,7 @@ static unlang_action_t unlang_map_state_init(REQUEST *request, rlm_rcode_t *pres
         *      Set this BEFORE doing anything else, as we will be
         *      called again after unlang_xlat_push() returns.
         */
-       frame->process = map_proc_apply;
+       frame->interpret = map_proc_apply;
 
        /*
         *      Expand the map source
@@ -349,21 +349,21 @@ void unlang_map_init(void)
        unlang_register(UNLANG_TYPE_FILTER,
                           &(unlang_op_t){
                                .name = "filter",
-                               .func = unlang_update_state_init,
+                               .interpret = unlang_update_state_init,
                                .debug_braces = true
                           });
 
        unlang_register(UNLANG_TYPE_UPDATE,
                           &(unlang_op_t){
                                .name = "update",
-                               .func = unlang_update_state_init,
+                               .interpret = unlang_update_state_init,
                                .debug_braces = true
                           });
 
        unlang_register(UNLANG_TYPE_MAP,
                           &(unlang_op_t){
                                .name = "map",
-                               .func = unlang_map_state_init,
+                               .interpret = unlang_map_state_init,
                                .frame_state_size = sizeof(unlang_frame_state_map_proc_t),
                                .frame_state_name = "unlang_frame_state_map_proc_t",
                           });

diff --git a/src/lib/unlang/module.c b/src/lib/unlang/module.c
index 74c40b30c1d09f1c5d284f857ceaecbeda080673..8912ffd0bc2cf3aa64f4c745faacabe9d6b3ad66 100644 (file)
--- a/src/lib/unlang/module.c
+++ b/src/lib/unlang/module.c
@@ -638,7 +638,7 @@ rlm_rcode_t unlang_module_yield(REQUEST *request,
        state->resume = resume;
        state->signal = signal;
 
-       frame->process = unlang_module_resume;
+       frame->interpret = unlang_module_resume;
        return RLM_MODULE_YIELD;
 }
 
@@ -718,7 +718,7 @@ static unlang_action_t unlang_module(REQUEST *request, rlm_rcode_t *presult)
                if (stack_depth < stack->depth) return UNLANG_ACTION_PUSHED_CHILD;
                rad_assert(stack_depth == stack->depth);
                *presult = rcode;
-               frame->process = unlang_module_resume;
+               frame->interpret = unlang_module_resume;
                return UNLANG_ACTION_YIELD;
        }
 
@@ -739,7 +739,7 @@ void unlang_module_init(void)
        unlang_register(UNLANG_TYPE_MODULE,
                           &(unlang_op_t){
                                .name = "module",
-                               .func = unlang_module,
+                               .interpret = unlang_module,
                                .signal = unlang_module_signal,
                                .frame_state_size = sizeof(unlang_frame_state_module_t),
                                .frame_state_name = "unlang_frame_state_module_t",

diff --git a/src/lib/unlang/parallel.c b/src/lib/unlang/parallel.c
index d546b7987111970912b78e2df58fd61f0fd43dea..07dd364c13c75c6aed1314d4b22d6d46cc60b204 100644 (file)
--- a/src/lib/unlang/parallel.c
+++ b/src/lib/unlang/parallel.c
@@ -420,7 +420,7 @@ static unlang_action_t unlang_parallel(REQUEST *request, rlm_rcode_t *presult)
                state->children[i].instruction = instruction;
        }
 
-       frame->process = unlang_parallel_process;
+       frame->interpret = unlang_parallel_process;
        return unlang_parallel_process(request, presult);
 }
 
@@ -429,7 +429,7 @@ void unlang_parallel_init(void)
        unlang_register(UNLANG_TYPE_PARALLEL,
                           &(unlang_op_t){
                                .name = "parallel",
-                               .func = unlang_parallel,
+                               .interpret = unlang_parallel,
                                .signal = unlang_parallel_signal,
                                .debug_braces = true
                           });

diff --git a/src/lib/unlang/return.c b/src/lib/unlang/return.c
index 9eb8545bfa52e8d01f8408cdc2c773de445bae11..7b454f6ef47da88e13733548bf333f09970fafd7 100644 (file)
--- a/src/lib/unlang/return.c
+++ b/src/lib/unlang/return.c
@@ -49,6 +49,6 @@ void unlang_return_init(void)
        unlang_register(UNLANG_TYPE_RETURN,
                           &(unlang_op_t){
                                .name = "return",
-                               .func = unlang_return,
+                               .interpret = unlang_return,
                           });
 }

diff --git a/src/lib/unlang/subrequest.c b/src/lib/unlang/subrequest.c
index b82452e4b8562cbc5ec0df42cf99e288eb903a34..f6791ae026a95fafa7105bc256a633020d886dd5 100644 (file)
--- a/src/lib/unlang/subrequest.c
+++ b/src/lib/unlang/subrequest.c
@@ -214,7 +214,7 @@ static unlang_action_t unlang_subrequest_state_init(REQUEST *request, rlm_rcode_
        RDEBUG2("Creating subrequest (%s)", child->name);
        log_request_pair_list(L_DBG_LVL_1, request, child->packet->vps, NULL);
 
-       frame->process = unlang_subrequest_process;
+       frame->interpret = unlang_subrequest_process;
        return unlang_subrequest_process(request, presult);
 }
 
@@ -397,7 +397,7 @@ void unlang_subrequest_push(rlm_rcode_t *out, REQUEST *child, bool top_frame)
        state->persist = true;
        state->child = child;
 
-       frame->process = unlang_subrequest_process;
+       frame->interpret = unlang_subrequest_process;
 }
 
 int unlang_subrequest_op_init(void)
@@ -414,7 +414,7 @@ int unlang_subrequest_op_init(void)
        unlang_register(UNLANG_TYPE_SUBREQUEST,
                           &(unlang_op_t){
                                .name = "subrequest",
-                               .func = unlang_subrequest_state_init,
+                               .interpret = unlang_subrequest_state_init,
                                .signal = unlang_subrequest_signal,
                                .debug_braces = true,
                                .frame_state_size = sizeof(unlang_frame_state_subrequest_t),
@@ -424,7 +424,7 @@ int unlang_subrequest_op_init(void)
        unlang_register(UNLANG_TYPE_DETACH,
                           &(unlang_op_t){
                                .name = "detach",
-                               .func = unlang_detach,
+                               .interpret = unlang_detach,
                                .frame_state_size = sizeof(unlang_frame_state_detach_t),
                                .frame_state_name = "unlang_frame_state_detach_t",
                           });

diff --git a/src/lib/unlang/switch.c b/src/lib/unlang/switch.c
index 2d140311540ddea3ea9c1452d25042659794f8f9..c3b552279964fb3c6789a4f041c9032db010beb0 100644 (file)
--- a/src/lib/unlang/switch.c
+++ b/src/lib/unlang/switch.c
@@ -192,14 +192,14 @@ void unlang_switch_init(void)
        unlang_register(UNLANG_TYPE_SWITCH,
                           &(unlang_op_t){
                                .name = "switch",
-                               .func = unlang_switch,
+                               .interpret = unlang_switch,
                                .debug_braces = true
                           });
 
        unlang_register(UNLANG_TYPE_CASE,
                           &(unlang_op_t){
                                .name = "case",
-                               .func = unlang_case,
+                               .interpret = unlang_case,
                                .debug_braces = true
                           });
 }

diff --git a/src/lib/unlang/unlang_priv.h b/src/lib/unlang/unlang_priv.h
index 140f4ff69a778838177a4f39e8824408073f1a2f..8003c8c8293014c2e3a580973e0149841368e02b 100644 (file)
--- a/src/lib/unlang/unlang_priv.h
+++ b/src/lib/unlang/unlang_priv.h
@@ -212,7 +212,7 @@ typedef struct {
        unlang_t                *instruction;                   //!< The unlang node we're evaluating.
        unlang_t                *next;                          //!< The next unlang node we will evaluate
 
-       unlang_op_call_t        process;                        //!< function to call for processing this stack frame
+       unlang_op_interpret_t   interpret;                      //!< function to call for interpreting this stack frame
        unlang_op_signal_t      signal;                         //!< function to call when signalling this stack frame
 
        /** Stack frame specialisations

diff --git a/src/lib/unlang/xlat.c b/src/lib/unlang/xlat.c
index f87eb79bc700f4f10123492b1cea4eaa9ac0b76b..778ca2a18c64a46ba52660551a148c1d42516bd6 100644 (file)
--- a/src/lib/unlang/xlat.c
+++ b/src/lib/unlang/xlat.c
@@ -380,7 +380,7 @@ xlat_action_t unlang_xlat_yield(REQUEST *request,
        unlang_stack_frame_t            *frame = &stack->frame[stack->depth];
        unlang_frame_state_xlat_t       *state = talloc_get_type_abort(frame->state, unlang_frame_state_xlat_t);
 
-       frame->process = unlang_xlat_resume;
+       frame->interpret = unlang_xlat_resume;
 
        /*
         *      Over-ride whatever functions were there before.
@@ -427,7 +427,7 @@ void unlang_xlat_init(void)
        unlang_register(UNLANG_TYPE_XLAT,
                           &(unlang_op_t){
                                .name = "xlat_eval",
-                               .func = unlang_xlat,
+                               .interpret = unlang_xlat,
                                .signal = unlang_xlat_signal,
                                .debug_braces = false,
                                .frame_state_size = sizeof(unlang_frame_state_xlat_t),
@@ -438,7 +438,7 @@ void unlang_xlat_init(void)
        unlang_register(UNLANG_TYPE_XLAT_INLINE,
                           &(unlang_op_t){
                                .name = "xlat_inline",
-                               .func = unlang_xlat_inline,
+                               .interpret = unlang_xlat_inline,
                                .debug_braces = false
                           });
 }