[pypy-commit] extradoc extradoc: get consistent prints from lua

[cfbolz]

Author: Carl Friedrich Bolz <cfbolz at gmx.de>
Branch: extradoc
Changeset: r4639:ede104ea35ad
Date: 2012-08-16 18:39 +0200
http://bitbucket.org/pypy/extradoc/changeset/ede104ea35ad/

Log:	get consistent prints from lua

diff --git a/talk/dls2012/benchmarks/convolution/convolution.lua b/talk/dls2012/benchmarks/convolution/convolution.lua
--- a/talk/dls2012/benchmarks/convolution/convolution.lua
+++ b/talk/dls2012/benchmarks/convolution/convolution.lua
@@ -159,20 +159,19 @@
     arg = args[1]
     num = tonumber(args[2])
     if arg == "conv3" then
-        conv3(num)
+        return conv3(num)
     elseif arg == "conv5" then
-        conv5(num)
+        return conv5(num)
     elseif arg == "conv3x3" then
         num2 = tonumber(args[3])
-        conv3x3(num, num2)
+        return conv3x3(num, num2)
     elseif arg == "dilate3x3" then
         num2 = tonumber(args[3])
-        dilate3x3(num, num2)
+        return dilate3x3(num, num2)
     elseif arg == "sobel_magnitude" then
         num2 = tonumber(args[3])
-        sobel_magnitude(num, num2)
+        return sobel_magnitude(num, num2)
     end
-    return string.format("%s", arg)
 end
 
 --main(arg)
diff --git a/talk/dls2012/benchmarks/runner.lua b/talk/dls2012/benchmarks/runner.lua
--- a/talk/dls2012/benchmarks/runner.lua
+++ b/talk/dls2012/benchmarks/runner.lua
@@ -43,8 +43,7 @@
 package.path = package.path .. ";convolution/?.lua"
 require('convolution')
 function benchmarks.convolution(a, b, c)
-    convolution.main({a, b, c})
-    return string.format('%s(%s, %s)', a, b, tostring(c))
+    return convolution.main({a, b, c})
 end