require improvements, remove global Util

2017-09-05 02:09:31 -04:00
parent 2b1d96ab37
commit ae7508e89b
82 changed files with 506 additions and 455 deletions
--- a/sys/apis/util.lua
+++ b/sys/apis/util.lua
@@ -69,6 +69,19 @@ function Util.print(pattern, ...)
  print(Util.tostring(pattern, ...))
 end

+function Util.getVersion()
+  local version
+
+  if _CC_VERSION then
+    version = tonumber(_CC_VERSION:gmatch('[%d]+%.?[%d][%d]', '%1')())
+  end
+  if not version and _HOST then
+    version = tonumber(_HOST:gmatch('[%d]+%.?[%d][%d]', '%1')())
+  end
+
+  return version or 1.7
+end
+
 function Util.runFunction(env, fn, ...)
  setfenv(fn, env)
  setmetatable(env, { __index = _G })