@specs-feup/clava-misra 1.0.2 → 1.0.3

package/dist/ast-visitor/VisitWithContext.d.ts

@@ -0,0 +1,32 @@
+import { LaraJoinPoint } from "@specs-feup/lara/api/LaraJoinPoint.js";
+import Context from "./Context.js";
+import Visit from "./Visit.js";
+/**
+ * Visit with a shared context to enable communication between visits
+ *
+ * Need to implement:
+ * - apply($jp)
+ * - initialValue()
+ */
+export default abstract class VisitWithContext<T, C extends Context<T> = Context<T>> extends Visit {
+    protected context: C;
+    /**
+     * @param context Shared context object
+     */
+    constructor(context: C);
+    /**
+     * @return Visit name, defaults to class name
+     */
+    get name(): string;
+    /**
+     * @returns Initial value stored in the shared context
+     */
+    abstract initialValue(): T;
+    /**
+     * Applies the transformation to the given node
+     * @param $jp The node to transform
+     * @returns Transformation result
+     */
+    abstract apply($jp: LaraJoinPoint): unknown;
+}
+//# sourceMappingURL=VisitWithContext.d.ts.map

package/dist/ast-visitor/VisitWithContext.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"VisitWithContext.d.ts","sourceRoot":"","sources":["../../src/ast-visitor/VisitWithContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,KAAK,MAAM,YAAY,CAAC;AAE/B;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,gBAAgB,CAAC,CAAC,EAAE,CAAC,SAAS,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAE,SAAQ,KAAK;IAC9F,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;IAErB;;OAEG;gBACS,OAAO,EAAE,CAAC;IAMtB;;OAEG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;OAEG;IACH,QAAQ,CAAC,YAAY,IAAI,CAAC;IAE1B;;;;OAIG;IACH,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO;CAC9C"}

package/dist/ast-visitor/VisitWithContext.js

@@ -0,0 +1,26 @@
+import Visit from "./Visit.js";
+/**
+ * Visit with a shared context to enable communication between visits
+ *
+ * Need to implement:
+ * - apply($jp)
+ * - initialValue()
+ */
+export default class VisitWithContext extends Visit {
+    context;
+    /**
+     * @param context Shared context object
+     */
+    constructor(context) {
+        super();
+        this.context = context;
+        this.context.put(this.name, this.initialValue());
+    }
+    /**
+     * @return Visit name, defaults to class name
+     */
+    get name() {
+        return this.constructor.name;
+    }
+}
+//# sourceMappingURL=VisitWithContext.js.map

package/dist/ast-visitor/VisitWithContext.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"VisitWithContext.js","sourceRoot":"","sources":["../../src/ast-visitor/VisitWithContext.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,YAAY,CAAC;AAE/B;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,OAAgB,gBAAuD,SAAQ,KAAK;IACpF,OAAO,CAAI;IAErB;;OAEG;IACH,YAAY,OAAU;QAClB,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;IACrD,CAAC;IAED;;OAEG;IACH,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;IACjC,CAAC;CAaJ"}

package/dist/main.js

@@ -1,5 +1,5 @@
 import MISRATool from "./MISRATool.js";
 MISRATool.checkCompliance();
-MISRATool.applyCorrections();
+MISRATool.correctViolations();
 //await VisualizationTool.visualize();
 //# sourceMappingURL=main.js.map

package/dist/main.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,MAAM,gBAAgB,CAAC;AAEvC,SAAS,CAAC,eAAe,EAAE,CAAC;AAC5B,SAAS,CAAC,gBAAgB,EAAE,CAAC;AAE7B,sCAAsC"}
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,MAAM,gBAAgB,CAAC;AAEvC,SAAS,CAAC,eAAe,EAAE,CAAC;AAC5B,SAAS,CAAC,iBAAiB,EAAE,CAAC;AAE9B,sCAAsC"}

package/dist/rules/Section13_SideEffects/Rule_13_6_SafeSizeOfOperand.d.ts

@@ -0,0 +1,27 @@
+import { Joinpoint } from "@specs-feup/clava/api/Joinpoints.js";
+import MISRARule from "../../MISRARule.js";
+import { AnalysisType, MISRATransformationReport } from "../../MISRA.js";
+/**
+ * MISRA-C Rule 13.6: The operand of the sizeof operator shall not contain any expression which has potential side effects
+ */
+export default class Rule_13_6_SafeSizeOfOperand extends MISRARule {
+    #private;
+    /**
+     * Scope of analysis
+     */
+    analysisType: AnalysisType;
+    /**
+     * @returns Rule identifier according to MISRA-C:2012
+     */
+    get name(): string;
+    private operandIsVariableArrayType;
+    /**
+     *
+     * @param $jp - Joinpoint to analyze
+     * @param logErrors - [logErrors=false] - Whether to log errors if a violation is detected
+     * @returns Returns true if the joinpoint violates the rule, false otherwise
+     */
+    match($jp: Joinpoint, logErrors?: boolean): boolean;
+    apply($jp: Joinpoint): MISRATransformationReport;
+}
+//# sourceMappingURL=Rule_13_6_SafeSizeOfOperand.d.ts.map

package/dist/rules/Section13_SideEffects/Rule_13_6_SafeSizeOfOperand.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Rule_13_6_SafeSizeOfOperand.d.ts","sourceRoot":"","sources":["../../../src/rules/Section13_SideEffects/Rule_13_6_SafeSizeOfOperand.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,SAAS,EAAkE,MAAM,qCAAqC,CAAC;AACxJ,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,yBAAyB,EAA2B,MAAM,gBAAgB,CAAC;AAMlG;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,2BAA4B,SAAQ,SAAS;;IAC9D;;OAEG;IACH,YAAY,eAAwC;IAMpD;;OAEG;IACH,IAAa,IAAI,IAAI,MAAM,CAE1B;IAED,OAAO,CAAC,0BAA0B;IAIlC;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,SAAS,EAAE,SAAS,GAAE,OAAe,GAAG,OAAO;IA+B1D,KAAK,CAAC,GAAG,EAAE,SAAS,GAAG,yBAAyB;CA4CnD"}

package/dist/rules/Section13_SideEffects/Rule_13_6_SafeSizeOfOperand.js

@@ -0,0 +1,98 @@
+import { BinaryOp, Call, UnaryExprOrType, UnaryOp, VariableArrayType, Varref } from "@specs-feup/clava/api/Joinpoints.js";
+import MISRARule from "../../MISRARule.js";
+import { AnalysisType, MISRATransformationReport, MISRATransformationType } from "../../MISRA.js";
+import Query from "@specs-feup/lara/api/weaver/Query.js";
+import { getVolatileVarRefs } from "../../utils/VarUtils.js";
+import { isValidFile } from "../../utils/FileUtils.js";
+import ClavaJoinPoints from "@specs-feup/clava/api/clava/ClavaJoinPoints.js";
+/**
+ * MISRA-C Rule 13.6: The operand of the sizeof operator shall not contain any expression which has potential side effects
+ */
+export default class Rule_13_6_SafeSizeOfOperand extends MISRARule {
+    /**
+     * Scope of analysis
+     */
+    analysisType = AnalysisType.SINGLE_TRANSLATION_UNIT;
+    #modifyingExpressions = [];
+    #functionCalls = [];
+    #volatileRefs = [];
+    /**
+     * @returns Rule identifier according to MISRA-C:2012
+     */
+    get name() {
+        return "13.6";
+    }
+    operandIsVariableArrayType($jp) {
+        return $jp.argType != undefined && $jp.argType instanceof VariableArrayType;
+    }
+    /**
+     *
+     * @param $jp - Joinpoint to analyze
+     * @param logErrors - [logErrors=false] - Whether to log errors if a violation is detected
+     * @returns Returns true if the joinpoint violates the rule, false otherwise
+     */
+    match($jp, logErrors = false) {
+        if (!($jp instanceof UnaryExprOrType && $jp.kind === "sizeof")) {
+            return false;
+        }
+        this.#functionCalls = Query.searchFromInclusive($jp, Call).get();
+        this.#volatileRefs = this.operandIsVariableArrayType($jp) ? getVolatileVarRefs($jp.argType.sizeExpr) : [];
+        this.#modifyingExpressions = [
+            ...Query.searchFromInclusive($jp, UnaryOp, { kind: /(post_inc)|(post_dec)|(pre_inc)|(pre_dec)/ }).get(),
+            ...Query.searchFromInclusive($jp, BinaryOp, { kind: /(assign)|(add_assign)|(sub_assign)|(mul_assign)|(div_assign)|(rem_assign)|(shl_assign)|(shr_assign)|(and_assign)|(xor_assign)|(or_assign)/ }).get()
+        ];
+        const isNonCompliant = this.#functionCalls.length > 0 || this.#modifyingExpressions.length > 0 || this.#volatileRefs.length > 0;
+        if (isNonCompliant && logErrors) {
+            this.#functionCalls.forEach(call => {
+                this.logMISRAError(call, `Function call '${call.name}' in sizeof is not allowed because it has no effect.`);
+            });
+            this.#modifyingExpressions.forEach(expr => {
+                this.logMISRAError(expr, `Modifying expression '${expr.code}' in sizeof is not allowed because it has no effect.`);
+            });
+            this.#volatileRefs.forEach(ref => {
+                this.logMISRAError(ref, `Access to volatile object ${ref.name} in sizeof is not allowed.`);
+            });
+        }
+        return isNonCompliant;
+    }
+    apply($jp) {
+        if (!this.match($jp)) {
+            return new MISRATransformationReport(MISRATransformationType.NoChange);
+        }
+        if (!this.operandIsVariableArrayType($jp)) {
+            for (const callJp of this.#functionCalls) {
+                const callAncestor = callJp.getAncestor("call");
+                if (callAncestor === undefined || callAncestor.depth < $jp.depth) {
+                    const functionType = callJp.functionType.returnType;
+                    const fileJp = callJp.getAncestor("file");
+                    const tempJp = fileJp.lastChild.insertAfter(ClavaJoinPoints.stmtLiteral(`static int _temp_misra_var = sizeof(${functionType.code});`));
+                    const jpIndex = Query.searchFrom(fileJp, UnaryExprOrType).get().length;
+                    let newSizeOf = isValidFile(fileJp, UnaryExprOrType, jpIndex);
+                    newSizeOf = $jp.replaceWith(newSizeOf);
+                    newSizeOf.setArgType(functionType);
+                    tempJp.detach();
+                    return new MISRATransformationReport(MISRATransformationType.Replacement, newSizeOf);
+                }
+            }
+            for (const expr of this.#modifyingExpressions) {
+                let varRef = expr instanceof BinaryOp ?
+                    expr.left : Query.searchFrom(expr, Varref).get()[0];
+                expr.replaceWith(varRef);
+            }
+            return new MISRATransformationReport(MISRATransformationType.DescendantChange);
+        }
+        else {
+            this.#functionCalls.forEach(call => {
+                this.logMISRAError(call, `Function call '${call.name}' in sizeof is not allowed. Could not correct because it is used to define a variable-length array type and it is unspecified whether it will be evaluated or not.`);
+            });
+            this.#modifyingExpressions.forEach(expr => {
+                this.logMISRAError(expr, `Modifying expression '${expr.code}' in sizeof is not allowed. Could not correct because it is used to define a variable-length array type and it is unspecified whether it will be evaluated or not.`);
+            });
+            this.#volatileRefs.forEach(ref => {
+                this.logMISRAError(ref, `Access to volatile object '${ref.name}' in sizeof is not allowed. Could not correct because it is used to define a variable-length array type and it is unspecified whether it will be evaluated or not.`);
+            });
+            return new MISRATransformationReport(MISRATransformationType.NoChange);
+        }
+    }
+}
+//# sourceMappingURL=Rule_13_6_SafeSizeOfOperand.js.map

package/dist/rules/Section13_SideEffects/Rule_13_6_SafeSizeOfOperand.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Rule_13_6_SafeSizeOfOperand.js","sourceRoot":"","sources":["../../../src/rules/Section13_SideEffects/Rule_13_6_SafeSizeOfOperand.ts"],"names":[],"mappings":"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"}

package/dist/rules/Section16_SwitchStatements/Rule_16_2_TopLevelSwitch.d.ts

@@ -1,15 +1,54 @@
 import { Joinpoint } from "@specs-feup/clava/api/Joinpoints.js";
 import MISRARule from "../../MISRARule.js";
-import MISRAContext from "../../MISRAContext.js";
-import { MISRATransformationReport } from "../../MISRA.js";
+import { AnalysisType, MISRATransformationReport } from "../../MISRA.js";
 /**
- * MISRA Rule 16.2: A switch label shall only be used when the most closely-enclos ing
-compound statement is the body of a switch statement
+ * MISRA-C Rule 16.2: A switch label shall only be used when the most closely-enclosing compound statement is the body of a switch statement
  */
 export default class Rule_16_2_TopLevelSwitch extends MISRARule {
     #private;
-    constructor(context: MISRAContext);
+    /**
+     * Scope of analysis
+     */
+    readonly analysisType = AnalysisType.SINGLE_TRANSLATION_UNIT;
+    /**
+     * A positive integer starting from 1 that indicates the rule's priority, determining the order in which rules are applied.
+     */
+    readonly priority = 4;
+    /**
+     * @returns Rule identifier according to MISRA-C:2012
+     */
+    get name(): string;
+    /**
+     * Checks if the given joinpoint is a switch statement with any misplaced case labels.
+     * A case label is considered misplaced if it is not a direct child of the switch body.
+     *
+     * @param $jp - Joinpoint to analyze
+     * @param logErrors - [logErrors=false] - Whether to log errors if a violation is detected
+     * @returns Returns true if the joinpoint violates the rule, false otherwise
+     */
     match($jp: Joinpoint, logErrors?: boolean): boolean;
-    transform($jp: Joinpoint): MISRATransformationReport;
+    /**
+     * Transforms the joinpoint if it represents a switch with any misplaced case labels.
+     * For that, each case label is moved to a new location within the switch.
+     *
+     * @param $jp - Joinpoint to transform
+     * @returns Report detailing the transformation result
+     */
+    apply($jp: Joinpoint): MISRATransformationReport;
+    /**
+     * Relocates a inner case to a new position while preserving control flow.
+     * First, copies the instructions to be executed (direct siblings and fall-through code).
+     * Then, moves the case to the new position and finally appends the copied instructions after the case.
+     *
+     * @param caseLabel The inner case to relocate
+     */
+    private changeCaseLocation;
+    /**
+     * Retrieves the top-level case that contains a given inner case label.
+     *
+     * @param caseLabel - The inner case joinpoint
+     * @returns The ancestor case that contains the given inner case
+     */
+    private getCaseAncestor;
 }
 //# sourceMappingURL=Rule_16_2_TopLevelSwitch.d.ts.map

package/dist/rules/Section16_SwitchStatements/Rule_16_2_TopLevelSwitch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Rule_16_2_TopLevelSwitch.d.ts","sourceRoot":"","sources":["../../../src/rules/Section16_SwitchStatements/Rule_16_2_TopLevelSwitch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,SAAS,EAAU,MAAM,qCAAqC,CAAC;AAC9E,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAAO,YAAY,MAAM,uBAAuB,CAAC;AAEjD,OAAO,EAAE,yBAAyB,EAA2B,MAAM,gBAAgB,CAAC;AAEpF;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,wBAAyB,SAAQ,SAAS;;gBAG/C,OAAO,EAAE,YAAY;IAIjC,KAAK,CAAC,GAAG,EAAE,SAAS,EAAE,SAAS,GAAE,OAAe,GAAG,OAAO;IAc1D,SAAS,CAAC,GAAG,EAAE,SAAS,GAAG,yBAAyB;CAQvD"}
+{"version":3,"file":"Rule_16_2_TopLevelSwitch.d.ts","sourceRoot":"","sources":["../../../src/rules/Section16_SwitchStatements/Rule_16_2_TopLevelSwitch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,SAAS,EAAU,MAAM,qCAAqC,CAAC;AACrF,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAE3C,OAAO,EAAE,YAAY,EAAE,yBAAyB,EAA2B,MAAM,gBAAgB,CAAC;AAElG;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,wBAAyB,SAAQ,SAAS;;IAC3D;;OAEG;IACH,QAAQ,CAAC,YAAY,wCAAwC;IAE7D;;OAEG;IACH,QAAQ,CAAC,QAAQ,KAAK;IAItB;;OAEG;IACH,IAAa,IAAI,IAAI,MAAM,CAE1B;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,GAAG,EAAE,SAAS,EAAE,SAAS,GAAE,OAAe,GAAG,OAAO;IAc1D;;;;;;OAMG;IACH,KAAK,CAAC,GAAG,EAAE,SAAS,GAAG,yBAAyB;IAWhD;;;;;;OAMG;IACH,OAAO,CAAC,kBAAkB;IAyC1B;;;;;OAKG;IACH,OAAO,CAAC,eAAe;CAQ1B"}

package/dist/rules/Section16_SwitchStatements/Rule_16_2_TopLevelSwitch.js

@@ -1,16 +1,34 @@
-import { Case, Switch } from "@specs-feup/clava/api/Joinpoints.js";
+import { Break, Case, Switch } from "@specs-feup/clava/api/Joinpoints.js";
 import MISRARule from "../../MISRARule.js";
 import Query from "@specs-feup/lara/api/weaver/Query.js";
-import { MISRATransformationReport, MISRATransformationType } from "../../MISRA.js";
+import { AnalysisType, MISRATransformationReport, MISRATransformationType } from "../../MISRA.js";
 /**
- * MISRA Rule 16.2: A switch label shall only be used when the most closely-enclos ing
-compound statement is the body of a switch statement
+ * MISRA-C Rule 16.2: A switch label shall only be used when the most closely-enclosing compound statement is the body of a switch statement
  */
 export default class Rule_16_2_TopLevelSwitch extends MISRARule {
+    /**
+     * Scope of analysis
+     */
+    analysisType = AnalysisType.SINGLE_TRANSLATION_UNIT;
+    /**
+     * A positive integer starting from 1 that indicates the rule's priority, determining the order in which rules are applied.
+     */
+    priority = 4;
     #misplacedCases = [];
-    constructor(context) {
-        super("16.2", context);
+    /**
+     * @returns Rule identifier according to MISRA-C:2012
+     */
+    get name() {
+        return "16.2";
     }
+    /**
+     * Checks if the given joinpoint is a switch statement with any misplaced case labels.
+     * A case label is considered misplaced if it is not a direct child of the switch body.
+     *
+     * @param $jp - Joinpoint to analyze
+     * @param logErrors - [logErrors=false] - Whether to log errors if a violation is detected
+     * @returns Returns true if the joinpoint violates the rule, false otherwise
+     */
     match($jp, logErrors = false) {
         if (!($jp instanceof Switch))
             return false;
@@ -21,13 +39,78 @@ export default class Rule_16_2_TopLevelSwitch extends MISRARule {
         }
         return this.#misplacedCases.length > 0;
     }
-    transform($jp) {
+    /**
+     * Transforms the joinpoint if it represents a switch with any misplaced case labels.
+     * For that, each case label is moved to a new location within the switch.
+     *
+     * @param $jp - Joinpoint to transform
+     * @returns Report detailing the transformation result
+     */
+    apply($jp) {
         if (!this.match($jp))
             return new MISRATransformationReport(MISRATransformationType.NoChange);
         for (const caseLabel of this.#misplacedCases) {
-            caseLabel.detach();
+            this.changeCaseLocation(caseLabel);
         }
         return new MISRATransformationReport(MISRATransformationType.DescendantChange);
     }
+    /**
+     * Relocates a inner case to a new position while preserving control flow.
+     * First, copies the instructions to be executed (direct siblings and fall-through code).
+     * Then, moves the case to the new position and finally appends the copied instructions after the case.
+     *
+     * @param caseLabel The inner case to relocate
+     */
+    changeCaseLocation(caseLabel) {
+        // Collect instructions that follow the given case
+        const instructions = caseLabel.siblingsRight.map(sibling => sibling.deepCopy());
+        // If direct instruction do not have a break statement, find additional statements from higher scopes that will be executed
+        if (!instructions.some(instruction => instruction instanceof Break)) {
+            let lastScope = caseLabel;
+            do {
+                lastScope = lastScope.parent;
+                const rightStmts = lastScope.siblingsRight;
+                for (const rightStmt of rightStmts) {
+                    if (rightStmt.currentRegion instanceof Switch && rightStmt instanceof Case) {
+                        break;
+                    }
+                    instructions.push(rightStmt.deepCopy());
+                }
+            } while (!(lastScope.currentRegion instanceof Switch));
+        }
+        // Locate target position
+        const caseAncestor = this.getCaseAncestor(caseLabel);
+        const caseAncestorRightSiblings = caseAncestor.siblingsRight;
+        const nextCaseIndex = caseAncestorRightSiblings.findIndex(jp => jp instanceof Case);
+        const targetStmt = nextCaseIndex != -1 ? caseAncestorRightSiblings[nextCaseIndex] : caseAncestorRightSiblings[caseAncestorRightSiblings.length - 1];
+        // Move case label to the new position
+        caseLabel.detach();
+        if (targetStmt instanceof Case) {
+            targetStmt.insertBefore(caseLabel);
+        }
+        else {
+            targetStmt.insertAfter(caseLabel);
+        }
+        // Add instructions after caseLabel
+        let lastStmt = caseLabel;
+        for (const instruction of instructions) {
+            lastStmt.insertAfter(instruction);
+            lastStmt = instruction;
+        }
+    }
+    /**
+     * Retrieves the top-level case that contains a given inner case label.
+     *
+     * @param caseLabel - The inner case joinpoint
+     * @returns The ancestor case that contains the given inner case
+     */
+    getCaseAncestor(caseLabel) {
+        let stmt = caseLabel;
+        while (!(stmt.currentRegion instanceof Switch)) {
+            stmt = stmt.parent;
+        }
+        const caseAncestor = stmt.siblingsLeft.reverse().find(jp => jp instanceof Case);
+        return caseAncestor;
+    }
 }
 //# sourceMappingURL=Rule_16_2_TopLevelSwitch.js.map

package/dist/rules/Section16_SwitchStatements/Rule_16_2_TopLevelSwitch.js.map

@@ -1 +1 @@
-{"version":3,"file":"Rule_16_2_TopLevelSwitch.js","sourceRoot":"","sources":["../../../src/rules/Section16_SwitchStatements/Rule_16_2_TopLevelSwitch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAa,MAAM,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAE3C,OAAO,KAAK,MAAM,sCAAsC,CAAC;AACzD,OAAO,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAEpF;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,wBAAyB,SAAQ,SAAS;IAC3D,eAAe,GAAW,EAAE,CAAC;IAE7B,YAAY,OAAqB;QAC7B,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,GAAc,EAAE,YAAqB,KAAK;QAC5C,IAAI,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC;YAAE,OAAO,KAAK,CAAC;QAE3C,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE;aACnD,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,aAAa,YAAY,MAAM,CAAC,CAAC,CAAC;QAEvE,IAAI,SAAS,EAAE,CAAC;YACZ,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CACrC,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,qGAAqG,CAAC,CACvI,CAAC;QACN,CAAC;QACD,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC;IAC3C,CAAC;IAED,SAAS,CAAC,GAAc;QACpB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;YAAE,OAAO,IAAI,yBAAyB,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC;QAE7F,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YAC3C,SAAS,CAAC,MAAM,EAAE,CAAC;QACvB,CAAC;QACD,OAAO,IAAI,yBAAyB,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;IACnF,CAAC;CACJ"}
+{"version":3,"file":"Rule_16_2_TopLevelSwitch.js","sourceRoot":"","sources":["../../../src/rules/Section16_SwitchStatements/Rule_16_2_TopLevelSwitch.ts"],"names":[],"mappings":"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"}

package/dist/rules/Section16_SwitchStatements/Rule_16_3_UnconditionalBreak.d.ts

@@ -1,16 +1,26 @@
 import { Joinpoint } from "@specs-feup/clava/api/Joinpoints.js";
 import MISRARule from "../../MISRARule.js";
-import MISRAContext from "../../MISRAContext.js";
-import { MISRATransformationReport } from "../../MISRA.js";
+import { AnalysisType, MISRATransformationReport } from "../../MISRA.js";
 /**
- * MISRA Rule 16.3: An unconditional break statement shall terminate every switch-clause
+ * MISRA-C Rule 16.3: An unconditional break statement shall terminate every switch-clause
  */
 export default class Rule_16_3_UnconditionalBreak extends MISRARule {
     #private;
-    constructor(context: MISRAContext);
+    /**
+     * Scope of analysis
+     */
+    readonly analysisType = AnalysisType.SINGLE_TRANSLATION_UNIT;
+    /**
+     * A positive integer starting from 1 that indicates the rule's priority, determining the order in which rules are applied.
+     */
+    readonly priority = 3;
+    /**
+     * @returns Rule identifier according to MISRA-C:2012
+     */
+    get name(): string;
     match($jp: Joinpoint, logErrors?: boolean): boolean;
     private getNextStatementsToExecute;
     private insertNextStatementsToExecute;
-    transform($jp: Joinpoint): MISRATransformationReport;
+    apply($jp: Joinpoint): MISRATransformationReport;
 }
 //# sourceMappingURL=Rule_16_3_UnconditionalBreak.d.ts.map

package/dist/rules/Section16_SwitchStatements/Rule_16_3_UnconditionalBreak.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Rule_16_3_UnconditionalBreak.d.ts","sourceRoot":"","sources":["../../../src/rules/Section16_SwitchStatements/Rule_16_3_UnconditionalBreak.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,SAAS,EAA2B,MAAM,qCAAqC,CAAC;AAChG,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAAO,YAAY,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,yBAAyB,EAA2B,MAAM,gBAAgB,CAAC;AAIpF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,4BAA6B,SAAQ,SAAS;;gBAGnD,OAAO,EAAE,YAAY;IAIjC,KAAK,CAAC,GAAG,EAAE,SAAS,EAAE,SAAS,GAAE,OAAe,GAAG,OAAO;IAc1D,OAAO,CAAC,0BAA0B;IAalC,OAAO,CAAC,6BAA6B;IAWrC,SAAS,CAAC,GAAG,EAAE,SAAS,GAAG,yBAAyB;CAavD"}
+{"version":3,"file":"Rule_16_3_UnconditionalBreak.d.ts","sourceRoot":"","sources":["../../../src/rules/Section16_SwitchStatements/Rule_16_3_UnconditionalBreak.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,SAAS,EAAgB,MAAM,qCAAqC,CAAC;AACrF,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,yBAAyB,EAA2B,MAAM,gBAAgB,CAAC;AAIlG;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,4BAA6B,SAAQ,SAAS;;IAC/D;;OAEG;IACH,QAAQ,CAAC,YAAY,wCAAwC;IAE7D;;OAEG;IACH,QAAQ,CAAC,QAAQ,KAAK;IAOtB;;OAEG;IACH,IAAa,IAAI,IAAI,MAAM,CAE1B;IAED,KAAK,CAAC,GAAG,EAAE,SAAS,EAAE,SAAS,GAAE,OAAe,GAAG,OAAO;IAc1D,OAAO,CAAC,0BAA0B;IAalC,OAAO,CAAC,6BAA6B;IAWrC,KAAK,CAAC,GAAG,EAAE,SAAS,GAAG,yBAAyB;CAanD"}

package/dist/rules/Section16_SwitchStatements/Rule_16_3_UnconditionalBreak.js

@@ -1,15 +1,29 @@
 import { Break, Switch, Case } from "@specs-feup/clava/api/Joinpoints.js";
 import MISRARule from "../../MISRARule.js";
-import { MISRATransformationReport, MISRATransformationType } from "../../MISRA.js";
-import { getLastStmtOfCase } from "../../utils/utils.js";
+import { AnalysisType, MISRATransformationReport, MISRATransformationType } from "../../MISRA.js";
 import ClavaJoinPoints from "@specs-feup/clava/api/clava/ClavaJoinPoints.js";
+import { getLastStmtOfCase } from "../../utils/SwitchUtils.js";
 /**
- * MISRA Rule 16.3: An unconditional break statement shall terminate every switch-clause
+ * MISRA-C Rule 16.3: An unconditional break statement shall terminate every switch-clause
  */
 export default class Rule_16_3_UnconditionalBreak extends MISRARule {
+    /**
+     * Scope of analysis
+     */
+    analysisType = AnalysisType.SINGLE_TRANSLATION_UNIT;
+    /**
+     * A positive integer starting from 1 that indicates the rule's priority, determining the order in which rules are applied.
+     */
+    priority = 3;
+    /**
+     * List of statements that require a `break` statement as their last sibling
+     */
     #statementsNeedingBreakAfter = [];
-    constructor(context) {
-        super("16.3", context);
+    /**
+     * @returns Rule identifier according to MISRA-C:2012
+     */
+    get name() {
+        return "16.3";
     }
     match($jp, logErrors = false) {
         if (!($jp instanceof Switch))
@@ -43,7 +57,7 @@ export default class Rule_16_3_UnconditionalBreak extends MISRARule {
         }
         lastStmt.insertAfter(ClavaJoinPoints.breakStmt());
     }
-    transform($jp) {
+    apply($jp) {
         if (!this.match($jp))
             return new MISRATransformationReport(MISRATransformationType.NoChange);
         for (const stmt of this.#statementsNeedingBreakAfter) {

package/dist/rules/Section16_SwitchStatements/Rule_16_3_UnconditionalBreak.js.map

@@ -1 +1 @@
-{"version":3,"file":"Rule_16_3_UnconditionalBreak.js","sourceRoot":"","sources":["../../../src/rules/Section16_SwitchStatements/Rule_16_3_UnconditionalBreak.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAwB,MAAM,EAAE,IAAI,EAAE,MAAM,qCAAqC,CAAC;AAChG,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAE3C,OAAO,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AACpF,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,eAAe,MAAM,gDAAgD,CAAC;AAE7E;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,4BAA6B,SAAQ,SAAS;IAC/D,4BAA4B,GAAgB,EAAE,CAAC;IAE/C,YAAY,OAAqB;QAC7B,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,GAAc,EAAE,YAAqB,KAAK;QAC5C,IAAI,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC;YAAE,OAAO,KAAK,CAAC;QAE3C,IAAI,CAAC,4BAA4B,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;aACvF,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,IAAI,CAAC,CAAC,QAAQ,YAAY,KAAK,CAAC,CAAgB,CAAC;QAEjF,IAAI,SAAS,EAAE,CAAC;YACZ,IAAI,CAAC,4BAA4B,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBAC7C,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,gDAAgD,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;YAC3F,CAAC,CAAC,CAAC;QACP,CAAC;QACD,OAAO,IAAI,CAAC,4BAA4B,CAAC,MAAM,GAAG,CAAC,CAAC;IACxD,CAAC;IAEO,0BAA0B,CAAC,EAAa;QAC5C,IAAI,KAAK,GAAG,EAAE,CAAC;QAEf,KAAK,MAAM,OAAO,IAAI,EAAE,CAAC,aAAa,EAAE,CAAC;YACrC,IAAI,OAAO,YAAY,KAAK;gBACxB,MAAM;YACV,IAAI,OAAO,YAAY,IAAI;gBACvB,SAAS;YACb,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QACnC,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEO,6BAA6B,CAAC,EAAa;QAC/C,MAAM,SAAS,GAAG,IAAI,CAAC,0BAA0B,CAAC,EAAE,CAAC,CAAC;QACtD,IAAI,QAAQ,GAAG,EAAE,CAAC;QAElB,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;YAC3B,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YAC3B,QAAQ,GAAG,IAAI,CAAC;QACpB,CAAC;QACD,QAAQ,CAAC,WAAW,CAAC,eAAe,CAAC,SAAS,EAAE,CAAC,CAAC;IACtD,CAAC;IAED,SAAS,CAAC,GAAc;QACpB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;YAChB,OAAO,IAAI,yBAAyB,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC;QAE3E,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,4BAA4B,EAAE,CAAC;YACnD,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC,CAAC,+BAA+B;gBAC7D,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,SAAS,EAAE,CAAC,CAAC;YAClD,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,6BAA6B,CAAC,IAAI,CAAC,CAAC;YAC7C,CAAC;QACL,CAAC;QACD,OAAO,IAAI,yBAAyB,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;IACnF,CAAC;CACJ"}
+{"version":3,"file":"Rule_16_3_UnconditionalBreak.js","sourceRoot":"","sources":["../../../src/rules/Section16_SwitchStatements/Rule_16_3_UnconditionalBreak.ts"],"names":[],"mappings":"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"}

package/dist/rules/Section16_SwitchStatements/Rule_16_4_SwitchHasDefault.d.ts

@@ -1,12 +1,18 @@
 import { Joinpoint } from "@specs-feup/clava/api/Joinpoints.js";
 import MISRARule from "../../MISRARule.js";
-import MISRAContext from "../../MISRAContext.js";
-import { MISRATransformationReport } from "../../MISRA.js";
+import { AnalysisType, MISRATransformationReport } from "../../MISRA.js";
 /**
- * MISRA Rule 16.4: Every switch statement shall have a default label
+ * MISRA-C Rule 16.4: Every switch statement shall have a default label
  */
 export default class Rule_16_4_SwitchHasDefault extends MISRARule {
-    constructor(context: MISRAContext);
+    /**
+     * Scope of analysis
+     */
+    readonly analysisType = AnalysisType.SINGLE_TRANSLATION_UNIT;
+    /**
+    * @returns Rule identifier according to MISRA-C:2012
+    */
+    get name(): string;
     /**
      * Checks if the given joinpoint is a switch statement with a default case
      * @param $jp - Joinpoint to analyze
@@ -14,6 +20,6 @@ export default class Rule_16_4_SwitchHasDefault extends MISRARule {
      * @returns Returns true if the joinpoint violates the rule, false otherwise
      */
     match($jp: Joinpoint, logErrors?: boolean): boolean;
-    transform($jp: Joinpoint): MISRATransformationReport;
+    apply($jp: Joinpoint): MISRATransformationReport;
 }
 //# sourceMappingURL=Rule_16_4_SwitchHasDefault.d.ts.map

package/dist/rules/Section16_SwitchStatements/Rule_16_4_SwitchHasDefault.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Rule_16_4_SwitchHasDefault.d.ts","sourceRoot":"","sources":["../../../src/rules/Section16_SwitchStatements/Rule_16_4_SwitchHasDefault.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAU,MAAM,qCAAqC,CAAC;AACxE,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAAO,YAAY,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,yBAAyB,EAA2B,MAAM,gBAAgB,CAAC;AAIpF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,0BAA2B,SAAQ,SAAS;gBACjD,OAAO,EAAE,YAAY;IAIjC;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,SAAS,EAAE,SAAS,GAAE,OAAe,GAAG,OAAO;IAU1D,SAAS,CAAC,GAAG,EAAE,SAAS,GAAG,yBAAyB;CAcvD"}
+{"version":3,"file":"Rule_16_4_SwitchHasDefault.d.ts","sourceRoot":"","sources":["../../../src/rules/Section16_SwitchStatements/Rule_16_4_SwitchHasDefault.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAU,MAAM,qCAAqC,CAAC;AACxE,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,yBAAyB,EAA2B,MAAM,gBAAgB,CAAC;AAGlG;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,0BAA2B,SAAQ,SAAS;IAC7D;;OAEG;IACH,QAAQ,CAAC,YAAY,wCAAwC;IAE5D;;MAEE;IACH,IAAa,IAAI,IAAI,MAAM,CAE1B;IAED;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,SAAS,EAAE,SAAS,GAAE,OAAe,GAAG,OAAO;IAU1D,KAAK,CAAC,GAAG,EAAE,SAAS,GAAG,yBAAyB;CAYnD"}

package/dist/rules/Section16_SwitchStatements/Rule_16_4_SwitchHasDefault.js

@@ -1,14 +1,20 @@
 import { Switch } from "@specs-feup/clava/api/Joinpoints.js";
 import MISRARule from "../../MISRARule.js";
-import { MISRATransformationReport, MISRATransformationType } from "../../MISRA.js";
+import { AnalysisType, MISRATransformationReport, MISRATransformationType } from "../../MISRA.js";
 import ClavaJoinPoints from "@specs-feup/clava/api/clava/ClavaJoinPoints.js";
-import { getNumOfSwitchClauses, switchHasBooleanCondition, switchHasConditionalBreak } from "../../utils/utils.js";
 /**
- * MISRA Rule 16.4: Every switch statement shall have a default label
+ * MISRA-C Rule 16.4: Every switch statement shall have a default label
  */
 export default class Rule_16_4_SwitchHasDefault extends MISRARule {
-    constructor(context) {
-        super("16.4", context);
+    /**
+     * Scope of analysis
+     */
+    analysisType = AnalysisType.SINGLE_TRANSLATION_UNIT;
+    /**
+    * @returns Rule identifier according to MISRA-C:2012
+    */
+    get name() {
+        return "16.4";
     }
     /**
      * Checks if the given joinpoint is a switch statement with a default case
@@ -25,17 +31,14 @@ export default class Rule_16_4_SwitchHasDefault extends MISRARule {
         }
         return noDefaultCase;
     }
-    transform($jp) {
+    apply($jp) {
         if (!this.match($jp))
             return new MISRATransformationReport(MISRATransformationType.NoChange);
-        if ((getNumOfSwitchClauses($jp) < 2 || switchHasBooleanCondition($jp)) &&
-            !switchHasConditionalBreak($jp)) { // Will be handled by rules 16.6 or 16.7
-            return new MISRATransformationReport(MISRATransformationType.NoChange);
-        }
         $jp.children[1].lastChild
             .insertAfter(ClavaJoinPoints.defaultStmt())
             .insertAfter(ClavaJoinPoints.emptyStmt())
             .insertAfter(ClavaJoinPoints.breakStmt());
+        this.context.addRuleResult(this.ruleID, $jp, MISRATransformationType.DescendantChange);
         return new MISRATransformationReport(MISRATransformationType.DescendantChange);
     }
 }

package/dist/rules/Section16_SwitchStatements/Rule_16_4_SwitchHasDefault.js.map

@@ -1 +1 @@
-{"version":3,"file":"Rule_16_4_SwitchHasDefault.js","sourceRoot":"","sources":["../../../src/rules/Section16_SwitchStatements/Rule_16_4_SwitchHasDefault.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,MAAM,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAE3C,OAAO,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AACpF,OAAO,eAAe,MAAM,gDAAgD,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAEnH;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,0BAA2B,SAAQ,SAAS;IAC7D,YAAY,OAAqB;QAC7B,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3B,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,GAAc,EAAE,YAAqB,KAAK;QAC5C,IAAI,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC;YAAE,OAAO,KAAK,CAAC;QAE3C,MAAM,aAAa,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC;QAC1C,IAAI,aAAa,IAAI,SAAS,EAAE,CAAC;YAC7B,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,6CAA6C,CAAC,CAAA;QAC1E,CAAC;QACD,OAAO,aAAa,CAAC;IACzB,CAAC;IAED,SAAS,CAAC,GAAc;QACpB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;YAAE,OAAO,IAAI,yBAAyB,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC;QAE7F,IAAI,CAAC,qBAAqB,CAAC,GAAa,CAAC,GAAG,CAAC,IAAI,yBAAyB,CAAC,GAAa,CAAC,CAAC;YACtF,CAAC,yBAAyB,CAAC,GAAa,CAAC,EAAE,CAAC,CAAC,wCAAwC;YACrF,OAAO,IAAI,yBAAyB,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC;QAC3E,CAAC;QAED,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;aACpB,WAAW,CAAC,eAAe,CAAC,WAAW,EAAE,CAAC;aAC1C,WAAW,CAAC,eAAe,CAAC,SAAS,EAAE,CAAC;aACxC,WAAW,CAAC,eAAe,CAAC,SAAS,EAAE,CAAC,CAAC;QAC9C,OAAO,IAAI,yBAAyB,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;IACnF,CAAC;CACJ"}
+{"version":3,"file":"Rule_16_4_SwitchHasDefault.js","sourceRoot":"","sources":["../../../src/rules/Section16_SwitchStatements/Rule_16_4_SwitchHasDefault.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,MAAM,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAClG,OAAO,eAAe,MAAM,gDAAgD,CAAC;AAE7E;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,0BAA2B,SAAQ,SAAS;IAC7D;;OAEG;IACM,YAAY,GAAG,YAAY,CAAC,uBAAuB,CAAC;IAE5D;;MAEE;IACH,IAAa,IAAI;QACb,OAAO,MAAM,CAAC;IAClB,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,GAAc,EAAE,YAAqB,KAAK;QAC5C,IAAI,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC;YAAE,OAAO,KAAK,CAAC;QAE3C,MAAM,aAAa,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC;QAC1C,IAAI,aAAa,IAAI,SAAS,EAAE,CAAC;YAC7B,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,6CAA6C,CAAC,CAAA;QAC1E,CAAC;QACD,OAAO,aAAa,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,GAAc;QAChB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;YAChB,OAAO,IAAI,yBAAyB,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC;QAE3E,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;aACpB,WAAW,CAAC,eAAe,CAAC,WAAW,EAAE,CAAC;aAC1C,WAAW,CAAC,eAAe,CAAC,SAAS,EAAE,CAAC;aACxC,WAAW,CAAC,eAAe,CAAC,SAAS,EAAE,CAAC,CAAC;QAE9C,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;QACvF,OAAO,IAAI,yBAAyB,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;IACnF,CAAC;CACJ"}