@atlisp/lint 0.2.21 → 0.2.22

package/dist/checks/multiple-setq.js

@@ -4,6 +4,7 @@ exports.checkMultipleSetq = checkMultipleSetq;
 exports.checkMultipleSetqAst = checkMultipleSetqAst;
 const locale_1 = require("../locale");
 const parser_1 = require("@atlisp/parser");
+const shared_1 = require("../visitors/shared");
 function checkMultipleSetq(content, file) {
     const ast = (0, parser_1.parseAst)(content, { errorRecovery: true });
     return checkMultipleSetqAst(ast, file);
@@ -18,7 +19,7 @@ function checkMultipleSetqAst(ast, file) {
             parents.add(n.parent);
     }
     for (const parent of parents) {
-        if (!(0, parser_1.astIsList)(parent))
+        if (!(0, parser_1.astIsList)(parent) || (0, shared_1.isNonSequentialParent)(parent))
             continue;
         let prevWasSetq = false;
         let prevSetqNode = null;

package/dist/checks/setq-multiple.js

@@ -2,14 +2,40 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkSetqMultiple = checkSetqMultiple;
 const locale_1 = require("../locale");
-const utils_1 = require("../utils");
+const parser_1 = require("@atlisp/parser");
+const shared_1 = require("../visitors/shared");
 function checkSetqMultiple(content, file) {
     const issues = [];
-    const lines = content.split('\n');
-    for (let i = 0; i < lines.length; i++) {
-        const stripped = (0, utils_1.stripLine)(lines[i]);
-        if (/\(setq\s+\S+\s+[^\s)]+\)\s*\(setq\b/.test(stripped)) {
-            issues.push({ file, line: i + 1, severity: 'warn', rule: 'setq_multiple', message: (0, locale_1.t)('setq_multiple') });
+    const ast = (0, parser_1.parseAst)(content, { errorRecovery: true });
+    const parents = new Set();
+    const setqNodes = (0, parser_1.astFindAll)(ast, n => (0, parser_1.astIsList)(n, 'setq'));
+    for (const n of setqNodes) {
+        if (n.parent)
+            parents.add(n.parent);
+    }
+    for (const parent of parents) {
+        if (!(0, parser_1.astIsList)(parent) || (0, shared_1.isNonSequentialParent)(parent))
+            continue;
+        let prevSetqNode = null;
+        for (const child of parent.children) {
+            if ((0, parser_1.astIsList)(child, 'setq')) {
+                if (prevSetqNode) {
+                    issues.push({
+                        file,
+                        line: prevSetqNode.pos.line,
+                        severity: 'warn',
+                        rule: 'setq_multiple',
+                        message: (0, locale_1.t)('setq_multiple'),
+                    });
+                    prevSetqNode = null;
+                }
+                else {
+                    prevSetqNode = child;
+                }
+            }
+            else {
+                prevSetqNode = null;
+            }
         }
     }
     return issues;

package/dist/fixes/index.js

@@ -4,6 +4,7 @@ exports.FIXABLE_RULES = void 0;
 exports.applyFixesFromProviders = applyFixesFromProviders;
 const nth_usage_1 = require("../checks/nth-usage");
 const parser_1 = require("@atlisp/parser");
+const shared_1 = require("../visitors/shared");
 function buildPosToOffset(_content) {
     return pos => pos.offset;
 }
@@ -162,7 +163,24 @@ function misplaced_else_fallback(issues, content) {
     }
     return content;
 }
+function isSetqInNonSequentialParent(ast, line) {
+    if (!ast)
+        return false;
+    const setqNodes = (0, parser_1.astFindAll)(ast, n => (0, parser_1.astIsList)(n, 'setq') && n.pos.line === line);
+    for (const n of setqNodes) {
+        if (n.parent && (0, shared_1.isNonSequentialParent)(n.parent))
+            return true;
+    }
+    return false;
+}
 function setq_multiple_fallback(issues, content) {
+    let ast;
+    try {
+        ast = (0, parser_1.parseAst)(content, { errorRecovery: true });
+    }
+    catch {
+        /* ignore parse errors */
+    }
     const lines = content.split('\n');
     const lineOffsets = buildLineOffsets(lines);
     const ops = [];
@@ -170,6 +188,9 @@ function setq_multiple_fallback(issues, content) {
         const lineIdx = issue.line - 1;
         if (lineIdx < 0 || lineIdx >= lines.length)
             continue;
+        // Skip setq forms in non-sequential positions (if branches, and/or, ...)
+        if (isSetqInNonSequentialParent(ast, issue.line))
+            continue;
         const line = lines[lineIdx];
         const setqMatch = line.match(/\(setq(?=\s|$)/);
         if (!setqMatch)
@@ -594,6 +615,8 @@ const CONTENT_FIX_PROVIDERS = {
             const parent = a.parent;
             if (!parent || !(0, parser_1.astIsList)(parent))
                 continue;
+            if ((0, shared_1.isNonSequentialParent)(parent))
+                continue;
             const aIdx = parent.children.indexOf(a);
             if (aIdx === -1 || parent.children[aIdx + 1] !== b)
                 continue;

package/dist/visitors/register.js

@@ -273,7 +273,11 @@ function registerVisitorRules(visitor, state, checks, addIssue, config, file) {
             dangerNames.add('eval');
         if (dangerNames.size > 0) {
             visitor.on('*', node => {
-                if ((0, parser_1.astIsList)(node) && node.children.length > 0 && (0, parser_1.astIsSymbol)(node.children[0]) && node.children[0].name && dangerNames.has(node.children[0].name)) {
+                if ((0, parser_1.astIsList)(node) &&
+                    node.children.length > 0 &&
+                    (0, parser_1.astIsSymbol)(node.children[0]) &&
+                    node.children[0].name &&
+                    dangerNames.has(node.children[0].name)) {
                     if (!(0, shared_1.isInQuote)(node)) {
                         state.dangerousCalls.push({ name: node.children[0].name, node });
                     }
@@ -284,6 +288,10 @@ function registerVisitorRules(visitor, state, checks, addIssue, config, file) {
     if (checks['multiple_setq'] !== 'off') {
         visitor.on('*', node => {
             if ((0, parser_1.astIsList)(node)) {
+                // Skip condition/branch positions (if/and/or/while/...) where setq
+                // children are mutually exclusive or short-circuited — merging would break them.
+                if ((0, shared_1.isNonSequentialParent)(node))
+                    return;
                 let prevSetq = false;
                 for (const child of node.children) {
                     if ((0, parser_1.astIsList)(child, 'setq')) {
@@ -605,12 +613,18 @@ function registerVisitorRules(visitor, state, checks, addIssue, config, file) {
                 if ((0, shared_1.isInQuote)(node))
                     return;
                 const parent = node.parent;
-                if (parent && (0, parser_1.astIsList)(parent) && parent.children.length > 0 && (0, parser_1.astIsSymbol)(parent.children[0], 'vl-catch-all-apply')) {
+                if (parent &&
+                    (0, parser_1.astIsList)(parent) &&
+                    parent.children.length > 0 &&
+                    (0, parser_1.astIsSymbol)(parent.children[0], 'vl-catch-all-apply')) {
                     return;
                 }
                 let hasCallback = false;
                 for (const child of node.children.slice(1)) {
-                    if ((0, parser_1.astIsList)(child) && child.children.length > 0 && (0, parser_1.astIsSymbol)(child.children[0]) && (child.children[0].name === 'lambda' || child.children[0].name === 'function')) {
+                    if ((0, parser_1.astIsList)(child) &&
+                        child.children.length > 0 &&
+                        (0, parser_1.astIsSymbol)(child.children[0]) &&
+                        (child.children[0].name === 'lambda' || child.children[0].name === 'function')) {
                         hasCallback = true;
                         break;
                     }

package/dist/visitors/shared.d.ts

@@ -36,5 +36,6 @@ export declare function hasSelfCall(body: AstNode[], fnName: string): boolean;
 export declare function defunParams(defunNode: AstNode): string[];
 export declare function defunLocals(defunNode: AstNode): string[];
 export declare function collectSymbolRefs(node: AstNode, result: Set<string>): void;
+export declare function isNonSequentialParent(node: AstNode): boolean;
 export declare const higherOrderFuncs: Set<string>;
 //# sourceMappingURL=shared.d.ts.map

package/dist/visitors/shared.js

@@ -10,6 +10,7 @@ exports.hasSelfCall = hasSelfCall;
 exports.defunParams = defunParams;
 exports.defunLocals = defunLocals;
 exports.collectSymbolRefs = collectSymbolRefs;
+exports.isNonSequentialParent = isNonSequentialParent;
 const parser_1 = require("@atlisp/parser");
 function isInQuote(node, checkFunction = true) {
     for (const p of (0, parser_1.astAncestors)(node)) {
@@ -114,6 +115,19 @@ function collectSymbolRefs(node, result) {
         collectSymbolRefs(c, result);
     }
 }
+// Forms whose child lists are not guaranteed to execute in sequence
+// (conditions / branches / short-circuit value positions). Merging consecutive
+// (setq ...) children of these heads would change program semantics.
+const NON_SEQUENTIAL_HEADS = new Set(['if', 'and', 'or', 'while', 'repeat', 'foreach']);
+// Returns true when the list's children occupy non-sequential positions
+// (e.g. the then/else branches of an if), so consecutive setq children
+// must NOT be reported as mergeable.
+function isNonSequentialParent(node) {
+    if (!(0, parser_1.astIsList)(node) || node.children.length === 0)
+        return true;
+    const head = node.children[0];
+    return (0, parser_1.astIsSymbol)(head) && NON_SEQUENTIAL_HEADS.has(head.name);
+}
 exports.higherOrderFuncs = new Set([
     'mapcar',
     'apply',

package/package.json

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