Start implementing a c library for turmits

Makefile

@@ -0,0 +1,9 @@
+all: libs
+
+libs:
+	make -C libs
+
+.PHONY: libs clean
+
+clean:
+	make -C libs clean

gte.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+PYTHONPATH=":`pwd`/libs" /usr/bin/env python3 -m gte $*

libs/Makefile

@@ -2,7 +2,10 @@ PYTHON=/usr/bin/python3
 
 all: cturmit*.so
 
-cturmit*.so: setup.py build/lib.*/cturmit*.so
+turmit.o: turmit.c turmit.h
+	gcc -c turmit.c
+
+cturmit*.so: setup.py build/lib.*/cturmit*.so turmit.o
 	cp build/lib.*/cturmit*.so ./
 
 build/lib.*/cturmit*.so: cturmit.c cturmit.h

libs/cturmit.c

@@ -18,13 +18,13 @@ PyInit_cturmit(void)
 	return m;
 }
 
-void
+	void
 CTurmit_dealloc(CTurmit *self)
 {
 	Py_TYPE(self)->tp_free((PyObject*)self);
 }
 
-Py_ssize_t
+	Py_ssize_t
 CTurmit_len(CTurmit *self)
 {
 	return self->len;

libs/cturmit.h

@@ -1,6 +1,8 @@
 #include<Python.h>
 #include"structmember.h"
 
+#include "turmit.h"
+
 typedef struct
 {
 	PyObject VAR_HEAD;
@@ -18,10 +20,10 @@ static PyModuleDef cturmitmodule = {
 
 static PyMemberDef CTurmit_members[] = {
 	{"len", T_PYSSIZET, offsetof(CTurmit, len), 0,
-	 "Expression len"},
+		"Expression len"},
 	/*
-	{"heap_sz", T_PYSSIZET, offsetof(CTurmit, heap_sz), 0,
-	 "Item heap counter"},
+	   {"heap_sz", T_PYSSIZET, offsetof(CTurmit, heap_sz), 0,
+	   "Item heap counter"},
 	 */
 	{NULL}  /* Sentinel */
 };
@@ -37,7 +39,7 @@ static PyMethodDef CTurmit_methods[] = {
 };
 
 
-static PyObject *
+	static PyObject *
 CTurmit_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
 	CTurmit *self;
@@ -51,7 +53,7 @@ CTurmit_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 void
 CTurmit_dealloc(CTurmit *self);
 
-static int
+	static int
 CTurmit_init(CTurmit *self, PyObject *args, PyObject *kwds)
 {
 	//Init attributes
@@ -61,44 +63,43 @@ CTurmit_init(CTurmit *self, PyObject *args, PyObject *kwds)
 
 static PyTypeObject CTurmitType = {
 	PyVarObject_HEAD_INIT(NULL, 0)
-	"cturmit.CTurmit",			 /* tp_name */
-	sizeof(CTurmit),			 /* tp_basicsize */
-	0,						 /* tp_itemsize */
-	(destructor)CTurmit_dealloc, /* tp_dealloc */
-	0,						 /* tp_print */
-	0,						 /* tp_getattr */
-	0,						 /* tp_setattr */
-	0,						 /* tp_reserved */
-	0,						 /* tp_repr */
-	0,						 /* tp_as_number */
-	0,						 /* tp_as_sequence */
-	CTurmit_asmapping,				 /* tp_as_mapping */
-	0,						 /* tp_hash  */
-	0,						 /* tp_call */
-	0,						 /* tp_str */
-	0,						 /* tp_getattro */
-	0,						 /* tp_setattro */
-	0,						 /* tp_as_buffer */
-	Py_TPFLAGS_DEFAULT |
-		Py_TPFLAGS_BASETYPE,   /* tp_flags */
-	"CTurmit objects",		   /* tp_doc */
-	0,						 /* tp_traverse */
-	0,						 /* tp_clear */
-	0,						 /* tp_richcompare */
-	0,						 /* tp_weaklistoffset */
-	0,						 /* tp_iter */
-	0,						 /* tp_iternext */
-	CTurmit_methods,			 /* tp_methods */
-	CTurmit_members,			 /* tp_members */
-	0,						 /* tp_getset */
-	0,						 /* tp_base */
-	0,						 /* tp_dict */
-	0,						 /* tp_descr_get */
-	0,						 /* tp_descr_set */
-	0,						 /* tp_dictoffset */
-	(initproc)CTurmit_init,	  /* tp_init */
-	0,						 /* tp_alloc */
-	CTurmit_new,				 /* tp_new */
+		"cturmit.CTurmit",			/* tp_name */
+	sizeof(CTurmit),				/* tp_basicsize */
+	0,						/* tp_itemsize */
+	(destructor)CTurmit_dealloc,			/* tp_dealloc */
+	0,						/* tp_print */
+	0,						/* tp_getattr */
+	0,						/* tp_setattr */
+	0,						/* tp_reserved */
+	0,						/* tp_repr */
+	0,						/* tp_as_number */
+	0,						/* tp_as_sequence */
+	CTurmit_asmapping,				/* tp_as_mapping */
+	0,						/* tp_hash  */
+	0,						/* tp_call */
+	0,						/* tp_str */
+	0,						/* tp_getattro */
+	0,						/* tp_setattro */
+	0,						/* tp_as_buffer */
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,  	/* tp_flags */
+	"CTurmit objects",				/* tp_doc */
+	0,						/* tp_traverse */
+	0,						/* tp_clear */
+	0,						/* tp_richcompare */
+	0,						/* tp_weaklistoffset */
+	0,						/* tp_iter */
+	0,						/* tp_iternext */
+	CTurmit_methods,				/* tp_methods */
+	CTurmit_members,				/* tp_members */
+	0,						/* tp_getset */
+	0,						/* tp_base */
+	0,						/* tp_dict */
+	0,						/* tp_descr_get */
+	0,						/* tp_descr_set */
+	0,						/* tp_dictoffset */
+	(initproc)CTurmit_init,				/* tp_init */
+	0,						/* tp_alloc */
+	CTurmit_new,					/* tp_new */
 };
 
 

libs/turmit.c

@@ -0,0 +1,43 @@
+#include "turmit.h"
+
+TURMIT_OP(mem_sz)
+{
+	turmit_int *new;
+	turmit_int new_sz, old_sz;
+	
+	old_sz = turmit->stack_sz;
+	new_sz = SPOP(turmit);
+	new_sz = new_sz<2?2:new_sz;
+
+	new = realloc(turmit->stack, sizeof(turmit_int) * new_sz);
+	if(old_sz < new_sz)
+	{
+		bzero(turmit->stack + old_sz, new_sz - old_sz);
+	}
+}
+
+turmit_t *turmit_alloc(ssize_t stack_sz, ssize_t int_max, const char *expr,
+	unsigned char flags)
+{
+	turmit_t *res;
+
+	res = malloc(sizeof(struct turmit_s));
+	if(!res)
+	{
+		perror("Unable to allocate memory for turmit");
+		return NULL;
+	}
+	return turmit_init(res, stack_sz, int_max, expr, flags);
+}
+
+turmit_t *turmit_init(turmit_t *turmit, ssize_t stack_sz, ssize_t int_max,
+	const char *expr, unsigned char flags)
+{
+	int ret;
+
+	turmit->flags = flags;
+	turmit->stack_sz = stack_sz;
+	turmit->int_max = int_max;
+	turmit->expr = strndup(expr, TURMIT_EXPR_MAX_SZ);
+}
+

libs/turmit.h

@@ -0,0 +1,87 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+
+typedef unsigned long long int turmit_int;
+typedef struct turmit_op_s turmit_op_t;
+typedef struct turmit_s turmit_t;
+
+#define SCUR(t) (t->stack[t->stack_cur])
+#define SDEC(t) (t->stack_cur = (t->stack_cur>0?t->stack_cur:t->stack_sz) -1)
+#define SINC(t) (t->stack_cur = (t->stack_cur + 1) % t->stack_sz)
+#define SPOP(t) (__SPOP(t))
+#define SPUSH(t, v) (t->stack[SINC(t)] = v)
+
+
+#define TURMIT_EXPR_MAX_SZ	0xFFFFFFFF
+
+#define TURMIT_LAZY		0
+#define TURMIT_AUTOCOMP		1
+
+#define TURMIT_OK		0
+#define TURMIT_ERROR		-1
+
+
+union turmit_op_u
+{
+	void (*op)(turmit_t*, turmit_int[5]);
+	turmit_int val;
+};
+
+struct turmit_op_s
+{
+	union turmit_op_u op;
+	short value; /*!< 0 if op is an operation pointer */
+};
+
+struct turmit_s
+{
+	char *expr;
+	unsigned char flags;
+	ssize_t int_max;
+
+	turmit_op_t *op_expr;
+	ssize_t op_expr_sz;
+
+	ssize_t stack_sz;
+	turmit_int *stack;
+	ssize_t stack_cur;
+};
+
+inline static turmit_int __SPOP(turmit_t *t) {
+	turmit_int r = t->stack[t->stack_cur];
+	SDEC(t);
+	return r;
+}
+
+
+#define TURMIT_OP(NAME) static void NAME (turmit_t *turmit, turmit_int args[5])
+
+/**@brief Allocate memory and initialise a turmit
+ * @param const char* The turmit expression
+ * @param unsigned char One of TURMIT_LAZY or TURMIT_AUTOCOMP.
+ * @return A pointer on the new turmit
+ */
+turmit_t *turmit_alloc(ssize_t stack_sz, ssize_t int_max, const char *expr,
+	unsigned char flags);
+
+/**@brief Initialize a turmit
+ * @param turmit_t* The turmit to initialize
+ * @param const char* The turmit expression
+ * @param unsigned char One of TURMIT_LAZY or TURMIT_AUTOCOMP.
+ * @return The pointer on the turmit
+ */
+turmit_t *turmit_init(turmit_t *turmit, ssize_t stack_sz, ssize_t int_max,
+	const char *expr, unsigned char flags);
+
+/**@brief Free memory of a turmit
+ * @param turmit the turmit to free
+ */
+void turmit_free(turmit_t *turmit);
+
+/**@brief Populate turmit_t.op_expr and set op_expr_sz
+ * @return 0 if no errors
+ */
+int turmit_compile(turmit_t *turmit);
+