OFFN, LIMS parse without values

staniska · Nov 13, 2020 · 0b9bafb · 0b9bafb
1 parent ff5ee04
commit 0b9bafb
Showing 1 changed file with 25 additions and 2 deletions.
diff --git a/lib/interpretator.js b/lib/interpretator.js
@@ -9,7 +9,6 @@ import {replacements} from "./replacements";
 import {insertRnd, insertChr} from './element-insert';
 import stringParse from './stringParse';
 
-
 const myMath = new sinumerikMath();
 
 export function progParser(lastLineNum) {
@@ -237,6 +236,7 @@ function parseDataClear(programName) {
 }
 
 function parseRows(programText, programName, variables) {
+
     console.log('parseRows for ' + programName);
     // console.log(programText);
 
@@ -325,7 +325,9 @@ function parseRows(programText, programName, variables) {
 
             var primitives = generatePrimitives(rowText, programName, row);
 
+
             if (primitives) {
+
                 for (let i = 0; i < primitives.length; i++) {
 
                     for (var iter in primitives[i].operators) {
@@ -1423,7 +1425,7 @@ function generateCanvasPrimitives(primitives, programName, row) {
                     var elements = insertChr(View.sinumerikView.parseData.prevMove[0], canvasElement, programName);
                     if (View.sinumerikView.parseData.prevMove[0].type == 'G1') {
                         View.sinumerikView.parseData.prevMove[0].toolRadiusCompensation = View.sinumerikView.parseData.toolRadiusCompensation;
-                        View.sinumerikView.parseData.canvas.push(View.sinumerikView.parseData.prevMove[0]);
+                        // View.sinumerikView.parseData.canvas.push(View.sinumerikView.parseData.prevMove[0]);
                     }
                     View.sinumerikView.parseData.prevMove.shift();
                 }
@@ -2173,6 +2175,27 @@ function generatePrimitives(rowText, programName, progRowNum) {
     }
     //endregion
 
+    //region OFFN
+    regEx = /(?<!\w)OFFN(?!\w)/;
+    if (regEx.exec(programRow)) {
+        primitives[0].operators[0] = {};
+        primitives[0].operators[0].type = 'OFFN';
+        console.log('OFFN');
+        return primitives;
+    }
+    //endregion
+
+    //region LIMS
+    regEx = /(?<!\w)LIMS(?!\w)/;
+    if (regEx.exec(programRow)) {
+        primitives[0].operators[0] = {};
+        primitives[0].operators[0].type = 'LIMS';
+        console.log('LIMS');
+        return primitives;
+    }
+    //endregion
+
+
     for (let i = 0; i < splitRow.length; i ++) {
         primitives[0].operators[i] = {};