mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-16 16:50:21 +02:00
Add disjoint syntax object type
* libguile/Makefile.am (libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES): (DOT_X_FILES, DOT_DOC_FILES, noinst_HEADERS): Add syntax.c and syntax.h. * libguile/evalext.c (scm_self_evaluating_p): * libguile/goops.c (class_syntax, scm_class_of, scm_goops_early_init): * libguile/init.c (scm_init_guile): * libguile/print.c (iprin1): * libguile/tags.h (scm_tc7_syntax): * module/oop/goops.scm (<syntax>): * module/system/base/types.scm (%tc7-syntax, cell->object): * module/system/vm/disassembler.scm (code-annotation): Wire up the new data type. * libguile/syntax.c: * libguile/syntax.h: New files. * module/ice-9/boot-9.scm: Move new definitions to (system syntax internal). * module/system/syntax.scm (print-syntax): New helper. * module/system/vm/assembler.scm (statically-allocatable?) (intern-constant, link-data): Arrange to be able to write syntax objects into images. * module/language/cps/types.scm (&syntax): New type. Remove &hash-table; it was never detected, an internal binding, and we need the bit to avoid going into bignum territory.
This commit is contained in:
Andy Wingo
parent
6ba3f35f26
commit
64c5cc58fc
15 changed files with 221 additions and 8 deletions
|
|
@ -212,6 +212,7 @@ libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES = \
|
|||
strports.c \
|
||||
struct.c \
|
||||
symbols.c \
|
||||
syntax.c \
|
||||
threads.c \
|
||||
throw.c \
|
||||
trees.c \
|
||||
|
|
@ -316,6 +317,7 @@ DOT_X_FILES = \
|
|||
strports.x \
|
||||
struct.x \
|
||||
symbols.x \
|
||||
syntax.x \
|
||||
threads.x \
|
||||
throw.x \
|
||||
trees.x \
|
||||
|
|
@ -418,6 +420,7 @@ DOT_DOC_FILES = \
|
|||
strports.doc \
|
||||
struct.doc \
|
||||
symbols.doc \
|
||||
syntax.doc \
|
||||
threads.doc \
|
||||
throw.doc \
|
||||
trees.doc \
|
||||
|
|
@ -509,6 +512,7 @@ noinst_HEADERS = conv-integer.i.c conv-uinteger.i.c \
|
|||
posix-w32.h \
|
||||
private-options.h \
|
||||
ports-internal.h \
|
||||
syntax.h \
|
||||
weak-list.h
|
||||
|
||||
# vm instructions
|
||||
|
|
|
|||
|
|
@ -82,6 +82,7 @@ SCM_DEFINE (scm_self_evaluating_p, "self-evaluating?", 1, 0, 0,
|
|||
case scm_tc7_dynamic_state:
|
||||
case scm_tc7_frame:
|
||||
case scm_tc7_keyword:
|
||||
case scm_tc7_syntax:
|
||||
case scm_tc7_vm_cont:
|
||||
case scm_tc7_number:
|
||||
case scm_tc7_string:
|
||||
|
|
|
|||
|
|
@ -110,6 +110,7 @@ static SCM class_applicable_struct_class;
|
|||
static SCM class_applicable_struct_with_setter_class;
|
||||
static SCM class_number, class_list;
|
||||
static SCM class_keyword;
|
||||
static SCM class_syntax;
|
||||
static SCM class_atomic_box;
|
||||
static SCM class_port, class_input_output_port;
|
||||
static SCM class_input_port, class_output_port;
|
||||
|
|
@ -227,6 +228,8 @@ SCM_DEFINE (scm_class_of, "class-of", 1, 0, 0,
|
|||
return class_frame;
|
||||
case scm_tc7_keyword:
|
||||
return class_keyword;
|
||||
case scm_tc7_syntax:
|
||||
return class_syntax;
|
||||
case scm_tc7_atomic_box:
|
||||
return class_atomic_box;
|
||||
case scm_tc7_vm_cont:
|
||||
|
|
@ -1002,6 +1005,7 @@ SCM_DEFINE (scm_sys_goops_early_init, "%goops-early-init", 0, 0, 0,
|
|||
class_dynamic_state = scm_variable_ref (scm_c_lookup ("<dynamic-state>"));
|
||||
class_frame = scm_variable_ref (scm_c_lookup ("<frame>"));
|
||||
class_keyword = scm_variable_ref (scm_c_lookup ("<keyword>"));
|
||||
class_syntax = scm_variable_ref (scm_c_lookup ("<syntax>"));
|
||||
class_atomic_box = scm_variable_ref (scm_c_lookup ("<atomic-box>"));
|
||||
class_vm_cont = scm_variable_ref (scm_c_lookup ("<vm-continuation>"));
|
||||
class_bytevector = scm_variable_ref (scm_c_lookup ("<bytevector>"));
|
||||
|
|
|
|||
|
|
@ -124,6 +124,7 @@
|
|||
#include "libguile/strports.h"
|
||||
#include "libguile/struct.h"
|
||||
#include "libguile/symbols.h"
|
||||
#include "libguile/syntax.h"
|
||||
#include "libguile/throw.h"
|
||||
#include "libguile/arrays.h"
|
||||
#include "libguile/trees.h"
|
||||
|
|
@ -507,6 +508,7 @@ scm_i_init_guile (void *base)
|
|||
scm_init_evalext ();
|
||||
scm_init_debug (); /* Requires macro smobs */
|
||||
scm_init_simpos ();
|
||||
scm_init_syntax ();
|
||||
#if HAVE_MODULES
|
||||
scm_init_dynamic_linking (); /* Requires smob_prehistory */
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@
|
|||
#include "libguile/ports-internal.h"
|
||||
#include "libguile/strings.h"
|
||||
#include "libguile/strports.h"
|
||||
#include "libguile/syntax.h"
|
||||
#include "libguile/vectors.h"
|
||||
#include "libguile/numbers.h"
|
||||
#include "libguile/vm.h"
|
||||
|
|
@ -716,6 +717,9 @@ iprin1 (SCM exp, SCM port, scm_print_state *pstate)
|
|||
scm_puts ("#:", port);
|
||||
scm_iprin1 (scm_keyword_to_symbol (exp), port, pstate);
|
||||
break;
|
||||
case scm_tc7_syntax:
|
||||
scm_i_syntax_print (exp, port, pstate);
|
||||
break;
|
||||
case scm_tc7_atomic_box:
|
||||
scm_i_atomic_box_print (exp, port, pstate);
|
||||
break;
|
||||
|
|
|
|||
120
libguile/syntax.c
Normal file
120
libguile/syntax.c
Normal file
|
|
@ -0,0 +1,120 @@
|
|||
/* Copyright (C) 2017 Free Software Foundation, Inc.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public License
|
||||
* as published by the Free Software Foundation; either version 3 of
|
||||
* the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
||||
* 02110-1301 USA
|
||||
*/
|
||||
|
||||
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
# include <config.h>
|
||||
#endif
|
||||
|
||||
#include "libguile/_scm.h"
|
||||
#include "libguile/keywords.h"
|
||||
#include "libguile/ports.h"
|
||||
#include "libguile/syntax.h"
|
||||
#include "libguile/validate.h"
|
||||
|
||||
|
||||
|
||||
static int
|
||||
scm_is_syntax (SCM x)
|
||||
{
|
||||
return SCM_HAS_TYP7 (x, scm_tc7_syntax);
|
||||
}
|
||||
|
||||
#define SCM_VALIDATE_SYNTAX(pos, scm) \
|
||||
SCM_I_MAKE_VALIDATE_MSG2 (pos, scm, scm_is_syntax, "syntax object")
|
||||
|
||||
SCM_DEFINE (scm_syntax_p, "syntax?", 1, 0, 0,
|
||||
(SCM obj),
|
||||
"Return @code{#t} if the argument @var{obj} is a syntax object,\n"
|
||||
"else @code{#f}.")
|
||||
#define FUNC_NAME s_scm_syntax_p
|
||||
{
|
||||
return scm_from_bool (scm_is_syntax (obj));
|
||||
}
|
||||
#undef FUNC_NAME
|
||||
|
||||
SCM_DEFINE (scm_make_syntax, "make-syntax", 3, 0, 0,
|
||||
(SCM exp, SCM wrap, SCM module),
|
||||
"Make a new syntax object.")
|
||||
#define FUNC_NAME s_scm_make_syntax
|
||||
{
|
||||
return scm_double_cell (scm_tc7_syntax, SCM_UNPACK (exp),
|
||||
SCM_UNPACK (wrap), SCM_UNPACK (module));
|
||||
}
|
||||
#undef FUNC_NAME
|
||||
|
||||
SCM_DEFINE (scm_syntax_expression, "syntax-expression", 1, 0, 0,
|
||||
(SCM obj),
|
||||
"Return the expression contained in the syntax object @var{obj}.")
|
||||
#define FUNC_NAME s_scm_syntax_expression
|
||||
{
|
||||
SCM_VALIDATE_SYNTAX (1, obj);
|
||||
return SCM_CELL_OBJECT_1 (obj);
|
||||
}
|
||||
#undef FUNC_NAME
|
||||
|
||||
SCM_DEFINE (scm_syntax_wrap, "syntax-wrap", 1, 0, 0,
|
||||
(SCM obj),
|
||||
"Return the wrap contained in the syntax object @var{obj}.")
|
||||
#define FUNC_NAME s_scm_syntax_wrap
|
||||
{
|
||||
SCM_VALIDATE_SYNTAX (1, obj);
|
||||
return SCM_CELL_OBJECT_2 (obj);
|
||||
}
|
||||
#undef FUNC_NAME
|
||||
|
||||
SCM_DEFINE (scm_syntax_module, "syntax-module", 1, 0, 0,
|
||||
(SCM obj),
|
||||
"Return the module info contained in the syntax object @var{obj}.")
|
||||
#define FUNC_NAME s_scm_syntax_module
|
||||
{
|
||||
SCM_VALIDATE_SYNTAX (1, obj);
|
||||
return SCM_CELL_OBJECT_3 (obj);
|
||||
}
|
||||
#undef FUNC_NAME
|
||||
|
||||
static SCM print_syntax_var;
|
||||
|
||||
static void
|
||||
init_print_syntax_var (void)
|
||||
{
|
||||
print_syntax_var =
|
||||
scm_c_private_variable ("system syntax", "print-syntax");
|
||||
}
|
||||
|
||||
void
|
||||
scm_i_syntax_print (SCM obj, SCM port, scm_print_state *pstate)
|
||||
{
|
||||
static scm_i_pthread_once_t once = SCM_I_PTHREAD_ONCE_INIT;
|
||||
scm_i_pthread_once (&once, init_print_syntax_var);
|
||||
scm_call_2 (scm_variable_ref (print_syntax_var), obj, port);
|
||||
}
|
||||
|
||||
void
|
||||
scm_init_syntax ()
|
||||
{
|
||||
#include "libguile/syntax.x"
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
Local Variables:
|
||||
c-file-style: "gnu"
|
||||
End:
|
||||
*/
|
||||
34
libguile/syntax.h
Normal file
34
libguile/syntax.h
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
#ifndef SCM_SYNTAX_H
|
||||
#define SCM_SYNTAX_H
|
||||
|
||||
/* Copyright (C) 2017 Free Software Foundation, Inc.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public License
|
||||
* as published by the Free Software Foundation; either version 3 of
|
||||
* the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
||||
* 02110-1301 USA
|
||||
*/
|
||||
|
||||
#include "libguile/__scm.h"
|
||||
|
||||
SCM_INTERNAL SCM scm_syntax_p (SCM obj);
|
||||
SCM_INTERNAL SCM scm_make_syntax (SCM exp, SCM wrap, SCM module);
|
||||
SCM_INTERNAL SCM scm_syntax_expression (SCM obj);
|
||||
SCM_INTERNAL SCM scm_syntax_wrap (SCM obj);
|
||||
SCM_INTERNAL SCM scm_syntax_module (SCM obj);
|
||||
|
||||
SCM_INTERNAL void scm_i_syntax_print (SCM obj, SCM port,
|
||||
scm_print_state *pstate);
|
||||
SCM_INTERNAL void scm_init_syntax (void);
|
||||
|
||||
#endif /* SCM_SYNTAX_H */
|
||||
|
|
@ -416,7 +416,7 @@ typedef union SCM { struct { scm_t_bits n; } n; } SCM;
|
|||
#define scm_tc7_frame 0x2f
|
||||
#define scm_tc7_keyword 0x35
|
||||
#define scm_tc7_atomic_box 0x37
|
||||
#define scm_tc7_unused_3d 0x3d
|
||||
#define scm_tc7_syntax 0x3d
|
||||
#define scm_tc7_unused_3f 0x3f
|
||||
#define scm_tc7_program 0x45
|
||||
#define scm_tc7_vm_cont 0x47
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue