Changeset bcd557 in git for Singular/iplib.cc

Timestamp:

Jun 18, 1998, 7:32:13 PM (26 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

300a346b7aab2a310ad9542b7b9ed1e68c1a8be2

Parents:

0a53a908f6c1a64a4e1f1b05085604516b79f95d

Message:

* hannes:error handling (grammar.y iparith.cc iplib.cc)
          (leaving of levels, local vars, messages,..)


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

File:

• Singular/iplib.cc (modified) (6 diffs)

Singular/iplib.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iplib.cc,v 1.30 1998-06-13 12:44:42 krueger Exp $ */
+/* $Id: iplib.cc,v 1.31 1998-06-18 17:32:12 Singular Exp $ */
 /*
 * ABSTRACT: interpreter: LIB and help
@@ -130 +130 @@
   char buf[256], *s = NULL, *p;
   long procbuflen;
-  
+
   FILE * fp = feFopen( pi->libname, "rb", NULL, TRUE );
   if (fp==NULL)
@@ -320 +320 @@
   idhdl ns = namespaceroot->get(plib,0, TRUE);
   FreeL(plib);
-  if(ns != NULL) {
+  if(ns != NULL)
+  {
     namespaceroot->push(IDPACKAGE(ns), IDID(ns));
     //printf("iiMake_proc: namespace found.\n");
-  } else {
+  }
+  else
+  {
     namespaceroot->push(namespaceroot->root->pack, "toplevel");
     //printf("iiMake_proc: staying in TOP-LEVEL\n");
   }
 #else /* HAVE_NAMESPACES */
-  if(pi->is_static && myynest==0) {
+  if(pi->is_static && myynest==0)
+  {
     Werror("'%s::%s()' is a local procedure and cannot be accessed by an user.",
            pi->libname, pi->procname);
@@ -346 +350 @@
 #endif
 #if 1
-  if(pi->language == LANG_SINGULAR) err=iiPStart(pn,sl);
-  if(pi->language == LANG_C)
+  if(pi->language == LANG_SINGULAR)
+  {
+    err=iiPStart(pn,sl);
+  }
+  else if(pi->language == LANG_C)
   {
     leftv res = (leftv)Alloc0(sizeof(sleftv));
@@ -408 +415 @@
   if (iiCurrArgs!=NULL)
   {
-    Warn("too many arguments for %s",IDID(pn));
+    if (!err) Warn("too many arguments for %s",IDID(pn));
     iiCurrArgs->CleanUp();
     Free((ADDRESS)iiCurrArgs,sizeof(sleftv));
@@ -416 +423 @@
   namespaceroot->pop();
 #endif /* HAVE_NAMESPACES */
-  if (err) return NULL;
+  if (err)
+    return NULL;
   return &iiRETURNEXPR[myynest+1];
 }