I still suck at merging :(

diff --git a/src/compiler/lcode.lua b/src/compiler/lcode.lua
index 11203afca00d74100fd69521ee0bb5f5c95f6955..c4af6846ab75663e5f8b8d4835a8d3ba470af3be 100644 (file)
--- a/src/compiler/lcode.lua
+++ b/src/compiler/lcode.lua
@@ -982,7 +982,7 @@ function luaK:code(fs, i, line)
   if line == 0 then
     f.lineinfo[fs.pc] = fs.lastline
     if fs.lastline == 0 then
-      print(debug.traceback())
+      --print(debug.traceback())
     end    
   end
 

diff --git a/src/compiler/ldump.lua b/src/compiler/ldump.lua
index 60b9074f7c882f38edf1c1eb01310142687f9848..39393fb607985587245511613c907c669c2e4330 100644 (file)
--- a/src/compiler/ldump.lua
+++ b/src/compiler/ldump.lua
@@ -295,7 +295,7 @@ function luaU:DumpLines(f, D)
   --was DumpVector
   for i = 0, n - 1 do
     self:DumpInt(f.lineinfo[i], D)  -- was DumpBlock
-    print(i, f.lineinfo[i])
+    --print(i, f.lineinfo[i])
   end
 end
 

diff --git a/src/compiler/lexer.lua b/src/compiler/lexer.lua
index 03856119d760dc64efc468316a5df945948e887a..ca71e1b5bc7cd597315c4789ecabd2c5fb647c6b 100644 (file)
--- a/src/compiler/lexer.lua
+++ b/src/compiler/lexer.lua
@@ -315,9 +315,9 @@ function lexer:next (n)
    for i=1,n do 
       a = _G.table.remove (self.peeked, 1) 
       if a then 
-        debugf ("[L:%i K:%i T:%s %q]", a.line or -1, a.char or -1, 
-                a.tag or '<none>', a[1]) end
-        self.lastline = a.lineinfo.last
+         debugf ("[L:%i K:%i T:%s %q]", a.line or -1, a.char or -1, 
+                 a.tag or '<none>', a[1])
+         self.lastline = a.lineinfo.last
       end     
    end
    return a or eof_token