diff options
Diffstat (limited to 'server')
-rw-r--r-- | server/locale/en-US/script.lni | 5 | ||||
-rw-r--r-- | server/locale/zh-CN/script.lni | 3 | ||||
-rw-r--r-- | server/src/vm/special.lua | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/server/locale/en-US/script.lni b/server/locale/en-US/script.lni index cb863f1d..ae64c2e3 100644 --- a/server/locale/en-US/script.lni +++ b/server/locale/en-US/script.lni @@ -63,7 +63,7 @@ PARSER_UNKNOWN_TAG = 'Unknown tag.' PARSER_MULTI_TAG = 'Dose not support multi tags.' PARSER_UNEXPECT_LFUNC_NAME = 'Local function can only use identifiers as name.' PARSER_ERR_LCOMMENT_END = 'Multi-line annotations should be closed by `{symbol}` .' -PARSER_ERR_C_LONG_COMMENT = 'Lua should use `-[[ ]]` for multi-line annotations.' +PARSER_ERR_C_LONG_COMMENT = 'Lua should use `--[[ ]]` for multi-line annotations.' PARSER_ERR_LSTRING_END = 'Long string should be closed by `{symbol}` .' PARSER_ERR_ASSIGN_AS_EQ = 'Should use `=` for assignment.' PARSER_ERR_EQ_AS_ASSIGN = 'Should use `==` for equal.' @@ -71,6 +71,8 @@ PARSER_ERR_UEQ = 'Should use `~=` for not equal.' PARSER_ERR_THEN_AS_DO = 'Should use `then` .' PARSER_ERR_DO_AS_THEN = 'Should use `do` .' PARSER_MISS_END = 'Miss corresponding `end` .' +PARSER_ERR_COMMENT_PREFIX = 'Lua should use `--` for annotations.' +PARSER_MISS_SEP_IN_TABLE = 'Miss symbol `,` or `;` .' SYMBOL_ANONYMOUS = '<Anonymous>' @@ -100,6 +102,7 @@ ACTION_FIX_UEQ = 'Modify to `~=` .' ACTION_FIX_THEN_AS_DO = 'Modify to `then` .' ACTION_FIX_DO_AS_THEN = 'Modify to `do` .' ACTION_ADD_END = 'Add `end` (infer the addition location ny indentations).' +ACTION_FIX_COMMENT_PREFIX = 'Modify to `--` .' COMMAND_DISABLE_DIAG = 'Disable diagnostics' COMMAND_MARK_GLOBAL = 'Mark defined global' diff --git a/server/locale/zh-CN/script.lni b/server/locale/zh-CN/script.lni index 0ad21162..37fa9c28 100644 --- a/server/locale/zh-CN/script.lni +++ b/server/locale/zh-CN/script.lni @@ -71,6 +71,8 @@ PARSER_ERR_UEQ = '应使用`~=`来进行不等于判断。' PARSER_ERR_THEN_AS_DO = '应使用`then`。' PARSER_ERR_DO_AS_THEN = '应使用`do`。' PARSER_MISS_END = '缺少对应的`end`。' +PARSER_ERR_COMMENT_PREFIX = 'Lua应使用`--`来进行注释。' +PARSER_MISS_SEP_IN_TABLE = '需要用`,`或`;`进行分割。' SYMBOL_ANONYMOUS = '<匿名函数>' @@ -100,6 +102,7 @@ ACTION_FIX_UEQ = '改为 `~=` 。' ACTION_FIX_THEN_AS_DO = '改为 `then` 。' ACTION_FIX_DO_AS_THEN = '改为 `do` 。' ACTION_ADD_END = '添加 `end` (根据缩进推测添加位置)。' +ACTION_FIX_COMMENT_PREFIX = '改为 `--` 。' COMMAND_DISABLE_DIAG = '禁用诊断' COMMAND_MARK_GLOBAL = '标记全局变量' diff --git a/server/src/vm/special.lua b/server/src/vm/special.lua index bf02f620..c2bf0e99 100644 --- a/server/src/vm/special.lua +++ b/server/src/vm/special.lua @@ -27,7 +27,7 @@ function mt:checkEmmyParam(func, values, index, special, source) elseif special == 'pcall:1' then self:callEmmyPCall(func, values, index, source) elseif special == 'require:1' then - self:callEmmyRequire(func, values, index, source) + self:callEmmyRequire(func, values, index) end end |