Merge branch 'master' into generic-pattern1

Author: fesily

.github/workflows/test.yml

@@ -7,7 +7,7 @@ jobs:
       matrix:
         include:
           - { os: ubuntu-20.04,   platform: linux-x64 }
-          - { os: macos-latest,   platform: darwin-x64 }
+          - { os: macos-14,       platform: darwin-arm64 }
           - { os: windows-latest, platform: win32-x64 }
     runs-on: ${{ matrix.os }}
     steps:

3rd/EmmyLuaCodeStyle

@@ -293,6 +293,12 @@ When checking the type of union type, ignore the `nil` in it.
 
 When this setting is `false`, the `number|nil` type cannot be assigned to the `number` type. It can be with `true`.
 ]]
+config.type.inferParamType               =
+[[
+When a parameter type is not annotated, it is inferred from the function's call sites.
+
+When this setting is `false`, the type of the parameter is `any` when it is not annotated.
+]]
 config.doc.privateName                   =
 'Treat specific field names as private, e.g. `m_*` means `XXX.m_id` and `XXX.m_type` are private, witch can only be accessed in the class where the definition is located.'
 config.doc.protectedName                 =

3rd/bee.lua

@@ -293,6 +293,12 @@ When checking the type of union type, ignore the `nil` in it.
 
 When this setting is `false`, the `number|nil` type cannot be assigned to the `number` type. It can be with `true`.
 ]]
+config.type.inferParamType               = -- TODO: need translate!
+[[
+When the parameter type is not annotated, the parameter type is inferred from the function's incoming parameters.
+
+When this setting is `false`, the type of the parameter is `any` when it is not annotated.
+]]
 config.doc.privateName                   = -- TODO: need translate!
 'Treat specific field names as private, e.g. `m_*` means `XXX.m_id` and `XXX.m_type` are private, witch can only be accessed in the class where the definition is located.'
 config.doc.protectedName                 = -- TODO: need translate!

3rd/luamake

@@ -292,6 +292,12 @@ config.type.weakNilCheck                 =
 
 此设置为 `false` 时，`numer|nil` 类型无法赋给 `number` 类型；为 `true` 是则可以。
 ]]
+config.type.inferParamType               =
+[[
+未注释参数类型时，参数类型由函数传入参数推断。
+
+如果设置为 "false"，则在未注释时，参数类型为 "any"。
+]]
 config.doc.privateName                   =
 '将特定名称的字段视为私有，例如 `m_*` 意味着 `XXX.m_id` 与 `XXX.m_type` 是私有字段，只能在定义所在的类中访问。'
 config.doc.protectedName                 =

locale/en-us/setting.lua

@@ -292,6 +292,12 @@ When checking the type of union type, ignore the `nil` in it.
 
 When this setting is `false`, the `number|nil` type cannot be assigned to the `number` type. It can be with `true`.
 ]]
+config.type.inferParamType               = -- TODO: need translate!
+[[
+未注释参数类型时，参数类型由函数传入参数推断。
+
+如果设置为 "false"，则在未注释时，参数类型为 "any"。
+]]
 config.doc.privateName                   = -- TODO: need translate!
 'Treat specific field names as private, e.g. `m_*` means `XXX.m_id` and `XXX.m_type` are private, witch can only be accessed in the class where the definition is located.'
 config.doc.protectedName                 = -- TODO: need translate!

locale/pt-br/setting.lua

@@ -18,7 +18,7 @@ local includeCodeFormat = true
 
 require "make.detect_platform"
 
-lm:import "3rd/bee.lua"
+lm:import "3rd/bee.lua/make.lua"
 lm:import "make/code_format.lua"
 
 lm:source_set 'lpeglabel' {
@@ -55,21 +55,21 @@ lm:executable "lua-language-server" {
 }
 
 local platform = require 'bee.platform'
-local exe      = platform.OS == 'Windows' and ".exe" or ""
+local exe      = platform.os == 'windows' and ".exe" or ""
 
 lm:copy "copy_lua-language-server" {
-    input = lm.bindir .. "/lua-language-server" .. exe,
-    output = "bin/lua-language-server" .. exe,
+    inputs = "$bin/lua-language-server" .. exe,
+    outputs = "bin/lua-language-server" .. exe,
 }
 
 lm:copy "copy_bootstrap" {
-    input = "make/bootstrap.lua",
-    output = "bin/main.lua",
+    inputs = "make/bootstrap.lua",
+    outputs = "bin/main.lua",
 }
 
 lm:msvc_copydll 'copy_vcrt' {
     type = "vcrt",
-    output = "bin",
+    outputs = "bin",
 }
 
 lm:phony "all" {
@@ -93,27 +93,27 @@ if lm.notest then
 end
 
 lm:rule "run-bee-test" {
-    lm.bindir .. "/lua-language-server" .. exe, "$in",
+    args = { "$bin/lua-language-server" .. exe, "$in" },
     description = "Run test: $in.",
     pool = "console",
 }
 
 lm:rule "run-unit-test" {
-    "bin/lua-language-server" .. exe, "$in",
+    args = { "bin/lua-language-server" .. exe, "$in" },
     description = "Run test: $in.",
     pool = "console",
 }
 
 lm:build "bee-test" {
     rule = "run-bee-test",
     deps = { "lua-language-server", "copy_script" },
-    input = "3rd/bee.lua/test/test.lua",
+    inputs = "3rd/bee.lua/test/test.lua",
 }
 
 lm:build 'unit-test' {
     rule = "run-unit-test",
     deps = { "bee-test", "all" },
-    input = "test.lua",
+    inputs = "test.lua",
 }
 
 lm:default {

locale/zh-cn/setting.lua

@@ -2,7 +2,7 @@ local lm = require 'luamake'
 
 local platform = require 'bee.platform'
 
-if     platform.OS == 'macOS' then
+if     platform.os == 'macos' then
     if     lm.platform == nil then
     elseif lm.platform == "darwin-arm64" then
         lm.target = "arm64-apple-macos11"
@@ -11,7 +11,7 @@ if     platform.OS == 'macOS' then
     else
         error "unknown platform"
     end
-elseif platform.OS == 'Windows' then
+elseif platform.os == 'windows' then
     if     lm.platform == nil then
     elseif lm.platform == "win32-ia32" then
         lm.arch = "x86"
@@ -20,7 +20,7 @@ elseif platform.OS == 'Windows' then
     else
         error "unknown platform"
     end
-elseif platform.OS == 'Linux' then
+elseif platform.os == 'linux' then
     if     lm.platform == nil then
     elseif lm.platform == "linux-x64" then
     elseif lm.platform == "linux-arm64" then
@@ -52,7 +52,7 @@ local ARCH <const> = {
 }
 
 local function detectArch()
-    if platform.OS == 'Windows' then
+    if platform.os == 'windows' then
         return detectWindowsArch()
     end
     local posixArch = detectPosixArch()
@@ -67,5 +67,5 @@ local function targetPlatformArch()
 end
 
 if not lm.notest then
-    lm.notest = (platform.OS ~= 'Windows' and targetPlatformArch() ~= detectArch())
+    lm.notest = (platform.os ~= 'windows' and targetPlatformArch() ~= detectArch())
 end