Fix warning and error management of apio verilator linter

FPGAwars · Dec 26, 2024 · 29b0cf8 · 29b0cf8
1 parent c3347b3
commit 29b0cf8
Show file tree

Hide file tree

Showing 8 changed files with 801 additions and 65 deletions.
diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -46,7 +46,6 @@
   "engines": {},
   "node": ">= 21.1.0",
   "dependencies": {
-
     "ace-builds": "~1.4.12",
     "adm-zip": "0.4.7",
     "alertifyjs": "~1.13.1",
@@ -76,6 +75,7 @@
     "node-emoji": "~1.8.1",
     "node-lang-info": "~0.2.1",
     "openurl": "~1.1.1",
+    "proper-lockfile": "^4.1.2",
     "rmdir": "~1.2.0",
     "rsyncwrapper": "~2.0.1",
     "select2": "~4.1.0-rc.0",
@@ -87,9 +87,8 @@
     "sudo-prompt": "~8.2.0",
     "svg-pan-zoom": "~3.4.1",
     "svgo": "~0.7.2",
-    "tmp": "0.0.33",
-    "proper-lockfile": "^4.1.2",
-    "sweetalert2": "^11.14.4"
+    "sweetalert2": "^11.14.4",
+    "tmp": "0.0.33"
   },
   "readme": "../README.md",
   "keywords": [

diff --git a/app/scripts/graphics/joint.shapes.js b/app/scripts/graphics/joint.shapes.js
@@ -2819,6 +2819,7 @@ joint.shapes.ice.WireView = joint.dia.LinkView.extend({
     joint.dia.LinkView.prototype.initialize.apply(this, arguments);
 
     var self = this;
+
     setTimeout(function () {
       var size = self.model.get("size");
 
@@ -2841,7 +2842,7 @@ joint.shapes.ice.WireView = joint.dia.LinkView.extend({
       }
 
       self.updateWireProperties(size);
-      self.updateBifurcations();
+      self.updateBifurcations();i
     }, 0);
   },
 

diff --git a/app/scripts/services/graph.js b/app/scripts/services/graph.js
@@ -1518,7 +1518,9 @@ function updateWiresOnObstacles() {
                         commandManager.listen();
                     }
 
-                                    self.fitContent();
+
+                                self.updateWires();
+                                self.fitContent();
 
                                 this.enableAutoRouting();
                     if (callback) {

diff --git a/app/scripts/services/tools.js b/app/scripts/services/tools.js
@@ -910,7 +910,7 @@ angular
                     });
                   }
                 }else{
-                  let re = /%Error:\s+(\w+\.v):(\d+):(\d+):\s*(syntax error,.*)$/gm;
+                  re = /%Error:\s+(\w+\.v):(\d+):(\d+):\s*(syntax error,.*)$/gm;
 
                   while ((matchError = re.exec(stdout))) {
                     codeErrors.push({
@@ -920,7 +920,16 @@ angular
                     });
                   }
 
-                  console.log('ERROR_TASK',code);
+                   re = /%(Error|Warning)(-[A-Z0-9]+)?: main\.v:(\d+):(\d+): (.*?)[\r\n]/g;
+while ((matchError = re.exec(stdout))) {
+  codeErrors.push({
+    line: parseInt(matchError[3]),
+    msg: matchError[5].trim(),
+    type: matchError[1].toLowerCase() // Convert 'Error' or 'Warning' to lowercase for type
+  });
+}
+                  console.log('ERRORS',codeErrors);
+                  //console.log('ERROR_TASK',code);
                 } 
 
                 // - Yosys errors

diff --git a/app/scripts/services/utils.js b/app/scripts/services/utils.js
@@ -440,7 +440,7 @@ angular.module('icestudio')
             iceConsole.log("APIO VERSION "+common.APIO_VERSION+' / '+iceStudio.toolchain.apio);
 
           if(iceStudio.toolchain.apio >= '0.9.6' || common.APIO_VERSION === common.APIO_VERSION_DEV){
-              let args='--install';
+              let args='install';
               let edge='packages';
              /* switch(pkg){
               case 'drivers':