Add default rpn_if resf function implementation

rpn_if.c

@@ -87,11 +87,16 @@ size_t rpn_if_step(rpn_if_t *rif, size_t pos)
 	size_t i;
 	size_t newpos;
 	rif->params.arg_f(rif, pos, rif->rpn_args);
+	/* WRONG ! rif->rpn_args is in rif structure and do not have to be
+	   given as argument... */
 	for(i=0; i<rif->params.rpn_sz; i++)
 	{
 		rif->rpn_res[i] = rpn_expr_eval(&(rif->rpn[i]), rif->rpn_args);
 	}
-	rif->params.res_f(rif, &newpos, rif->rpn_res);
+	//rif->params.res_f(rif, &newpos, rif->rpn_res);
+	/* MEGA WRONG ! rif->rpn_res is in rif structure and do not have to be
+	   given as argument... */
+	rif->params.res_f(rif, &newpos, NULL);
 	return newpos;
 }
 

rpn_if.h

@@ -51,7 +51,9 @@ struct rpn_if_param_s
 	/**@brief Number of arguments expected by RPN expressions */
 	size_t rpn_argc;
 
-	/**@brief Position to RPN argument transformation */
+	/**@brief Set RPN arguments given a position
+	 * @note transform position to arguments and fetch other arguments
+	 * from memory map*/
 	int (*arg_f)(rpn_if_t *rif, size_t pos, rpn_value_t *args);
 	/**@brief RPN results to data and position transformation
 	 * @note set memory maps with converted data */
@@ -76,6 +78,9 @@ struct rpn_if_s
 	rpn_value_t *mem;
 };
 
+/**@brief Macro fetching a memory pointer given a position
+ * @return rpn_value_t* values
+ */
 #define rpn_if_getitem(rif, pos) (rif->mem + (rif->params.value_sz * pos))
 
 /**@brief Alloc a new @ref rpn_if_s from two transformation functions

rpn_if_default.c

@@ -24,7 +24,7 @@ int rpn_if_argf_default(rpn_if_t *rif, size_t pos, rpn_value_t *args)
 			cur_arg = *(data->size_lim);
 			break;
 	}
-	if(cur_arg >= rif->params.rpn_argc)
+	if(cur_arg > rif->params.rpn_argc)
 	{
 		/* Too many arguments for given rif !! */
 		return -1;
@@ -56,12 +56,85 @@ int rpn_if_argf_default(rpn_if_t *rif, size_t pos, rpn_value_t *args)
 			}
 			break;
 		default:
+			/* LOG ERROR */
 			return -1;
 	}
 	return -1;
 }
 
-int rpn_if_resf_default(rpn_if_t *rif, size_t *pos, rpn_value_t *data);
+int rpn_if_resf_default(rpn_if_t *rif, size_t *pos, rpn_value_t *data)
+{
+	rpn_if_default_data_t *data;
+	size_t cur_arg, i, rgb_imax;
+
+	data = (rpn_if_default_data_t*)rif->params.data;
+
+	switch(data->pos_flag)
+	{
+		case RPN_IF_POSITION_LINEAR:
+			rpn_if_resf_linear(rif, pos, data);
+			cur_arg = 1;
+			break;
+		case RPN_IF_POSITION_XY:
+			rpn_if_resf_xy(rif, pos, data);
+			cur_arg = 2;
+			break;
+		case RPN_IF_POSITION_XDIM:
+			rpn_if_resf_xdim(rif, pos, data);
+			cur_arg = *(data->size_lim);
+			break;
+	}
+	if(cur_arg > rif->params.rpn_argc)
+	{
+		/** LOG ERROR ! should never append... */
+		return -1;
+	}
+	rgb_imax = 3; /* rgba */
+	values = rpn_if_getimtem(rif, pos);
+	siwtch(data->res-flag)
+	{
+		case RPN_IF_RES_BOOL:
+			*values = 1;
+			break;
+
+		case RPN_IF_RES_CONST:
+			*values = *(data->const_val);
+			break;
+
+		case RPN_IF_RES_COUNT:
+			*values++;
+			beak;
+
+		case RPN_IF_RES_CONST_RGBA:
+			rgb_imax = 4;
+		case RPN_IF_RES_CONST_RGB:
+			for(i=0;i<rgb_imax;i++)
+			{
+				values[i] = data->const_val[i];
+			}
+			break;
+
+		case RPN_IF_RES_RGBA:
+			rgb_imax = 4;
+		case RPN_IF_RES_RGB:
+			for(i=0;i<rgb_imax;i++)
+			{
+				values[i] = rif->rpn_res[cur_arg+i];
+			}
+			break;
+
+		case RPN_IF_RES_XFUN:
+			for(i=0; i<rif->params.rpn_sz - cur_arg; i++)
+			{
+				values[i] = rif->rpn_res[cur_arg+i];
+			}
+			break;
+
+		default:
+			/* LOG ERROR */
+			return -1;
+	}
+}
 
 int rpn_if_argf_linear(rpn_if_t *rif, size_t pos, rpn_value_t *args)
 {