shithub: sl

Info  •  Files  •  Log  •  Branches

rename leftovers (define+define-macro)

--- a/src/flisp.c

+++ b/src/flisp.c

@@ -21,7 +21,7 @@

 value_t FL_builtins_table_sym, FL_quote, FL_lambda, FL_function, FL_comma, FL_commaat;

 value_t FL_commadot, FL_trycatch, FL_backquote;

 value_t FL_conssym, FL_symbolsym, FL_fixnumsym, FL_vectorsym, FL_builtinsym, FL_vu8sym;

-value_t FL_definesym, FL_defmacrosym, FL_forsym, FL_setqsym;

+value_t FL_defsym, FL_defmacrosym, FL_forsym, FL_setqsym;

 value_t FL_booleansym, FL_nullsym, FL_evalsym, FL_fnsym;

 value_t FL_nulsym, FL_alarmsym, FL_backspacesym, FL_tabsym, FL_linefeedsym, FL_newlinesym;

 value_t FL_vtabsym, FL_pagesym, FL_returnsym, FL_escsym, FL_spacesym, FL_deletesym;

@@ -1351,8 +1351,8 @@

 	FL_builtinsym = csymbol("builtin");

 	FL_booleansym = csymbol("boolean");

 	FL_nullsym = csymbol("null");

-	FL_definesym = csymbol("define");

-	FL_defmacrosym = csymbol("define-macro");

+	FL_defsym = csymbol("def");

+	FL_defmacrosym = csymbol("defmacro");

 	FL_forsym = csymbol("for");

 	FL_setqsym = csymbol("set!");

 	FL_evalsym = csymbol("eval");

--- a/src/flisp.h

+++ b/src/flisp.h

@@ -434,7 +434,7 @@

 extern value_t FL_builtins_table_sym, FL_quote, FL_lambda, FL_function, FL_comma, FL_commaat;

 extern value_t FL_commadot, FL_trycatch, FL_backquote;

 extern value_t FL_conssym, FL_symbolsym, FL_fixnumsym, FL_vectorsym, FL_builtinsym, FL_vu8sym;

-extern value_t FL_definesym, FL_defmacrosym, FL_forsym, FL_setqsym;

+extern value_t FL_defsym, FL_defmacrosym, FL_forsym, FL_setqsym;

 extern value_t FL_booleansym, FL_nullsym, FL_evalsym, FL_fnsym;

 extern value_t FL_nulsym, FL_alarmsym, FL_backspacesym, FL_tabsym, FL_linefeedsym, FL_newlinesym;

 extern value_t FL_vtabsym, FL_pagesym, FL_returnsym, FL_escsym, FL_spacesym, FL_deletesym;

--- a/src/print.c

+++ b/src/print.c

@@ -208,7 +208,7 @@

 specialindent(value_t head)

 {

 	// indent these forms 2 spaces, not lined up with the first argument

-	if(head == FL_lambda || head == FL_trycatch || head == FL_definesym ||

+	if(head == FL_lambda || head == FL_trycatch || head == FL_defsym ||

 		head == FL_defmacrosym || head == FL_forsym)

 		return 2;

 	return -1;

@@ -253,7 +253,7 @@

 indentafter2(value_t head, value_t v)

 {

 	// for certain X always indent (X a b) after a

-	return (head == FL_definesym || head == FL_defmacrosym) && !allsmallp(cdr_(v));

+	return (head == FL_defsym || head == FL_defmacrosym) && !allsmallp(cdr_(v));

 }

 static bool

-- 

⑨