Changeset f9bb68 in git

Timestamp:

Aug 27, 2010, 10:15:09 AM (14 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

555b030713519677d5c1d72e1cdfacc419cc4bdc

Parents:

5cb9ecd7f9c68100731d2b46abd492589627c598

Message:

implemented and documented new command 'datetime' for local date/time as string

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

Files:

• Singular/iparith.cc (modified) (2 diffs)
• Singular/misc_ip.cc (modified) (1 diff)
• Singular/subexpr.cc (modified) (6 diffs)
• Singular/tok.h (modified) (1 diff)
• doc/reference.doc (modified) (previous)
• kernel/timer.cc (modified) (1 diff)
• kernel/timer.h (modified) (1 diff)

Singular/iparith.cc

@@ -72 +72 @@
 #include <Singular/ipshell.h>
 #include <kernel/mpr_inout.h>
+
+#include <kernel/timer.h>
 
 #ifdef HAVE_PLURAL
@@ -442 +444 @@
 
 /* set sys vars*/
+  { "datetime",    0, DATETIME ,          SYSVAR},
   { "degBound",    0, VMAXDEG ,           SYSVAR},
   { "echo",        0, VECHO ,             SYSVAR},

Singular/misc_ip.cc

@@ -220 +220 @@
   if (nlIsZero(nn) || (nnAsInt != 0))
   {
-    nlDelete(&nn,NULL):
+    nlDelete(&nn,NULL);
     L->m[0].rtyp = INT_CMD;
     L->m[0].data = (void *)nnAsInt;

Singular/subexpr.cc

@@ -308 +308 @@
         }
         break;
+      case DATETIME:  
       case STRING_CMD:
         omFree((ADDRESS)data);
@@ -357 +358 @@
       case VCOLMAX:
       case VTIMER:
+      case DATETIME:
 #ifdef HAVE_RTIMER
       case VRTIMER:
@@ -390 +392 @@
       case VCOLMAX:
       case VTIMER:
+      case DATETIME:
 #ifdef HAVE_RTIMER
       case VRTIMER:
@@ -569 +572 @@
     else if (rtyp==LIB_CMD)
       x=(void *)omStrDup((char *)Data());
+    else if (rtyp==DATETIME)
+      x=(void *)omStrDup((char *)Data());
     else if ((rtyp==VMINPOLY)&& (currRing->minpoly!=NULL)&&(!rField_is_GF()))
       x=(void *)nCopy(currRing->minpoly);
@@ -852 +857 @@
         return INT_CMD;
       case LIB_CMD:
+      case DATETIME:
         return STRING_CMD;
       case VMINPOLY:
@@ -972 +978 @@
       case VCOLMAX:    return (void *)colmax;
       case VTIMER:     return (void *)getTimer();
+      case DATETIME:   return (void *)dateTime();
 #ifdef HAVE_RTIMER
       case VRTIMER:    return (void *)getRTimer();

Singular/tok.h

@@ -54 +54 @@
   CONTENT_CMD,
   COUNT_CMD,
+  DATETIME,
   DBPRINT_CMD,
   DEF_CMD,

kernel/timer.cc

@@ -176 +176 @@
 extern int iiOp;
 #endif
+
+char* dateTime()
+{
+#ifdef GETRUSAGE
+  time_t rawtime;
+  time(&rawtime);
+  char* s = ctime(&rawtime);     // s: with linefeed at the end
+  int l = strlen(s);
+  char* ss = (char*)omAlloc(l);
+  strncpy(ss, s, l - 1);
+  ss[l - 1] = '\0';              // ss: without linefeed at the end
+  return ss;
+#else
+  char* s = "Warning: date/time not available on your system";
+  int l = strlen(s) + 1;
+  char* ss = (char*)omAlloc(l);
+  strncpy(ss, s, l - 1);
+  ss[l - 1] = '\0';
+  return ss;
+#endif
+}
+
 void writeTime(const char* v)
 {

kernel/timer.h

@@ -12 +12 @@
 void startTimer(void);
 void writeTime(const char* s);
+char* dateTime(); // (local) date and local time as a string
 
 int initTimer();