more check about access

Author: sumneko

locale/en-us/script.lua

@@ -323,6 +323,8 @@ PARSER_LOCAL_LIMIT        =
 'Only 200 active local variables and upvalues can be existed at the same time.'
 PARSER_VARIABLE_NOT_DECLARED =
 'Variable `{name}` is not declared. (Use `global *` to allow undefined variables, or declare it with `global {name}`)'
+PARSER_ENV_IS_GLOBAL         =
+'_ENV is global when accessing variable `{name}`.'
 PARSER_ASSIGN_CONST_GLOBAL   =
 'Cannot assign to const global variable `{name}`.'
 PARSER_LUADOC_MISS_CLASS_NAME           =

locale/es-419/script.lua

@@ -317,6 +317,8 @@ PARSER_LOCAL_LIMIT        =
 'Solo 200 variables locales activas y valores anteriores pueden existir al mismo tiempo.'
 PARSER_VARIABLE_NOT_DECLARED =
 'Variable `{name}` no está declarada. (Use `global *` para permitir variables indefinidas, o declárela con `global {name}`)'
+PARSER_ENV_IS_GLOBAL         =
+'_ENV es global al acceder a la variable `{name}`.'
 PARSER_ASSIGN_CONST_GLOBAL   =
 'No se puede asignar a la variable global constante `{name}`.'
 PARSER_LUADOC_MISS_CLASS_NAME          =

locale/ja-jp/script.lua

@@ -319,6 +319,8 @@ PARSER_LOCAL_LIMIT        =
 '同時に存在できるローカル変数とアップバリューの数は200個までです。'
 PARSER_VARIABLE_NOT_DECLARED =
 '変数 `{name}` は宣言されていません。（`global *` を使用して未定義の変数を許可するか、`global {name}` で宣言してください）'
+PARSER_ENV_IS_GLOBAL         =
+'変数 `{name}` にアクセスする際、_ENV がグローバル変数です。'
 PARSER_ASSIGN_CONST_GLOBAL   =
 '定数グローバル変数 `{name}` に代入できません。'
 PARSER_LUADOC_MISS_CLASS_NAME           =

locale/pt-br/script.lua

@@ -319,6 +319,8 @@ PARSER_LOCAL_LIMIT        = -- TODO: need translate!
 'Only 200 active local variables and upvalues can be existed at the same time.'
 PARSER_VARIABLE_NOT_DECLARED =
 'Variável `{name}` não foi declarada. (Use `global *` para permitir variáveis indefinidas, ou declare com `global {name}`)'
+PARSER_ENV_IS_GLOBAL         =
+'_ENV é global ao acessar a variável `{name}`.'
 PARSER_ASSIGN_CONST_GLOBAL   =
 'Não é possível atribuir à variável global constante `{name}`.'
 PARSER_LUADOC_MISS_CLASS_NAME           =

locale/zh-cn/script.lua

@@ -323,6 +323,8 @@ PARSER_LOCAL_LIMIT        =
 '只能同时存在200个活跃的局部变量与上值。'
 PARSER_VARIABLE_NOT_DECLARED =
 '变量 `{name}` 未声明。（使用 `global *` 允许未定义变量,或使用 `global {name}` 声明）'
+PARSER_ENV_IS_GLOBAL         =
+'访问变量 `{name}` 时 _ENV 是全局变量。'
 PARSER_ASSIGN_CONST_GLOBAL   =
 '无法对常量全局变量 `{name}` 赋值。'
 PARSER_LUADOC_MISS_CLASS_NAME           =

locale/zh-tw/script.lua

@@ -319,6 +319,8 @@ PARSER_LOCAL_LIMIT        =
 '只能同時存在200個活躍的區域變數與上值。'
 PARSER_VARIABLE_NOT_DECLARED =
 '變數 `{name}` 未宣告。（使用 `global *` 允許未定義變數，或使用 `global {name}` 宣告）'
+PARSER_ENV_IS_GLOBAL         =
+'存取變數 `{name}` 時 _ENV 是全域變數。'
 PARSER_ASSIGN_CONST_GLOBAL   =
 '無法對常數全域變數 `{name}` 賦值。'
 PARSER_LUADOC_MISS_CLASS_NAME           =

script/core/diagnostics/global-in-nil-env.lua

@@ -10,6 +10,9 @@ return function (uri, callback)
 
     local function check(source)
         local node = source.node
+        if not node then
+            return
+        end
         if node.tag == '_ENV' then
             return
         end

script/core/diagnostics/undefined-env-child.lua

@@ -25,6 +25,9 @@ return function (uri, callback)
     end
 
     guide.eachSourceType(state.ast, 'getglobal', function (source)
+        if not source.node then
+            return
+        end
         if source.node.tag == '_ENV' then
             return
         end

script/parser/compile.lua

@@ -805,12 +805,16 @@ local function getVariable(name, pos)
         -- Find global in this chunk (globals don't have effect time, just find the last one)
         local globals = chunk.globals
         if globals then
-            for n = #globals, 1, -1 do
+            for n = 1, #globals do
                 local glob = globals[n]
-                if glob[1] == name then
-                    resGlobal = glob
+                if glob.effect > pos then
                     break
                 end
+                if glob[1] == name then
+                    if not resGlobal or resGlobal.effect < glob.effect then
+                        resGlobal = glob
+                    end
+                end
             end
         end
 
@@ -865,6 +869,9 @@ local function linkGlobalToEnv(node, var)
                 type   = 'VARIABLE_NOT_DECLARED',
                 start  = node.start,
                 finish = node.finish,
+                info   = {
+                    name = node[1],
+                }
             }
         end
     end
@@ -873,13 +880,13 @@ local function linkGlobalToEnv(node, var)
     local env
     if State.version == 'Lua 5.5' then
         env = getVariable(State.ENVMode, node.start)
-        if env and env.type == 'global' then
+        if env and env.type == 'setglobal' then
             pushError {
-                type   = 'RUNTIME_ERROR',
+                type   = 'ENV_IS_GLOBAL',
                 start  = node.start,
                 finish = node.finish,
                 info   = {
-                    message = '_ENV is global when accessing variable'
+                    name = node[1],
                 }
             }
         end
@@ -906,6 +913,7 @@ end
 local function createGlobalDeclare(obj, attrs)
     obj.type = 'setglobal'
     obj.declare = true
+    obj.effect = obj.finish
 
     if attrs then
         obj.attrs = attrs
@@ -3188,18 +3196,18 @@ local function parseMultiVars(n1, parser, isLocal)
         end
     end
 
-    if isLocal then
-        local effect = lastValue and lastValue.finish or lastVar.finish
-        n1.effect = effect
-        if n2 then
-            n2.effect = effect
-        end
-        if nrest then
-            for i = 1, #nrest do
-                nrest[i].effect = effect
-            end
+    local effect = lastValue and lastValue.finish or lastVar.finish
+    n1.effect = effect
+    if n2 then
+        n2.effect = effect
+    end
+    if nrest then
+        for i = 1, #nrest do
+            nrest[i].effect = effect
         end
+    end
 
+    do
         -- Lua 5.4: only one <close> attribute allowed across a local declaration
         -- Lua 5.5: multiple <close> are allowed
         if State.version == 'Lua 5.4' then

script/vm/compiler.lua

@@ -1714,6 +1714,9 @@ local compilerSwitch = util.switch()
         if vm.bindAs(source) then
             return
         end
+        if not source.node then
+            return
+        end
         if source.node[1] ~= '_ENV' then
             return
         end