Merge pull request #51 from vsmalladi/33-unrecognzied-symbols

Updated regex to not get hung up in 2 in H2O units. #33
gentooboontoo · Oct 1, 2015 · 3a18ec8 · 3a18ec8
2 parents 6d72047 + 9f69260
commit 3a18ec8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/spec/quantitiesSpec.js b/spec/quantitiesSpec.js
@@ -115,6 +115,16 @@ describe("js-quantities", function() {
       expect(qty.denominator).toEqual(["<1>"]);
     });
 
+    it("should create pressure units in term of height of water", function() {
+      var qty = Qty("1 inH2O");
+      expect(qty.scalar).toBe(1);
+      expect(qty.numerator).toEqual(["<inh2o>"]);
+
+      qty = Qty("1 cmH2O");
+      expect(qty.scalar).toBe(1);
+      expect(qty.numerator).toEqual(["<cmh2o>"]);
+    });
+
     it("should create with denominator", function() {
       var qty = Qty("1 m/s");
       expect(qty.scalar).toBe(1);

diff --git a/src/quantities.js b/src/quantities.js
@@ -305,8 +305,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
   var QTY_STRING = "(" + SIGNED_NUMBER + ")?" + "\\s*([^/]*)(?:\/(.+))?";
   var QTY_STRING_REGEX = new RegExp("^" + QTY_STRING + "$");
   var POWER_OP = "\\^|\\*{2}";
-  var TOP_REGEX = new RegExp ("([^ \\*]+?)(?:" + POWER_OP + ")?(-?\\d+)");
-  var BOTTOM_REGEX = new RegExp("([^ \\*]+?)(?:" + POWER_OP + ")?(\\d+)");
+  var TOP_REGEX = new RegExp ("([^ \\*]+?)(?:" + POWER_OP + ")?(-?\\d+(?![a-zA-Z]))");
+  var BOTTOM_REGEX = new RegExp("([^ \\*]+?)(?:" + POWER_OP + ")?(\\d+(?![a-zA-Z]))");
 
   var SIGNATURE_VECTOR = ["length", "time", "temperature", "mass", "current", "substance", "luminosity", "currency", "information", "angle", "capacitance"];
   var KINDS = {