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

* readline.c (match_paren): Changed return type to int (this is

Browse source 
the definition in readline 4) and modified code layout according
to GNU coding standards.
This commit is contained in:
Mikael Djurfeldt 2000-01-09 17:01:34 +00:00
parent 9359d6578a
commit 576cdec4d6
1 changed files with 32 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

51
guile-readline/readline.c
View file

@ -1,6 +1,6 @@
/* readline.c --- line editing support for Guile */ /* readline.c --- line editing support for Guile */
/* Copyright (C) 1997,1999 Free Software Foundation, Inc. /* Copyright (C) 1997,1999, 2000 Free Software Foundation, Inc.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -409,17 +409,18 @@ completion_function (char *text, int continuep)
/*Bouncing parenthesis (reimplemented by GH, 11/23/98, since readline is strict gpl)*/ /*Bouncing parenthesis (reimplemented by GH, 11/23/98, since readline is strict gpl)*/
static void match_paren(int x, int k); static int match_paren (int x, int k);
static int find_matching_paren(int k); static int find_matching_paren (int k);
static void init_bouncing_parens(); static void init_bouncing_parens ();
static void static void
init_bouncing_parens() init_bouncing_parens ()
{ {
if(strncmp(rl_get_keymap_name(rl_get_keymap()), "vi", 2)) { if (strncmp (rl_get_keymap_name (rl_get_keymap ()), "vi", 2))
rl_bind_key(')', match_paren); {
rl_bind_key(']', match_paren); rl_bind_key (')', match_paren);
rl_bind_key('}', match_paren); rl_bind_key (']', match_paren);
rl_bind_key ('}', match_paren);
} }
} }
@ -455,44 +456,48 @@ find_matching_paren(int k)
} }
else if (rl_line_buffer[i] == c) else if (rl_line_buffer[i] == c)
{ {
if (end_parens_found==0) return i; if (end_parens_found==0)
return i;
else --end_parens_found; else --end_parens_found;
} }
} }
return -1; return -1;
} }
static void static int
match_paren(int x, int k) match_paren (int x, int k)
{ {
int tmp; int tmp;
fd_set readset; fd_set readset;
struct timeval timeout; struct timeval timeout;
rl_insert(x, k); rl_insert (x, k);
if (!SCM_READLINE_BOUNCE_PARENS) if (!SCM_READLINE_BOUNCE_PARENS)
return; return 0;
/* Did we just insert a quoted paren? If so, then don't bounce. */ /* Did we just insert a quoted paren? If so, then don't bounce. */
if (rl_point - 1 >= 1 if (rl_point - 1 >= 1
&& rl_line_buffer[rl_point - 2] == '\\') && rl_line_buffer[rl_point - 2] == '\\')
return; return 0;
tmp = 1000 * SCM_READLINE_BOUNCE_PARENS; tmp = 1000 * SCM_READLINE_BOUNCE_PARENS;
timeout.tv_sec = tmp / 1000000; timeout.tv_sec = tmp / 1000000;
timeout.tv_usec = tmp % 1000000; timeout.tv_usec = tmp % 1000000;
FD_ZERO(&readset); FD_ZERO (&readset);
FD_SET(fileno(rl_instream), &readset); FD_SET (fileno (rl_instream), &readset);
if(rl_point > 1) { if (rl_point > 1)
{
tmp = rl_point; tmp = rl_point;
rl_point = find_matching_paren(k); rl_point = find_matching_paren (k);
if(rl_point > -1) { if (rl_point > -1)
rl_redisplay(); {
scm_internal_select(1, &readset, NULL, NULL, &timeout); rl_redisplay ();
scm_internal_select (1, &readset, NULL, NULL, &timeout);
} }
rl_point = tmp; rl_point = tmp;
} }
return 0;
} }
@ -509,7 +514,7 @@ scm_init_readline ()
rl_readline_name = "Guile"; rl_readline_name = "Guile";
#ifdef USE_THREADS #ifdef USE_THREADS
scm_mutex_init (&reentry_barrier_mutex); scm_mutex_init (&reentry_barrier_mutex, NULL);
#endif #endif
scm_init_opts (scm_readline_options, scm_init_opts (scm_readline_options,
scm_readline_opts, scm_readline_opts,