Changeset 98

Timestamp:

03/23/06 01:35:12 (3 years ago)

Author:

krobillard

Message:

Time is now stored as double. Removed OTime.

Location:

trunk/orca

Files:

• op.c (modified) (2 diffs)
• ovalue.h (modified) (3 diffs)
• print.c (modified) (4 diffs)
• unix/os.c (modified) (2 diffs)
• win32/os.c (modified) (1 diff)

trunk/orca/op.c

@@ -144 +144 @@
         if( orIs(b, OT_TIME) )
         {
-            OTime time;
-            OValue* res;
-
-            time.sec  = a->time.sec + b->time.sec;
-            time.usec = a->time.usec + b->time.usec;
-            if( time.usec > 1000000 )
-            {
-                time.sec  += 1;
-                time.usec -= 1000000;
-            }
-
-            res = orRESULT;
-            orSetTF( res, OT_TIME );
-            res->time = time;
+            orSeconds(a) += orSeconds(b);
             return;
         }
@@ -283 +270 @@
         if( orIs(b, OT_TIME) )
         {
-            OTime btime;
-            OValue* res;
-
-            // http://www.dusek.ch/manual/glibc/libc_21.html
-
-            btime = b->time;
-            if( a->time.usec < btime.usec )
-            {
-                int nsec = (btime.usec - a->time.usec) / 1000000 + 1;
-                btime.usec -= 1000000 * nsec;
-                btime.sec  += nsec;
-            }
-            if( a->time.usec - btime.usec > 1000000 )
-            {
-                int nsec = (a->time.usec - btime.usec) / 1000000;
-                btime.usec += 1000000 * nsec;
-                btime.sec  -= nsec;
-            }
-
-            res = orRESULT;
-            orSetTF( res, OT_TIME );
-            /* usec will always be positive. */
-            res->time.sec  = a->time.sec - btime.sec;
-            res->time.usec = a->time.usec - btime.usec;
-            /*
-            if( a->time.sec < time.sec )
-                res->time.sec = - res->time.sec;
-            */
+            orSeconds(a) -= orSeconds(b);
             return;
         }

trunk/orca/ovalue.h

@@ -169 +169 @@
 
 
-typedef struct
-{
-    int32_t     sec;
-    int32_t     usec;
-}
-OTime;
-
-
 typedef void (*ONativeFunc)(void*);
 
@@ -204 +196 @@
         OWordRef    word;
         OContext    ctx;
-        OTime       time;
         struct {
             OIndex      n;
@@ -494 +485 @@
 #define orLogic(val)    (val)->integer
 #define orDecimal(val)  (val)->num.decimal
+#define orSeconds(val)  (val)->num.decimal
 #define orTupleLen(val) (val)->argc
 

trunk/orca/print.c

@@ -202 +202 @@
     int yc;
 
-    tt = val->time.sec;
+    tt = (time_t) orSeconds(val);
     st = localtime( &tt );
 
@@ -241 +241 @@
 
 
+static void moldTime( OString* out, const OValue* val )
+{
+    char* cp;
+
+    orArrayReserve( out, 1, out->used + 32 );
+
+    cp = out->charArray + out->used;
+    strPrint( cp, "%f", orSeconds(val) );
+    while( *cp != '\0' )
+        ++cp;
+    out->used = cp - out->charArray;
+}
+
+
 static void formList( OString* out, const OValue* val )
 {
@@ -578 +592 @@
                             break;
 
-        case OT_TIME:       {
-                            double d;
-                            char* cp;
-                            d = ((double) val->time.sec) +
-                                ((double) val->time.usec * 0.000001);
-                            orArrayReserve( out, 1, out->used + 32 );
-                            cp = out->charArray + out->used;
-                            strPrint( cp, "%f", d );
-                            while( *cp != '\0' )
-                                ++cp;
-                            out->used = cp - out->charArray;
-                            }
+        case OT_TIME:       moldTime( out, val );
                             break;
 
@@ -890 +893 @@
                             break;
 
-        case OT_TIME:       {
-                            double d;
-                            char* cp;
-                            d = ((double) val->time.sec) +
-                                ((double) val->time.usec * 0.000001);
-                            orArrayReserve( out, 1, out->used + 32 );
-                            cp = out->charArray + out->used;
-                            strPrint( cp, "%f", d );
-                            while( *cp != '\0' )
-                                ++cp;
-                            out->used = cp - out->charArray;
-                            }
+        case OT_TIME:       moldTime( out, val );
                             break;
 

trunk/orca/unix/os.c

@@ -75 +75 @@
 
     orSetTF( res, OT_TIME );
-    res->time.sec  = buf.st_mtime;
-    res->time.usec = 0;
+    orSeconds(res) = buf.st_mtime;
     return 0;
 }
@@ -156 +155 @@
         orSetTF( res, OT_DATE );
 
-    res->time.sec  = tp.tv_sec;
-    res->time.usec = tp.tv_usec;
+    orSeconds(res) = tp.tv_sec + (tp.tv_usec * 0.000001);
 }
 

trunk/orca/win32/os.c

@@ -173 +173 @@
     else
         orSetTF( res, OT_DATE );
-    res->time.sec  = tb.time;
-    res->time.usec = tb.millitm * 1000;
+    orSeconds(res) = tb.time + (tb.millitm * 0.001);
 }