@lhncbc/ucum-lhc 4.2.0 → 5.0.2

package/source-cjs/unitString.js

@@ -4,26 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.UnitString = void 0;
-
 var intUtils_ = _interopRequireWildcard(require("./ucumInternalUtils.js"));
-
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
-
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 /**
  * This class handles the parsing of a unit string into a unit object
  */
-var Ucum = require('./config.js').Ucum;
 
+var Ucum = require('./config.js').Ucum;
 var Unit = require('./unit.js').Unit;
-
 var UnitTables = require('./unitTables.js').UnitTables;
-
 var PrefixTables = require('./prefixTables.js').PrefixTables;
-
 class UnitString {
   /**
    * Constructor
@@ -31,43 +23,52 @@ class UnitString {
   constructor() {
     // Get instances of the unit and prefix tables and the utilities
     this.utabs_ = UnitTables.getInstance();
-    this.pfxTabs_ = PrefixTables.getInstance(); // Set emphasis characters to defaults.  These are used to emphasize
+    this.pfxTabs_ = PrefixTables.getInstance();
+
+    // Set emphasis characters to defaults.  These are used to emphasize
     // certain characters or strings in user messages.  They can be reset in
     // the useHTMLInMessages method.
-
     this.openEmph_ = Ucum.openEmph_;
-    this.closeEmph_ = Ucum.closeEmph_; // Set the braces message to blank.  This message is displayed for each
+    this.closeEmph_ = Ucum.closeEmph_;
+
+    // Set the braces message to blank.  This message is displayed for each
     // validation request on the web page, but is included separately as
     // a note on the validation spreadsheet.  The useBraceMsgForEachString
     // method should be used to set the message to be displayed for each
     // unit string.
+    this.bracesMsg_ = '';
 
-    this.bracesMsg_ = ''; // Set the flags used, with indices, as place holders in unit strings
+    // Set the flags used, with indices, as place holders in unit strings
     // for parenthetical strings and strings within braces.
-
     this.parensFlag_ = "parens_placeholder"; // in lieu of Jehoshaphat
-
     this.pFlagLen_ = this.parensFlag_.length;
     this.braceFlag_ = "braces_placeholder"; // in lieu of Nebuchadnezzar
+    this.bFlagLen_ = this.braceFlag_.length;
 
-    this.bFlagLen_ = this.braceFlag_.length; // Initialize the message start/end strings, which will be set when
+    // Initialize the message start/end strings, which will be set when
     // parseString is called.
-
     this.vcMsgStart_ = null;
-    this.vcMsgEnd_ = null; // Arrays used by multiple methods within this class to hold persistent
+    this.vcMsgEnd_ = null;
+
+    // Arrays used by multiple methods within this class to hold persistent
     // data.  Just gets too bulky to pass these guys around.
-    // Messages to be returned to the calling function
 
-    this.retMsg_ = []; // Units for parenthetical unit strings
+    // Messages to be returned to the calling function
+    this.retMsg_ = [];
 
-    this.parensUnits_ = []; // annotation text for annotations found in unit strings
+    // Units for parenthetical unit strings
+    this.parensUnits_ = [];
 
-    this.annotations_ = []; // suggestions for unit strings that for which no unit was found
+    // annotation text for annotations found in unit strings
+    this.annotations_ = [];
 
+    // suggestions for unit strings that for which no unit was found
     this.suggestions = [];
   } // end constructor
+
   // The start of an error message about an invalid annotation character.
 
+  // A regular expression for validating annotation strings.
 
   /**
    * Sets the emphasis strings to the HTML used in the webpage display - or
@@ -93,11 +94,10 @@ class UnitString {
    * @param use flag indicating whether or not to use the braces message;
    *  defaults to true
    */
-
-
   useBraceMsgForEachString(use) {
     if (use === undefined || use) this.bracesMsg_ = Ucum.bracesMsg_;else this.bracesMsg_ = '';
   }
+
   /**
    * Parses a unit string, returns a unit, a possibly updated version of
    * the string passed in, and messages and suggestions where appropriate.
@@ -136,15 +136,12 @@ class UnitString {
    *   was found or if suggestions were not requested.
    * @throws an error if nothing was specified.
    */
-
-
   parseString(uStr, valConv, suggest) {
-    uStr = uStr.trim(); // Make sure we have something to work with
-
+    uStr = uStr.trim();
+    // Make sure we have something to work with
     if (uStr === '' || uStr === null) {
       throw new Error('Please specify a unit expression to be validated.');
     }
-
     if (valConv === 'validate') {
       this.vcMsgStart_ = Ucum.valMsgStart_;
       this.vcMsgEnd_ = Ucum.valMsgEnd_;
@@ -152,18 +149,18 @@ class UnitString {
       this.vcMsgStart_ = Ucum.cnvMsgStart_;
       this.vcMsgEnd_ = Ucum.cnvMsgEnd_;
     }
-
     if (suggest === undefined || suggest === false) {
       this.suggestions_ = null;
     } else {
       this.suggestions_ = [];
     }
-
     this.retMsg_ = [];
     this.parensUnits_ = [];
     this.annotations_ = [];
     let origString = uStr;
-    let retObj = []; // Extract any annotations, i.e., text enclosed in braces ({}) from the
+    let retObj = [];
+
+    // Extract any annotations, i.e., text enclosed in braces ({}) from the
     // string before further processing.  Store each one in this.annotations_
     // array and put a placeholder in the string for the annotation.  Do
     // this before other processing in case an annotation contains characters
@@ -171,41 +168,40 @@ class UnitString {
     // subsequent processing.
 
     uStr = this._getAnnotations(uStr);
-
     if (this.retMsg_.length > 0) {
       retObj[0] = null;
       retObj[1] = null;
     } else {
       // Flag used to block further processing on an unrecoverable error
-      let endProcessing = this.retMsg_.length > 0; // First check for one of the "special" units.  If it's one of those, put
+      let endProcessing = this.retMsg_.length > 0;
+
+      // First check for one of the "special" units.  If it's one of those, put
       // in a substitution phrase for it to avoid having it separated on its
       // embedded operator.  This will only happen, by the way, if it is
       // preceded by a prefix or followed by an operator and another unit.
-
       let sUnit = null;
-
       for (sUnit in Ucum.specUnits_) {
         while (uStr.indexOf(sUnit) !== -1) uStr = uStr.replace(sUnit, Ucum.specUnits_[sUnit]);
-      } // Check for spaces and throw an error if any are found.  The spec
+      }
+
+      // Check for spaces and throw an error if any are found.  The spec
       // explicitly forbids spaces except in annotations, which is why any
       // annotations are extracted before this check is made.
-
-
       if (uStr.indexOf(' ') > -1) {
         throw new Error('Blank spaces are not allowed in unit expressions.');
       } // end if blanks were found in the string
+
       // assign the array returned to retObj.  It will contain 2 elements:
       //  the unit returned in position 0; and the origString (possibly
       //  modified) in position 1.  The origString in position 1 will not
       //  be changed by subsequent processing.
-
-
       retObj = this._parseTheString(uStr, origString);
-      let finalUnit = retObj[0]; // Do a final check to make sure that finalUnit is a unit and not
+      let finalUnit = retObj[0];
+
+      // Do a final check to make sure that finalUnit is a unit and not
       // just a number.  Something like "8/{HCP}" will return a "unit" of 8
       // - which is not a unit.  Hm - evidently it is.  So just create a unit
       // object for it.
-
       if (intUtils_.isIntegerUnit(finalUnit) || typeof finalUnit === 'number') {
         finalUnit = new Unit({
           'csCode_': origString,
@@ -215,10 +211,8 @@ class UnitString {
         });
         retObj[0] = finalUnit;
       } // end final check
-
     } // end if no annotation errors were found
 
-
     retObj[2] = this.retMsg_;
     if (this.suggestions_ && this.suggestions_.length > 0) retObj[3] = this.suggestions_;
     return retObj;
@@ -251,86 +245,83 @@ class UnitString {
    * the this.suggestions_ array may be populated by methods called within
    *   this one
    */
-
-
   _parseTheString(uStr, origString) {
     // Unit to be returned
-    let finalUnit = null; // Flag used to block further processing on an unrecoverable error
+    let finalUnit = null;
+
+    // Flag used to block further processing on an unrecoverable error
+    let endProcessing = this.retMsg_.length > 0;
 
-    let endProcessing = this.retMsg_.length > 0; // Call _processParens to search for and process any/all parenthetical
+    // Call _processParens to search for and process any/all parenthetical
     // strings in uStr.  Units created for parenthetical strings will be
     // stored in the this.parensUnits_ array.
-
     let parensResp = this._processParens(uStr, origString);
+    endProcessing = parensResp[2];
 
-    endProcessing = parensResp[2]; // The array used to hold the units and their operators.
-
-    let uArray = []; // Continue if we didn't hit a problem
+    // The array used to hold the units and their operators.
+    let uArray = [];
 
+    // Continue if we didn't hit a problem
     if (!endProcessing) {
       uStr = parensResp[0];
-      origString = parensResp[1]; // Call _makeUnitsArray to convert the string to an array of unit
-      // descriptors with operators.
+      origString = parensResp[1];
 
+      // Call _makeUnitsArray to convert the string to an array of unit
+      // descriptors with operators.
       let mkUArray = this._makeUnitsArray(uStr, origString);
-
       endProcessing = mkUArray[2];
-
       if (!endProcessing) {
         uArray = mkUArray[0];
-        origString = mkUArray[1]; // Create a unit object out of each un element
-
+        origString = mkUArray[1];
+        // Create a unit object out of each un element
         let uLen = uArray.length;
-
         for (let u1 = 0; u1 < uLen; u1++) {
           //for (let u1 = 0; u1 < uLen && !endProcessing; u1++) {
-          let curCode = uArray[u1]['un']; // Determine the type of the "un" attribute of the current array element
+          let curCode = uArray[u1]['un'];
+
+          // Determine the type of the "un" attribute of the current array element
+
           // Check to see if it's a number.  If so write the number version of
           // the number back to the "un" attribute and move on
-
           if (intUtils_.isIntegerUnit(curCode)) {
             uArray[u1]['un'] = Number(curCode);
           } else {
             // The current unit array element is a string.  Check now to see
             // if it is or contains a parenthesized unit from this.parensUnits_.
             // If so, call _getParens to process the string and get the unit.
+
             if (curCode.indexOf(this.parensFlag_) >= 0) {
-              let parenUnit = this._getParensUnit(curCode, origString); // if we couldn't process the string, set the end flag and bypass
+              let parenUnit = this._getParensUnit(curCode, origString);
+              // if we couldn't process the string, set the end flag and bypass
               // further processing.
+              if (!endProcessing) endProcessing = parenUnit[1];
 
-
-              if (!endProcessing) endProcessing = parenUnit[1]; // If we're good, put the unit in the uArray and replace the
+              // If we're good, put the unit in the uArray and replace the
               // curCode, which contains the parentheses placeholders, etc.,
               // with the unit's code - including any substitutions.
-
               if (!endProcessing) {
                 uArray[u1]['un'] = parenUnit[0];
               }
             } // end if the curCode contains a parenthesized unit
+
             // Else it's not a parenthetical unit and not a number. Call
             // _makeUnit to create a unit for it.
             else {
-                let uRet = this._makeUnit(curCode, origString); // If we didn't get a unit, set the endProcessing flag.
-
-
-                if (uRet[0] === null) {
-                  endProcessing = true;
-                } else {
-                  uArray[u1]['un'] = uRet[0];
-                  origString = uRet[1];
-                }
-              } // end if the curCode is not a parenthetical expression
-
+              let uRet = this._makeUnit(curCode, origString);
+              // If we didn't get a unit, set the endProcessing flag.
+              if (uRet[0] === null) {
+                endProcessing = true;
+              } else {
+                uArray[u1]['un'] = uRet[0];
+                origString = uRet[1];
+              }
+            } // end if the curCode is not a parenthetical expression
           } // end if the "un" array is a not a number
-
         } // end do for each element in the units array
-
       } // end if _makeUnitsArray did not return an error
-
     } // end if _processParens did not find an error that causes a stop
-    // If we're still good, continue
-
 
+    // If we're still good, continue
     if (!endProcessing) {
       // Process the units (and numbers) to create one final unit object
       if ((uArray[0] === null || uArray[0] === ' ' || uArray[0]['un'] === undefined || uArray[0]['un'] === null) && this.retMsg_.length === 0) {
@@ -339,11 +330,9 @@ class UnitString {
         endProcessing = true;
       }
     }
-
     if (!endProcessing) {
       finalUnit = this._performUnitArithmetic(uArray, origString);
     }
-
     return [finalUnit, origString];
   } // end _parseTheString
 
@@ -360,20 +349,16 @@ class UnitString {
    *   (informational, error or warning) generated by this or called methods
    * the this.annotations_ array is populated by this method
    */
-
-
   _getAnnotations(uString) {
     let openBrace = uString.indexOf('{');
-
     while (openBrace >= 0) {
       let closeBrace = uString.indexOf('}');
-
       if (closeBrace < 0) {
         this.retMsg_.push('Missing closing brace for annotation starting at ' + this.openEmph_ + uString.substr(openBrace) + this.closeEmph_);
         openBrace = -1;
       } else {
-        let braceStr = uString.substring(openBrace, closeBrace + 1); // Check for valid characters in the annotation.
-
+        let braceStr = uString.substring(openBrace, closeBrace + 1);
+        // Check for valid characters in the annotation.
         if (!UnitString.VALID_ANNOTATION_REGEX.test(braceStr)) {
           this.retMsg_.push(UnitString.INVALID_ANNOTATION_CHAR_MSG + this.openEmph_ + braceStr + this.closeEmph_);
           openBrace = -1; // end search for annotations
@@ -385,15 +370,13 @@ class UnitString {
         }
       }
     } // end do while we have an opening brace
-    // check for a stray/unmatched closing brace
-
 
+    // check for a stray/unmatched closing brace
     if (this.retMsg_.length == 0) {
       // if there were no other errors above
       let closeBrace = uString.indexOf('}');
       if (closeBrace >= 0) this.retMsg_.push('Missing opening brace for closing brace found at ' + this.openEmph_ + uString.substring(0, closeBrace + 1) + this.closeEmph_);
     }
-
     return uString;
   } // end _getAnnotations
 
@@ -427,108 +410,101 @@ class UnitString {
    * this this.parensUnits_ array will be populated with units found for
    *   parenthetical unit strings
    */
-
-
   _processParens(uString, origString) {
     // Unit strings array and index
     let uStrArray = [];
     let uStrAryPos = 0;
     let stopProcessing = false;
-    let pu = this.parensUnits_.length; // Count of characters trimmed off the beginning of the unit string (uString)
+    let pu = this.parensUnits_.length;
+
+    // Count of characters trimmed off the beginning of the unit string (uString)
     // as units are removed from it; used for error messages to provide
     // context.
+    let trimmedCt = 0;
 
-    let trimmedCt = 0; // Break the unit string into pieces that consist of text outside of
+    // Break the unit string into pieces that consist of text outside of
     // parenthetical strings and placeholders for the parenthetical units.
     // This method is called recursively for parenthetical strings and the units
     // returned are stored in the this.parensUnits_ array.
-
     while (uString !== "" && !stopProcessing) {
       let openCt = 0;
       let closeCt = 0;
-      let openPos = uString.indexOf('('); // If an opening parenthesis was not found, check for an unmatched
+      let openPos = uString.indexOf('(');
+
+      // If an opening parenthesis was not found, check for an unmatched
       // close parenthesis.  If one was found report the error and end
       // processing.
-
       if (openPos < 0) {
         let closePos = uString.indexOf(')');
-
         if (closePos >= 0) {
           let theMsg = `Missing open parenthesis for close ` + `parenthesis at ${uString.substring(0, closePos + trimmedCt)}` + `${this.openEmph_}${uString.substr(closePos, 1)}${this.closeEmph_}`;
-
           if (closePos < uString.length - 1) {
             theMsg += `${uString.substr(closePos + 1)}`;
           }
-
           this.retMsg_.push(theMsg);
           uStrArray[uStrAryPos] = uString;
           stopProcessing = true;
         } // end if a close parenthesis was found
+
         // If no parentheses were found in the current unit string, transfer
         // it to the units array and blank out the string, which will end
         // the search for parenthetical units.
         else {
-            uStrArray[uStrAryPos] = uString;
-            uString = "";
-          } // end if no close parenthesis was found
-
+          uStrArray[uStrAryPos] = uString;
+          uString = "";
+        } // end if no close parenthesis was found
       } // end if no open parenthesis was found
+
       // Otherwise an open parenthesis was found. Process the string that
       // includes the parenthetical group
       else {
-          openCt += 1; // Write the text before the parentheses (if any) to the unit strings array
-
-          let uLen = uString.length;
-
-          if (openPos > 0) {
-            uStrArray[uStrAryPos++] = uString.substr(0, openPos);
-          } // Find the matching closePos, i.e., the one that closes the
-          // parenthetical group that this one opens.  Look also for
-          // another open parenthesis, in case this includes nested parenthetical
-          // strings.  This continues until it finds the same number of close
-          // parentheses as open parentheses, or runs out of string to check.
-          // In the case of nested parentheses this will identify the outer set
-          // of parentheses.
-
-
-          let closePos = 0;
-          let c = openPos + 1;
-
-          for (; c < uLen && openCt != closeCt; c++) {
-            if (uString[c] === '(') openCt += 1;else if (uString[c] === ')') closeCt += 1;
-          } // Put a placeholder for the group in the unit strings array and recursively
-          // call this method for the parenthetical group.  Put the unit returned
-          // in this.parensUnits_.  Set the unit string to whatever follows
-          // the position of the closing parenthesis for this group, to be
-          // processed by the next iteration of this loop.  If there's nothing
-          // left uString is set to "".
-
-
-          if (openCt === closeCt) {
-            closePos = c;
-            uStrArray[uStrAryPos++] = this.parensFlag_ + pu.toString() + this.parensFlag_;
+        openCt += 1;
+        // Write the text before the parentheses (if any) to the unit strings array
+        let uLen = uString.length;
+        if (openPos > 0) {
+          uStrArray[uStrAryPos++] = uString.substr(0, openPos);
+        }
 
-            let parseResp = this._parseTheString(uString.substring(openPos + 1, closePos - 1), origString);
+        // Find the matching closePos, i.e., the one that closes the
+        // parenthetical group that this one opens.  Look also for
+        // another open parenthesis, in case this includes nested parenthetical
+        // strings.  This continues until it finds the same number of close
+        // parentheses as open parentheses, or runs out of string to check.
+        // In the case of nested parentheses this will identify the outer set
+        // of parentheses.
+        let closePos = 0;
+        let c = openPos + 1;
+        for (; c < uLen && openCt != closeCt; c++) {
+          if (uString[c] === '(') openCt += 1;else if (uString[c] === ')') closeCt += 1;
+        }
 
-            if (parseResp[0] === null) stopProcessing = true;else {
-              origString = parseResp[1];
-              this.parensUnits_[pu++] = parseResp[0];
-              uString = uString.substr(closePos);
-              trimmedCt = closePos;
-            }
-          } // end if the number of open and close parentheses matched
-          // If the number of open and close parentheses doesn't match, indicate
-          // an error.
-          else {
-              uStrArray.push(origString.substr(openPos));
-              this.retMsg_.push(`Missing close parenthesis for open parenthesis at ` + `${origString.substring(0, openPos + trimmedCt)}` + `${this.openEmph_}${origString.substr(openPos, 1)}` + `${this.closeEmph_}${origString.substr(openPos + 1)}`);
-              stopProcessing = true;
-            }
-        } // end if an open parenthesis was found
+        // Put a placeholder for the group in the unit strings array and recursively
+        // call this method for the parenthetical group.  Put the unit returned
+        // in this.parensUnits_.  Set the unit string to whatever follows
+        // the position of the closing parenthesis for this group, to be
+        // processed by the next iteration of this loop.  If there's nothing
+        // left uString is set to "".
+        if (openCt === closeCt) {
+          closePos = c;
+          uStrArray[uStrAryPos++] = this.parensFlag_ + pu.toString() + this.parensFlag_;
+          let parseResp = this._parseTheString(uString.substring(openPos + 1, closePos - 1), origString);
+          if (parseResp[0] === null) stopProcessing = true;else {
+            origString = parseResp[1];
+            this.parensUnits_[pu++] = parseResp[0];
+            uString = uString.substr(closePos);
+            trimmedCt = closePos;
+          }
+        } // end if the number of open and close parentheses matched
 
+        // If the number of open and close parentheses doesn't match, indicate
+        // an error.
+        else {
+          uStrArray.push(origString.substr(openPos));
+          this.retMsg_.push(`Missing close parenthesis for open parenthesis at ` + `${origString.substring(0, openPos + trimmedCt)}` + `${this.openEmph_}${origString.substr(openPos, 1)}` + `${this.closeEmph_}${origString.substr(openPos + 1)}`);
+          stopProcessing = true;
+        }
+      } // end if an open parenthesis was found
     } // end do while the input string is not empty
-
-
     if (stopProcessing) this.parensUnits_ = [];
     return [uStrArray.join(''), origString, stopProcessing];
   } // end _processParens
@@ -552,47 +528,44 @@ class UnitString {
    * the this.retMsg_ array will be updated with any user messages
    *   (informational, error or warning) generated by this or called methods
    */
-
-
   _makeUnitsArray(uStr, origString) {
     // Separate the string into pieces based on delimiters / (division) and .
     // (multiplication).  The idea is to get an array of units on which we
     // can then perform any operations (prefixes, multiplication, division).
+
     let uArray1 = uStr.match(/([./]|[^./]+)/g);
     let endProcessing = false;
     let uArray = [];
-    let startNumCheck = /(^[0-9]+)(\[?[a-zA-Z\_0-9a-zA-Z\_]+\]?$)/; // If the first element in the array is the division operator (/), the
+    let startNumCheck = /(^[0-9]+)(\[?[a-zA-Z\_0-9a-zA-Z\_]+\]?$)/;
+
+    // If the first element in the array is the division operator (/), the
     // string started with '/'.  Add a first element containing 1 to the
     // array, which will cause the correct computation to be performed (inversion).
-
     if (uArray1[0] === "/") {
       uArray1.unshift("1");
-    } // If the first element in the array is the multiplication operator (.)
+    }
+    // If the first element in the array is the multiplication operator (.)
     // return an error.
     else if (uArray1[0] === '.') {
-        this.retMsg_.push(`${origString} is not a valid UCUM code. ` + `The multiplication operator at the beginning of the expression is ` + `not valid. A multiplication operator must appear only between ` + `two codes.`);
-        endProcessing = true;
-      }
-
+      this.retMsg_.push(`${origString} is not a valid UCUM code. ` + `The multiplication operator at the beginning of the expression is ` + `not valid. A multiplication operator must appear only between ` + `two codes.`);
+      endProcessing = true;
+    }
     if (!endProcessing) {
       // Check to see if there is a number preceding a unit code, e.g., 2mg
       // If so, update the first element to remove the number (2mg -> mg) and
       // add two elements to the beginning of the array - the number and the
       // multiplication operator.
+
       if (!intUtils_.isNumericString(uArray1[0])) {
         let numRes = uArray1[0].match(startNumCheck);
-
         if (numRes && numRes.length === 3 && numRes[1] !== '' && numRes[2] !== '' && numRes[2].indexOf(this.braceFlag_) !== 0) {
           let dispVal = numRes[2];
-
           if (!endProcessing && numRes[2].indexOf(this.parensFlag_) !== -1) {
             let parensback = this._getParensUnit(numRes[2], origString);
-
             numRes[2] = parensback[0]['csCode_'];
             dispVal = `(${numRes[2]})`;
             endProcessing = parensback[1];
           }
-
           if (!endProcessing) {
             this.retMsg_.push(`${numRes[1]}${dispVal} is not a valid UCUM code.` + `  ${this.vcMsgStart_}${numRes[1]}.${dispVal}${this.vcMsgEnd_}`);
             origString = origString.replace(`${numRes[1]}${dispVal}`, `${numRes[1]}.${dispVal}`);
@@ -601,6 +574,7 @@ class UnitString {
           }
         }
       } // end if the first element is not a number (only)
+
       // Create an array of unit/operator objects.  The unit is, for now, the
       // string containing the unit code (e.g., Hz for hertz) including
       // a possible prefix and exponent.   The operator is the operator to be
@@ -608,21 +582,18 @@ class UnitString {
       // us two objects.  The first will have a unit of a, and a blank operator
       // (because it's the first unit).  The second would have a unit of b
       // and the multiplication operator (.).
-
-
       if (!endProcessing) {
         let u1 = uArray1.length;
         uArray = [{
           op: "",
           un: uArray1[0]
         }];
-
         for (let n = 1; n < u1; n++) {
           // check to make sure that we don't have two operators together, e.g.,
           // mg./K.  If so, let the user know the problem.
-          let theOp = uArray1[n++]; // oh wait - check to make sure something is even there, that the
+          let theOp = uArray1[n++];
+          // oh wait - check to make sure something is even there, that the
           // user didn't end the expression with an operator.
-
           if (!uArray1[n]) {
             this.retMsg_.push(`${origString} is not a valid UCUM code. ` + `It is terminated with the operator ${this.openEmph_}` + `${theOp}${this.closeEmph_}.`);
             n = u1;
@@ -642,63 +613,52 @@ class UnitString {
             // 2.kJ.
             if (!intUtils_.isNumericString(uArray1[n])) {
               let numRes2 = uArray1[n].match(startNumCheck);
-
               if (numRes2 && numRes2.length === 3 && numRes2[1] !== '' && numRes2[2] !== '' && numRes2[2].indexOf(this.braceFlag_) !== 0) {
                 let invalidString = numRes2[0];
-
                 if (!endProcessing && numRes2[2].indexOf(this.parensFlag_) !== -1) {
                   let parensback = this._getParensUnit(numRes2[2], origString);
-
                   numRes2[2] = parensback[0]['csCode_'];
                   invalidString = `(${numRes2[2]})`;
                   endProcessing = parensback[1];
-
                   if (!endProcessing) {
                     this.retMsg_.push(`${numRes2[1]}${invalidString} is not a ` + `valid UCUM code.  ${this.vcMsgStart_}${numRes2[1]}.${invalidString}` + `${this.vcMsgEnd_}`);
                     let parensString = `(${numRes2[1]}.${invalidString})`;
                     origString = origString.replace(`${numRes2[1]}${invalidString}`, parensString);
-
                     let nextParens = this._processParens(parensString, origString);
-
                     endProcessing = nextParens[2];
-
                     if (!endProcessing) {
                       uArray.push({
                         op: theOp,
                         un: nextParens[0]
                       });
-                    } //uArray.push({op: '.', un: numRes2[2]});
-
+                    }
+                    //uArray.push({op: '.', un: numRes2[2]});
                   }
                 } // end if the string represents a parenthesized unit
                 else {
-                    let parensStr = '(' + numRes2[1] + '.' + numRes2[2] + ')';
-
-                    let parensResp = this._processParens(parensStr, origString); // if a "stop processing" flag was returned, set the n index to end
-                    // the loop and set the endProcessing flag
-
-
-                    if (parensResp[2]) {
-                      n = u1;
-                      endProcessing = true;
-                    } else {
-                      this.retMsg_.push(`${numRes2[0]} is not a ` + `valid UCUM code.  ${this.vcMsgStart_}${numRes2[1]}.${numRes2[2]}` + `${this.vcMsgEnd_}`);
-                      origString = origString.replace(numRes2[0], parensStr);
-                      uArray.push({
-                        op: theOp,
-                        un: parensResp[0]
-                      });
-                    } // end if no error on the processParens call
-
-                  } // end if the string does not represent a parenthesized unit
-
+                  let parensStr = '(' + numRes2[1] + '.' + numRes2[2] + ')';
+                  let parensResp = this._processParens(parensStr, origString);
+                  // if a "stop processing" flag was returned, set the n index to end
+                  // the loop and set the endProcessing flag
+                  if (parensResp[2]) {
+                    n = u1;
+                    endProcessing = true;
+                  } else {
+                    this.retMsg_.push(`${numRes2[0]} is not a ` + `valid UCUM code.  ${this.vcMsgStart_}${numRes2[1]}.${numRes2[2]}` + `${this.vcMsgEnd_}`);
+                    origString = origString.replace(numRes2[0], parensStr);
+                    uArray.push({
+                      op: theOp,
+                      un: parensResp[0]
+                    });
+                  } // end if no error on the processParens call
+                } // end if the string does not represent a parenthesized unit
               } // end if the string is a number followed by a string
               else {
-                  uArray.push({
-                    op: theOp,
-                    un: uArray1[n]
-                  });
-                }
+                uArray.push({
+                  op: theOp,
+                  un: uArray1[n]
+                });
+              }
             } else {
               uArray.push({
                 op: theOp,
@@ -706,14 +666,9 @@ class UnitString {
               });
             }
           } // end if there isn't a missing operator or unit code
-
         } // end do for each element in uArray1
-
       } // end if a processing error didn't occur in getParensUnit
-
     } // end if the string did not begin with a '.' with no following digit
-
-
     return [uArray, origString, endProcessing];
   } // end _makeUnitsArray
 
@@ -745,53 +700,50 @@ class UnitString {
    * @throws an error if an invalid parensUnit index was found.  This is
    *    a processing error.
    */
-
-
   _getParensUnit(pStr, origString) {
     let endProcessing = false;
     let retAry = [];
     let retUnit = null;
     let befAnnoText = null;
-    let aftAnnoText = null; // Get the location of the flags.  We're assuming there are only two
+    let aftAnnoText = null;
+
+    // Get the location of the flags.  We're assuming there are only two
     // because _processParens takes care of nesting.  By the time we get
     // here we should not be looking a nested parens.  Also get any text
     // before and after the parentheses.  Once we get the unit we update
     // the input string with the unit's csCode_, which will wipe out any
     // before and after text
-
     let psIdx = pStr.indexOf(this.parensFlag_);
     let befText = null;
-
     if (psIdx > 0) {
       befText = pStr.substr(0, psIdx - 1);
     }
-
     let peIdx = pStr.lastIndexOf(this.parensFlag_);
     let aftText = null;
-
     if (peIdx + this.pFlagLen_ < pStr.length) {
       aftText = pStr.substr(peIdx + this.pFlagLen_);
-    } // Get the text between the flags
+    }
 
+    // Get the text between the flags
+    let pNumText = pStr.substring(psIdx + this.pFlagLen_, peIdx);
 
-    let pNumText = pStr.substring(psIdx + this.pFlagLen_, peIdx); // Make sure the index is a number, and if it is, get the unit from the
+    // Make sure the index is a number, and if it is, get the unit from the
     // this.parensUnits_ array
-
     if (intUtils_.isNumericString(pNumText)) {
       retUnit = this.parensUnits_[Number(pNumText)];
-
       if (!intUtils_.isIntegerUnit(retUnit)) {
         pStr = retUnit.csCode_;
       } else {
         pStr = retUnit;
       }
-    } // If it's not a number, it's a programming error.  Throw a fit.
+    }
+    // If it's not a number, it's a programming error.  Throw a fit.
     else {
-        throw new Error(`Processing error - invalid parens number ${pNumText} ` + `found in ${pStr}.`);
-      } // If there's something in front of the starting parentheses flag, check to
-    // see if it's a number or an annotation.
-
+      throw new Error(`Processing error - invalid parens number ${pNumText} ` + `found in ${pStr}.`);
+    }
 
+    // If there's something in front of the starting parentheses flag, check to
+    // see if it's a number or an annotation.
     if (befText) {
       // If it's a number, assume that multiplication was assumed
       if (intUtils_.isNumericString(befText)) {
@@ -804,81 +756,79 @@ class UnitString {
         this.retMsg_.push(`${befText}${pStr} is not a valid UCUM code.\n` + this.vcMsgStart_ + pStr + this.vcMsgEnd_);
       } else {
         if (befText.indexOf(this.braceFlag_) >= 0) {
-          let annoRet = this._getAnnoText(befText, origString); // if we found not only an annotation, but text before or after
+          let annoRet = this._getAnnoText(befText, origString);
+          // if we found not only an annotation, but text before or after
           // the annotation (remembering that this is all before the
           // parentheses) throw an error - because we don't know what
           // to do with it.  Could it be missing an operator?
-
-
           if (annoRet[1] || annoRet[2]) {
             throw new Error(`Text found before the parentheses (` + `${befText}) included an annotation along with other text ` + `for parenthetical unit ${retUnit.csCode_}`);
-          } // Otherwise put the annotation after the unit string and note
+          }
+          // Otherwise put the annotation after the unit string and note
           // the misplacement.
-
-
           pStr += annoRet[0];
           this.retMsg_.push(`The annotation ${annoRet[0]} before the unit ` + `code is invalid.\n` + this.vcMsgStart_ + pStr + this.vcMsgEnd_);
-        } // else the text before the parentheses is neither a number nor
+        }
+        // else the text before the parentheses is neither a number nor
         // an annotation.  If suggestions were NOT requested, record an
         // error.
         else if (!this.suggestions_) {
-            this.retMsg_.push(`${befText} preceding the unit code ${pStr} ` + `is invalid.  Unable to make a substitution.`);
-            endProcessing = true;
-          } // otherwise try for suggestions
-          else {
-              let suggestStat = this._getSuggestions(befText);
-
-              endProcessing = suggestStat !== 'succeeded';
-            } // end if a brace was found or, if not, suggestions were not or
+          this.retMsg_.push(`${befText} preceding the unit code ${pStr} ` + `is invalid.  Unable to make a substitution.`);
+          endProcessing = true;
+        }
+        // otherwise try for suggestions
+        else {
+          let suggestStat = this._getSuggestions(befText);
+          endProcessing = suggestStat !== 'succeeded';
+        } // end if a brace was found or, if not, suggestions were not or
         // were requested
-
       } // end if text preceding the parentheses was not a number
-
     } // end if there was text before the parentheses
-    // Process any text after the parentheses
-
 
+    // Process any text after the parentheses
     if (aftText) {
       // if it's an annotation, get it and add it to the pStr
       if (aftText.indexOf(this.braceFlag_) >= 0) {
-        let annoRet = this._getAnnoText(aftText, origString); // if we found not only an annotation, but text before or after
+        let annoRet = this._getAnnoText(aftText, origString);
+        // if we found not only an annotation, but text before or after
         // the annotation (remembering that this is all after the
         // parentheses) throw an error - because we don't know what
         // to do with it.  Could it be missing an operator?
-
-
         if (annoRet[1] || annoRet[2]) {
           throw new Error(`Text found after the parentheses (` + `${aftText}) included an annotation along with other text ` + `for parenthetical unit ${retUnit.csCode_}`);
-        } // Otherwise put the annotation after the unit string - no message
+        }
+        // Otherwise put the annotation after the unit string - no message
         // needed.
-
-
         pStr += annoRet[0];
-      } // Otherwise check to see if it's an exponent.  If so, warn the
+      }
+      // Otherwise check to see if it's an exponent.  If so, warn the
       // user that it's not valid - but try it anyway
       else {
-          if (intUtils_.isNumericString(aftText)) {
+        if (intUtils_.isNumericString(aftText)) {
+          retUnit = null;
+          let msg = `An exponent (${aftText}) following a parenthesis ` + `is invalid as of revision 1.9 of the UCUM Specification.`;
+          // Add the suggestion only if the string in the parenthesis don't end with a number.
+          if (!pStr.match(/\d$/)) {
             pStr += aftText;
-            retUnit = retUnit.power(Number(aftText));
-            this.retMsg_.push(`An exponent (${aftText}) following a parenthesis ` + `is invalid as of revision 1.9 of the UCUM Specification.\n  ` + this.vcMsgStart_ + pStr + this.vcMsgEnd_);
-          } // else the text after the parentheses is neither a number nor
-          // an annotation.  If suggestions were NOT requested, record an
-          // error.
-          else if (!this.suggestions_) {
-              this.retMsg_.push(`Text ${aftText} following the unit code ${pStr} ` + `is invalid.  Unable to make a substitution.`);
-              endProcessing = true;
-            } // otherwise try for suggestions
-            else {
-                let suggestStat = this._getSuggestions(befText);
-
-                endProcessing = suggestStat !== 'succeeded';
-              } // end if text following the parentheses not an exponent
-
-        } // end if text following the parentheses is not an annotation
-
+            msg += '\n  ' + this.vcMsgStart_ + pStr + this.vcMsgEnd_;
+          }
+          this.retMsg_.push(msg);
+          endProcessing = true;
+        }
+        // else the text after the parentheses is neither a number nor
+        // an annotation.  If suggestions were NOT requested, record an
+        // error.
+        else if (!this.suggestions_) {
+          this.retMsg_.push(`Text ${aftText} following the unit code ${pStr} ` + `is invalid.  Unable to make a substitution.`);
+          endProcessing = true;
+        }
+        // otherwise try for suggestions
+        else {
+          let suggestStat = this._getSuggestions(befText);
+          endProcessing = suggestStat !== 'succeeded';
+        } // end if text following the parentheses not an exponent
+      } // end if text following the parentheses is not an annotation
     } // end if there is text following the parentheses
-
-
     if (!endProcessing) {
       if (!retUnit) {
         retUnit = new Unit({
@@ -896,7 +846,6 @@ class UnitString {
         retUnit.csCode_ = pStr;
       }
     }
-
     return [retUnit, endProcessing];
   } // end _getParensUnit
 
@@ -922,31 +871,28 @@ class UnitString {
    * the this.annotations_ array is used as the source for the annotations text
    * @throws an error if for a processing error - an invalid annotation index.
    */
-
-
   _getAnnoText(pStr, origString) {
     // if the starting braces flag is not at index 0, get the starting
     // text and the adjust the pStr to omit it.
     let asIdx = pStr.indexOf(this.braceFlag_);
     let startText = asIdx > 0 ? pStr.substring(0, asIdx) : null;
-
     if (asIdx !== 0) {
       pStr = pStr.substr(asIdx);
-    } // Get the location of the end flag and, if text follows it, get the text
-
+    }
 
+    // Get the location of the end flag and, if text follows it, get the text
     let aeIdx = pStr.indexOf(this.braceFlag_, 1);
-    let endText = aeIdx + this.bFlagLen_ < pStr.length ? pStr.substr(aeIdx + this.bFlagLen_) : null; // Get the index of the annotation in this.annotations_.
-    // Check it to make sure it's valid, and if not, throw an error
+    let endText = aeIdx + this.bFlagLen_ < pStr.length ? pStr.substr(aeIdx + this.bFlagLen_) : null;
 
+    // Get the index of the annotation in this.annotations_.
+    // Check it to make sure it's valid, and if not, throw an error
     let idx = pStr.substring(this.bFlagLen_, aeIdx);
     let idxNum = Number(idx);
-
     if (!intUtils_.isNumericString(idx) || idxNum >= this.annotations_.length) {
       throw new Error(`Processing Error - invalid annotation index ${idx} found ` + `in ${pStr} that was created from ${origString}`);
-    } // Replace the flags and annotation index with the annotation expression
-
+    }
 
+    // Replace the flags and annotation index with the annotation expression
     pStr = this.annotations_[idxNum];
     return [pStr, startText, endText];
   } // end _getAnnoText
@@ -976,29 +922,23 @@ class UnitString {
    *       Each array will contain the unit code, the unit name and the
    *       unit guidance (if any).
    */
-
-
   _getSuggestions(pStr) {
     let retObj = intUtils_.getSynonyms(pStr);
-
     if (retObj['status'] === 'succeeded') {
       let suggSet = {};
       suggSet['msg'] = `${pStr} is not a valid UCUM code.  We found possible ` + `units that might be what was meant:`;
       suggSet['invalidUnit'] = pStr;
       let synLen = retObj['units'].length;
       suggSet['units'] = [];
-
       for (let s = 0; s < synLen; s++) {
         let unit = retObj['units'][s];
         let unitArray = [unit['code'], unit['name'], unit['guidance']];
         suggSet['units'].push(unitArray);
       }
-
       this.suggestions_.push(suggSet);
     } else {
       this.retMsg_.push(`${pStr} is not a valid UCUM code.  No alternatives ` + `were found.`);
     }
-
     return retObj['status'];
   } // end getSuggestions
 
@@ -1023,255 +963,245 @@ class UnitString {
    *  the this.suggestions_ array will be populated if no unit (with or without
    *    substitutions) could be found and suggestions were requested
    */
-
-
   _makeUnit(uCode, origString) {
     // First try the code just as is, without looking for annotations,
     // prefixes, exponents, or elephants.
     let retUnit = this.utabs_.getUnitByCode(uCode);
-
     if (retUnit) {
       retUnit = retUnit.clone();
-    } // If we found it, we're done.  No need to parse for those elephants (or
+    }
+
+    // If we found it, we're done.  No need to parse for those elephants (or
     // other stuff).
     else if (uCode.indexOf(this.braceFlag_) >= 0) {
-        let getAnnoRet = this._getUnitWithAnnotation(uCode, origString);
-
-        retUnit = getAnnoRet[0];
+      let getAnnoRet = this._getUnitWithAnnotation(uCode, origString);
+      retUnit = getAnnoRet[0];
+      if (retUnit) {
+        origString = getAnnoRet[1];
+      }
+      // If a unit is not found, retUnit will be returned null and
+      // the this.retMsg_ array will contain a message describing the problem.
+      // If a unit is found, of course, all is good. So ... nothing left
+      // to see here, move along.
+    } // end if the uCode includes an annotation
+    else {
+      // So we didn't find a unit for the full uCode or for one with
+      // annotations.  Try looking for a unit that uses a carat (^)
+      // instead of an asterisk (*)
 
+      if (uCode.indexOf('^') > -1) {
+        let tryCode = uCode.replace('^', '*');
+        retUnit = this.utabs_.getUnitByCode(tryCode);
         if (retUnit) {
-          origString = getAnnoRet[1];
-        } // If a unit is not found, retUnit will be returned null and
-        // the this.retMsg_ array will contain a message describing the problem.
-        // If a unit is found, of course, all is good. So ... nothing left
-        // to see here, move along.
-
-      } // end if the uCode includes an annotation
-      else {
-          // So we didn't find a unit for the full uCode or for one with
-          // annotations.  Try looking for a unit that uses a carat (^)
-          // instead of an asterisk (*)
-          if (uCode.indexOf('^') > -1) {
-            let tryCode = uCode.replace('^', '*');
-            retUnit = this.utabs_.getUnitByCode(tryCode);
-
-            if (retUnit) {
-              retUnit = retUnit.clone();
-              retUnit.csCode_ = retUnit.csCode_.replace('*', '^');
-              retUnit.ciCode_ = retUnit.ciCode_.replace('*', '^');
-            }
-          } // If that didn't work, check to see if it should have brackets
-          // around it (uCode = degF when it should be [degF]
-
-
-          if (!retUnit) {
-            let addBrackets = '[' + uCode + ']';
-            retUnit = this.utabs_.getUnitByCode(addBrackets);
-
-            if (retUnit) {
-              retUnit = retUnit.clone();
-              origString = origString.replace(uCode, addBrackets);
-              this.retMsg_.push(`${uCode} is not a valid unit expression, but ` + `${addBrackets} is.\n` + this.vcMsgStart_ + `${addBrackets} (${retUnit.name_})${this.vcMsgEnd_}`);
-            } // end if we found the unit after adding brackets
-
-          } // end trying to add brackets
-          // If we didn't find it, try it as a name
-
-
-          if (!retUnit) {
-            let retUnitAry = this.utabs_.getUnitByName(uCode);
-
-            if (retUnitAry && retUnitAry.length > 0) {
-              retUnit = retUnitAry[0].clone();
-              let mString = 'The UCUM code for ' + uCode + ' is ' + retUnit.csCode_ + '.\n' + this.vcMsgStart_ + retUnit.csCode_ + this.vcMsgEnd_;
-              let dupMsg = false;
-
-              for (let r = 0; r < this.retMsg_.length && !dupMsg; r++) dupMsg = this.retMsg_[r] === mString;
-
-              if (!dupMsg) this.retMsg_.push(mString);
-              let rStr = new RegExp('(^|[.\/({])(' + uCode + ')($|[.\/)}])');
-              let res = origString.match(rStr);
-              origString = origString.replace(rStr, res[1] + retUnit.csCode_ + res[3]);
-              uCode = retUnit.csCode_;
-            }
-          } // If we still don't have a unit, try assuming a modifier (prefix and/or
-          // exponent) and look for a unit without the modifier
-
-
-          if (!retUnit) {
-            // Well, first see if it's one of the special units.  If so,
-            // replace the placeholder text with the actual unit string, keeping
-            // whatever text (probably a prefix) goes with the unit string.
-            let sUnit = null;
+          retUnit = retUnit.clone();
+          retUnit.csCode_ = retUnit.csCode_.replace('*', '^');
+          retUnit.ciCode_ = retUnit.ciCode_.replace('*', '^');
+        }
+      }
+      // If that didn't work, check to see if it should have brackets
+      // around it (uCode = degF when it should be [degF]
+      if (!retUnit) {
+        let addBrackets = '[' + uCode + ']';
+        retUnit = this.utabs_.getUnitByCode(addBrackets);
+        if (retUnit) {
+          retUnit = retUnit.clone();
+          origString = origString.replace(uCode, addBrackets);
+          this.retMsg_.push(`${uCode} is not a valid unit expression, but ` + `${addBrackets} is.\n` + this.vcMsgStart_ + `${addBrackets} (${retUnit.name_})${this.vcMsgEnd_}`);
+        } // end if we found the unit after adding brackets
+      } // end trying to add brackets
 
-            for (sUnit in Ucum.specUnits_) {
-              if (uCode.indexOf(Ucum.specUnits_[sUnit]) !== -1) uCode = uCode.replace(Ucum.specUnits_[sUnit], sUnit);
-            }
+      // If we didn't find it, try it as a name
+      if (!retUnit) {
+        let retUnitAry = this.utabs_.getUnitByName(uCode);
+        if (retUnitAry && retUnitAry.length > 0) {
+          retUnit = retUnitAry[0].clone();
+          let mString = 'The UCUM code for ' + uCode + ' is ' + retUnit.csCode_ + '.\n' + this.vcMsgStart_ + retUnit.csCode_ + this.vcMsgEnd_;
+          let dupMsg = false;
+          for (let r = 0; r < this.retMsg_.length && !dupMsg; r++) dupMsg = this.retMsg_[r] === mString;
+          if (!dupMsg) this.retMsg_.push(mString);
+          let rStr = new RegExp('(^|[.\/({])(' + uCode + ')($|[.\/)}])');
+          let res = origString.match(rStr);
+          origString = origString.replace(rStr, res[1] + retUnit.csCode_ + res[3]);
+          uCode = retUnit.csCode_;
+        }
+      }
 
-            retUnit = this.utabs_.getUnitByCode(uCode);
-            if (retUnit) retUnit = retUnit.clone();
-          }
+      // If we still don't have a unit, try assuming a modifier (prefix and/or
+      // exponent) and look for a unit without the modifier
+      if (!retUnit) {
+        // Well, first see if it's one of the special units.  If so,
+        // replace the placeholder text with the actual unit string, keeping
+        // whatever text (probably a prefix) goes with the unit string.
+        let sUnit = null;
+        for (sUnit in Ucum.specUnits_) {
+          if (uCode.indexOf(Ucum.specUnits_[sUnit]) !== -1) uCode = uCode.replace(Ucum.specUnits_[sUnit], sUnit);
+        }
+        retUnit = this.utabs_.getUnitByCode(uCode);
+        if (retUnit) retUnit = retUnit.clone();
+      }
+      if (!retUnit) {
+        let origCode = uCode;
+        let origUnit = null;
+        let exp = null;
+        let pfxCode = null;
+        let pfxObj = null;
+        let pfxVal = null;
+        let pfxExp = null;
+
+        // Look first for an exponent.  If we got one, separate it out and
+        // try to get the unit again
+        let codeAndExp = this._isCodeWithExponent(uCode);
+        if (codeAndExp) {
+          uCode = codeAndExp[0];
+          exp = codeAndExp[1];
+          origUnit = this.utabs_.getUnitByCode(uCode);
+        }
 
-          if (!retUnit) {
-            let origCode = uCode;
-            let origUnit = null;
-            let exp = null;
-            let pfxCode = null;
-            let pfxObj = null;
-            let pfxVal = null;
-            let pfxExp = null; // Look first for an exponent.  If we got one, separate it out and
-            // try to get the unit again
-
-            let codeAndExp = this._isCodeWithExponent(uCode);
-
-            if (codeAndExp) {
-              uCode = codeAndExp[0];
-              exp = codeAndExp[1];
+        // If an exponent is found but it's not a valid number, e.g. "2-1",
+        // mark the unit invalid. Otherwise, the "-1" part will be ignored
+        // because parseInt("2-1") results in 2. See LF-2870.
+        if (exp && isNaN(exp)) {
+          retUnit = null;
+          this.retMsg_.push(`${origCode} is not a valid UCUM code.`);
+        } else {
+          // If we still don't have a unit, separate out the prefix, if any,
+          // and try without it.
+          if (!origUnit) {
+            // Try for a single character prefix first.
+            pfxCode = uCode.charAt(0);
+            pfxObj = this.pfxTabs_.getPrefixByCode(pfxCode);
+
+            // if we got a prefix, get its info and remove it from the unit code
+            if (pfxObj) {
+              pfxVal = pfxObj.getValue();
+              pfxExp = pfxObj.getExp();
+              let pCodeLen = pfxCode.length;
+              uCode = uCode.substr(pCodeLen);
+
+              // try again for the unit
               origUnit = this.utabs_.getUnitByCode(uCode);
-            } // If we still don't have a unit, separate out the prefix, if any,
-            // and try without it.
-
 
-            if (!origUnit) {
-              // Try for a single character prefix first.
-              pfxCode = uCode.charAt(0);
-              pfxObj = this.pfxTabs_.getPrefixByCode(pfxCode); // if we got a prefix, get its info and remove it from the unit code
+              // If we still don't have a unit, see if the prefix could be the
+              // two character "da" (deka) prefix.  That's the only prefix with
+              // two characters, and without this check it's interpreted as "d"
+              // (deci) and the "a" is considered part of the unit code.
 
-              if (pfxObj) {
+              if (!origUnit && pfxCode == 'd' && uCode.substr(0, 1) == 'a') {
+                pfxCode = 'da';
+                pfxObj = this.pfxTabs_.getPrefixByCode(pfxCode);
                 pfxVal = pfxObj.getValue();
-                pfxExp = pfxObj.getExp();
-                let pCodeLen = pfxCode.length;
-                uCode = uCode.substr(pCodeLen); // try again for the unit
-
-                origUnit = this.utabs_.getUnitByCode(uCode); // If we still don't have a unit, see if the prefix could be the
-                // two character "da" (deka) prefix.  That's the only prefix with
-                // two characters, and without this check it's interpreted as "d"
-                // (deci) and the "a" is considered part of the unit code.
-
-                if (!origUnit && pfxCode == 'd' && uCode.substr(0, 1) == 'a') {
-                  pfxCode = 'da';
-                  pfxObj = this.pfxTabs_.getPrefixByCode(pfxCode);
-                  pfxVal = pfxObj.getValue();
-                  uCode = uCode.substr(1); // try one more time for the unit
-
-                  origUnit = this.utabs_.getUnitByCode(uCode);
-                } // Reject the unit we found if it might have another prefix.
-                // Such things are in our tables through the LOINC source_
-                // (ucum.csv) which has guidance and synonyms.  I think it should be
-                // safe to exclude anything whose source is LOINC from having a
-                // prefix.
-
-
-                if (origUnit && origUnit.source_ == 'LOINC') origUnit = null;
-              } // end if we found a prefix
+                uCode = uCode.substr(1);
 
-            } // end if we didn't get a unit after removing an exponent
-            // If we still haven't found anything, we're done looking.
-            // (We tried with the full unit string, with the unit string
-            // without the exponent, the unit string without a prefix,
-            // common errors, etc. That's all we can try).
-
-
-            if (!origUnit) {
-              retUnit = null; // BUT if the user asked for suggestions, at least look for them
-
-              if (this.suggestions_) {
-                let suggestStat = this._getSuggestions(origCode);
-              } else {
-                this.retMsg_.push(`${origCode} is not a valid UCUM code.`);
+                // try one more time for the unit
+                origUnit = this.utabs_.getUnitByCode(uCode);
               }
-            } else {
-              // Otherwise we found a unit object.  Clone it and then apply the
-              // prefix and exponent, if any, to it.  And remove the guidance.
-              retUnit = origUnit.clone(); // If we are here, this is only part of the full unit string, so it is
-              // not a base unit, and the synonyms will mostly likely not be correct for the full
-              // string.
-
-              retUnit.resetFieldsForDerivedUnit();
-              let theDim = retUnit.getProperty('dim_');
-              let theMag = retUnit.getProperty('magnitude_');
-              let theName = retUnit.getProperty('name_');
-              let theCiCode = retUnit.getProperty('ciCode_');
-              let thePrintSymbol = retUnit.getProperty('printSymbol_'); // If there is an exponent for the unit, apply it to the dimension
-              // and magnitude now
-
-              if (exp) {
-                exp = parseInt(exp);
-                let expMul = exp;
-                if (theDim) theDim = theDim.mul(exp);
-                theMag = Math.pow(theMag, exp);
-                retUnit.assignVals({
-                  'magnitude_': theMag
-                }); // If there is also a prefix, apply the exponent to the prefix.
-
-                if (pfxObj) {
-                  // if the prefix base is 10 it will have an exponent.  Multiply
-                  // the current prefix exponent by the exponent for the unit
-                  // we're working with.  Then raise the prefix value to the level
-                  // defined by the exponent.
-                  if (pfxExp) {
-                    expMul *= pfxObj.getExp();
-                    pfxVal = Math.pow(10, expMul);
-                  } // If the prefix base is not 10, it won't have an exponent.
-                  // At the moment I don't see any units using the prefixes
-                  // that aren't base 10.   But if we get one the prefix value
-                  // will be applied to the magnitude (below) if the unit does
-                  // not have a conversion function, and to the conversion prefix
-                  // if it does.
-
-                } // end if there's a prefix as well as the exponent
-
-              } // end if there's an exponent
-              // Now apply the prefix, if there is one, to the conversion
-              // prefix or the magnitude
 
+              // Reject the unit we found if it might have another prefix.
+              // Such things are in our tables through the LOINC source_
+              // (ucum.csv) which has guidance and synonyms.  I think it should be
+              // safe to exclude anything whose source is LOINC from having a
+              // prefix.
+              if (origUnit && origUnit.source_ == 'LOINC') origUnit = null;
+            } // end if we found a prefix
+          } // end if we didn't get a unit after removing an exponent
+
+          // If we still haven't found anything, we're done looking.
+          // (We tried with the full unit string, with the unit string
+          // without the exponent, the unit string without a prefix,
+          // common errors, etc. That's all we can try).
+          if (!origUnit) {
+            retUnit = null;
+            // BUT if the user asked for suggestions, at least look for them
+            if (this.suggestions_) {
+              let suggestStat = this._getSuggestions(origCode);
+            } else {
+              this.retMsg_.push(`${origCode} is not a valid UCUM code.`);
+            }
+          } else {
+            // Otherwise we found a unit object.  Clone it and then apply the
+            // prefix and exponent, if any, to it.  And remove the guidance.
+            retUnit = origUnit.clone();
+            // If we are here, this is only part of the full unit string, so it is
+            // not a base unit, and the synonyms will mostly likely not be correct for the full
+            // string.
+            retUnit.resetFieldsForDerivedUnit();
+            let theDim = retUnit.getProperty('dim_');
+            let theMag = retUnit.getProperty('magnitude_');
+            let theName = retUnit.getProperty('name_');
+            let theCiCode = retUnit.getProperty('ciCode_');
+            let thePrintSymbol = retUnit.getProperty('printSymbol_');
+            // If there is an exponent for the unit, apply it to the dimension
+            // and magnitude now
+            if (exp) {
+              exp = parseInt(exp);
+              let expMul = exp;
+              if (theDim) theDim = theDim.mul(exp);
+              theMag = Math.pow(theMag, exp);
+              retUnit.assignVals({
+                'magnitude_': theMag
+              });
 
+              // If there is also a prefix, apply the exponent to the prefix.
               if (pfxObj) {
-                if (retUnit.cnv_) {
-                  retUnit.assignVals({
-                    'cnvPfx_': pfxVal
-                  });
-                } else {
-                  theMag *= pfxVal;
-                  retUnit.assignVals({
-                    'magnitude_': theMag
-                  });
+                // if the prefix base is 10 it will have an exponent.  Multiply
+                // the current prefix exponent by the exponent for the unit
+                // we're working with.  Then raise the prefix value to the level
+                // defined by the exponent.
+                if (pfxExp) {
+                  expMul *= pfxObj.getExp();
+                  pfxVal = Math.pow(10, expMul);
                 }
-              } // if we have a prefix and/or an exponent, add them to the unit
-              // attributes - name, csCode, ciCode and print symbol
-
-
-              let theCode = retUnit.csCode_;
-
-              if (pfxObj) {
-                theName = pfxObj.getName() + theName;
-                theCode = pfxCode + theCode;
-                theCiCode = pfxObj.getCiCode() + theCiCode;
-                thePrintSymbol = pfxObj.getPrintSymbol() + thePrintSymbol;
+                // If the prefix base is not 10, it won't have an exponent.
+                // At the moment I don't see any units using the prefixes
+                // that aren't base 10.   But if we get one the prefix value
+                // will be applied to the magnitude (below) if the unit does
+                // not have a conversion function, and to the conversion prefix
+                // if it does.
+              } // end if there's a prefix as well as the exponent
+            } // end if there's an exponent
+
+            // Now apply the prefix, if there is one, to the conversion
+            // prefix or the magnitude
+            if (pfxObj) {
+              if (retUnit.cnv_) {
                 retUnit.assignVals({
-                  'name_': theName,
-                  'csCode_': theCode,
-                  'ciCode_': theCiCode,
-                  'printSymbol_': thePrintSymbol
+                  'cnvPfx_': pfxVal
                 });
-              }
-
-              if (exp) {
-                let expStr = exp.toString();
+              } else {
+                theMag *= pfxVal;
                 retUnit.assignVals({
-                  'name_': theName + '<sup>' + expStr + '</sup>',
-                  'csCode_': theCode + expStr,
-                  'ciCode_': theCiCode + expStr,
-                  'printSymbol_': thePrintSymbol + '<sup>' + expStr + '</sup>'
+                  'magnitude_': theMag
                 });
               }
-            } // end if an original unit was found (without prefix and/or exponent)
-
-          } // end if we didn't get a unit for the full unit code (w/out modifiers)
-
-        } // end if we didn't find the unit on the first try, before parsing
-
-
+            }
+            // if we have a prefix and/or an exponent, add them to the unit
+            // attributes - name, csCode, ciCode and print symbol
+            let theCode = retUnit.csCode_;
+            if (pfxObj) {
+              theName = pfxObj.getName() + theName;
+              theCode = pfxCode + theCode;
+              theCiCode = pfxObj.getCiCode() + theCiCode;
+              thePrintSymbol = pfxObj.getPrintSymbol() + thePrintSymbol;
+              retUnit.assignVals({
+                'name_': theName,
+                'csCode_': theCode,
+                'ciCode_': theCiCode,
+                'printSymbol_': thePrintSymbol
+              });
+            }
+            if (exp) {
+              let expStr = exp.toString();
+              retUnit.assignVals({
+                'name_': theName + '<sup>' + expStr + '</sup>',
+                'csCode_': theCode + expStr,
+                'ciCode_': theCiCode + expStr,
+                'printSymbol_': thePrintSymbol + '<sup>' + expStr + '</sup>'
+              });
+            }
+          } // end if an original unit was found (without prefix and/or exponent)
+        } // end if an invalid exponent wasn't found
+      } // end if we didn't get a unit for the full unit code (w/out modifiers)
+    } // end if we didn't find the unit on the first try, before parsing
     return [retUnit, origString];
   } // end _makeUnit
 
@@ -1288,101 +1218,109 @@ class UnitString {
    * the this.retMsg_ array will be updated with any user messages
    *   (informational, error or warning) generated by this or called methods
    */
-
-
   _getUnitWithAnnotation(uCode, origString) {
-    let retUnit = null; // Get the annotation and anything that precedes or follows it.
+    let retUnit = null;
 
+    // Get the annotation and anything that precedes or follows it.
     let annoRet = this._getAnnoText(uCode, origString);
-
     let annoText = annoRet[0];
     let befAnnoText = annoRet[1];
-    let aftAnnoText = annoRet[2]; // Add the warning about annotations - just once.
+    let aftAnnoText = annoRet[2];
 
-    if (this.bracesMsg_ && this.retMsg_.indexOf(this.bracesMsg_) === -1) this.retMsg_.push(this.bracesMsg_); // If there's no text before or after the annotation, it's probably
+    // Add the warning about annotations - just once.
+
+    if (this.bracesMsg_ && this.retMsg_.indexOf(this.bracesMsg_) === -1) this.retMsg_.push(this.bracesMsg_);
+
+    // If there's no text before or after the annotation, it's probably
     // something that should be interpreted as a 1, e.g., {KCT'U}.
     // HOWEVER, it could also be a case where someone used braces instead
     // of brackets, e.g., {degF} instead of [degF].  Check for that before
     // we assume it should be a 1.
-
     let msgLen = this.retMsg_.length;
-
     if (!befAnnoText && !aftAnnoText) {
       let tryBrackets = '[' + annoText.substring(1, annoText.length - 1) + ']';
+      let mkUnitRet = this._makeUnit(tryBrackets, origString);
 
-      let mkUnitRet = this._makeUnit(tryBrackets, origString); // If we got back a unit, assign it to the returned unit, and add
-      // a message to advise the user that brackets should enclose the code
-
-
+      // Nearly anything inside braces is valid, so we don't want to change the
+      // unit, but we can put the found unit in the message as a sort of
+      // warning.
       if (mkUnitRet[0]) {
-        retUnit = mkUnitRet[0];
-        origString = origString.replace(annoText, tryBrackets);
-        this.retMsg_.push(`${annoText} is not a valid unit expression, but ` + `${tryBrackets} is.\n` + this.vcMsgStart_ + `${tryBrackets} (${retUnit.name_})${this.vcMsgEnd_}`);
-      } // Otherwise assume that this should be interpreted as a 1
-      else {
-          // remove error message generated for trybrackets
-          if (this.retMsg_.length > msgLen) {
-            this.retMsg_.pop();
-          }
-
-          uCode = 1;
-          retUnit = 1;
+        retUnit = uCode;
+        this.retMsg_.push(`${annoText} is a valid unit expression, but ` + `did you mean ${tryBrackets} (${mkUnitRet[0].name_})?`);
+      } else {
+        // remove error message generated for trybrackets
+        if (this.retMsg_.length > msgLen) {
+          this.retMsg_.pop();
         }
+      }
+
+      // This is the case where the string is only this annotation.
+      // Create and return a unit object, as we do for numeric units in
+      // parseString.
+      retUnit = new Unit({
+        'csCode_': annoText,
+        'ciCode_': annoText,
+        'magnitude_': 1,
+        'name_': annoText
+      });
     } // end if it's only an annotation
     else {
-        // if there's text before and no text after, assume the text before
-        // the annotation is the unit code (with an annotation following it).
-        // Call _makeUnit for the text before the annotation.
-        if (befAnnoText && !aftAnnoText) {
-          // make sure that what's before the annoText is not a number, e.g.,
-          // /100{cells}.  But f it is a number, just set the return unit to
-          // the number.
-          if (intUtils_.isIntegerUnit(befAnnoText)) {
-            retUnit = befAnnoText;
-          } // Otherwise try to find a unit
-          else {
-              let mkUnitRet = this._makeUnit(befAnnoText, origString); // if a unit was returned
-
+      // if there's text before and no text after, assume the text before
+      // the annotation is the unit code (with an annotation following it).
+      // Call _makeUnit for the text before the annotation.
+      if (befAnnoText && !aftAnnoText) {
+        // make sure that what's before the annoText is not a number, e.g.,
+        // /100{cells}.  But f it is a number, just set the return unit to
+        // the number.
+        if (intUtils_.isIntegerUnit(befAnnoText)) {
+          retUnit = befAnnoText;
+        }
+        // Otherwise try to find a unit
+        else {
+          let mkUnitRet = this._makeUnit(befAnnoText, origString);
 
-              if (mkUnitRet[0]) {
-                retUnit = mkUnitRet[0];
-                retUnit.csCode_ += annoText;
-                origString = mkUnitRet[1];
-              } // Otherwise add a not found message
-              else {
-                  this.retMsg_.push(`Unable to find a unit for ${befAnnoText} that ` + `precedes the annotation ${annoText}.`);
-                }
-            }
-        } // else if there's only text after the annotation, try for a unit
-        // from the after text and assume the user put the annotation in
-        // the wrong place (and tell them)
-        else if (!befAnnoText && aftAnnoText) {
-            // Again, test for a number and if it is a number, set the return
-            // unit to the number.
-            if (intUtils_.isIntegerUnit(aftAnnoText)) {
-              retUnit = aftAnnoText + annoText;
-              this.retMsg_.push(`The annotation ${annoText} before the ``${aftAnnoText} is invalid.\n` + this.vcMsgStart_ + retUnit + this.vcMsgEnd_);
-            } else {
-              let mkUnitRet = this._makeUnit(aftAnnoText, origString);
-
-              if (mkUnitRet[0]) {
-                retUnit = mkUnitRet[0];
-                retUnit.csCode_ += annoText;
-                origString = retUnit.csCode_;
-                this.retMsg_.push(`The annotation ${annoText} before the unit ` + `code is invalid.\n` + this.vcMsgStart_ + retUnit.csCode_ + this.vcMsgEnd_);
-              } // Otherwise add a not found message
-              else {
-                  this.retMsg_.push(`Unable to find a unit for ${befAnnoText} that ` + `follows the annotation ${annoText}.`);
-                }
-            }
-          } // else it's got text before AND after the annotation.  Now what?
-          // For now this is an error.  This may be a case of a missing
-          // operator but that is not handled yet.
+          // if a unit was returned
+          if (mkUnitRet[0]) {
+            retUnit = mkUnitRet[0];
+            retUnit.csCode_ += annoText;
+            origString = mkUnitRet[1];
+          }
+          // Otherwise add a not found message
           else {
-              this.retMsg_.push(`Unable to find a unit for ${befAnnoText}${annoText}` + `${aftAnnoText}.\nWe are not sure how to interpret text both before ` + `and after the annotation.  Sorry`);
-            }
-      } // else if there's text before/and or after the annotation
-
+            this.retMsg_.push(`Unable to find a unit for ${befAnnoText} that ` + `precedes the annotation ${annoText}.`);
+          }
+        }
+      }
+      // else if there's only text after the annotation, try for a unit
+      // from the after text and assume the user put the annotation in
+      // the wrong place (and tell them)
+      else if (!befAnnoText && aftAnnoText) {
+        // Again, test for a number and if it is a number, set the return
+        // unit to the number.
+        if (intUtils_.isIntegerUnit(aftAnnoText)) {
+          retUnit = aftAnnoText + annoText;
+          this.retMsg_.push(`The annotation ${annoText} before the ``${aftAnnoText} is invalid.\n` + this.vcMsgStart_ + retUnit + this.vcMsgEnd_);
+        } else {
+          let mkUnitRet = this._makeUnit(aftAnnoText, origString);
+          if (mkUnitRet[0]) {
+            retUnit = mkUnitRet[0];
+            retUnit.csCode_ += annoText;
+            origString = retUnit.csCode_;
+            this.retMsg_.push(`The annotation ${annoText} before the unit ` + `code is invalid.\n` + this.vcMsgStart_ + retUnit.csCode_ + this.vcMsgEnd_);
+          }
+          // Otherwise add a not found message
+          else {
+            this.retMsg_.push(`Unable to find a unit for ${befAnnoText} that ` + `follows the annotation ${annoText}.`);
+          }
+        }
+      }
+      // else it's got text before AND after the annotation.  Now what?
+      // For now this is an error.  This may be a case of a missing
+      // operator but that is not handled yet.
+      else {
+        this.retMsg_.push(`Unable to find a unit for ${befAnnoText}${annoText}` + `${aftAnnoText}.\nWe are not sure how to interpret text both before ` + `and after the annotation.  Sorry`);
+      }
+    } // else if there's text before/and or after the annotation
 
     return [retUnit, origString];
   } // end _getUnitWithAnnotations
@@ -1403,11 +1341,8 @@ class UnitString {
    * the this.retMsg_ array will be updated with any user messages
    *   (informational, error or warning) generated by this or called methods
    */
-
-
   _performUnitArithmetic(uArray, origString) {
     let finalUnit = uArray[0]['un'];
-
     if (intUtils_.isIntegerUnit(finalUnit)) {
       finalUnit = new Unit({
         'csCode_': finalUnit,
@@ -1416,14 +1351,12 @@ class UnitString {
         'name_': finalUnit
       });
     }
-
     let uLen = uArray.length;
-    let endProcessing = false; // Perform the arithmetic for the units, starting with the first 2 units.
+    let endProcessing = false;
+    // Perform the arithmetic for the units, starting with the first 2 units.
     // We only need to do the arithmetic if we have more than one unit.
-
     for (let u2 = 1; u2 < uLen && !endProcessing; u2++) {
       let nextUnit = uArray[u2]['un'];
-
       if (intUtils_.isIntegerUnit(nextUnit)) {
         nextUnit = new Unit({
           'csCode_': nextUnit,
@@ -1432,14 +1365,11 @@ class UnitString {
           'name_': nextUnit
         });
       }
-
       if (nextUnit === null || typeof nextUnit !== 'number' && !nextUnit.getProperty) {
         let msgString = `Unit string (${origString}) contains unrecognized ` + 'element';
-
         if (nextUnit) {
           msgString += ` (${this.openEmph_}${nextUnit.toString()}` + `${this.closeEmph_})`;
         }
-
         msgString += '; could not parse full string.  Sorry';
         this.retMsg_.push(msgString);
         endProcessing = true;
@@ -1447,9 +1377,10 @@ class UnitString {
         try {
           // Is the operation division?
           let thisOp = uArray[u2]['op'];
-          let isDiv = thisOp === '/'; // Perform the operation.  Both the finalUnit and nextUnit
-          // are unit objects.
+          let isDiv = thisOp === '/';
 
+          // Perform the operation.  Both the finalUnit and nextUnit
+          // are unit objects.
           isDiv ? finalUnit = finalUnit.divide(nextUnit) : finalUnit = finalUnit.multiplyThese(nextUnit);
         } catch (err) {
           this.retMsg_.unshift(err.message);
@@ -1457,10 +1388,7 @@ class UnitString {
           finalUnit = null;
         }
       } // end if we have another valid unit/number to process
-
     } // end do for each unit after the first one
-
-
     return finalUnit;
   } // end _performUnitArithmetic
 
@@ -1488,25 +1416,21 @@ class UnitString {
    *  if there is no trailing number or something follows the trailing
    *  number, or if the first part is not characters.
    */
-
-
   _isCodeWithExponent(uCode) {
     let ret = [];
-    let res = uCode.match(/(^[^\-\+]+?)([\-\+\d]+)$/); // If we got a return with an exponent, separate the exponent from the
-    // unit and return both (as separate values)
+    let res = uCode.match(/(^[^\-\+]+?)([\-\+\d]+)$/);
 
+    // If we got a return with an exponent, separate the exponent from the
+    // unit and return both (as separate values)
     if (res && res[2] && res[2] !== "") {
       ret.push(res[1]);
       ret.push(res[2]);
     } // end if we got an exponent
     else {
-        ret = null;
-      }
-
+      ret = null;
+    }
     return ret;
   } // end _isCodeWithExponent
-
-
 } // end class UnitString
 
 /**
@@ -1520,18 +1444,13 @@ class UnitString {
  *
  *  @return the singleton UnitString object.
  */
-
-
 exports.UnitString = UnitString;
-
 _defineProperty(UnitString, "INVALID_ANNOTATION_CHAR_MSG", 'An invalid character was found in the annotation ');
-
-// A regular expression for validating annotation strings.
 _defineProperty(UnitString, "VALID_ANNOTATION_REGEX", /^\{[!-z|~]*\}$/);
-
 UnitString.getInstance = function () {
   return new UnitString();
 };
+
 /*
 // Perform the first request for the object, to set the getInstance method.
 UnitString.getInstance();