Changeset a40e7b in git

Timestamp:

Apr 6, 1998, 1:31:09 PM (25 years ago)

Author:

Jens Schmidt <schmidt@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'cdfcdb8287f66bc6070028082cbbc6eff10e609b')

Children:

88ede96835b4305a14e21ff220d0e5eebd58549b

Parents:

3ba84ce0237d1edda5eed542f689d3e795661cdb

Message:

***** merge from branch `factory-gcd' to main trunk


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

Location:

factory/ftest

Files:

• ftest_io.h (modified) (2 diffs)
• ftest_util.cc (modified) (2 diffs)
• ftest_util.m4 (modified) (3 diffs)

factory/ftest/ftest_io.h

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: ftest_io.h,v 1.7 1998-04-06 11:08:44 schmidt Exp $ */
+/* $Id: ftest_io.h,v 1.8 1998-04-06 11:30:29 schmidt Exp $ */
 
 #ifndef INCL_FTEST_IO_H
@@ -14 +14 @@
 
 // functions to read objects from strings
-void ftestRead ( const char *, CanonicalForm & );
-void ftestRead ( const char *, Variable & );
-void ftestRead ( const char *, int & );
-void ftestRead ( const char *, bool & );
+void ftestReadString ( const char *, CanonicalForm & );
+void ftestReadString ( const char *, Variable & );
+void ftestReadString ( const char *, int & );
+void ftestReadString ( const char *, bool & );
 
 void ftestPrintResult ( const char * resultName, const CanonicalForm & result );

factory/ftest/ftest_util.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: ftest_util.cc,v 1.16 1998-04-06 11:08:59 schmidt Exp $ */
+/* $Id: ftest_util.cc,v 1.17 1998-04-06 11:31:09 schmidt Exp $ */
 
 //{{{ docu
@@ -410 +410 @@
             strncpy( mipoString, tokenString, mipoLen );
             mipoString[mipoLen] = '\0';
-            ftestRead( mipoString, mipo );
+            ftestReadString( mipoString, mipo );
             delete [] mipoString;
 

factory/ftest/ftest_util.m4

@@ -1 @@
-dnl $Id: ftest_util.m4,v 1.17 1998-04-06 11:09:14 schmidt Exp $
+dnl $Id: ftest_util.m4,v 1.18 1998-04-06 11:30:51 schmidt Exp $
 dnl
 dnl ftest_util.m4 - m4 macros used by the factory test environment.
@@ -200 +200 @@
   ``if ( argv[ optind ] ) {
         ftestArgGiven$1= true;
-        ftestRead( argv[ optind++ ], $1);
+        ftestReadString( argv[ optind++ ], $1);
     } else
         ftestError( CommandlineError,
@@ -208 +208 @@
   ``if ( argv[ optind ] ) {
         ftestArgGiven$1= true;
-        ftestRead( argv[ optind++ ], $1 );
+        ftestReadString( argv[ optind++ ], $1 );
     } else
         $1 = '_qstripTWS(`$2')`;'',
   ``if ( ftestSearchTaggedArg( argc, argv, optind, $3) ) {
         ftestArgGiven$1 = true;
-        ftestRead( argv[ optind++ ], $1 );
+        ftestReadString( argv[ optind++ ], $1 );
     } else
         $1 = '_qstripTWS(`$2')`;'')