Merge pull request #4 from codefori/fix/chars_in_string

Fix string parsing issues and add additional test case

Author: worksofliam

src/dspf.js

@@ -264,7 +264,7 @@ class DisplayFile {
     if (value.length > 0) {
       value += ` `;
 
-      let inBrakcets = 0;
+      let inBrackets = 0;
       let word = ``;
       let innerValue = ``;
       let inString = false;
@@ -273,13 +273,13 @@ class DisplayFile {
         switch (value[i]) {
         case `+`:
         case `-`:
-          if (!inString && value[i+1] !== newLineMark) {
+          if (value[i+1] !== newLineMark) {
             innerValue += value[i];
           }
           break;
 
         case `'`:
-          if (inBrakcets > 0) {
+          if (inBrackets > 0) {
             innerValue += value[i];
           } else {
             if (inString) {
@@ -294,15 +294,23 @@ class DisplayFile {
           break;
 
         case `(`:
-          inBrakcets++;
+          if (inString) {
+            innerValue += value[i];
+          } else {
+            inBrackets++;
+          }
           break;
         case `)`:
-          inBrakcets--;
+          if (inString) {
+            innerValue += value[i];
+          } else {
+            inBrackets--;
+          }
           break;
 
         case newLineMark:
         case ` `:
-          if (inBrakcets > 0 || inString) {
+          if (inBrackets > 0 || inString) {
             if (value[i] !== newLineMark) {
               innerValue += value[i];
             }
@@ -324,7 +332,7 @@ class DisplayFile {
           if (value[i] === newLineMark) conditionalLine += 1;
           break;
         default:
-          if (inBrakcets > 0 || inString) 
+          if (inBrackets > 0 || inString) 
             innerValue += value[i];
           else
             word += value[i];

test/file/issue1382.js

@@ -0,0 +1,6 @@
+exports.lines = [
+  `     A                                      DSPSIZ(27 132 *DS4)`,
+  `     A          R SCRN2`,
+  `     A                                  2  2'This text containt parentheses (Y/N)'`,
+  `     A                                  3  2'This text containt dashes -Y/N-'`,
+];

test/tests.js

@@ -4,6 +4,7 @@ const { DisplayFile } = require("../src/dspf");
 const depts = require("./file/depts");
 const replloadfm = require("./file/replloadfm");
 const issue1149 = require(`./file/issue1149`);
+const issue1382 = require(`./file/issue1382`);
 
 exports.simple = () => {
   const file = new DisplayFile();
@@ -151,4 +152,25 @@ exports.issue1149 = () => {
 
   const windowTitle = windowFormat.keywords.find(keyword => keyword.name === `WDWTITLE`);
   assert.strictEqual(windowTitle.value, `*TEXT 'Print accounts by store number for status type - Help' *COLOR WHT`);
+
+  const text4 = windowFormat.fields.find(field => field.name === `TEXT4`);
+  assert.ok(text4);
+  assert.strictEqual(text4.value, `taken a check from that account.  You can only select one status type`);
+  assert.deepStrictEqual(text4.position, {x: 2, y: 5});
+}
+
+exports.issue1382 = () => {
+  const file = new DisplayFile();
+  file.parse(issue1382.lines);
+
+  const screenFormat = file.formats[1];
+  assert.strictEqual(screenFormat.name, `SCRN2`);
+
+  const textField1 = screenFormat.fields[0];
+  assert.strictEqual(textField1.name, `TEXT1`);
+  assert.strictEqual(textField1.value, `This text containt parentheses (Y/N)`);
+
+  const textField2 = screenFormat.fields[1];
+  assert.strictEqual(textField2.name, `TEXT2`);
+  assert.strictEqual(textField2.value, `This text containt dashes -Y/N-`);
 }