Fix line number bug in runtime error handling

probmods · Oct 24, 2016 · 70882ed · 70882ed
1 parent b005d2c
commit 70882ed
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/docs/index.html b/docs/index.html
@@ -1710,6 +1710,13 @@
     <div class="col">
       <h3>error handling</h3>
 
+      runtime error:
+      <pre><code>var x = 3;
+observe()
+55
+      </code></pre>
+
+
       syntax - unmatched open bracket:
       <pre><code>flip(</code></pre>
 

diff --git a/docs/webppl-editor.js b/docs/webppl-editor.js
@@ -42758,7 +42758,7 @@ var CodeEditor = React.createClass({
           // We can use the following information for highlighting a
           // suitable point in the user program.
           var wpplError = error.wpplError,
-              lineNumber = wpplError.lineNumber,
+              lineNumber = wpplError.lineNumber - 1,
               columnNumber = wpplError.columnNumber,
               endColumn = wpplError.name ? columnNumber + wpplError.name.length : Infinity;
           var cm = comp.refs.editor.getCodeMirror();
@@ -42775,7 +42775,7 @@ var CodeEditor = React.createClass({
 
         var re_line = /Line ([0-9]+): /;
         if (re_line.test(message)) {
-          var line = re_line.exec(message)[1] - 1;
+          var line = parseInt(re_line.exec(message)[1]) - 1;
           cm.markText({ line: line, ch: 0 }, { line: line, ch: Infinity }, { className: "CodeMirrorError", clearOnEnter: true });
         }
         e.message = "Syntax error: " + e.message.replace(re_line, "");

diff --git a/src/index.js b/src/index.js
@@ -427,7 +427,7 @@ var CodeEditor = React.createClass({
           // We can use the following information for highlighting a
           // suitable point in the user program.
           var wpplError = error.wpplError,
-              lineNumber = wpplError.lineNumber,
+              lineNumber = wpplError.lineNumber - 1,
               columnNumber = wpplError.columnNumber,
               endColumn = wpplError.name ? columnNumber + wpplError.name.length : Infinity;
           var cm = comp.refs.editor.getCodeMirror();
@@ -448,7 +448,7 @@ var CodeEditor = React.createClass({
 
         var re_line = /Line ([0-9]+): /;
         if (re_line.test(message)) {
-          var line = re_line.exec(message)[1] - 1;
+          var line = parseInt(re_line.exec(message)[1]) - 1;
           cm.markText({line: line, ch: 0},
                       {line: line, ch: Infinity},
                       {className: "CodeMirrorError", clearOnEnter: true});