Strange commit

python_if.c

@@ -78,80 +78,37 @@ PyObject* rpnif_new(PyTypeObject *subtype, PyObject *args, PyObject* kwds)
 
 int rpnif_init(PyObject *self, PyObject *args, PyObject *kwds)
 {
-	PyRPNExpr_t *expr_self;
-	char *names[] = {"expression", "args_count", "stack_size", NULL};
+	/**@todo TODO write the function */
+	PyRPNIterExpr_t *expr_self;
+	char *names[] = {"pos_flag", "res_flag", "lim", "value", "stack_size", NULL};
+	unsigned short pos_flag, res_flag, stack_size;
+	PyObject *lim, *value;
 	char err_str[256];
-	const char *expr;
-	long long int args_count, stack_size;
 
-	expr_self = (PyRPNExpr_t*)self;
+	expr_self = (PyRPNIterExpr_t*)self;
 
 	stack_size = 16;
-	expr_self->rpn = NULL;
-
-	if(!PyArg_ParseTupleAndKeywords(args, kwds, "sL|L:RPNExpr.__init__", names, &expr,
-		&args_count, &stack_size))
-	{
-		return -1;
-	}
-
-	if(strlen(expr) == 0)
-	{
-		PyErr_SetString(PyExc_ValueError,
-			"RpnExpr.__init__() expect expression argument to be not empty");
-		return -1;
-	}
+	value = lim = NULL;
+	expr_self->rif = NULL;
 
-	if(args_count < 0 || args_count > 255)
+	if(!PyArg_ParseTupleAndKeywords(args, kwds, "HHO|OH:RPNIterExpr.__init__", names,
+		&pos_flag, &res_flag, lim, value, &stack_size))
 	{
-		snprintf(err_str, 128,
-			"Argument count should be in [4..255] but %lld given",
-			args_count);
-		PyErr_SetString(PyExc_ValueError, err_str);
 		return -1;
 	}
 
+	// Args checking
 	if(stack_size < 4 || stack_size > 255)
 	{
 		snprintf(err_str, 128,
-			"Stack size should be in [0..255] but %lld given",
+			"Stack size should be in [0..255] but %u given",
 			stack_size);
 		PyErr_SetString(PyExc_ValueError, err_str);
 		return -1;
 	}
+	//Check & convert lim
 
-	expr_self->rpn = malloc(sizeof(rpn_expr_t));
-	if(!expr_self->rpn)
-	{
-		snprintf(err_str, 256,
-			"Expression memory allocation error : %s",
-			strerror(errno));
-	}
-	bzero(expr_self->rpn, sizeof(rpn_expr_t));
-
-	if(rpn_expr_init(expr_self->rpn, stack_size, args_count) < 0)
-	{
-		snprintf(err_str, 256,
-			"Expression init error : %s",
-			expr_self->rpn->err_reason);
-		PyErr_SetString(PyExc_ValueError, err_str);
-		return -1;
-	}
-
-	expr_self->args = malloc(sizeof(rpn_value_t) * args_count);
-	if(!expr_self->args)
-	{
-		snprintf(err_str, 256,
-			"Error allocating arguments memory : %s",
-			strerror(errno));
-		return -1;
-	}
-
-	if(rpn_expr_compile(expr_self->rpn, expr))
-	{
-		PyErr_SetString(PyExc_ValueError, expr_self->rpn->err_reason);
-		return -1;
-	}
+	//Check & convert value
 
 	return 0;
 }
@@ -170,21 +127,25 @@ void rpnif_del(PyObject *self)
 
 PyObject* rpnif_str(PyObject *self)
 {
+	/**@todo TODO write the function */
 	Py_RETURN_NONE;
 }
 
 PyObject* rpnif_repr(PyObject *self)
 {
+	/**@todo TODO write the function */
 	Py_RETURN_NONE;
 }
 
 PyObject* rpnif_getstate(PyObject *self, PyObject *noargs)
 {
+	/**@todo TODO write the function */
 	Py_RETURN_NONE;
 }
 
 PyObject* rpnif_setstate(PyObject *self, PyObject *state_bytes)
 {
+	/**@todo TODO write the function */
 	Py_RETURN_NONE;
 }