Changeset 6f83c3d in git

Timestamp:

Oct 29, 1998, 2:27:56 PM (26 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

49e4cf52022a948fa0a8caaba481eaaefe28591a

Parents:

42aacda3aa026dde5ffeb3dc2f373683406c43ad

Message:

* hannes: Print-optimizations


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

Location:

Singular

Files:

• fereadl.c (added)
• ipassign.cc (modified) (2 diffs)
• ipid.cc (modified) (5 diffs)
• iplib.cc (modified) (9 diffs)

Singular/ipassign.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipassign.cc,v 1.39 1998-10-29 09:50:43 Singular Exp $ */
+/* $Id: ipassign.cc,v 1.40 1998-10-29 13:27:54 Singular Exp $ */
 
 /*
@@ -1291 +1291 @@
             if (lt==LIST_CMD && (l->req_packhdl)!= NULL)
             {
-//              Print("==========>ipAssign() - 3\n");
+              // Print("==========>ipAssign() - 3\n");
               namespaceroot->push( IDPACKAGE(l->req_packhdl) ,
                                    IDID(l->req_packhdl));

Singular/ipid.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipid.cc,v 1.24 1998-10-28 18:12:55 Singular Exp $ */
+/* $Id: ipid.cc,v 1.25 1998-10-29 13:27:55 Singular Exp $ */
 
 /*
@@ -428 +428 @@
   }
   // pointer -------------------------------------------------------------
-  else if(IDTYP(h)==POINTER_CMD) {
-    Print(">>>>>>Free pointer\n");
+  else if(IDTYP(h)==POINTER_CMD)
+  {
+    PrintS(">>>>>>Free pointer\n");
   }
 #endif /* HAVE_NAMESPACES */
@@ -496 +497 @@
   // now dechain it and delete idrec
 #ifdef KAI_
-  if(h->next != NULL)Print("=======>%s(%x) -> %s<====\n", IDID(h), IDID(h), IDID(h->next));
-  else Print("=======>%s(%x)<====\n", IDID(h), IDID(h));
+  if(h->next != NULL)
+    Print("=======>%s(%x) -> %s<====\n", IDID(h), IDID(h), IDID(h->next));
+  else
+    Print("=======>%s(%x)<====\n", IDID(h), IDID(h));
 #endif
 
@@ -716 +719 @@
     {
       Print("//dclose(%s)\n",pack->libname);
-      
     }
     FreeL((ADDRESS)pack->libname);
@@ -911 +913 @@
   for(nshdl=namespaceroot; nshdl->isroot != TRUE; nshdl = nshdl->next) {
     //Print("NSstack: %s:%d, nesting=%d\n", nshdl->name, nshdl->lev, nshdl->myynest);
-    if (nshdl->pack==pack) {
+    if (nshdl->pack==pack)
+    {
       Warn("package '%s' still in use on level %d",nshdl->name, nshdl->lev);
       return FALSE;
     }
   }
-  if (nshdl->pack==pack) {
+  if (nshdl->pack==pack)
+  {
     //Print("NSstack: %s:%d, nesting=%d\n", nshdl->name, nshdl->lev, nshdl->myynest);
     Warn("package '%s' still in use on level %d",nshdl->name, nshdl->lev);

Singular/iplib.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iplib.cc,v 1.38 1998-10-22 12:26:12 krueger Exp $ */
+/* $Id: iplib.cc,v 1.39 1998-10-29 13:27:56 Singular Exp $ */
 /*
 * ABSTRACT: interpreter: LIB and help
@@ -306 +306 @@
     if (iiLocalRing[i]==NULL) PrintS("NULL");
     else                      Print("%d",iiLocalRing[i]);
-    Print("\n");
+    PrintLn();
   }
 #endif
@@ -315 +315 @@
       if (nshdl->currRing==NULL) PrintS("NULL");
       else                       Print("%d",nshdl->currRing);
-      Print("\n");
+      PrintLn();
     }
     Print("%d lev %d:",nshdl->lev, nshdl->myynest);
     if (nshdl->currRing==NULL) PrintS("NULL");
     else                       Print("%d",nshdl->currRing);
-    Print("\n");
+    PrintLn();
   }
   if (currRing==NULL) PrintS("curr:NULL\n");
@@ -407 +407 @@
                  err=TRUE;
                  break;
-               
+
     case LANG_SINGULAR:
                  err=iiPStart(pn,sl);
@@ -598 +598 @@
 #ifdef HAVE_NAMESPACES
   int token;
-  
+
   if(IsCmd(plib, &token)) {
     Werror("'%s' is resered identifier\n", plib);
@@ -742 +742 @@
     }
 #if 0
-    Print("--------------------\n");
-    for(ls = library_stack; ls != NULL; ls = ls->next) {
+    PrintS("--------------------\n");
+    for(ls = library_stack; ls != NULL; ls = ls->next)
+    {
       Print("%s: LIB-stack:(%d), %s %s\n", newlib, ls->cnt, ls->get(),
         ls->to_be_done ? "not loaded" : "loaded");
     }
-    Print("--------------------\n");
+    PrintS("--------------------\n");
 #endif
   }
@@ -954 +955 @@
 
   h = enterid(mstrdup(procname),0, PROC_CMD, &IDROOT, FALSE);
-  if ( h!= NULL ) {
+  if ( h!= NULL )
+  {
     Print("register binary proc: %s::%s\n", libname, procname);
     pi = IDPROC(h);
@@ -964 +966 @@
     pi->data.o.function = func;
     return(1);
-  } else {
-    Print("iiAddCproc: failed.\n");
+  }
+  else
+  {
+    PrintS("iiAddCproc: failed.\n");
   }
   return(0);
@@ -1000 +1004 @@
   // printf("iiConvName: '%s' '%s' => '%s'\n", libname, tmpname, r);
   FreeL(tmpname);
-  
+
   return(r);
 }