diff --git a/display.c b/display.c index 14053a34..0c0e03d4 100644 --- a/display.c +++ b/display.c @@ -58,10 +58,11 @@ display_helper (FILE* f, SCM x, bool cont, char const *sep, bool quote) { char const *name = 0; if (VALUE (x) == char_nul.value) name = char_nul.name; + else if (VALUE (x) == char_alarm.value) name = char_alarm.name; else if (VALUE (x) == char_backspace.value) name = char_backspace.name; else if (VALUE (x) == char_tab.value) name = char_tab.name; else if (VALUE (x) == char_newline.value) name = char_newline.name; - else if (VALUE (x) == char_vt.value) name = char_vt.name; + else if (VALUE (x) == char_vtab.value) name = char_vtab.name; else if (VALUE (x) == char_page.value) name = char_page.name; else if (VALUE (x) == char_return.value) name = char_return.name; else if (VALUE (x) == char_space.value) name = char_space.name; diff --git a/mes.c b/mes.c index 1ca53e07..67c7fcba 100644 --- a/mes.c +++ b/mes.c @@ -131,10 +131,11 @@ scm scm_symbol_cons = {SYMBOL, "cons"}; scm char_eof = {CHAR, .name="*eof*", .value=-1}; scm char_nul = {CHAR, .name="nul", .value=0}; +scm char_alarm = {CHAR, .name="alarm", .value=8}; scm char_backspace = {CHAR, .name="backspace", .value=8}; scm char_tab = {CHAR, .name="tab", .value=9}; scm char_newline = {CHAR, .name="newline", .value=10}; -scm char_vt = {CHAR, .name="vt", .value=11}; +scm char_vtab = {CHAR, .name="vtab", .value=11}; scm char_page = {CHAR, .name="page", .value=12}; scm char_return = {CHAR, .name="return", .value=13}; scm char_space = {CHAR, .name="space", .value=32}; diff --git a/module/language/c/lexer.mes b/module/language/c/lexer.mes index 45a6e17e..265b3e28 100644 --- a/module/language/c/lexer.mes +++ b/module/language/c/lexer.mes @@ -158,7 +158,7 @@ ((#\n) #\newline) ((#\r) #\return) ((#\t) #\tab) - ((#\v) #\vt) + ((#\v) #\vtab) ((#\0) (let ((next (peek-char))) (cond @@ -402,7 +402,7 @@ ;;(display "next-token c=") (display c) (newline) (case c - ((#\tab #\vt #\page #\space ;;#\x00A0 + ((#\tab #\vtab #\page #\space ;;#\x00A0 ) ; whitespace (read-char) (next-token div?)) diff --git a/reader.c b/reader.c index 30cd8b08..5fb081cf 100644 --- a/reader.c +++ b/reader.c @@ -122,10 +122,11 @@ read_character () } *p = 0; if (!strcmp (buf, char_nul.name)) c = char_nul.value; + else if (!strcmp (buf, char_alarm.name)) c = char_alarm.value; else if (!strcmp (buf, char_backspace.name)) c = char_backspace.value; else if (!strcmp (buf, char_tab.name)) c = char_tab.value; else if (!strcmp (buf, char_newline.name)) c = char_newline.value; - else if (!strcmp (buf, char_vt.name)) c = char_vt.value; + else if (!strcmp (buf, char_vtab.name)) c = char_vtab.value; else if (!strcmp (buf, char_page.name)) c = char_page.value; else if (!strcmp (buf, char_return.name)) c = char_return.value; else if (!strcmp (buf, char_space.name)) c = char_space.value;