Changeset 2272c33 in git

Timestamp:

Dec 3, 1999, 12:20:15 PM (24 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

119b42669f61fbdc46ad811506b6378c287583fb

Parents:

caa8e6acf436c3f1afc45aa776a9230ee6926ea0

Message:

* abort for Emacs implemented
* env variables for ESingular prefixed with ESINGULAR


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

Location:

Singular

Files:

• cntrlc.cc (modified) (4 diffs)
• extra.cc (modified) (2 diffs)
• feOpt.cc (modified) (2 diffs)
• feOpt.h (modified) (4 diffs)
• feResource.cc (modified) (3 diffs)

Singular/cntrlc.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: cntrlc.cc,v 1.27 1999-11-15 17:19:52 obachman Exp $ */
+/* $Id: cntrlc.cc,v 1.28 1999-12-03 11:20:13 obachman Exp $ */
 /*
 * ABSTRACT - interupt handling
@@ -19 +19 @@
 #include "cntrlc.h"
 #include "polys.h"
+#include "feOpt.h"
 #ifdef PAGE_TEST
 #include "page.h"
@@ -342 +343 @@
   {
     int cnt=0;
-    fprintf(stderr,"\n(last cmd:%d: `%s` in line\n>>%s<<)",
-      iiOp,Tok2Cmdname(iiOp),my_yylinebuf);
-    fputs("\nabort command(a), continue(c) or quit Singular(q) ?",stderr);fflush(stderr);
-    switch(fgetc(stdin))
+    int c;
+    fprintf(stderr,"// ** Interrupt at cmd:`%s` in line:'%s'\n",
+      Tok2Cmdname(iiOp),my_yylinebuf);
+    if (feGetOptValue(FE_OPT_EMACS) == NULL)
+    {
+      fputs("abort command(a), continue(c) or quit Singular(q) ?",stderr);fflush(stderr);
+      c = fgetc(stdin);
+    }
+    else
+    {
+      c = 'a';
+    }
+    
+    switch(c)
     {
 #if defined(MONOM_COUNT) || defined(DIV_COUNT)
@@ -379 +390 @@
                 siCntrlc++;
       case 'c':
-                fgetc(stdin);
+                if (feGetOptValue(FE_OPT_EMACS) == NULL) fgetc(stdin);
                 signal(SIGINT ,(si_hdl_typ)sigint_handler);
                 return;

Singular/extra.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: extra.cc,v 1.124 1999-12-01 13:22:51 Singular Exp $ */
+/* $Id: extra.cc,v 1.125 1999-12-03 11:20:14 obachman Exp $ */
 /*
 * ABSTRACT: general interface to internals of Singular ("system" command)
@@ -482 +482 @@
      res->rtyp=STRING_CMD;
      res->data=(void *)mstrdup(
-       "Olaf Bachmann, Hubert Grassmann, Kai Krueger, Wolfgang Neumann, Thomas Nuessler, Wilfred Pohl, Jens Schmidt, Thomas Siebert, Ruediger Stobbe, Tim Wichmann");
+       "Olaf Bachmann, Hubert Grassmann, Kai Krueger, Wolfgang Neumann, Thomas Nuessler, Wilfred Pohl, Jens Schmidt, Thomas Siebert, Ruediger Stobbe, Moritz Wenk, Tim Wichmann");
      return FALSE;
    }

Singular/feOpt.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: feOpt.cc,v 1.7 1999-11-15 17:19:56 obachman Exp $ */
+/* $Id: feOpt.cc,v 1.8 1999-12-03 11:20:14 obachman Exp $ */
 /*
 * ABSTRACT: Implementation of option buisness
@@ -247 +247 @@
   }
   return FE_OPT_UNDEF;
+}
+
+void* feGetOptValue(feOptIndex opt)
+{
+  return feOptSpec[(int)opt].value;
 }
 

Singular/feOpt.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: feOpt.h,v 1.3 1999-11-15 17:19:56 obachman Exp $ */
+/* $Id: feOpt.h,v 1.4 1999-12-03 11:20:15 obachman Exp $ */
 /*
 * ABSTRACT: Declarations for working with Options
@@ -15 +15 @@
 #define LONG_OPTION_RETURN 13 
 
-// specifies format of options
+/* specifies format of options */
 extern struct fe_option feOptSpec[];
 
 #ifndef GENERATE_OPTION_INDEX
 
-// provides feOptIndex enum type for fast accesses to feOptSpec
+/* provides feOptIndex enum type for fast accesses to feOptSpec */
 #if ! defined(GENTABLE) && ! defined(GENERATE_DEPEND)
 #ifdef ESINGULAR
@@ -30 +30 @@
 typedef enum {FE_OPT_UNDEF}  feOptIndex;
 #endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void* feGetOptValue(feOptIndex opt);
+  
+
+#ifdef __cplusplus
+}
 
 inline void* feOptValue(feOptIndex opt)
@@ -72 +82 @@
 void fePrintOptValues();
 
-#endif // ! GENERATE_OPTION_INDEX
+#endif /* __cplusplus */
 
-#endif //  FEOPTS_H
+#endif /* ! GENERATE_OPTION_INDEX */
+
+#endif /*  FEOPTS_H */

Singular/feResource.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: feResource.cc,v 1.16 1999-11-15 17:19:57 obachman Exp $ */
+/* $Id: feResource.cc,v 1.17 1999-12-03 11:20:15 obachman Exp $ */
 /*
 * ABSTRACT: management of resources
@@ -75 +75 @@
   {"HtmlDir",   'h',    feResDir,   "SINGULAR_HTML_DIR",    "%r/html",              ""},
   {"ManualUrl", 'u',    feResUrl,   "SINGULAR_URL",         "http://www.mathematik.uni-kl.de/~zca/Singular/Manual/"S_VERSION1,    ""},
-  {"EmacsDir",  'e',    feResDir,   "SINGULAR_EMACS_DIR",   "%r/emacs",             ""},
 #if !defined(macintosh)
   {"netscape",  'N',    feResBinary,"NETSCAPE",             "%b/netscape",          ""},
@@ -85 +84 @@
 
 #ifdef ESINGULAR
-  {"emacs",    'E',    feResBinary, "EMACS",               "%b/emacs",              ""},
-  {"SingularEmacs",'M',feResBinary, "SINGULAR",             "%b/Singular",           ""},
-  {"EmacsLoad",'l',    feResFile,   "SINGULAR_EMACS_LOAD",  "%e/.emacs-singular",             ""},
+  {"emacs",    'E',    feResBinary, "ESINGULAR_EMACS",      "%b/emacs",              ""},
+  {"SingularEmacs",'M',feResBinary, "ESINGULAR_SINGULAR",             "%b/Singular",           ""},
+  {"EmacsLoad",'l',    feResFile,   "ESINGULAR_EMACS_LOAD",  "%e/.emacs-singular",             ""},
+  {"EmacsDir",  'e',    feResDir,   "ESINGULAR_EMACS_DIR",   "%r/emacs",             ""},
+#else
+  {"EmacsDir",  'e',    feResDir,   "SINGULAR_EMACS_DIR",   "%r/emacs",             ""},
 #endif
   {NULL, 0, feResUndef, NULL, NULL, NULL}, // must be the last record