From e263e2ed5cf155936d16a3cd2d91096c02a5e0f1 Mon Sep 17 00:00:00 2001
From: Kaz Kylheku <kaz@kylheku.com>
Date: Fri, 20 Aug 2021 06:43:20 -0700
Subject: configure: implement full-repl option.

This patch unbundles the building of the full-featured REPL
from HAVE_TERMIOS. We make it subject to its own configuration
option CONFIG_FULL_REPL, which is 1 by default. This way, the
downstream users or package maintainers can build TXR without
the full-featured REPL even if HAVE_TERMIOS is 1, and the
other termios material is built-in.

* configure (full_repl): New variable.
(help): Include full-repl in the help text.
In the termios test, if we don't detect termios, then
negate the full_repl variable.
In the final config variable generation section, generate
the  CONFIG_FULL_REPL 1 define in config.h, if full_repl
is true, ensuring it is subject to HAVE_TERMIOS, too.

* linenoise/linenoise.c: Replace HAVE_TERMIOS with
CONFIG_FULL_REPL.

* linenoise/linenoise.h: Likewise.

* parser.c: Likewise.

* txr.c: Likewise and ...
(if_termios): Macro renamed to if_full_repl.
(if_full_repl): New macro.
(opt_noninteractive): Use if_full_repl macro for
initializing.
(banner): Use if_ful_repl macro instead of if_termios.
---
 parser.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'parser.c')

diff --git a/parser.c b/parser.c
index 22f8fee4..4a85fa1c 100644
--- a/parser.c
+++ b/parser.c
@@ -924,7 +924,7 @@ static void load_rcfile(val name)
   uw_catch_end;
 }
 
-#if HAVE_TERMIOS
+#if CONFIG_FULL_REPL
 
 static val get_visible_syms(val package, int include_fallback)
 {
@@ -1491,7 +1491,7 @@ val repl(val bindings, val in_stream, val out_stream, val env)
   val rcfile = if2(home && !opt_noprofile, scat2(home, lit("/.txr_profile")));
   val old_sig_handler = set_sig_handler(num(SIGINT), func_n2(repl_intr));
   val hist_len_var = lookup_global_var(listener_hist_len_s);
-#if HAVE_TERMIOS
+#if CONFIG_FULL_REPL
   val multi_line_var = lookup_global_var(listener_multi_line_p_s);
   val sel_inclusive_var = lookup_global_var(listener_sel_inclusive_p_s);
 #endif
@@ -1522,7 +1522,7 @@ val repl(val bindings, val in_stream, val out_stream, val env)
 
   reg_varl(result_hash_sym, result_hash);
 
-#if HAVE_TERMIOS
+#if CONFIG_FULL_REPL
   lino_set_completion_cb(ls, provide_completions, 0);
   lino_set_atom_cb(ls, provide_atom, 0);
 #endif
@@ -1543,7 +1543,7 @@ val repl(val bindings, val in_stream, val out_stream, val env)
     }
   }
 
-#if HAVE_TERMIOS
+#if CONFIG_FULL_REPL
   lino_set_noninteractive(ls, opt_noninteractive);
 #endif
 
@@ -1556,7 +1556,7 @@ val repl(val bindings, val in_stream, val out_stream, val env)
     uw_frame_t uw_handler;
 
     lino_hist_set_max_len(ls, c_num(cdr(hist_len_var), self));
-#if HAVE_TERMIOS
+#if CONFIG_FULL_REPL
     lino_set_multiline(ls, cdr(multi_line_var) != nil);
     lino_set_selinclusive(ls, cdr(sel_inclusive_var) != nil);
 #endif
@@ -1564,7 +1564,7 @@ val repl(val bindings, val in_stream, val out_stream, val env)
     reg_varl(var_counter_sym, var_counter);
     line_w = linenoise(ls, c_str(prompt, self));
 
-#if HAVE_TERMIOS
+#if CONFIG_FULL_REPL
     rplacd(multi_line_var, tnil(lino_get_multiline(ls)));
 #endif
 
@@ -1628,13 +1628,13 @@ val repl(val bindings, val in_stream, val out_stream, val env)
                                            in_stream, out_stream));
         val pprin = cdr(pprint_var);
         val (*pfun)(val, val) = if3(pprin, pprinl, prinl);
-#if HAVE_TERMIOS
+#if CONFIG_FULL_REPL
         val (*tsfun)(val) = if3(pprin, tostringp, tostring);
 #endif
         reg_varl(var_sym, value);
         sethash(result_hash, var_counter, value);
         pfun(value, out_stream);
-#if HAVE_TERMIOS
+#if CONFIG_FULL_REPL
         lino_set_result(ls, chk_strdup(c_str(tsfun(value), self)));
 #endif
         lino_hist_add(ls, line_w);
-- 
cgit v1.2.3