mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 11:50:28 +02:00
bf9eb54aab
* libguile/private-options.h: Add SCM_CURLY_INFIX_P macro, and increment
SCM_N_READ_OPTIONS.
* libguile/read.c (sym_nfx, sym_bracket_list, sym_bracket_apply): New
variables.
(scm_read_opts): Add curly-infix reader option. Reformat to comply
with GNU coding standards.
(scm_t_read_opts): Add curly_infix_p and neoteric_p fields.
(init_read_options): Initialize new fields.
(CHAR_IS_DELIMITER): Add '{', '}', '[', and ']' as delimiters if
curly_infix_p is set.
(set_port_square_brackets_p, set_port_curly_infix_p): New functions.
(read_inner_expression): New function which contains the code that was
previously in 'scm_read_expression'. Handle curly braces when
curly_infix_p is set. If curly_infix_p is set and square_brackets_p
is unset, follow the Kawa convention: [...] => ($bracket-list$ ...)
(scm_read_expression): New function body to handle neoteric
expressions where appropriate.
(scm_read_shebang): Handle the new reader directives: '#!curly-infix'
and the non-standard '#!curly-infix-and-bracket-lists'.
(scm_read_sexp): Handle curly infix lists.
* module/ice-9/boot-9.scm (%cond-expand-features): Add srfi-105 feature
identifier.
* doc/ref/srfi-modules.texi (SRFI-105): Add stub doc for SRFI-105.
* doc/ref/api-evaluation.texi (Scheme Read): Add documentation for the
'curly-infix' read option, and the '#!curly-infix' and
'#!curly-infix-and-bracket-lists' reader directives.
* doc/ref/api-options.texi (Runtime Options): Add 'curly-infix' to the
list of read options.
* test-suite/Makefile.am: Add tests/srfi-105.test.
* test-suite/tests/srfi-105.test: New file.
74 lines
2.5 KiB
C
74 lines
2.5 KiB
C
/*
|
|
* private-options.h - private declarations for option handling
|
|
*
|
|
* We put this in a private header, since layout of data structures
|
|
* is an implementation detail that we want to hide.
|
|
*
|
|
* Copyright (C) 2007, 2009, 2010, 2011 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
|
|
*/
|
|
|
|
#ifndef PRIVATE_OPTIONS
|
|
#define PRIVATE_OPTIONS
|
|
|
|
/*
|
|
debugging.
|
|
*/
|
|
SCM_INTERNAL scm_t_option scm_debug_opts[];
|
|
|
|
#define SCM_BACKWARDS_P scm_debug_opts[0].val
|
|
#define SCM_BACKTRACE_WIDTH scm_debug_opts[1].val
|
|
#define SCM_BACKTRACE_DEPTH scm_debug_opts[2].val
|
|
#define SCM_BACKTRACE_P scm_debug_opts[3].val
|
|
#define SCM_STACK_LIMIT scm_debug_opts[4].val
|
|
#define SCM_SHOW_FILE_NAME scm_debug_opts[5].val
|
|
#define SCM_WARN_DEPRECATED scm_debug_opts[6].val
|
|
#define SCM_N_DEBUG_OPTIONS 7
|
|
|
|
|
|
/*
|
|
printing
|
|
*/
|
|
SCM_INTERNAL scm_t_option scm_print_opts[];
|
|
|
|
#define SCM_PRINT_HIGHLIGHT_PREFIX_I 0
|
|
#define SCM_PRINT_HIGHLIGHT_PREFIX (SCM_PACK (scm_print_opts[0].val))
|
|
#define SCM_PRINT_HIGHLIGHT_SUFFIX_I 1
|
|
#define SCM_PRINT_HIGHLIGHT_SUFFIX (SCM_PACK (scm_print_opts[1].val))
|
|
#define SCM_PRINT_KEYWORD_STYLE_I 2
|
|
#define SCM_PRINT_KEYWORD_STYLE (SCM_PACK (scm_print_opts[2].val))
|
|
#define SCM_PRINT_ESCAPE_NEWLINES_P scm_print_opts[3].val
|
|
#define SCM_N_PRINT_OPTIONS 4
|
|
|
|
|
|
/*
|
|
read
|
|
*/
|
|
SCM_INTERNAL scm_t_option scm_read_opts[];
|
|
|
|
#define SCM_COPY_SOURCE_P scm_read_opts[0].val
|
|
#define SCM_RECORD_POSITIONS_P scm_read_opts[1].val
|
|
#define SCM_CASE_INSENSITIVE_P scm_read_opts[2].val
|
|
#define SCM_KEYWORD_STYLE scm_read_opts[3].val
|
|
#define SCM_R6RS_ESCAPES_P scm_read_opts[4].val
|
|
#define SCM_SQUARE_BRACKETS_P scm_read_opts[5].val
|
|
#define SCM_HUNGRY_EOL_ESCAPES_P scm_read_opts[6].val
|
|
#define SCM_CURLY_INFIX_P scm_read_opts[7].val
|
|
|
|
#define SCM_N_READ_OPTIONS 7
|
|
|
|
#endif /* PRIVATE_OPTIONS */
|