From 6885aeba2f1d00925af3df67048e8c12849c2b11 Mon Sep 17 00:00:00 2001
From: Sorrel Bri <sorrel.bri.june@gmail.com>
Date: Wed, 19 Feb 2020 23:18:18 -0800
Subject: [PATCH] add error check for unknown tokens in feature portions of
 rules

---
 src/reducers/reducer.results.js      | 100 +++++++++++++++++----------
 src/reducers/reducer.results.test.js |   6 ++
 2 files changed, 71 insertions(+), 35 deletions(-)

diff --git a/src/reducers/reducer.results.js b/src/reducers/reducer.results.js
index 33fe83d..9ba5027 100644
--- a/src/reducers/reducer.results.js
+++ b/src/reducers/reducer.results.js
@@ -89,20 +89,39 @@ const decomposeRule = (rule: string, index: number): ruleBundle => {
   }
 }
 
+const doesFeatureRuleContainUnknownToken = features => {
+  const unknownTokens = features
+  .match(/\W/g)
+  .filter(v => v !== '-' && v !== '+' && v !== ']' && v !== '[' && v !== ' ')
+  if (unknownTokens.length) throw `Unknown token '${unknownTokens[0]}'`;
+  return true
+}
+
 const getPositiveFeatures = phoneme => {
-  const positiveFeatures = phoneme.match(/(?=\+.).*(?<=\-)|(?=\+.).*(?!\-).*(?<=\])/g)
-  return positiveFeatures ? positiveFeatures[0]
-  .trim().match(/\w+/g)
-  .reduce((map, feature) => ({...map, [feature]: true}), {})
-  : {}
+  try {
+    const positiveFeatures = phoneme.match(/(?=\+.).*(?<=\-)|(?=\+.).*(?!\-).*(?<=\])/g)
+    if (positiveFeatures) doesFeatureRuleContainUnknownToken(positiveFeatures[0])
+    return positiveFeatures ? positiveFeatures[0]
+    .trim().match(/\w+/g)
+    .reduce((map, feature) => ({...map, [feature]: true}), {})
+    : {}
+  } catch (err) {
+    throw err;
+  }
 }
 
 const getNegativeFeatures = phoneme => {
-  const negativeFeatures = phoneme.match(/(?=\-.).*(?<=\+)|(?=\-.).*(?!\+).*(?<=\])/g)
-  return negativeFeatures ? negativeFeatures[0]
-  .trim().match(/\w+/g)
-  .reduce((map, feature) => ({...map, [feature]: false}), {})
-  : {}
+  try {
+    const negativeFeatures = phoneme.match(/(?=\-.).*(?<=\+)|(?=\-.).*(?!\+).*(?<=\])/g)
+    if (negativeFeatures) doesFeatureRuleContainUnknownToken(negativeFeatures[0])
+    return negativeFeatures ? negativeFeatures[0]
+    .trim()
+    .match(/\w+/g)
+    .reduce((map, feature) => ({...map, [feature]: false}), {})
+    : {}
+  } catch (err) {
+    throw err;
+  }
 }
 
 const mapToPositiveAndNegativeFeatures = phoneme => (
@@ -114,28 +133,36 @@ const mapStringToFeatures = (ruleString, phones) => {
     if (ruleString === '#') return ['#']
     if (ruleString === '0') return [];
     const ruleBrackets = ruleString.match(/\[.*\]/)
-    if (ruleBrackets) {
-      return ruleString
+    try {
+      if (ruleBrackets) {
+        return ruleString
         .split('[')
         // filter out empty strings
         .filter(v => v)
         .map(mapToPositiveAndNegativeFeatures)
+      }
+      return findFeaturesFromGrapheme(phones, ruleString);
+    } catch (err) {
+      throw err;
     }
-    return findFeaturesFromGrapheme(phones, ruleString);
   }
   return {};
 }
 
-const mapRuleBundleToFeatureBundle =  phones => ruleBundle => {
+const mapRuleBundleToFeatureBundle =  phones => ( ruleBundle, index ) => {
   // for each object in ruleBundle, map values to array of objects with feature-boolean key-value pairs
-  const { newFeatures, environment:{ pre, position, post } } = ruleBundle;
-  return {
-    environment: {
-      pre: mapStringToFeatures(pre, phones),
-      position: mapStringToFeatures(position, phones),
-      post: mapStringToFeatures(post, phones),
-    },
-    newFeatures: mapStringToFeatures(newFeatures, phones)
+  try {
+    const { newFeatures, environment:{ pre, position, post } } = ruleBundle;
+    return {
+      environment: {
+        pre: mapStringToFeatures(pre, phones),
+        position: mapStringToFeatures(position, phones),
+        post: mapStringToFeatures(post, phones),
+      },
+      newFeatures: mapStringToFeatures(newFeatures, phones)
+    }
+  } catch (err) {
+    throw errorMessage`Error in line ${index + 1}: ${err}`;
   }
 }
 
@@ -228,18 +255,21 @@ const stringifyResults = lexemeBundle => Object.entries(lexemeBundle).map(getGra
 export const run = (state: stateType, action: resultsAction): stateType => {
 
   // TODO iterate through each epoch
-  const epoch = state.epochs[0];
-
-  const { phones, lexicon, features } = state;
-
-  const ruleBundle = decomposeRules(epoch, phones);
-  const lexiconBundle = formBundleFromLexicon(lexicon)(phones); 
-  const passResults = transformLexicon(lexiconBundle)(ruleBundle)(features);
-  const stringifiedPassResults = passResults.map(stringifyResults);
-  const pass = {
-    pass: epoch.name,
-    lexicon: stringifiedPassResults
+  try {
+    const epoch = state.epochs[0];
+    const { phones, lexicon, features } = state;
+    
+    const ruleBundle = decomposeRules(epoch, phones);
+    const lexiconBundle = formBundleFromLexicon(lexicon)(phones); 
+    const passResults = transformLexicon(lexiconBundle)(ruleBundle)(features);
+    const stringifiedPassResults = passResults.map(stringifyResults);
+    const pass = {
+      pass: epoch.name,
+      lexicon: stringifiedPassResults
+    }
+    
+    return {...state, results: [pass] }
+  } catch (err) {
+    return err;
   }
-
-  return {...state, results: [pass] }
 }
\ No newline at end of file
diff --git a/src/reducers/reducer.results.test.js b/src/reducers/reducer.results.test.js
index 88c521c..2e7a711 100644
--- a/src/reducers/reducer.results.test.js
+++ b/src/reducers/reducer.results.test.js
@@ -55,6 +55,12 @@ describe('Results', () => {
     expect(decomposeRules(epoch, phones)).toEqual("Error in line 1: Too many '_' operators");
   })
 
+  it('rule with incorrect feature syntax returns helpful error message', () => {
+    const { phones } = initState();
+    const epoch = { name: 'error epoch', changes: [ '[+ occlusive - nasal = obstruent]>n/_' ] }
+    expect(decomposeRules(epoch, phones)).toEqual("Error in line 1: Unknown token '='");
+  })
+
   it('expect transform lexeme to apply rule to lexeme', () => {
     const lexemeBundle = getlexemeBundle();
     const resultsLexeme = [...lexemeBundle]