Merge pull request #308 from charliva/pr-better-errors

Fix issue #307, improve regular expression to parse error messages
FPGAwars · Feb 8, 2019 · a2f294d · a2f294d
2 parents b7460f8 + 74920df
commit a2f294d
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/app/scripts/services/tools.js b/app/scripts/services/tools.js
@@ -469,22 +469,21 @@ angular.module('icestudio')
 
               // - Yosys syntax errors
               // - main.v:31: ERROR: #...
-              re = /\smain\.v:([0-9]+):\s(.*?)(ERROR):\s(.*?), (.*?)[\r|\n]/g;
+              re = /\smain\.v:([0-9]+):\s(.*?)(ERROR):\s(.*?)[\r|\n]/g;
               while (matchError = re.exec(stdout)) {
 
                 var msg = '';
                 var line = parseInt(matchError[1]);
                 var type = matchError[3].toLowerCase();
-                var preContent = matchError[5];
-                var postContent = matchError[4];
+                var preContent = matchError[4];
 
                 // If the error is about an unexpected token, the error is not
                 // deterministic, therefore we indicate that "the error
                 //is around this line ..."
                 if (preContent.indexOf('unexpected TOK_')>=0) {
                     msg = 'Syntax error arround this line';
                 }else{
-                  msg = preContent+': '+postContent;
+                  msg = preContent;
                 }
                 codeErrors.push( {
                   line: line,