@atlisp/lint 0.2.9 → 0.2.11

package/README.md

@@ -128,6 +128,7 @@ npx @atlisp/lint --format-check
 | `shadow_builtin` | warn | 最佳实践 | defun 覆盖内置函数 |
 | `dynamic_doc` | warn | 最佳实践 | C: 命令缺少 (princ) |
 | `open_without_close` | warn | 最佳实践 | open/close 数量不匹配 |
+| `strcat_or_arg` | error | 正确性 | strcat 参数中使用 or（or 返回 T/nil） |
 | `strcat_usage` | warn | 最佳实践 | + 拼接而非 strcat |
 | `cond_simplify` | warn | 风格 | 单分支 cond 可简化为 if |
 | `arg_count` | warn | 最佳实践 | 参数数量不匹配 |

package/atlisp-lint.default.json

@@ -59,13 +59,14 @@
     "extra_parens": "warn",
     "arg_count": "error",
     "builtin_arg_count": "error",
+    "strcat_or_arg": "error",
     "strcat_usage": "warn",
     "cond_simplify": "warn",
     "quote_style": "warn",
     "eq_usage": "warn",
     "lambda_syntax": "off",
     "comment_style": "warn",
-    "empty_catch": "warn",
+    "empty_catch": "info",
     "nth_usage": "warn",
     "append_single": "warn",
     "setq_multiple": "warn",

package/atlisp-lint.schema.json

@@ -59,7 +59,7 @@
         "duplicate_defun": { "type": "string", "enum": ["off", "info", "warn", "error"], "default": "warn" },
         "dynamic_doc": { "type": "string", "enum": ["off", "info", "warn", "error"], "default": "warn" },
         "empty_branch": { "type": "string", "enum": ["off", "info", "warn", "error"], "default": "warn" },
-        "empty_catch": { "type": "string", "enum": ["off", "info", "warn", "error"], "default": "warn" },
+        "empty_catch": { "type": "string", "enum": ["off", "info", "warn", "error"], "default": "info" },
         "empty_comment": { "type": "string", "enum": ["off", "info", "warn", "error"], "default": "info" },
         "encoding": { "type": "string", "enum": ["off", "info", "warn", "error"], "default": "error" },
         "entget_in_loop": { "type": "string", "enum": ["off", "info", "warn", "error"], "default": "warn" },
@@ -111,6 +111,7 @@
         "shadow_builtin": { "type": "string", "enum": ["off", "info", "warn", "error"], "default": "warn" },
         "single_arg_and_or": { "type": "string", "enum": ["off", "info", "warn", "error"], "default": "info" },
         "startapp": { "type": "string", "enum": ["off", "info", "warn", "error"], "default": "warn" },
+        "strcat_or_arg": { "type": "string", "enum": ["off", "info", "warn", "error"], "default": "error" },
         "strcat_usage": { "type": "string", "enum": ["off", "info", "warn", "error"], "default": "info" },
         "string_concat_loop": { "type": "string", "enum": ["off", "info", "warn", "error"], "default": "info" },
         "token_in_url": { "type": "string", "enum": ["off", "info", "warn", "error"], "default": "warn" },

package/dist/checks/builtin-arg-count.js

@@ -172,7 +172,7 @@ const BUILTIN_ARITY = {
     trans: { min: 3, max: 4 },
     // === Table/dictionary ===
     tblobjname: { min: 2, max: 2 },
-    tblnext: { min: 2, max: 2 },
+    tblnext: { min: 1, max: 2 },
     tblsearch: { min: 2, max: 3 },
     acad_colordlg: { min: 1, max: 3 },
     // === ActiveX ===

package/dist/config.js

@@ -102,13 +102,14 @@ const DEFAULT_CONFIG = {
         extra_parens: 'warn',
         arg_count: 'warn',
         builtin_arg_count: 'error',
+        strcat_or_arg: 'error',
         strcat_usage: 'info',
         cond_simplify: 'info',
         quote_style: 'info',
         eq_usage: 'warn',
         lambda_syntax: 'off',
         comment_style: 'info',
-        empty_catch: 'warn',
+        empty_catch: 'info',
         nth_usage: 'info',
         append_single: 'info',
         setq_multiple: 'warn',
@@ -120,7 +121,7 @@ const DEFAULT_CONFIG = {
         shadow_builtin: 'warn',
         dynamic_doc: 'warn',
         loop_optimization: 'info',
-        format_indent: 'warn',
+        format_indent: 'off',
         redundant_if: 'info',
         unused_catch_result: 'info',
         string_concat_loop: 'info',

package/dist/locale.js

@@ -94,6 +94,7 @@ const messages = {
         'index.watch_status': '{0} files checked: {1} error(s), {2} warning(s)',
         'index.format_unstable': 'Formatting is not idempotent — re-running formatCode produces different output',
         unused_catch_result: 'vl-catch-all-apply result used as boolean — use vl-catch-all-error-p to check',
+        strcat_or_arg: 'or in strcat argument — or returns T/nil, not a string',
         string_concat_loop: 'String concatenation inside {0} — move strcat outside the loop for performance',
         if_without_else: 'if without else branch — else is implicitly nil, which is idiomatic in Lisp',
         redundant_list: '(list) evaluates to nil — use nil directly',
@@ -222,6 +223,7 @@ Options:
         'index.watch_status': '已检查 {0} 个文件: {1} 个错误, {2} 个警告',
         'index.format_unstable': '格式化结果不稳定——再次格式化后输出不同',
         unused_catch_result: 'vl-catch-all-apply 的结果被当作布尔值使用——应用 vl-catch-all-error-p 检查',
+        strcat_or_arg: 'strcat 参数中使用了 or 函数调用（or 返回 T 或 nil，不是字符串）',
         string_concat_loop: '循环 {0} 内使用了字符串拼接——为提升性能请将 strcat 移到循环外',
         if_without_else: 'if 没有 else 分支——else 默认为 nil 是 Lisp 惯用写法',
         redundant_list: '(list) 等于 nil——请直接使用 nil',

package/dist/presets.js

@@ -50,13 +50,14 @@ exports.PRESETS = {
             extra_parens: 'warn',
             arg_count: 'warn',
             builtin_arg_count: 'error',
+            strcat_or_arg: 'error',
             strcat_usage: 'info',
             cond_simplify: 'info',
             quote_style: 'info',
             eq_usage: 'warn',
             lambda_syntax: 'off',
             comment_style: 'info',
-            empty_catch: 'warn',
+            empty_catch: 'info',
             nth_usage: 'info',
             append_single: 'info',
             setq_multiple: 'warn',
@@ -133,6 +134,7 @@ exports.PRESETS = {
             extra_parens: 'error',
             arg_count: 'error',
             builtin_arg_count: 'error',
+            strcat_or_arg: 'error',
             strcat_usage: 'error',
             cond_simplify: 'error',
             quote_style: 'error',
@@ -151,7 +153,7 @@ exports.PRESETS = {
             shadow_builtin: 'error',
             dynamic_doc: 'error',
             loop_optimization: 'warn',
-            format_indent: 'warn',
+            format_indent: 'off',
             redundant_if: 'error',
             module_registration: 'error',
             namespace_header: 'error',

package/dist/rules.js

@@ -179,6 +179,12 @@ exports.RULES = [
     { name: 'shadow_builtin', defaultSeverity: 'warn', description: '检测覆盖内置函数的 defun', category: '最佳实践' },
     { name: 'single_arg_and_or', defaultSeverity: 'info', description: '检测单参数 and/or 建议简化', category: '风格' },
     { name: 'startapp', defaultSeverity: 'warn', description: '检测 startapp 调用（启动外部程序）', category: '安全' },
+    {
+        name: 'strcat_or_arg',
+        defaultSeverity: 'error',
+        description: '检测 strcat 参数中使用 or（or 返回 T/nil，非字符串）',
+        category: '正确性',
+    },
     {
         name: 'strcat_usage',
         defaultSeverity: 'info',

package/dist/validate.js

@@ -62,6 +62,7 @@ const VALID_RULES = [
     'shadow_builtin',
     'single_arg_and_or',
     'startapp',
+    'strcat_or_arg',
     'strcat_usage',
     'token_in_url',
     'trailing_paren',

package/dist/visitor-runner.js

@@ -664,6 +664,29 @@ function runChecksWithVisitor(ast, file, config, disableMap) {
             }
         });
     }
+    // strcat_or_arg
+    if (checks['strcat_or_arg'] !== 'off') {
+        visitor.on('*', node => {
+            if (node.type === 'list' &&
+                node.children &&
+                node.children.length > 1 &&
+                node.children[0].type === 'symbol' &&
+                node.children[0].name === 'strcat') {
+                if (isInQuote(node))
+                    return;
+                for (let i = 1; i < node.children.length; i++) {
+                    const arg = node.children[i];
+                    if (arg.type === 'list' &&
+                        arg.children &&
+                        arg.children.length > 0 &&
+                        arg.children[0].type === 'symbol' &&
+                        arg.children[0].name === 'or') {
+                        addIssue('strcat_or_arg', arg.pos.line, (0, locale_1.t)('strcat_or_arg'));
+                    }
+                }
+            }
+        });
+    }
     // redundant_list
     if (checks['redundant_list'] !== 'off') {
         visitor.on('list', node => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlisp/lint",
-  "version": "0.2.9",
+  "version": "0.2.11",
   "description": "AutoLISP static analysis tool — parens, security, conventions, SBCL syntax validation",
   "keywords": [
     "CAD",