[svn:parrot] r30147 - in branches/opengl4lua/languages/lua: demo src/lib t

[fperrad]

Author: fperrad
Date: Sat Aug  9 11:29:14 2008
New Revision: 30147

Modified:
   branches/opengl4lua/languages/lua/demo/triangle.lua
   branches/opengl4lua/languages/lua/src/lib/luaos.pir
   branches/opengl4lua/languages/lua/t/os.t

Log:
[Lua] merge from trunk (30137 -> 30146)

Modified: branches/opengl4lua/languages/lua/demo/triangle.lua
==============================================================================
--- branches/opengl4lua/languages/lua/demo/triangle.lua (original)
+++ branches/opengl4lua/languages/lua/demo/triangle.lua Sat Aug  9 11:29:14 2008
@@ -28,7 +28,7 @@
     dt = now - prev_time
     prev_time = now
     if rotating and dt ~= 0 then
-        gl.Rotate(10*dt, 0, 1, 0)
+        gl.Rotate(360*dt, 0, 1, 0)
        glut.PostRedisplay()
     end
 end

Modified: branches/opengl4lua/languages/lua/src/lib/luaos.pir
==============================================================================
--- branches/opengl4lua/languages/lua/src/lib/luaos.pir (original)
+++ branches/opengl4lua/languages/lua/src/lib/luaos.pir Sat Aug  9 11:29:14 2008
@@ -395,9 +395,9 @@
     $I0 = isa table, 'LuaNil'
     unless $I0 goto L2
   L1:
-    $I0 = time
+    $N0 = time
     new res, 'LuaNumber'
-    set res, $I0
+    set res, $N0
     .return (res)
   L2:
     lua_checktype(1, table, 'table')

Modified: branches/opengl4lua/languages/lua/t/os.t
==============================================================================
--- branches/opengl4lua/languages/lua/t/os.t    (original)
+++ branches/opengl4lua/languages/lua/t/os.t    Sat Aug  9 11:29:14 2008
@@ -175,13 +175,13 @@
 language_output_like( 'lua', << 'CODE', << 'OUTPUT', 'function os.time' );
 print(os.time())
 CODE
-/^\d+/
+/^\d+(\.\d+)?$/
 OUTPUT
 
 language_output_like( 'lua', << 'CODE', << 'OUTPUT', 'function os.time' );
 print(os.time(nil))
 CODE
-/^\d+/
+/^\d+(\.\d+)?$/
 OUTPUT
 
 language_output_like( 'lua', << 'CODE', << 'OUTPUT', 'function os.time' );