Change keyword parsing

Signed-off-by: Liam Allan <[email protected]>

Author: worksofliam

src/dspf.js

@@ -256,41 +256,7 @@ class DisplayFile {
       conditions: []
     };
 
-    let inString = false;
-    let value = ``;
-  
-    keywordStrings.forEach(keywordString => {
-      if (keywordString.startsWith(`'`)) {
-        inString = true;
-        keywordString = keywordString.substring(1);
-  
-        if (keywordString.endsWith(`'`) || keywordString.endsWith(`-`)) {
-          keywordString = keywordString.substring(0, keywordString.length - 1);
-        }
-  
-        result.value = keywordString;
-        value += `!`;
-        return;
-      }
-  
-      if (keywordString.endsWith('-')) {
-        if (inString)
-          result.value += keywordString.substring(0, keywordString.length - 1);
-        else
-          value += keywordString.substring(0, keywordString.length - 1);
-      } else 
-      if (keywordString.endsWith(`'`)) {
-        if (inString) {
-          result.value += keywordString.substring(0, keywordString.length - 1);
-          inString = false; 
-        }
-      } else {
-        value += keywordString + ` `;
-      }
-
-      value += `!`;
-    });
-
+    let value = keywordStrings.join(` !`) + ` !`;
     let conditionalLine = 1;
 
     if (value.length > 0) {
@@ -299,24 +265,45 @@ class DisplayFile {
       let inBrakcets = 0;
       let word = ``;
       let innerValue = ``;
+      let inString = false;
 
       for (let i = 0; i < value.length; i++) {
         switch (value[i]) {
+        case `+`:
+        case `-`:
+          if (!inString) {
+            innerValue += value[i];
+          }
+          break;
+          
         case `!`:
-          if (inBrakcets > 0) {
+          if (inBrakcets > 0 && !inString) {
             innerValue += value[i];
           } else {
             conditionalLine += 1;
           }
           break;
+
+        case `'`:
+          if (inString) {
+            inBrakcets = 0;
+            inString = false;
+
+            result.value = innerValue;
+            innerValue = ``;
+          } else {
+            inString = true;
+          }
+          break;
+
         case `(`:
           inBrakcets++;
           break;
         case `)`:
           inBrakcets--;
           break;
         case ` `:
-          if (inBrakcets > 0) {
+          if (inBrakcets > 0 || inString) {
             innerValue += value[i];
           } else {
             if (word.length > 0) {
@@ -334,7 +321,7 @@ class DisplayFile {
           }
           break;
         default:
-          if (inBrakcets > 0) 
+          if (inBrakcets > 0 || inString) 
             innerValue += value[i];
           else
             word += value[i];