From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 17 Jul 2009 18:33:01 +0000 (+0000)
Subject: libs/web: optimize code generation in luci.template
X-Git-Tag: 0.10.0~1341
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=768bf67b867df0fde2715308eef482cb677a8566

libs/web: optimize code generation in luci.template
---

diff --git a/libs/web/luasrc/template.lua b/libs/web/luasrc/template.lua
index 83efd2200..c8f4daa2d 100644
--- a/libs/web/luasrc/template.lua
+++ b/libs/web/luasrc/template.lua
@@ -24,7 +24,7 @@ limitations under the License.
 
 ]]--
 
-local fs = require"luci.fs"
+local fs = require "luci.fs"
 local sys = require "luci.sys"
 local util = require "luci.util"
 local table = require "table"
@@ -89,9 +89,9 @@ function compile(template)
 	
 	-- Replacements
 	local r_include = '")\ninclude("%s")\nwrite("'
-	local r_i18n    = '"..translate("%1","%2").."'
-	local r_i18n2    = '"..translate("%1", "").."'
-	local r_pexec   = '"..(%s or "").."'
+	local r_i18n    = '")\nwrite(translate("%1","%2"))\nwrite("'
+	local r_i18n2   = '")\nwrite(translate("%1", ""))\nwrite("'
+	local r_pexec   = '")\nwrite(tostring(%s or ""))\nwrite("'
 	local r_exec    = '")\n%s\nwrite("'
 	
 	-- Parse the expressions