mirrors/ecl
1
Fork 0
mirror of https://gitlab.com/embeddable-common-lisp/ecl.git synced 2026-04-27 19:50:44 -07:00
Code Issues Projects Releases Packages Wiki Activity

reader: always cons full escape_list

Browse source 
This is in preparation for separating CL-specific tokenization from general
rule. We need to carry information about all escaped characters even when we
don't change their case, this is to allow for interpretation of special token
characters, like ":" - when it is escaped then it has no meaning, otherwise it
separates the symbol from the package.
This commit is contained in:
Daniel Kochmański 2026-03-02 10:58:13 +01:00
parent f270b54692
commit 1a83e74f45
1 changed files with 11 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/c/reader.d
View file

@ -28,11 +28,11 @@
#define read_suppress (ecl_symbol_value(@'*read-suppress*') != ECL_NIL)
/*
* This routine inverts the case of the characters in the buffer which
* were not escaped. ESCAPE_LIST is a list of intevals of characters
* that were escaped, as in ({(low-limit . high-limit)}*). The list
* goes from the last interval to the first one, in reverse order,
* and thus we run the buffer from the end to the beginning.
* This routine inverts the case of the characters in the buffer which were not
* escaped. ESCAPE_LIST is a list of intevals of characters that were escaped,
* as in ({(low-limit . high-limit)}*). The list goes from the last interval to
* the first one, in reverse order, and thus we run the buffer from the end to
* the beginning.
*/
static void
invert_buffer_case(cl_object x, cl_object escape_list, int sign)
@ -193,13 +193,9 @@ ecl_read_token(cl_object in, int flags, bool escape_first_p)
if (a == cat_single_escape) {
c = ecl_read_char_noeof(in);
a = cat_constituent;
if (read_case == ecl_case_invert) {
escape_list = CONS(CONS(ecl_make_fixnum(length),
ecl_make_fixnum(length-1)),
escape_list);
} else {
escape_list = ECL_T;
}
escape_list = CONS(CONS(ecl_make_fixnum(length),
ecl_make_fixnum(length-1)),
escape_list);
ecl_string_push_extend(token, c);
length++;
goto NEXT;
@ -217,13 +213,9 @@ ecl_read_token(cl_object in, int flags, bool escape_first_p)
ecl_string_push_extend(token, c);
length++;
}
if (read_case == ecl_case_invert) {
escape_list = CONS(CONS(ecl_make_fixnum(begin),
ecl_make_fixnum(length-1)),
escape_list);
} else {
escape_list = ECL_T;
}
escape_list = CONS(CONS(ecl_make_fixnum(begin),
ecl_make_fixnum(length-1)),
escape_list);
goto NEXT;
}
if (a == cat_whitespace || a == cat_terminating) {