Changeset 8ae083e in git for factory/ftest/ftest_io.cc

Timestamp:

Nov 13, 1997, 9:36:17 AM (27 years ago)

Author:

Jens Schmidt <schmidt@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

a575f89fba03b79875381ccf28cc22f88b93ac12

Parents:

ff2775e90f3a43033b5e59d003b2345631fcccd2

Message:

	* ftest_io.cc (ftestPrintResult): adapted to new output format


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

File:

• factory/ftest/ftest_io.cc (modified) (7 diffs)

factory/ftest/ftest_io.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: ftest_io.cc,v 1.8 1997-10-28 17:20:53 schmidt Exp $ */
+/* $Id: ftest_io.cc,v 1.9 1997-11-13 08:36:17 schmidt Exp $ */
 
 //{{{ docu
@@ -32 +32 @@
 ftestGetCanonicalForm ( const char * canFormSpec )
 {
-    // get string to read canonical form from
     const char * stringF = canFormSpec;
     stringF = ftestSkipBlancs( stringF );
@@ -48 +47 @@
         return f;
     } else {
+        // get string to read canonical form from
         if ( *stringF == '$' ) {
             const char * tokenCursor = ftestSkipBlancs( stringF+1 );
@@ -74 +74 @@
         *stringCursor = '\0';
 
-        // read f
+        // read f and return it
         CanonicalForm f;
         istrstream( terminatedStringF ) >> f;
-
         delete [] terminatedStringF;
         return f;
@@ -152 +151 @@
 {
     if ( ftestPrintResultFlag ) {
-        ftestPrint( "result: %s\n", "@@%s\n", resultName );
+        cout << "Result: " << resultName << ":" << endl;
         cout << result << endl;
-        ftestPrint( (char *)0, "@@\n" );
     } else if ( ! ftestPrintFlag )
-        cout << result << endl;
+        cout << "(" << result << ")" << endl;
 }
 //}}}
@@ -172 +170 @@
 
     if ( ftestPrintResultFlag ) {
-        ftestPrint( "result: %s\n", "@@%s\n", resultName );
+        cout << "Result: " << resultName << ":" << endl;
         for ( I = result; I.hasItem(); I++ )
             cout << I.getItem() << endl;
-        ftestPrint( (char *)0, "@@\n" );
     } else if ( ! ftestPrintFlag )
         for ( I = result; I.hasItem(); I++ )
-            cout << I.getItem() << endl;
+            cout << "(" << I.getItem() << ")" << endl;
 }
 //}}}
@@ -191 +188 @@
 ftestPrintResult ( const char * resultName, const int result )
 {
-    if ( ftestPrintResultFlag ) {
-        ftestPrint( "result: %s\n", "@@%s\n", resultName );
-        cout << result << endl;
-        ftestPrint( (char *)0, "@@\n" );
-    } else if ( ! ftestPrintFlag )
+    if ( ftestPrintResultFlag )
+        cout << "Result: " << resultName << ": " << result << endl;
+    else if ( ! ftestPrintFlag )
         cout << result << endl;
 }