Changeset e860fa in git

Timestamp:

Apr 30, 2005, 4:41:31 PM (18 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

f45ec2ef6f63ae01a2bba579ec15408dab628fdc

Parents:

f5de432da81d07da14eedd6b7b34d0d515772c5f

Message:

*hannes: readlin stuff


git-svn-id: file:///usr/local/Singular/svn/trunk@7965 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• kernel/feread.cc (modified) (10 diffs)

kernel/feread.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: feread.cc,v 1.3 2005-01-13 15:22:24 Singular Exp $ */
+/* $Id: feread.cc,v 1.4 2005-04-30 14:41:31 Singular Exp $ */
 /*
 * ABSTRACT: input from ttys, simulating fgets
@@ -50 +50 @@
 /* =                   static/dymanic readline                      = */
 /* ===================================================================*/
-#if defined(HAVE_READLINE) || defined(HAVE_DYN_RL)
+#if defined(HAVE_READLINE) || defined(HAVE_DYN_RL) || defined(HAVE_LIBREADLINE)
 
 #include "../Singular/ipshell.h"
@@ -95 +95 @@
 /* ===================================================================*/
 /* some procedure are shared with "dynamic readline" */
-#if defined(HAVE_READLINE) && !defined(HAVE_FEREAD)
+#if (defined(HAVE_READLINE) || defined(HAVE_LIBREADLINE) || defined(HAVE_DYN_RL)) && !defined(HAVE_FEREAD)
 #include <unistd.h>
 #include <stdio.h>
@@ -157 +157 @@
 *   array of matches, or NULL if there aren't any.
 */
+#if defined(HAVE_DYN_RL)
+extern "C" 
+{
+  int fe_init_dyn_rl();
+  char *(*fe_filename_completion_function)(); /* 3 */
+  char *(* fe_readline) ();                   /* 4 */
+  void (*fe_add_history) ();                  /* 5 */
+  char ** fe_rl_readline_name;                /* 6 */
+  char **fe_rl_line_buffer;                   /* 7 */
+  char **(*fe_completion_matches)();          /* 8 */
+  CPPFunction **fe_rl_attempted_completion_function; /* 9 */
+  FILE ** fe_rl_outstream;                    /* 10 */
+  int (*fe_write_history) ();                 /* 11 */
+  int (*fe_history_total_bytes) ();           /* 12 */
+  void (*fe_using_history) ();                /* 13 */
+  int (*fe_read_history) ();                  /* 14 */
+
+}
+#endif
 char ** singular_completion (char *text, int start, int end)
 {
@@ -162 +181 @@
      to complete.  Otherwise it may be the name of a file in the current
      directory. */
-  if (rl_line_buffer[start-1]=='"')
-    return rl_completion_matches (text, (RL_PROC)rl_filename_completion_function);
-  char **m=rl_completion_matches (text, (RL_PROC)command_generator);
+#ifdef HAVE_DYN_RL
+  #define x_rl_line_buffer (*fe_rl_line_buffer)
+  #define x_rl_completion_matches (*fe_completion_matches)
+  #define x_rl_filename_completion_function (*fe_filename_completion_function)
+#else
+  #define x_rl_line_buffer rl_line_buffer
+  #define x_rl_completion_matches rl_completion_matches
+  #define x_rl_filename_completion_function rl_filename_completion_function
+#endif
+  if (x_rl_line_buffer[start-1]=='"')
+    return x_rl_completion_matches (text, (RL_PROC)x_rl_filename_completion_function);
+  char **m=x_rl_completion_matches (text, (RL_PROC)command_generator);
+#undef x_rl_line_buffer
+#undef x_rl_completion_matches
   if (m==NULL)
   {
@@ -175 +205 @@
 }
 
+#ifndef HAVE_DYN_RL
 char * fe_fgets_stdin_rl(char *pr,char *s, int size)
 {
@@ -209 +240 @@
 }
 #endif
+#endif
 
 /* ===================================================================*/
@@ -233 +265 @@
 /* some procedure are shared with "static readline" */
 #if defined(HAVE_DYN_RL)
-extern "C" 
-{
-  extern void * fe_rl_hdl;
-  extern char ** fe_rl_readline_name;
-  char * fe_fgets_stdin_rl(char *pr,char *s, int size);
-  int fe_init_dyn_rl();
-  extern FILE ** fe_rl_outstream;
-  void (*fe_add_history)(char *);
-  char * (*fe_readline)(char *);
-}
-
 char * fe_fgets_stdin_drl(char *pr,char *s, int size)
 {
@@ -297 +318 @@
 static char * fe_fgets_stdin_init(char *pr,char *s, int size)
 {
-#if defined(HAVE_READLINE) && !defined(HAVE_FEREAD)
+#if (defined(HAVE_READLINE) || defined(HAVE_LIBREADLINE)) && !defined(HAVE_DYN_RL) && !defined(HAVE_FEREAD)
   /* Allow conditional parsing of the ~/.inputrc file. */
   rl_readline_name = "Singular";
@@ -345 +366 @@
     return fe_fgets_stdin(pr,s,size);
   }
+  else /* could load libreadline: */
+  {
+    /* Allow conditional parsing of the ~/.inputrc file. */
+    *fe_rl_readline_name = "Singular";
+    /* Tell the completer that we want a crack first. */
+    *fe_rl_attempted_completion_function = (CPPFunction *)singular_completion;
+    /* try to read a history */
+    (*fe_using_history)();
+    char *p = getenv("SINGULARHIST");
+    if (p != NULL)
+    {
+      (*fe_read_history) (p);
+    }
+  }
 
   /* set the output stream */