Skip to content

Commit 1de2908

Browse files
fix typos
lots of compiler errors
1 parent c3c0ffe commit 1de2908

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

ulisp-esp32.ino

+15-10
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
/* Test MACRO with
1919
2020
(defmacro foo (aa bb) `(defmacro ,aa () `(princ ,,bb)))
21-
(foo 'bar "baz")
21+
(foo bar "baz")
2222
2323
*/
2424

@@ -3047,7 +3047,7 @@ object *fn_intern (object *args, object *env) {
30473047
checkargs(INTERN, args);
30483048
if (!stringp(car(args))) error(INTERN, notastring, car(args));
30493049
char b[BUFFERSIZE];
3050-
char *cs = cstring(car(args), b, BUFFERSIZE);
3050+
char *cs = cstring(INTERN, car(args), b, BUFFERSIZE);
30513051
return internlong(cs);
30523052
}
30533053

@@ -5819,11 +5819,11 @@ const char doc_defmacro[] PROGMEM = "(defmacro (params*) body*)\n"
58195819
"defines a macro";
58205820
const char doc_quasiquote[] PROGMEM = "(quasiquote *args)\n"
58215821
"Lisp quasiquotes";
5822-
const char doc_unqoute[] PROGMEM = "(unqoute arg)\n"
5822+
const char doc_unquote[] PROGMEM = "(unqouote arg)\n"
58235823
"Lisp unquotes. Cannot be used outside of (quasiquote).";
58245824
const char doc_unquotesplicing[] PROGMEM = "(unquote-splicing *args)\n"
58255825
"Lisp unquotes. Cannot be used outside of (quasiquote).";
5826-
const char doc_unquotesplicing[] PROGMEM = "(expand macro params body)\n"
5826+
const char doc_expand[] PROGMEM = "(expand macro params body)\n"
58275827
"Expand a macro.";
58285828

58295829
const char doc40[] PROGMEM = "(progn form*)\n"
@@ -6252,9 +6252,9 @@ const char doc220[] PROGMEM = "(invert-display boolean)\n"
62526252

62536253
const char doc_batteryvoltage[] PROGMEM = "(battery:voltage)\n"
62546254
"Returns the current voltage of the LiPo battery powering the board.";
6255-
const char doc_baterypercentage[] PROGMEM = "(battery:percentage)\n"
6255+
const char doc_batterypercentage[] PROGMEM = "(battery:percentage)\n"
62566256
"Returns the current percentage charge of the LiPo battery powering the board, from 0-100%.";
6257-
const char doc_baterypercentage[] PROGMEM = "(battery:change-rate)\n"
6257+
const char doc_batterychangerate[] PROGMEM = "(battery:change-rate)\n"
62586258
"Returns the change rate of the LiPo battery powering the board, that is, how fast it is charging or discharging.";
62596259

62606260
// Insert your own function documentation here
@@ -6304,6 +6304,12 @@ const tbl_entry_t lookup_table[] PROGMEM = {
63046304
{ string_unwindprotect, sp_unwindprotect, 0x1F, doc_unwindprotect },
63056305
{ string_ignoreerrors, sp_ignoreerrors, 0x11, doc_ignoreerrors },
63066306
// { string_error, sp_error, 0x2F, doc_error },
6307+
{ string_MACRO_SENTINEL, NULL, 0x00, NULL },
6308+
{ string_defmacro, sp_defmacro, 0x2F, doc_defmacro },
6309+
{ string_quasiquote, sp_quasiquote, 0x11, doc_quasiquote },
6310+
{ string_unquote, sp_unquote, 0x11, doc_unquote },
6311+
{ string_unquotesplicing, sp_unquote_splicing, 0x11, doc_unquotesplicing },
6312+
{ string_expand, sp_expand, 0x23, doc_expand },
63076313

63086314
{ string39, NULL, 0x00, NULL },
63096315
{ string40, tf_progn, 0x0F, doc40 },
@@ -6503,7 +6509,7 @@ const tbl_entry_t lookup_table[] PROGMEM = {
65036509
{ string229, NULL, 0x00, NULL },
65046510

65056511
// Insert your own table entries here
6506-
{ string_batteryvoltage, fn_batteryvoltage, 0x00, doc_batteryvolatage },
6512+
{ string_batteryvoltage, fn_batteryvoltage, 0x00, doc_batteryvoltage },
65076513
{ string_batterypercentage, fn_batterypercentage, 0x00, doc_batterypercentage },
65086514
{ string_batterychangerate, fn_batterychangerate, 0x00, doc_batterychangerate },
65096515

@@ -6569,7 +6575,6 @@ void testescape () {
65696575
eval - the main Lisp evaluator
65706576
*/
65716577
object *eval (object *form, object *env) {
6572-
static unsigned long start = 0;
65736578
int TC=0;
65746579
EVAL:
65756580
yield(); // Needed on ESP8266 to avoid Soft WDT Reset or ESP32 for multithreading
@@ -7376,7 +7381,7 @@ void repl (object *env) {
73767381
loop - the Arduino IDE main execution loop
73777382
*/
73787383
void loop () {
7379-
if (!setjmp(exception)) {
7384+
if (ulisp_setup_error_handling()) {
73807385
; // noop
73817386
}
73827387
// Come here after error
@@ -7386,4 +7391,4 @@ void loop () {
73867391
SDpfile.close(); SDgfile.close();
73877392
client.stop();
73887393
repl(NULL);
7389-
}
7394+
}

0 commit comments

Comments
 (0)