@specs-feup/clava-misra 1.0.0 → 1.0.1

package/dist/misra/sections/Section13_SideEffects.js

@@ -0,0 +1,90 @@
+import Query from "@specs-feup/lara/api/weaver/Query.js";
+import { Varref, Call, QualType, Vardecl, UnaryOp, InitList, BinaryOp } from "@specs-feup/clava/api/Joinpoints.js";
+import MISRAAnalyser from "../MISRAAnalyser.js";
+import TraversalType from "@specs-feup/lara/api/weaver/TraversalType.js";
+import Fix from "@specs-feup/clava/api/clava/analysis/Fix.js";
+export default class Section13_SideEffects extends MISRAAnalyser {
+    ruleMapper;
+    constructor(rules) {
+        super(rules);
+        this.ruleMapper = new Map([
+            [1, this.r13_1_initListSideEffects.bind(this)],
+            [3, this.r13_3_noIncrementSideEffects.bind(this)],
+            [4, this.r13_4_noUseOfAssignmentValue.bind(this)],
+            [5, this.r13_5_shortCircuitSideEffects.bind(this)]
+        ]);
+    }
+    checkPotentialPersistentSideEffects($startNode, type, filters, name, childFun) {
+        Query.searchFrom($startNode, type, filters).get().forEach(list => {
+            Query.searchFromInclusive(childFun(list), Varref).get().forEach(ref => {
+                if (ref.type instanceof QualType && ref.type.qualifiers?.includes("volatile")) {
+                    this.logMISRAError(list, `${name} ${list.code} contains persistent side effects: an access to volatile object ${ref.name}.`);
+                }
+            }, this);
+            Query.searchFromInclusive(childFun(list), Call).get().forEach(call => {
+                this.logMISRAError(list, `${name} ${list.code} may contain persistent side effects in call to ${call.name}.`);
+            }, this);
+            Query.searchFromInclusive(childFun(list), UnaryOp, { kind: /(post_inc)|(post_dec)|(pre_inc)|(pre_dec)/ }).get().forEach(op => {
+                Query.searchFrom(op, Varref).get().forEach(ref => {
+                    if (ref.declaration instanceof Vardecl && ref.declaration.isGlobal) {
+                        this.logMISRAError(list, `${name} ${list.code} may contain persistent side effects in expression ${op.code}.`);
+                    }
+                });
+            }, this);
+        }, this);
+    }
+    r13_1_initListSideEffects($startNode) {
+        this.checkPotentialPersistentSideEffects($startNode, InitList, undefined, "Initializer list", jp => jp);
+    }
+    static visitAllExprs(fun, root) {
+        let curr = root;
+        while (curr) {
+            const temp = curr;
+            //console.log(temp.joinPointType);
+            curr = curr.rightJp;
+            if (temp.instanceOf("expression")) {
+                fun(temp);
+            }
+            else
+                Section13_SideEffects.visitAllExprs(fun, temp.children[0]);
+        }
+    }
+    checkIncrementSideEffects(exprRoot) {
+        const jps = Query.searchFrom(exprRoot, UnaryOp, { kind: /(post_inc)|(post_dec)|(pre_inc)|(pre_dec)/ }, TraversalType.POSTORDER).get();
+        const calls = Query.searchFromInclusive(exprRoot, Call).get();
+        const assignments = Query.searchFromInclusive(exprRoot, BinaryOp, { isAssignment: true }).get();
+        if (jps.length + calls.length + assignments.length < 2)
+            return;
+        this.logMISRAError(exprRoot, `Expression ${exprRoot.code} contains a pre/post inc/decrement operator and other side effects.`, new Fix(exprRoot, ($jp) => {
+            const jps = Query.searchFrom($jp, UnaryOp, { kind: /(post_inc)|(post_dec)|(pre_inc)|(pre_dec)/ }, TraversalType.POSTORDER).get();
+            const calls = Query.searchFromInclusive($jp, Call).get();
+            const assignments = Query.searchFromInclusive($jp, BinaryOp, { isAssignment: true }).get();
+            const transformationNo = (calls.length === 0 && assignments.length === 0) ? jps.length - 1 : jps.length;
+            for (let i = 0; i < transformationNo; i++) {
+                const jp = jps[i];
+                if (/post_.*/.test(jp.kind)) {
+                    $jp.insertAfter(jp.deepCopy());
+                }
+                else {
+                    $jp.insertBefore(jp.deepCopy());
+                }
+                console.log(jp);
+                jp.replaceWith(jp.operand);
+            }
+        }));
+    }
+    r13_3_noIncrementSideEffects($startNode) {
+        Section13_SideEffects.visitAllExprs(this.checkIncrementSideEffects, $startNode);
+    }
+    r13_4_noUseOfAssignmentValue($startNode) {
+        for (const bOp of Query.searchFrom($startNode, BinaryOp, { isAssignment: true })) {
+            if (!bOp.parent.instanceOf("exprStmt") && !(bOp.parent.instanceOf("parenExpr") && bOp.parent?.parent?.instanceOf("exprStmt"))) {
+                this.logMISRAError(bOp, `Value of assignment expression ${bOp.code} should not be used.`);
+            }
+        }
+    }
+    r13_5_shortCircuitSideEffects($startNode) {
+        this.checkPotentialPersistentSideEffects($startNode, BinaryOp, { operator: /(\&\&|\|\|)/ }, "RHS of && or || expression", jp => jp.right);
+    }
+}
+//# sourceMappingURL=Section13_SideEffects.js.map

package/dist/misra/sections/Section13_SideEffects.js.map

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

package/dist/misra/sections/Section14_ControlStmtExprs.d.ts

@@ -0,0 +1,8 @@
+import { Program, FileJp } from "@specs-feup/clava/api/Joinpoints.js";
+import MISRAAnalyser from "../MISRAAnalyser.js";
+export default class Section14_ControlStmtExprs extends MISRAAnalyser {
+    ruleMapper: Map<number, (jp: Program | FileJp) => void>;
+    constructor(rules: number[]);
+    private r14_4_essentiallyBooleanInControllingExpr;
+}
+//# sourceMappingURL=Section14_ControlStmtExprs.d.ts.map

package/dist/misra/sections/Section14_ControlStmtExprs.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Section14_ControlStmtExprs.d.ts","sourceRoot":"","sources":["../../../src/misra/sections/Section14_ControlStmtExprs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAiC,MAAM,qCAAqC,CAAC;AACrG,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAEhD,MAAM,CAAC,OAAO,OAAO,0BAA2B,SAAQ,aAAa;IACjE,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,OAAO,GAAG,MAAM,KAAK,IAAI,CAAC,CAAC;gBAE5C,KAAK,EAAE,MAAM,EAAE;IAO3B,OAAO,CAAC,yCAAyC;CAYpD"}

package/{src/misra/sections/Section14_ControlStmtExprs.ts → dist/misra/sections/Section14_ControlStmtExprs.js}

@@ -1,21 +1,18 @@
 import Query from "@specs-feup/lara/api/weaver/Query.js";
-import { Program, FileJp, Loop, Joinpoint, If, ExprStmt } from "@specs-feup/clava/api/Joinpoints.js";
+import { Loop, If } from "@specs-feup/clava/api/Joinpoints.js";
 import MISRAAnalyser from "../MISRAAnalyser.js";
-
 export default class Section14_ControlStmtExprs extends MISRAAnalyser {
-    ruleMapper: Map<number, (jp: Program | FileJp) => void>;
-
-    constructor(rules: number[]) {
+    ruleMapper;
+    constructor(rules) {
         super(rules);
         this.ruleMapper = new Map([
             [4, this.r14_4_essentiallyBooleanInControllingExpr.bind(this)]
         ]);
     }
-    
-    private r14_4_essentiallyBooleanInControllingExpr($startNode: Joinpoint) { //better way?
+    r14_4_essentiallyBooleanInControllingExpr($startNode) {
         Query.searchFrom($startNode, Loop).get().forEach(loop => {
-            if ((loop.cond as ExprStmt).expr.type.code !== "bool") {
-                this.logMISRAError(loop, `Loop controlling expression ${(loop.cond as ExprStmt).expr.code} does not have essentially boolean type.`);
+            if (loop.cond.expr.type.code !== "bool") {
+                this.logMISRAError(loop, `Loop controlling expression ${loop.cond.expr.code} does not have essentially boolean type.`);
             }
         }, this);
         Query.searchFrom($startNode, If).get().forEach(ifStmt => {
@@ -24,4 +21,5 @@ export default class Section14_ControlStmtExprs extends MISRAAnalyser {
             }
         }, this);
     }
-}
+}
+//# sourceMappingURL=Section14_ControlStmtExprs.js.map

package/dist/misra/sections/Section14_ControlStmtExprs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Section14_ControlStmtExprs.js","sourceRoot":"","sources":["../../../src/misra/sections/Section14_ControlStmtExprs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,sCAAsC,CAAC;AACzD,OAAO,EAAmB,IAAI,EAAa,EAAE,EAAY,MAAM,qCAAqC,CAAC;AACrG,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAEhD,MAAM,CAAC,OAAO,OAAO,0BAA2B,SAAQ,aAAa;IACjE,UAAU,CAA8C;IAExD,YAAY,KAAe;QACvB,KAAK,CAAC,KAAK,CAAC,CAAC;QACb,IAAI,CAAC,UAAU,GAAG,IAAI,GAAG,CAAC;YACtB,CAAC,CAAC,EAAE,IAAI,CAAC,yCAAyC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACjE,CAAC,CAAC;IACP,CAAC;IAEO,yCAAyC,CAAC,UAAqB;QACnE,KAAK,CAAC,UAAU,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACpD,IAAK,IAAI,CAAC,IAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBACpD,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,+BAAgC,IAAI,CAAC,IAAiB,CAAC,IAAI,CAAC,IAAI,0CAA0C,CAAC,CAAC;YACzI,CAAC;QACL,CAAC,EAAE,IAAI,CAAC,CAAC;QACT,KAAK,CAAC,UAAU,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACpD,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBACnC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,+BAA+B,MAAM,CAAC,IAAI,CAAC,IAAI,0CAA0C,CAAC,CAAC;YAC1H,CAAC;QACL,CAAC,EAAE,IAAI,CAAC,CAAC;IACb,CAAC;CACJ"}

package/dist/misra/sections/Section15_ControlFlow.d.ts

@@ -0,0 +1,14 @@
+import { Program, FileJp } from "@specs-feup/clava/api/Joinpoints.js";
+import MISRAAnalyser from "../MISRAAnalyser.js";
+export default class Section15_ControlFlow extends MISRAAnalyser {
+    ruleMapper: Map<number, (jp: Program | FileJp) => void>;
+    constructor(rules: number[]);
+    private r15_1_noGoto;
+    private static isBeforeInCode;
+    private r15_2_noBackJumps;
+    private r15_3_gotoBlockEnclosed;
+    private static addBreaksToExits;
+    private static addGotosToExits;
+    private r15_4_loopSingleBreak;
+}
+//# sourceMappingURL=Section15_ControlFlow.d.ts.map

package/dist/misra/sections/Section15_ControlFlow.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Section15_ControlFlow.d.ts","sourceRoot":"","sources":["../../../src/misra/sections/Section15_ControlFlow.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAyC,MAAM,qCAAqC,CAAC;AAC7G,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAEhD,MAAM,CAAC,OAAO,OAAO,qBAAsB,SAAQ,aAAa;IAC5D,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,OAAO,GAAG,MAAM,KAAK,IAAI,CAAC,CAAC;gBAE5C,KAAK,EAAE,MAAM,EAAE;IAU3B,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,MAAM,CAAC,cAAc;IAK7B,OAAO,CAAC,iBAAiB;IAQzB,OAAO,CAAC,uBAAuB;IA0B/B,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAa/B,OAAO,CAAC,MAAM,CAAC,eAAe;IAsB9B,OAAO,CAAC,qBAAqB;CAgBhC"}

package/dist/misra/sections/Section15_ControlFlow.js

@@ -0,0 +1,97 @@
+import Query from "@specs-feup/lara/api/weaver/Query.js";
+import { GotoStmt, LabelStmt, Break } from "@specs-feup/clava/api/Joinpoints.js";
+import MISRAAnalyser from "../MISRAAnalyser.js";
+export default class Section15_ControlFlow extends MISRAAnalyser {
+    ruleMapper;
+    constructor(rules) {
+        super(rules);
+        this.ruleMapper = new Map([
+            [1, this.r15_1_noGoto.bind(this)],
+            [2, this.r15_2_noBackJumps.bind(this)],
+            [3, this.r15_3_gotoBlockEnclosed.bind(this)],
+            [4, this.r15_4_loopSingleBreak.bind(this)]
+        ]);
+    }
+    r15_1_noGoto($startNode) {
+        Query.searchFrom($startNode, GotoStmt).get().forEach(goto => this.logMISRAError(goto, "goto statements should not be used."), this);
+        return [];
+    }
+    static isBeforeInCode(line1, col1, line2, col2) {
+        if (line1 < line2)
+            return true;
+        else
+            return col1 < col2;
+    }
+    r15_2_noBackJumps($startNode) {
+        for (const gotoStmt of Query.searchFrom($startNode, GotoStmt)) {
+            if (!Section15_ControlFlow.isBeforeInCode(gotoStmt.line, gotoStmt.column, gotoStmt.label.line, gotoStmt.label.column)) {
+                this.logMISRAError(gotoStmt, "Back jumps using goto statements are not allowed.");
+            } //maybe there is a better way?
+        }
+    }
+    r15_3_gotoBlockEnclosed($startNode) {
+        const labelMap = new Map();
+        Query.searchFrom($startNode, LabelStmt).get().forEach(stmt => labelMap.set(stmt.decl.astId, stmt.astId));
+        for (const gotoStmt of Query.searchFrom($startNode, GotoStmt)) {
+            let curr = gotoStmt.getAncestor("scope");
+            const ancestor = gotoStmt.getAncestor("function");
+            let error = true;
+            let temp;
+            do {
+                temp = curr;
+                if (curr.children.map(n => n.astId).includes(labelMap.get(gotoStmt.label.astId))) {
+                    error = false;
+                    break;
+                }
+                curr = curr.getAncestor("scope");
+            } while (temp.parent.astId !== ancestor.astId);
+            if (error) {
+                this.logMISRAError(gotoStmt, `Label ${gotoStmt.label.name} is not declared in a block enclosing the goto statement.`);
+            }
+        }
+    }
+    static addBreaksToExits($startNode, exits, nodes) {
+        for (const goto of Query.searchFrom($startNode, Break)) {
+            const ancestor = goto.getAncestor("loop");
+            if (ancestor && exits.has(ancestor.astId)) {
+                exits.set(ancestor.astId, (exits.get(ancestor.astId) ?? 0) + 1);
+            }
+            else if (ancestor) {
+                exits.set(ancestor.astId, 1);
+                nodes.set(ancestor.astId, ancestor);
+            }
+        }
+    }
+    static addGotosToExits($startNode, exits, nodes, labels) {
+        for (const goto of Query.searchFrom($startNode, GotoStmt)) {
+            let ancestor = goto.getAncestor("loop");
+            const labelAncestor = labels.get(goto.label.astId)?.getAncestor("loop");
+            while (ancestor) {
+                if (labelAncestor?.astId === ancestor.astId)
+                    break;
+                if (ancestor && exits.has(ancestor.astId)) {
+                    exits.set(ancestor.astId, (exits.get(ancestor.astId) ?? 0) + 1);
+                }
+                else if (ancestor) {
+                    exits.set(ancestor.astId, 1);
+                    nodes.set(ancestor.astId, ancestor);
+                }
+                ancestor = ancestor.getAncestor("loop");
+            }
+        }
+    }
+    r15_4_loopSingleBreak($startNode) {
+        const labelMap = new Map();
+        Query.searchFrom($startNode, LabelStmt).get().forEach(stmt => labelMap.set(stmt.decl.astId, stmt));
+        const exits = new Map();
+        const nodes = new Map();
+        Section15_ControlFlow.addBreaksToExits($startNode, exits, nodes);
+        Section15_ControlFlow.addGotosToExits($startNode, exits, nodes, labelMap);
+        exits.forEach((v, k, m) => {
+            if (v > 1) {
+                this.logMISRAError(nodes.get(k), "Loops should have at most one break/goto statement.");
+            }
+        }, this);
+    }
+}
+//# sourceMappingURL=Section15_ControlFlow.js.map

package/dist/misra/sections/Section15_ControlFlow.js.map

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

package/dist/misra/sections/Section16_SwitchStatements.d.ts

@@ -0,0 +1,13 @@
+import { Program, FileJp } from "@specs-feup/clava/api/Joinpoints.js";
+import MISRAAnalyser from "../MISRAAnalyser.js";
+export default class Section16_SwitchStatements extends MISRAAnalyser {
+    ruleMapper: Map<number, (jp: Program | FileJp) => void>;
+    constructor(rules: number[]);
+    private r16_1_16_3_wellFormedSwitch;
+    private r16_2_topLevelSwitchLabels;
+    private r16_4_switchHasDefault;
+    private r16_5_defaultFirstOrLast;
+    private r16_6_noTwoClauses;
+    private r16_7_noEssentialBooleanInSwitch;
+}
+//# sourceMappingURL=Section16_SwitchStatements.d.ts.map

package/dist/misra/sections/Section16_SwitchStatements.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Section16_SwitchStatements.d.ts","sourceRoot":"","sources":["../../../src/misra/sections/Section16_SwitchStatements.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAwE,MAAM,qCAAqC,CAAC;AAC5I,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAIhD,MAAM,CAAC,OAAO,OAAO,0BAA2B,SAAQ,aAAa;IACjE,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,OAAO,GAAG,MAAM,KAAK,IAAI,CAAC,CAAC;gBAE5C,KAAK,EAAE,MAAM,EAAE;IAW3B,OAAO,CAAC,2BAA2B;IA0BnC,OAAO,CAAC,0BAA0B;IAQlC,OAAO,CAAC,sBAAsB;IAK9B,OAAO,CAAC,wBAAwB;IAchC,OAAO,CAAC,kBAAkB;IAmC1B,OAAO,CAAC,gCAAgC;CA6C3C"}

package/{src/misra/sections/Section16_SwitchStatements.ts → dist/misra/sections/Section16_SwitchStatements.js}

@@ -1,13 +1,11 @@
 import Query from "@specs-feup/lara/api/weaver/Query.js";
-import { Program, FileJp, Switch, Break, Case, Joinpoint, BuiltinType, BoolLiteral, Expression } from "@specs-feup/clava/api/Joinpoints.js";
+import { Switch, Break, Case, BuiltinType, BoolLiteral } from "@specs-feup/clava/api/Joinpoints.js";
 import MISRAAnalyser from "../MISRAAnalyser.js";
 import Fix from "@specs-feup/clava/api/clava/analysis/Fix.js";
 import ClavaJoinPoints from "@specs-feup/clava/api/clava/ClavaJoinPoints.js";
-
 export default class Section16_SwitchStatements extends MISRAAnalyser {
-    ruleMapper: Map<number, (jp: Program | FileJp) => void>;
-
-    constructor(rules: number[]) {
+    ruleMapper;
+    constructor(rules) {
         super(rules);
         this.ruleMapper = new Map([
             [1, this.r16_1_16_3_wellFormedSwitch.bind(this)],
@@ -17,14 +15,13 @@ export default class Section16_SwitchStatements extends MISRAAnalyser {
             [7, this.r16_7_noEssentialBooleanInSwitch.bind(this)]
         ]);
     }
-
-    private r16_1_16_3_wellFormedSwitch($startNode: Joinpoint) {
+    r16_1_16_3_wellFormedSwitch($startNode) {
         for (const switchStmt of Query.searchFrom($startNode, Switch)) {
-    
             let foundStmt = false;
             let first = true;
             for (const child of switchStmt.children[1].children) {
-                if (child instanceof Break) {;
+                if (child instanceof Break) {
+                    ;
                     foundStmt = false;
                 }
                 else if (child instanceof Case) {
@@ -33,7 +30,6 @@ export default class Section16_SwitchStatements extends MISRAAnalyser {
                 else {
                     foundStmt = true;
                 }
-    
                 if (foundStmt && child.instanceOf("case")) {
                     this.logMISRAError(child, `A break is missing before ${child.code}`);
                 }
@@ -41,23 +37,19 @@ export default class Section16_SwitchStatements extends MISRAAnalyser {
             if (!switchStmt.children[1].lastChild.instanceOf("break")) {
                 this.logMISRAError(switchStmt.children[1].lastChild, "A break is missing at the end of the switch statement.");
             }
-        }   
+        }
     }
-
-    private r16_2_topLevelSwitchLabels($startNode: Joinpoint) {
+    r16_2_topLevelSwitchLabels($startNode) {
         Query.searchFrom($startNode, Case).get().forEach(caseLabel => {
             if (!caseLabel.currentRegion.instanceOf("switch")) {
-                this.logMISRAError(caseLabel, "A switch label can only be used if its enclosing compound statement is the switch statement itself.")
+                this.logMISRAError(caseLabel, "A switch label can only be used if its enclosing compound statement is the switch statement itself.");
             }
         }, this);
     }
-
-    private r16_4_switchHasDefault($startNode: Joinpoint) {
-        Query.searchFrom($startNode, Switch, {hasDefaultCase: false}).get().forEach(sw => this.logMISRAError(sw, "Switch statement is missing a default case."), this);
+    r16_4_switchHasDefault($startNode) {
+        Query.searchFrom($startNode, Switch, { hasDefaultCase: false }).get().forEach(sw => this.logMISRAError(sw, "Switch statement is missing a default case."), this);
     }
-    
-
-    private r16_5_defaultFirstOrLast($startNode: Joinpoint) {
+    r16_5_defaultFirstOrLast($startNode) {
         Query.searchFrom($startNode, Switch).get().forEach(switchStmt => {
             for (let i = 0; i < switchStmt.cases.length; i++) {
                 if (switchStmt.cases[i].isDefault && (i == 0 || i == switchStmt.cases.length)) {
@@ -70,8 +62,7 @@ export default class Section16_SwitchStatements extends MISRAAnalyser {
             }
         }, this);
     }
-
-    private r16_6_noTwoClauses($startNode: Joinpoint) {
+    r16_6_noTwoClauses($startNode) {
         Query.searchFrom($startNode, Switch).get().forEach(switchStmt => {
             let clauses = 0;
             let foundStmt = false;
@@ -88,67 +79,51 @@ export default class Section16_SwitchStatements extends MISRAAnalyser {
                     foundStmt = true;
                 }
             }
-
             if (clauses == 2) {
-                this.logMISRAError(switchStmt, "Switch statements should have more than two clauses.", new Fix(
-                    switchStmt,
-                    (switchStmt: Joinpoint) => {
-                        let firstClauseExpr: Expression;
-                        let secondClauseExpr: Expression;
-                        let firstClause: Joinpoint[] = [];
-                        let secondClause: Joinpoint[] = []
-                        for (const child of switchStmt.children[1].children) {
-                             
-                        }
+                this.logMISRAError(switchStmt, "Switch statements should have more than two clauses.", new Fix(switchStmt, (switchStmt) => {
+                    let firstClauseExpr;
+                    let secondClauseExpr;
+                    let firstClause = [];
+                    let secondClause = [];
+                    for (const child of switchStmt.children[1].children) {
                     }
-                ));
+                }));
             }
         }, this);
     }
-
-    private r16_7_noEssentialBooleanInSwitch($startNode: Joinpoint) { //is this the best way?
+    r16_7_noEssentialBooleanInSwitch($startNode) {
         Query.searchFrom($startNode, Switch).get().forEach(switchStmt => {
             if (switchStmt.condition.type instanceof BuiltinType && switchStmt.condition.type.builtinKind === "Bool") {
-                this.logMISRAError(switchStmt, `Switch statement controlling expression ${switchStmt.condition.code} must not have essentially boolean type.`, new Fix(
-                    switchStmt,
-                    (switchStmt) => {
-                        const trueClause: Joinpoint[] = [];
-                        const falseClause: Joinpoint[] = [];
-                        let inTrue: boolean = false;
-                        let inFalse: boolean = false;
-                        for (const child of switchStmt.children[1].children) {
-                            if (child instanceof Case && child.values.length == 1 && child.values[0].children[0] instanceof BoolLiteral && child.values[0].children[0].value) {
-                                inTrue = true;
-                                inFalse = false;
-                            }
-                            else if (child instanceof Case && child.values.length == 1 && child.values[0].children[0] instanceof BoolLiteral && !child.values[0].children[0].value) {
-                                inFalse = true;
-                                inTrue = false;
-                            }
-                            else if (child instanceof Break) {
-                                inTrue = false;
-                                inFalse = false;
-                            }
-
-                            if (inTrue && !(child instanceof Case)) {
-                                trueClause.push(child.deepCopy());
-                            }
-                            else if (inFalse && !(child instanceof Case)) {
-                                falseClause.push(child.deepCopy());
-                            }
+                this.logMISRAError(switchStmt, `Switch statement controlling expression ${switchStmt.condition.code} must not have essentially boolean type.`, new Fix(switchStmt, (switchStmt) => {
+                    const trueClause = [];
+                    const falseClause = [];
+                    let inTrue = false;
+                    let inFalse = false;
+                    for (const child of switchStmt.children[1].children) {
+                        if (child instanceof Case && child.values.length == 1 && child.values[0].children[0] instanceof BoolLiteral && child.values[0].children[0].value) {
+                            inTrue = true;
+                            inFalse = false;
+                        }
+                        else if (child instanceof Case && child.values.length == 1 && child.values[0].children[0] instanceof BoolLiteral && !child.values[0].children[0].value) {
+                            inFalse = true;
+                            inTrue = false;
+                        }
+                        else if (child instanceof Break) {
+                            inTrue = false;
+                            inFalse = false;
+                        }
+                        if (inTrue && !(child instanceof Case)) {
+                            trueClause.push(child.deepCopy());
+                        }
+                        else if (inFalse && !(child instanceof Case)) {
+                            falseClause.push(child.deepCopy());
                         }
-
-                        const ifStmt = ClavaJoinPoints.ifStmt(
-                            (switchStmt as Switch).condition,
-                            ClavaJoinPoints.scope(...trueClause),
-                            ClavaJoinPoints.scope(...falseClause)
-                        );
-
-                        switchStmt.replaceWith(ifStmt);
                     }
-                ));
+                    const ifStmt = ClavaJoinPoints.ifStmt(switchStmt.condition, ClavaJoinPoints.scope(...trueClause), ClavaJoinPoints.scope(...falseClause));
+                    switchStmt.replaceWith(ifStmt);
+                }));
             }
         }, this);
     }
-    
-}
+}
+//# sourceMappingURL=Section16_SwitchStatements.js.map

package/dist/misra/sections/Section16_SwitchStatements.js.map

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

package/dist/misra/sections/Section17_Functions.d.ts

@@ -0,0 +1,9 @@
+import { Program, FileJp } from "@specs-feup/clava/api/Joinpoints.js";
+import MISRAAnalyser from "../MISRAAnalyser.js";
+export default class Section17_Functions extends MISRAAnalyser {
+    protected ruleMapper: Map<number, (jp: Program | FileJp) => void>;
+    constructor(rules: number[]);
+    private r17_1_noStdargUsage;
+    private r17_7_returnValuesAreUsed;
+}
+//# sourceMappingURL=Section17_Functions.d.ts.map

package/dist/misra/sections/Section17_Functions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Section17_Functions.d.ts","sourceRoot":"","sources":["../../../src/misra/sections/Section17_Functions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAmD,MAAM,qCAAqC,CAAC;AACvH,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAKhD,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,aAAa;IAC1D,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,OAAO,GAAG,MAAM,KAAK,IAAI,CAAC,CAAC;gBAEtD,KAAK,EAAE,MAAM,EAAE;IAQ3B,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,yBAAyB;CAWpC"}

package/{src/misra/sections/Section17_Functions.ts → dist/misra/sections/Section17_Functions.js}

@@ -1,33 +1,30 @@
-import { Program, FileJp, Joinpoint, Include, Call, BuiltinType, ExprStmt } from "@specs-feup/clava/api/Joinpoints.js";
+import { Include, Call, BuiltinType, ExprStmt } from "@specs-feup/clava/api/Joinpoints.js";
 import MISRAAnalyser from "../MISRAAnalyser.js";
 import Query from "@specs-feup/lara/api/weaver/Query.js";
 import Fix from "@specs-feup/clava/api/clava/analysis/Fix.js";
 import ClavaJoinPoints from "@specs-feup/clava/api/clava/ClavaJoinPoints.js";
-
 export default class Section17_Functions extends MISRAAnalyser {
-    protected ruleMapper: Map<number, (jp: Program | FileJp) => void>;
-    
-    constructor(rules: number[]) {
+    ruleMapper;
+    constructor(rules) {
         super(rules);
         this.ruleMapper = new Map([
             [1, this.r17_1_noStdargUsage.bind(this)],
             [7, this.r17_7_returnValuesAreUsed.bind(this)]
         ]);
     }
-
-    private r17_1_noStdargUsage($startNode: Joinpoint) {
-        Query.searchFrom($startNode, Include, {name: "stdarg.h", isAngled: true}).get().forEach(include => this.logMISRAError(include, "Use of <stdarg.h> is not allowed."), this);
+    r17_1_noStdargUsage($startNode) {
+        Query.searchFrom($startNode, Include, { name: "stdarg.h", isAngled: true }).get().forEach(include => this.logMISRAError(include, "Use of <stdarg.h> is not allowed."), this);
     }
-
-    private r17_7_returnValuesAreUsed($startNode: Joinpoint) {
-        Query.searchFrom($startNode, Call, {returnType: (type) => !(type instanceof BuiltinType && type.isVoid)}).get().forEach(call => {
+    r17_7_returnValuesAreUsed($startNode) {
+        Query.searchFrom($startNode, Call, { returnType: (type) => !(type instanceof BuiltinType && type.isVoid) }).get().forEach(call => {
             console.log(call.parent);
             if (call.parent instanceof ExprStmt) {
                 this.logMISRAError(call, `Return value of ${call.signature} must be used. It can be discarded with an explicit cast to void.`, new Fix(call, ($jp) => {
-                    const newJp = ClavaJoinPoints.cStyleCast(ClavaJoinPoints.type("void"), $jp.deepCopy() as Call);
+                    const newJp = ClavaJoinPoints.cStyleCast(ClavaJoinPoints.type("void"), $jp.deepCopy());
                     $jp.replaceWith(newJp);
                 }));
             }
         }, this);
     }
-}
+}
+//# sourceMappingURL=Section17_Functions.js.map

package/dist/misra/sections/Section17_Functions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Section17_Functions.js","sourceRoot":"","sources":["../../../src/misra/sections/Section17_Functions.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AACvH,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAChD,OAAO,KAAK,MAAM,sCAAsC,CAAC;AACzD,OAAO,GAAG,MAAM,6CAA6C,CAAC;AAC9D,OAAO,eAAe,MAAM,gDAAgD,CAAC;AAE7E,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,aAAa;IAChD,UAAU,CAA8C;IAElE,YAAY,KAAe;QACvB,KAAK,CAAC,KAAK,CAAC,CAAC;QACb,IAAI,CAAC,UAAU,GAAG,IAAI,GAAG,CAAC;YACtB,CAAC,CAAC,EAAE,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACxC,CAAC,CAAC,EAAE,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACjD,CAAC,CAAC;IACP,CAAC;IAEO,mBAAmB,CAAC,UAAqB;QAC7C,KAAK,CAAC,UAAU,CAAC,UAAU,EAAE,OAAO,EAAE,EAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,mCAAmC,CAAC,EAAE,IAAI,CAAC,CAAC;IAC/K,CAAC;IAEO,yBAAyB,CAAC,UAAqB;QACnD,KAAK,CAAC,UAAU,CAAC,UAAU,EAAE,IAAI,EAAE,EAAC,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,YAAY,WAAW,IAAI,IAAI,CAAC,MAAM,CAAC,EAAC,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC3H,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACzB,IAAI,IAAI,CAAC,MAAM,YAAY,QAAQ,EAAE,CAAC;gBAClC,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,mBAAmB,IAAI,CAAC,SAAS,mEAAmE,EAAE,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE;oBACjJ,MAAM,KAAK,GAAG,eAAe,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,QAAQ,EAAU,CAAC,CAAC;oBAC/F,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;gBAC3B,CAAC,CAAC,CAAC,CAAC;YACR,CAAC;QACL,CAAC,EAAE,IAAI,CAAC,CAAC;IACb,CAAC;CACJ"}

package/dist/misra/sections/Section18_PointersAndArrays.d.ts

@@ -0,0 +1,13 @@
+import { Program, FileJp } from "@specs-feup/clava/api/Joinpoints.js";
+import MISRAAnalyser from "../MISRAAnalyser.js";
+export default class Section18_PointersAndArrays extends MISRAAnalyser {
+    ruleMapper: Map<number, (jp: Program | FileJp) => void>;
+    constructor(rules: number[]);
+    private r18_4_noPointerArithmetic;
+    private static getDepth;
+    private static getUnderlyingType;
+    private r18_5_noExcessivePointerNesting;
+    private r18_7_noFlexibleArrayMembers;
+    private r18_8_noVariableLengthArrays;
+}
+//# sourceMappingURL=Section18_PointersAndArrays.d.ts.map

package/dist/misra/sections/Section18_PointersAndArrays.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Section18_PointersAndArrays.d.ts","sourceRoot":"","sources":["../../../src/misra/sections/Section18_PointersAndArrays.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAqG,MAAM,qCAAqC,CAAC;AACzK,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAEhD,MAAM,CAAC,OAAO,OAAO,2BAA4B,SAAQ,aAAa;IAClE,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,OAAO,GAAG,MAAM,KAAK,IAAI,CAAC,CAAC;gBAE5C,KAAK,EAAE,MAAM,EAAE;IAU3B,OAAO,CAAC,yBAAyB;IAOjC,OAAO,CAAC,MAAM,CAAC,QAAQ;IAkBvB,OAAO,CAAC,MAAM,CAAC,iBAAiB;IAgBhC,OAAO,CAAC,+BAA+B;IAgCvC,OAAO,CAAC,4BAA4B;IASpC,OAAO,CAAC,4BAA4B;CAQvC"}