Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall 2014-12-03 14:11:14 +01:00
commit 1fc9cd07c3

View File

@ -923,7 +923,7 @@ local function parse_template(params, template, nparams, pos)
end end
map_op[".template__"] = function(params, template, nparams) map_op[".template__"] = function(params, template, nparams)
if not params then return sub(template, 9) end if not params then return template:gsub("%x%x%x%x%x%x%x%x", "") end
-- Limit number of section buffer positions used by a single dasm_put(). -- Limit number of section buffer positions used by a single dasm_put().
-- A single opcode needs a maximum of 3 positions. -- A single opcode needs a maximum of 3 positions.