First instruction has now also 0 as adress

+ Minor code style improvements

Author: dgc08

js/flowchart.js

@@ -57,7 +57,7 @@ function generateFlowChartCode() {
   code = `start=>start: Start\n`;
 
   source.forEach((cmd, index) => {
-    const line = index + 1;
+    const line = index;
     let nodetype = 'operation';
 
     if (cmd.startsWith('dec')) {
@@ -75,7 +75,7 @@ function generateFlowChartCode() {
 
   code += `\nstart->node1\n`;
   source.forEach((cmd, index) => {
-    const line = index + 1;
+    const line = index;
 
     if (cmd.startsWith('tst')) {
       code += `node${line}(yes)->node${line + 1}\n`;

js/simulator.js

@@ -63,7 +63,11 @@ function executeLine() {
   // setup pointer
   const pointer = document.getElementById('pointer');
 
+<<<<<<< ours
   const content = code[line - 1];
+=======
+  const content = code[line];
+>>>>>>> theirs
   const cmd = content.substring(0, 3);
   const param = parseInt(content.substring(3, content.length));
 
@@ -74,7 +78,7 @@ function executeLine() {
   for (let i = 0; i < lines.length; i++) {
     const lineContent = lines[i];
     if (lineContent != '' && !lineContent.startsWith(';')) linesOfCode++; // check if this line is code
-    if (linesOfCode == line) {
+    if (linesOfCode-1 == line) {
       pointer.style.top = i * 20 - 4 + 'pt';
       break;
     }
@@ -84,11 +88,20 @@ function executeLine() {
   switch (cmd) {
     case 'jmp':
       line = param;
+<<<<<<< ours
       break;
+=======
+      return
+>>>>>>> theirs
 
     case 'tst':
-      // If register doesnt exist or is null, skip next line
-      if (registers[param] == null || registers[param] == 0) line++;
+    checkRegisterCount(param);
+      if (registers[param]==0)
+        line++;
+      if (registers[param] == null){
+        line++;
+        registers[param] = 0;
+      }
       break;
 
     case 'hlt':