Commit 59d4bc27b324ccfca80a9b5ed3a3c461d27fa2c8 - Tamsin

Refactor libtamsin starting with small stuff. Cat's Eye Technologies 10 years ago

2 changed file(s) with 9 addition(s) and 18 deletion(s). Raw diff Collapse all Expand all

-13

c_src/term.c less more

128	128	assert(lhs->subterms == NULL);
129	129	assert(rhs->subterms == NULL);
130	130
131		if (lhs->storing != NULL) {
132		lhs = lhs->storing;
133		}
134		if (rhs->storing != NULL) {
135		rhs = rhs->storing;
136		}
137
138	131	new_size = lhs->size + rhs->size;
139	132	new_atom = malloc(new_size);
140	133	memcpy(new_atom, lhs->atom, lhs->size);

152	145	struct term term_flatten(const struct term t) {
153	146	struct term_list *tl;
154	147
155		if (t->storing != NULL) { /* it's a variable; get its value */
156		return term_flatten(t->storing);
157		} else if (t->subterms == NULL) { /* it's an atom */
	148	if (t->subterms == NULL) { /* it's an atom */
158	149	return term_new(t->atom, t->size);
159	150	} else { /* it's a constructor */
160	151	struct term *n;

265	256	struct term term_repr(const struct term t) {
266	257	struct term_list *tl;
267	258
268		if (t->storing != NULL) { /* it's a variable; get its value */
269		return term_repr(t->storing);
270		} else if (t->subterms == NULL) { /* it's an atom */
	259	if (t->subterms == NULL) { /* it's an atom */
271	260	return term_escape_atom(t);
272	261	} else { /* it's a constructor */
273	262	struct term *n;

-5

test.sh less more

6	6	GLOB="eg/.tamsin lib/.tamsin mains/*.tamsin"
7	7
8	8	mkdir -p tmp
9		make all \|\| exit 1
10	9
11	10	if [ x$1 = 'x-f' ]; then
12	11	shift

79	78	fi
80	79
81	80	if [ $MODE = "compiled" ]; then
	81	make c_src/libtamsin.a \|\| exit 1
82	82	echo "*** Compiling $SRC (with $LIBS)"
83	83	echo "*** and testing it against '$CMD'..."
84	84	bin/tamsin compile $LIBS $SRC > tmp/foo.c && \

110	110	exit 0
111	111	}
112	112
113		if [ x$1 = xcompiler ]; then
	113	if [ x$1 = xinterpreter -o x$1 = xi ]; then
	114	echo "*** Testing Python interpreter..."
	115	falderal $VERBOSE --substring-error fixture/tamsin.py.markdown $FILES
	116	elif [ x$1 = xcompiler ]; then
	117	make c_src/libtamsin.a \|\| exit 1
114	118	echo "*** Testing compiler..."
115	119	falderal $VERBOSE --substring-error fixture/compiler.py.markdown $FILES
116		elif [ x$1 = xinterpreter -o x$1 = xi ]; then
117		echo "*** Testing Python interpreter..."
118		falderal $VERBOSE --substring-error fixture/tamsin.py.markdown $FILES
119	120	elif [ x$1 = xgrammar ]; then
120	121	test_it $MODE "mains/grammar.tamsin" \
121	122	"lib/tamsin_scanner.tamsin" \

152	153	echo "*** Testing Bootstrapped Tamsin-in-Tamsin compiler..."
153	154	falderal $VERBOSE --substring-error fixture/bootstrapped.markdown $FILES
154	155	elif [ x$1 = xmicro ]; then
	156	make bin/micro-tamsin \|\| exit 1
155	157	echo "*** Testing Micro-Tamsin interpreter..."
156	158	FILES="doc/Micro-Tamsin.markdown"
157	159	falderal $VERBOSE --substring-error fixture/micro-tamsin.markdown $FILES