simplify parser through %token_class'es

[m6w6/ext-psi] / tests / time / time.psi

diff --git a/tests/time/time.psi b/tests/time/time.psi
index 5a9b2b04f0bafca6a3a57adbbfdc973aa0281c9a..e49118545a9fae248e10e3b15d54b1729cfa884a 100644 (file)
--- a/tests/time/time.psi
+++ b/tests/time/time.psi
@@ -1,42 +1,14 @@
-typedef long time_t;
-typedef int suseconds_t;
-
-struct timespec {
-       time_t tv_sec;
-       long tv_nsec;
-}
-
-struct timeval {
-       time_t tv_sec;
-       suseconds_t tv_usec;
-}
-
-struct timezone {
-       int tz_minuteswest;
-       int tz_dsttime;
-}
-
-struct tm {
-       int tm_sec;
-       int tm_min;
-       int tm_hour;
-       int tm_mday;
-       int tm_mon;
-       int tm_year;
-       int tm_wday;
-       int tm_yday;
-       int tm_isdst;
-       long tm_gmtoff;
-       char *tm_zone;
-}
-
 extern int gettimeofday(struct timeval *tv, struct timezone *tz);
 function psi\gettimeofday(array &$tv = NULL, array &$tz = NULL) : int {
        let tv = calloc(1, struct timeval);
        let tz = calloc(1, struct timezone);
        return to_int(gettimeofday);
-       set $tv = to_array(*tv);
-       set $tz = to_array(*tz);
+       set $tv = to_array(*tv, 
+               to_int(tv_sec), 
+               to_int(tv_usec));
+       set $tz = to_array(*tz, 
+               to_int(tz_minuteswest), 
+               to_int(tz_dsttime));
 }
 
 extern char *asctime(struct tm *tm);
@@ -45,11 +17,44 @@ function psi\asctime(array $tm = NULL) : string {
        return to_string(asctime);
 }
 
+extern char *asctime_r(struct tm *tm, char *buf);
+function psi\asctime_r(array $tm = NULL) : string {
+       let tm = arrval($tm);
+       let buf = calloc(32, char);
+       return to_string(asctime_r);
+}
 
-extern struct tm *gmtime(time_t tp);
+extern struct tm *gmtime(time_t *tp);
 function psi\gmtime(int $ts) : array {
        let tp = &intval($ts);
-       return to_array(gmtime);
+       return to_array(*gmtime,
+               to_int(tm_sec),
+               to_int(tm_min),
+               to_int(tm_hour),
+               to_int(tm_mday),
+               to_int(tm_mon),
+               to_int(tm_year),
+               to_int(tm_wday),
+               to_int(tm_yday),
+               to_int(tm_isdst)
+       );
+}
+
+extern struct tm *gmtime_r(time_t *tp, struct tm *buf);
+function psi\gmtime_r(int $ts) : array {
+       let tp = &intval($ts);
+       let buf = calloc(1, struct tm);
+       return to_array(*gmtime_r,
+               to_int(tm_sec),
+               to_int(tm_min),
+               to_int(tm_hour),
+               to_int(tm_mday),
+               to_int(tm_mon),
+               to_int(tm_year),
+               to_int(tm_wday),
+               to_int(tm_yday),
+               to_int(tm_isdst)
+       );
 }
 
 extern int nanosleep(struct timespec *rqtp, struct timespec *rmtp);
@@ -57,5 +62,20 @@ function psi\nanosleep(array $rq = NULL, array &$rm = NULL) : int {
        let rqtp = arrval($rq);
        let rmtp = calloc(1, struct timespec);
        return to_int(nanosleep);
-       set $rm = to_array(*rmtp);
+       set $rm = to_array(*rmtp,
+               to_int(tv_sec),
+               to_int(tv_nsec)
+       );
+}
+
+extern clock_t times(struct tms *buf);
+function psi\times(array &$tms = NULL) : int {
+       let buf = calloc(1, struct tms);
+       return to_int(times);
+       set $tms = to_array(*buf,
+               to_int(tms_utime),
+               to_int(tms_stime),
+               to_int(tms_cutime),
+               to_int(tms_cstime)
+       );
 }