shithub: femtolisp

Info  •  Files  •  Log  •  Branches

pair symbol → cons

--- a/cvalues.c

+++ b/cvalues.c

@@ -686,7 +686,7 @@

 {

 	argcount(nargs, 1);

 	switch(tag(args[0])){

-	case TAG_CONS: return FL(pairsym);

+	case TAG_CONS: return FL(conssym);

 	case TAG_NUM1: case TAG_NUM: return FL(fixnumsym);

 	case TAG_SYM: return FL(symbolsym);

 	case TAG_VECTOR: return FL(vectorsym);

--- a/flisp.c

+++ b/flisp.c

@@ -2260,7 +2260,7 @@

 	FL(DivideError) = symbol("divide-error", false);

 	FL(EnumerationError) = symbol("enumeration-error", false);

 	FL(Error) = symbol("error", false);

-	FL(pairsym) = symbol("pair", false);

+	FL(conssym) = symbol("cons", false);

 	FL(symbolsym) = symbol("symbol", false);

 	FL(fixnumsym) = symbol("fixnum", false);

 	FL(vectorsym) = symbol("vector", false);

--- a/flisp.h

+++ b/flisp.h

@@ -376,7 +376,7 @@

 	value_t printwidthsym, printreadablysym, printprettysym, printlengthsym;

 	value_t printlevelsym, builtins_table_sym;

-	value_t pairsym, symbolsym, fixnumsym, vectorsym, builtinsym, vu8sym;

+	value_t conssym, symbolsym, fixnumsym, vectorsym, builtinsym, vu8sym;

 	value_t definesym, defmacrosym, forsym, setqsym;

 	value_t tsym, Tsym, fsym, Fsym, booleansym, nullsym, evalsym, fnsym;

 	// for reading characters

--- a/print.c

+++ b/print.c

@@ -276,7 +276,7 @@

 }

 static void

-print_pair(ios_t *f, value_t v)

+print_cons(ios_t *f, value_t v)

 {

 	value_t cd;

 	char *op;

@@ -495,7 +495,7 @@

 		if(iscvalue(v))

 			cvalue_print(f, v);

 		else

-			print_pair(f, v);

+			print_cons(f, v);

 		break;

 	}

 	FL(p_level)--;