Changeset 78a9c9 in git

Timestamp:

Jan 10, 2022, 6:06:25 PM (17 months ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

676e2a091749a42bee06cf6f1c818c7058262096

Parents:

5c29ad95d24d1484c07c51e546825480eccc41b0

Message:

storing/using history in .singularhist by default

Files:

• Singular/dyn_modules/machinelearning/machinelearning.cc (modified) (4 diffs)
• Singular/misc_ip.cc (modified) (1 diff)
• doc/NEWS.texi (modified) (3 diffs)
• doc/general.doc (modified) (previous)
• kernel/oswrapper/feread.cc (modified) (1 diff)
• kernel/oswrapper/feread.h (modified) (1 diff)
• kernel/oswrapper/fereadl.c (modified) (2 diffs)

Singular/dyn_modules/machinelearning/machinelearning.cc

@@ -6 +6 @@
 #include "Singular/ipid.h"
 #include "Singular/mod_lib.h"
+#include "kernel/oswrapper/feread.h"
 
 #ifdef HAVE_PYTHON
@@ -16 +17 @@
         int lengths[5];
         char *filename = getenv("SINGULARHIST");
-        if (filename==NULL) filename=(char*)"~/.history";
+        if (filename==NULL) filename=SINGULARHIST_FILE;
         int i;
         lists L = (lists)omAllocBin(slists_bin);
@@ -40 +41 @@
         #ifdef HAVE_OMALLOC
         ml_make_prediction(filename, buffer, lengths, _omStrDup);
-        #else /*xalloc*/
+        #else /*xalloc*/
         ml_make_prediction(filename, buffer, lengths, omStrDup);
-        #endif
+        #endif
 
         L->Init(5);
@@ -66 +67 @@
 {
         char *filename = getenv("SINGULARHIST");
-        if (filename==NULL)
-        {
-          WarnS("SINGULARHIST is not set - no history available, using ~/.history");
-        }
+        if (filename==NULL)
+        {
+          WarnS("SINGULARHIST is not set - no history available, using ~/.singularhist");
+        }
         // this is the initialization routine of the module
         // adding the routine predictHelp:

Singular/misc_ip.cc

@@ -1119 +1119 @@
     }
 #endif   // HAVE_SIMPLEIPC
-    fe_reset_input_mode();
     monitor(NULL,0);
 #ifdef PAGE_TEST

doc/NEWS.texi

@@ -25 +25 @@
 @c @itemize
 @c @end itemize
-@c 
+@c
 @c New libraries:
-@c 
+@c
 @c @itemize
 @c @end itemize
@@ -41 +41 @@
 Changes in the kernel/build system:
 @itemize
+@item input history is stored by default in @code{.singularhist} (@nref{SINGULARHSIT}).
 @item ABI change: all number routines (@code{n_...}) have only @code{coeffs} as last argument,
      functions with @code{ring} as last argument are removed
@@ -129 +130 @@
 @itemize
 @item chern.lib:  new version (@nref{chern_lib})
-@item grobcov.lib: new version (@nref{grobcov_lib}), 
-      new functions @nref{ConsLevels}, @nref{Levels}, @nref{Grob1Levels}, 
+@item grobcov.lib: new version (@nref{grobcov_lib}),
+      new functions @nref{ConsLevels}, @nref{Levels}, @nref{Grob1Levels},
       @nref{DifConsLCSets}
 @end itemize

kernel/oswrapper/feread.cc

@@ -367 +367 @@
     using_history();
     char *p = getenv("SINGULARHIST");
-    if (p != NULL)
+    if (p==NULL) p=SINGULARHIST_FILE;
+    if (strlen(p) != 0)
     {
       read_history (p);

kernel/oswrapper/feread.h

@@ -9 +9 @@
 
 EXTERN_VAR char    prompt_char; /*1 either '>' or '.'*/
+
+#define SINGULARHIST_FILE ".singularhist"
 
 #ifdef __cplusplus

kernel/oswrapper/fereadl.c

@@ -12 +12 @@
 #include "kernel/mod2.h"
 #include "omalloc/omalloc.h"
+#include "kernel/oswrapper/feread.h"
 
 #ifdef HAVE_FEREAD
@@ -829 +830 @@
 #if defined(HAVE_DYN_RL)
   char *p = getenv("SINGULARHIST");
-  if ((p != NULL) && (fe_history_total_bytes != NULL))
+  if (p==NULL) p=SINGULARHIST_FILE;
+  if ((strlen(p) != 0) && (fe_history_total_bytes != NULL))
   {
     if((*fe_history_total_bytes)()!=0)
       (*fe_write_history) (p);
   }
-#endif
-#if defined(HAVE_READLINE) && !defined(HAVE_FEREAD) && !defined(HAVE_DYN_RL)
+#elif defined(HAVE_READLINE) && !defined(HAVE_FEREAD) && !defined(HAVE_DYN_RL)
   char *p = getenv("SINGULARHIST");
-  if (p != NULL)
+  if (p==NULL) p=SINGULARHIST_FILE;
+  if (strlen(p) != 0)
   {
     if(history_total_bytes()!=0)
       write_history (p);
   }
-#endif
-#if defined(HAVE_FEREAD)
+#elif defined(HAVE_FEREAD)
   #ifndef HAVE_ATEXIT
   fe_reset_fe(NULL,NULL);