mirrors/ecl
1
Fork 0
mirror of https://gitlab.com/embeddable-common-lisp/ecl.git synced 2026-03-10 07:00:20 -07:00
Code Issues Projects Releases Packages Wiki Activity

reader: add a new object to the system ecl_token

Browse source 
It represents unparsed token constructed by the reader.
This commit is contained in:
Daniel Kochmański 2026-03-02 21:32:46 +01:00
parent 8281d2316f
commit d495a41464
8 changed files with 29 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/c/alloc_2.d
View file

@ -337,6 +337,7 @@ ecl_alloc_object(cl_type t)
case t_mailbox:
#endif
case t_foreign:
case t_token:
case t_codeblock: {
cl_object obj;
ecl_disable_interrupts_env(the_env);
@ -553,6 +554,7 @@ void init_type_info (void)
init_tm(t_codeblock, "CODEBLOCK", sizeof(struct ecl_codeblock), -1);
init_tm(t_foreign, "FOREIGN", sizeof(struct ecl_foreign), 2);
init_tm(t_frame, "STACK-FRAME", sizeof(struct ecl_stack_frame), 0);
init_tm(t_token, "TOKEN", sizeof(struct ecl_token), 2);
init_tm(t_weak_pointer, "WEAK-POINTER", sizeof(struct ecl_weak_pointer), 0);
#ifdef ECL_SSE2
init_tm(t_sse_pack, "SSE-PACK", sizeof(struct ecl_sse_pack), 0);
@ -712,6 +714,9 @@ void init_type_info (void)
to_bitmap(&o, &(o.foreign.tag));
type_info[t_frame].descriptor =
to_bitmap(&o, &(o.frame.env));
type_info[t_token].descriptor =
to_bitmap(&o, &(o.token.string)) |
to_bitmap(&o, &(o.token.escape)));
type_info[t_weak_pointer].descriptor = 0;
#ifdef ECL_SSE2
type_info[t_sse_pack].descriptor = 0;

3
src/c/clos/instance.d
View file

@ -394,6 +394,7 @@ enum ecl_built_in_classes {
ECL_BUILTIN_CODE_BLOCK,
ECL_BUILTIN_FOREIGN_DATA,
ECL_BUILTIN_FRAME,
ECL_BUILTIN_TOKEN,
ECL_BUILTIN_WEAK_POINTER,
ECL_BUILTIN_PROCESS,
ECL_BUILTIN_LOCK,
@ -511,6 +512,8 @@ cl_class_of(cl_object x)
index = ECL_BUILTIN_FOREIGN_DATA; break;
case t_frame:
index = ECL_BUILTIN_FRAME; break;
case t_token:
index = ECL_BUILTIN_TOKEN; break;
case t_weak_pointer:
index = ECL_BUILTIN_WEAK_POINTER; break;
#ifdef ECL_SSE2

7
src/c/printer/write_ugly.d
View file

@ -370,6 +370,12 @@ write_frame(cl_object x, cl_object stream)
_ecl_write_unreadable(x, "frame", ecl_make_fixnum(x->frame.size), stream);
}
static void
write_token(cl_object x, cl_object stream)
{
_ecl_write_unreadable(x, "token", x->token.string, stream);
}
static void
write_weak_pointer(cl_object x, cl_object stream)
{
@ -480,6 +486,7 @@ static printer dispatch[FREE+1] = {
write_codeblock, /* t_codeblock */
write_foreign, /* t_foreign */
write_frame, /* t_frame */
write_token, /* t_token */
write_weak_pointer, /* t_weak_pointer */
#ifdef ECL_SSE2
_ecl_write_sse, /* t_sse_pack */

1
src/c/serialize.d
View file

@ -76,6 +76,7 @@ static cl_index object_size[] = {
ROUNDED_SIZE(ecl_codeblock), /* t_codeblock */
ROUNDED_SIZE(ecl_foreign), /* t_foreign */
ROUNDED_SIZE(ecl_stack_frame), /* t_frame */
ROUNDED_SIZE(ecl_token), /* t_token */
ROUNDED_SIZE(ecl_weak_pointer) /* t_weak_pointer */
#ifdef ECL_SSE2
, ROUNDED_SIZE(ecl_sse_pack) /* t_sse_pack */

1
src/c/symbols_list.h
View file

@ -1847,6 +1847,7 @@ cl_symbols[] = {
{SYS_ "CODE-BLOCK" ECL_FUN(NULL, NULL, -1) ECL_VAR(SI_ORDINARY, OBJNULL)},
{SYS_ "TOKEN" ECL_FUN(NULL, NULL, -1) ECL_VAR(SI_ORDINARY, OBJNULL)},
{SYS_ "FRAME" ECL_FUN(NULL, NULL, -1) ECL_VAR(SI_ORDINARY, OBJNULL)},
{SYS_ "APPLY-FROM-STACK-FRAME" ECL_FUN("si_apply_from_stack_frame", si_apply_from_stack_frame, 2) ECL_VAR(SI_ORDINARY, OBJNULL)},

2
src/c/typespec.d
View file

@ -181,6 +181,8 @@ ecl_type_to_symbol(cl_type t)
return @'si::foreign-data';
case t_frame:
return @'si::frame';
case t_token:
return @'si::token';
case t_weak_pointer:
return @'ext::weak-pointer';
#ifdef ECL_SSE2

1
src/clos/hierarchy.lsp
View file

@ -228,6 +228,7 @@
(si::code-block)
(si::foreign-data)
(si::frame)
(si::token)
(si::weak-pointer)
(:threads mp::process)
(:threads mp::lock)

9
src/h/object.h
View file

@ -84,6 +84,7 @@ typedef enum {
t_codeblock,
t_foreign,
t_frame,
t_token,
t_weak_pointer,
#ifdef ECL_SSE2
t_sse_pack,
@ -947,6 +948,13 @@ struct ecl_stack_frame {
struct cl_env_struct *env;
};
/* Token is constructed by the reader from constituents and then parsed. */
struct ecl_token {
_ECL_HDR1(escaped);
cl_object string; /* the token string */
cl_object escape; /* ranges of escaped characters */
};
struct ecl_weak_pointer { /* weak pointer to value */
_ECL_HDR;
cl_object value;
@ -1175,6 +1183,7 @@ union cl_lispunion {
struct ecl_cclosure cclosure; /* compiled closure */
struct ecl_dummy d; /* dummy */
struct ecl_instance instance; /* clos instance */
struct ecl_token token; /* token */
#ifdef ECL_THREADS
struct ecl_process process; /* process */
struct ecl_lock lock; /* lock */