Merge pull request #6 from amtl/node6

update remodel lib so it works with node 6
facebookarchive · May 5, 2016 · 004d510 · 004d510
2 parents 7a28185 + dc93346
commit 004d510
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/js/object-mona-parser/algebraic-type/algebraic-type-parser.js b/src/js/object-mona-parser/algebraic-type/algebraic-type-parser.js
@@ -61,18 +61,18 @@ function parse(fileInput) {
     if (parsedType == null) {
       throw "parsed type came back as null";
     }
+    return {
+      errorReason: null,
+      isValid: true,
+      type: parsedType
+    };
   } catch (e) {
     return {
       errorReason:e.message,
       isValid:false,
       type: null
     };
   }
-  return {
-    errorReason: null,
-    isValid: true,
-    type: parsedType
-  };
 }
 
 module.exports = {

diff --git a/src/js/object-mona-parser/value-object/value-object-parser.js b/src/js/object-mona-parser/value-object/value-object-parser.js
@@ -18,6 +18,11 @@ const parseCommon = require('../object-parser-common');
 function parse(fileInput) {
   try {
     const parsedType = mona.parse(parseCommon.parseNamedAttributeGroupWithIncludes(), fileInput);
+    return {
+      errorReason: null,
+      isValid: true,
+      foundType: parsedType
+    };
   } catch (e) {
     return {
       errorReason:e.message,
@@ -26,11 +31,6 @@ function parse(fileInput) {
     };
   }
 
-  return {
-    errorReason: null,
-    isValid: true,
-    foundType: parsedType
-  };
 }
 
 module.exports = {