[svn:parrot] r17955 - in trunk/languages/lua: lib t

[fperrad]

Author: fperrad
Date: Mon Apr  2 23:18:33 2007
New Revision: 17955

Modified:
   trunk/languages/lua/lib/luaos.pir
   trunk/languages/lua/t/alarm.t
   trunk/languages/lua/t/os.t

Log:
[Lua]
- fix os.date

Modified: trunk/languages/lua/lib/luaos.pir
==============================================================================
--- trunk/languages/lua/lib/luaos.pir   (original)
+++ trunk/languages/lua/lib/luaos.pir   Mon Apr  2 23:18:33 2007
@@ -139,12 +139,12 @@
 
 .sub '_os_date' :anon
     .param pmc format :optional
-    .param pmc time :optional
+    .param pmc time_ :optional
     .local pmc ret
     .local int t
     $S1 = optstring(format, '%c')
     $I0 = time
-    t = optint(time, $I0)
+    t = optint(time_, $I0)
     $S0 = substr $S1, 0, 1
     unless $S0 == '!' goto L1
     $P0 = decodetime t

Modified: trunk/languages/lua/t/alarm.t
==============================================================================
--- trunk/languages/lua/t/alarm.t       (original)
+++ trunk/languages/lua/t/alarm.t       Mon Apr  2 23:18:33 2007
@@ -61,8 +61,7 @@
 require "alarm"
 
 function myalarm()
-    --print("in alarm!",os.date"%T",a,math.floor(100*a/N).."%")
-    print("in alarm!",a,math.floor(100*a/N).."%")
+    print("in alarm!",os.date"%H:%M:%S",a,math.floor(100*a/N).."%")
     alarm(1)
 end
 
@@ -78,7 +77,7 @@
 print(a)
 print"bye"
 CODE
-/^hello\n(in alarm!\t\d+\t\d+%\n)+100000\nbye/gm
+/^hello\n(in alarm!\t\d\d:\d\d:\d\d\t\d+\t\d+%\n)+100000\nbye/gm
 OUTPUT
 
 language_output_like( 'lua', << 'CODE', << 'OUTPUT', 'function alarm (bad 
delay)' );

Modified: trunk/languages/lua/t/os.t
==============================================================================
--- trunk/languages/lua/t/os.t  (original)
+++ trunk/languages/lua/t/os.t  Mon Apr  2 23:18:33 2007
@@ -27,7 +27,7 @@
 use FindBin;
 use lib "$FindBin::Bin";
 
-use Parrot::Test tests => 18;
+use Parrot::Test tests => 19;
 use Test::More;
 
 language_output_is( 'lua', << 'CODE', << 'OUTPUT', 'function os.date' );
@@ -45,6 +45,12 @@
 01/01/70 00:00:00
 OUTPUT
 
+language_output_like( 'lua', << 'CODE', << 'OUTPUT', 'function os.date' );
+print(os.date("%H:%M:%S"))
+CODE
+/\d\d:\d\d:\d\d/
+OUTPUT
+
 language_output_is( 'lua', << 'CODE', << 'OUTPUT', 'function os.difftime' );
 print(os.difftime(1234, 1200))
 print(os.difftime(1234))