mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00
Code Activity

scm_ungetc, scm_ungets instead of _unlocked variants

Browse source 
* libguile/ports.h (scm_ungetc_unlocked, scm_ungets_unlocked): Remove;
  replace with scm_ungetc, scm_ungets.
* libguile/ports.c (scm_ungetc, scm_ungets, scm_unread_char)
  (scm_unread_string): Adapt.
* libguile/rdelim.c (scm_read_delimited_x): Use scm_ungetc.
* libguile/read.c: Unread characers with scm_ungetc, not
  scm_ungetc_unlocked.
This commit is contained in:
Andy Wingo 2016-04-23 22:20:18 +02:00
parent 21650f8d52
commit 122c8e6b37
4 changed files with 27 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

30
libguile/ports.c
View file

@ -2037,7 +2037,7 @@ scm_unget_byte (int c, SCM port)
} }
void void
scm_ungetc_unlocked (scm_t_wchar c, SCM port) scm_ungetc (scm_t_wchar c, SCM port)
#define FUNC_NAME "scm_ungetc" #define FUNC_NAME "scm_ungetc"
{ {
scm_t_port *pt = SCM_PTAB_ENTRY (port); scm_t_port *pt = SCM_PTAB_ENTRY (port);
@ -2089,17 +2089,7 @@ scm_ungetc_unlocked (scm_t_wchar c, SCM port)
#undef FUNC_NAME #undef FUNC_NAME
void void
scm_ungetc (scm_t_wchar c, SCM port) scm_ungets (const char *s, int n, SCM port)
{
scm_i_pthread_mutex_t *lock;
scm_c_lock_port (port, &lock);
scm_ungetc_unlocked (c, port);
if (lock)
scm_i_pthread_mutex_unlock (lock);
}
void
scm_ungets_unlocked (const char *s, int n, SCM port)
{ {
/* This is simple minded and inefficient, but unreading strings is /* This is simple minded and inefficient, but unreading strings is
* probably not a common operation, and remember that line and * probably not a common operation, and remember that line and
@ -2108,17 +2098,7 @@ scm_ungets_unlocked (const char *s, int n, SCM port)
* Please feel free to write an optimized version! * Please feel free to write an optimized version!
*/ */
while (n--) while (n--)
scm_ungetc_unlocked (s[n], port); scm_ungetc (s[n], port);
}
void
scm_ungets (const char *s, int n, SCM port)
{
scm_i_pthread_mutex_t *lock;
scm_c_lock_port (port, &lock);
scm_ungets_unlocked (s, n, port);
if (lock)
scm_i_pthread_mutex_unlock (lock);
} }
SCM_DEFINE (scm_peek_char, "peek-char", 0, 1, 0, SCM_DEFINE (scm_peek_char, "peek-char", 0, 1, 0,
@ -2202,7 +2182,7 @@ SCM_DEFINE (scm_unread_char, "unread-char", 1, 1, 0,
c = SCM_CHAR (cobj); c = SCM_CHAR (cobj);
scm_ungetc_unlocked (c, port); scm_ungetc (c, port);
return cobj; return cobj;
} }
#undef FUNC_NAME #undef FUNC_NAME
@ -2224,7 +2204,7 @@ SCM_DEFINE (scm_unread_string, "unread-string", 2, 0, 0,
n = scm_i_string_length (str); n = scm_i_string_length (str);
while (n--) while (n--)
scm_ungetc_unlocked (scm_i_string_ref (str, n), port); scm_ungetc (scm_i_string_ref (str, n), port);
return str; return str;
} }

2
libguile/ports.h
View file

@ -306,9 +306,7 @@ SCM_API SCM scm_read_char (SCM port);
SCM_API void scm_unget_bytes (const unsigned char *buf, size_t len, SCM port); SCM_API void scm_unget_bytes (const unsigned char *buf, size_t len, SCM port);
SCM_API void scm_unget_byte (int c, SCM port); SCM_API void scm_unget_byte (int c, SCM port);
SCM_API void scm_ungetc (scm_t_wchar c, SCM port); SCM_API void scm_ungetc (scm_t_wchar c, SCM port);
SCM_API void scm_ungetc_unlocked (scm_t_wchar c, SCM port);
SCM_API void scm_ungets (const char *s, int n, SCM port); SCM_API void scm_ungets (const char *s, int n, SCM port);
SCM_API void scm_ungets_unlocked (const char *s, int n, SCM port);
SCM_API SCM scm_peek_char (SCM port); SCM_API SCM scm_peek_char (SCM port);
SCM_API SCM scm_unread_char (SCM cobj, SCM port); SCM_API SCM scm_unread_char (SCM cobj, SCM port);
SCM_API SCM scm_unread_string (SCM str, SCM port); SCM_API SCM scm_unread_string (SCM str, SCM port);

2
libguile/rdelim.c
View file

@ -85,7 +85,7 @@ SCM_DEFINE (scm_read_delimited_x, "%read-delimited!", 3, 3, 0,
if (scm_i_string_ref (delims, k) == c) if (scm_i_string_ref (delims, k) == c)
{ {
if (scm_is_false (gobble)) if (scm_is_false (gobble))
scm_ungetc_unlocked (c, port); scm_ungetc (c, port);
return scm_cons (SCM_MAKE_CHAR (c), return scm_cons (SCM_MAKE_CHAR (c),
scm_from_size_t (j - cstart)); scm_from_size_t (j - cstart));

42
libguile/read.c
View file

@ -381,7 +381,7 @@ flush_ws (SCM port, scm_t_read_opts *opts, const char *eoferr)
} }
/* fall through */ /* fall through */
default: default:
scm_ungetc_unlocked (c, port); scm_ungetc (c, port);
return '#'; return '#';
} }
break; break;
@ -440,7 +440,7 @@ scm_read_sexp (scm_t_wchar chr, SCM port, scm_t_read_opts *opts)
if (terminating_char == c) if (terminating_char == c)
return SCM_EOL; return SCM_EOL;
scm_ungetc_unlocked (c, port); scm_ungetc (c, port);
tmp = scm_read_expression (port, opts); tmp = scm_read_expression (port, opts);
/* Note that it is possible for scm_read_expression to return /* Note that it is possible for scm_read_expression to return
@ -468,7 +468,7 @@ scm_read_sexp (scm_t_wchar chr, SCM port, scm_t_read_opts *opts)
"in pair: mismatched close paren: ~A", "in pair: mismatched close paren: ~A",
scm_list_1 (SCM_MAKE_CHAR (c))); scm_list_1 (SCM_MAKE_CHAR (c)));
scm_ungetc_unlocked (c, port); scm_ungetc (c, port);
tmp = scm_read_expression (port, opts); tmp = scm_read_expression (port, opts);
/* See above note about scm_sym_dot. */ /* See above note about scm_sym_dot. */
@ -593,7 +593,7 @@ skip_intraline_whitespace (SCM port)
} }
while (c == '\t' || uc_is_general_category (c, UC_SPACE_SEPARATOR)); while (c == '\t' || uc_is_general_category (c, UC_SPACE_SEPARATOR));
scm_ungetc_unlocked (c, port); scm_ungetc (c, port);
} }
/* Read either a double-quoted string or an R7RS-style symbol delimited /* Read either a double-quoted string or an R7RS-style symbol delimited
@ -741,7 +741,7 @@ scm_read_number (scm_t_wchar chr, SCM port, scm_t_read_opts *opts)
long line = SCM_LINUM (port); long line = SCM_LINUM (port);
int column = SCM_COL (port) - 1; int column = SCM_COL (port) - 1;
scm_ungetc_unlocked (chr, port); scm_ungetc (chr, port);
buffer = read_complete_token (port, opts, local_buffer, sizeof local_buffer, buffer = read_complete_token (port, opts, local_buffer, sizeof local_buffer,
&bytes_read); &bytes_read);
@ -772,7 +772,7 @@ scm_read_mixed_case_symbol (scm_t_wchar chr, SCM port, scm_t_read_opts *opts)
char local_buffer[READER_BUFFER_SIZE], *buffer; char local_buffer[READER_BUFFER_SIZE], *buffer;
SCM str; SCM str;
scm_ungetc_unlocked (chr, port); scm_ungetc (chr, port);
buffer = read_complete_token (port, opts, local_buffer, sizeof local_buffer, buffer = read_complete_token (port, opts, local_buffer, sizeof local_buffer,
&bytes_read); &bytes_read);
if (bytes_read > 0) if (bytes_read > 0)
@ -832,8 +832,8 @@ scm_read_number_and_radix (scm_t_wchar chr, SCM port, scm_t_read_opts *opts)
break; break;
default: default:
scm_ungetc_unlocked (chr, port); scm_ungetc (chr, port);
scm_ungetc_unlocked ('#', port); scm_ungetc ('#', port);
radix = 10; radix = 10;
} }
@ -881,7 +881,7 @@ scm_read_quote (int chr, SCM port, scm_t_read_opts *opts)
p = scm_sym_uq_splicing; p = scm_sym_uq_splicing;
else else
{ {
scm_ungetc_unlocked (c, port); scm_ungetc (c, port);
p = scm_sym_unquote; p = scm_sym_unquote;
} }
break; break;
@ -928,7 +928,7 @@ scm_read_syntax (int chr, SCM port, scm_t_read_opts *opts)
p = sym_unsyntax_splicing; p = sym_unsyntax_splicing;
else else
{ {
scm_ungetc_unlocked (c, port); scm_ungetc (c, port);
p = sym_unsyntax; p = sym_unsyntax;
} }
break; break;
@ -992,7 +992,7 @@ try_read_ci_chars (SCM port, const char *expected_chars)
break; break;
else if (c_tolower (c) != expected_chars[num_chars_read]) else if (c_tolower (c) != expected_chars[num_chars_read])
{ {
scm_ungetc_unlocked (c, port); scm_ungetc (c, port);
break; break;
} }
else else
@ -1004,7 +1004,7 @@ try_read_ci_chars (SCM port, const char *expected_chars)
else else
{ {
while (num_chars_read > 0) while (num_chars_read > 0)
scm_ungetc_unlocked (chars_read[--num_chars_read], port); scm_ungetc (chars_read[--num_chars_read], port);
return 0; return 0;
} }
} }
@ -1228,7 +1228,7 @@ scm_read_array (int c, SCM port, scm_t_read_opts *opts, long line, int column)
if (c == 'a' && try_read_ci_chars (port, "lse")) if (c == 'a' && try_read_ci_chars (port, "lse"))
return SCM_BOOL_F; return SCM_BOOL_F;
else if (c != EOF) else if (c != EOF)
scm_ungetc_unlocked (c, port); scm_ungetc (c, port);
return SCM_BOOL_F; return SCM_BOOL_F;
} }
rank = 1; rank = 1;
@ -1384,7 +1384,7 @@ scm_read_guile_bit_vector (scm_t_wchar chr, SCM port, scm_t_read_opts *opts,
} }
if (chr != EOF) if (chr != EOF)
scm_ungetc_unlocked (chr, port); scm_ungetc (chr, port);
return maybe_annotate_source return maybe_annotate_source
(scm_bitvector (scm_reverse_x (s_bits, SCM_EOL)), (scm_bitvector (scm_reverse_x (s_bits, SCM_EOL)),
@ -1439,7 +1439,7 @@ scm_read_shebang (scm_t_wchar chr, SCM port, scm_t_read_opts *opts)
name[i++] = c; name[i++] = c;
else if (CHAR_IS_DELIMITER (c)) else if (CHAR_IS_DELIMITER (c))
{ {
scm_ungetc_unlocked (c, port); scm_ungetc (c, port);
name[i] = '\0'; name[i] = '\0';
if (0 == strcmp ("r6rs", name)) if (0 == strcmp ("r6rs", name))
; /* Silently ignore */ ; /* Silently ignore */
@ -1461,12 +1461,12 @@ scm_read_shebang (scm_t_wchar chr, SCM port, scm_t_read_opts *opts)
} }
else else
{ {
scm_ungetc_unlocked (c, port); scm_ungetc (c, port);
break; break;
} }
} }
while (i > 0) while (i > 0)
scm_ungetc_unlocked (name[--i], port); scm_ungetc (name[--i], port);
return scm_read_scsh_block_comment (chr, port); return scm_read_scsh_block_comment (chr, port);
} }
@ -1518,7 +1518,7 @@ scm_read_commented_expression (scm_t_wchar chr, SCM port,
if (EOF == c) if (EOF == c)
scm_i_input_error ("read_commented_expression", port, scm_i_input_error ("read_commented_expression", port,
"no expression after #; comment", SCM_EOL); "no expression after #; comment", SCM_EOL);
scm_ungetc_unlocked (c, port); scm_ungetc (c, port);
scm_read_expression (port, opts); scm_read_expression (port, opts);
return SCM_UNSPECIFIED; return SCM_UNSPECIFIED;
} }
@ -1868,7 +1868,7 @@ scm_read_expression (SCM port, scm_t_read_opts *opts)
int c = flush_ws (port, opts, (char *) NULL); int c = flush_ws (port, opts, (char *) NULL);
if (c == EOF) if (c == EOF)
return SCM_EOF_VAL; return SCM_EOF_VAL;
scm_ungetc_unlocked (c, port); scm_ungetc (c, port);
line = SCM_LINUM (port); line = SCM_LINUM (port);
column = SCM_COL (port); column = SCM_COL (port);
} }
@ -1903,7 +1903,7 @@ scm_read_expression (SCM port, scm_t_read_opts *opts)
else else
{ {
if (chr != EOF) if (chr != EOF)
scm_ungetc_unlocked (chr, port); scm_ungetc (chr, port);
break; break;
} }
maybe_annotate_source (expr, port, opts, line, column); maybe_annotate_source (expr, port, opts, line, column);
@ -1937,7 +1937,7 @@ SCM_DEFINE (scm_read, "read", 0, 1, 0,
c = flush_ws (port, &opts, (char *) NULL); c = flush_ws (port, &opts, (char *) NULL);
if (EOF == c) if (EOF == c)
return SCM_EOF_VAL; return SCM_EOF_VAL;
scm_ungetc_unlocked (c, port); scm_ungetc (c, port);
return (scm_read_expression (port, &opts)); return (scm_read_expression (port, &opts));
} }