@khanacademy/kas 0.2.7 → 0.3.0

package/dist/es/index.js

@@ -3,7 +3,6 @@ import _ from 'underscore';
 // this is a @generated file
 
 /* parser generated by jison 0.4.15 */
-
 /*
   Returns a Parser object of the following structure:
 
@@ -78,17 +77,15 @@ import _ from 'underscore';
 */
 var parser$1 = function () {
   var o = function o(k, v, _o, l) {
-    for (_o = _o || {}, l = k.length; l--; _o[k[l]] = v) {
-    }
-
-    return _o;
-  },
-      $V0 = [1, 11],
-      $V1 = [1, 9],
-      $V2 = [8, 17],
-      $V3 = [6, 11],
-      $V4 = [6, 11, 13, 17];
-
+      for (_o = _o || {}, l = k.length; l--; _o[k[l]] = v) {
+      }
+      return _o;
+    },
+    $V0 = [1, 11],
+    $V1 = [1, 9],
+    $V2 = [8, 17],
+    $V3 = [6, 11],
+    $V4 = [6, 11, 13, 17];
   var parser = {
     trace: function trace() {},
     yy: {},
@@ -128,16 +125,10 @@ var parser$1 = function () {
       20: "NEG"
     },
     productions_: [0, [3, 3], [3, 2], [4, 3], [4, 1], [5, 3], [5, 1], [10, 3], [10, 2], [10, 1], [12, 3], [12, 1], [14, 1], [7, 1], [7, 1], [16, 1], [9, 2], [9, 1]],
-    performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate
-    /* action[1] */
-    , $$
-    /* vstack */
-    , _$
-    /* lstack */
-    ) {
+    performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate /* action[1] */, $$ /* vstack */, _$ /* lstack */) {
       /* this == yyval */
-      var $0 = $$.length - 1;
 
+      var $0 = $$.length - 1;
       switch (yystate) {
         case 1:
           return {
@@ -145,17 +136,14 @@ var parser$1 = function () {
             magnitude: $$[$0 - 2],
             unit: $$[$0 - 1]
           };
-
         case 2:
           return {
             type: "unitStandalone",
             unit: $$[$0 - 1]
           };
-
         case 3:
           this.$ = $$[$0 - 2] + "e" + $$[$0];
           break;
-
         case 4:
         case 13:
         case 14:
@@ -163,51 +151,42 @@ var parser$1 = function () {
         case 17:
           this.$ = $$[$0];
           break;
-
         case 5:
           this.$ = {
             num: $$[$0 - 2],
             denom: $$[$0]
           };
           break;
-
         case 6:
           this.$ = {
             num: $$[$0],
             denom: null
           };
           break;
-
         case 7:
           this.$ = [$$[$0 - 2]].concat($$[$0]);
           break;
-
         case 8:
           this.$ = [$$[$0 - 1]].concat($$[$0]);
           break;
-
         case 9:
           this.$ = [$$[$0]];
           break;
-
         case 10:
           this.$ = {
             name: $$[$0 - 2],
             pow: $$[$0]
           };
           break;
-
         case 11:
           this.$ = {
             name: $$[$0],
             pow: 1
           };
           break;
-
         case 12:
           this.$ = yytext;
           break;
-
         case 16:
           this.$ = "-" + $$[$0];
           break;
@@ -300,96 +279,80 @@ var parser$1 = function () {
     },
     parse: function parse(input) {
       var self = this,
-          stack = [0],
-          vstack = [null],
-          lstack = [],
-          table = this.table,
-          yytext = '',
-          yylineno = 0,
-          yyleng = 0,
-          TERROR = 2,
-          EOF = 1;
+        stack = [0],
+        vstack = [null],
+        lstack = [],
+        table = this.table,
+        yytext = '',
+        yylineno = 0,
+        yyleng = 0,
+        TERROR = 2,
+        EOF = 1;
       var args = lstack.slice.call(arguments, 1);
       var lexer = Object.create(this.lexer);
       var sharedState = {
         yy: {}
       };
-
       for (var k in this.yy) {
         if (Object.prototype.hasOwnProperty.call(this.yy, k)) {
           sharedState.yy[k] = this.yy[k];
         }
       }
-
       lexer.setInput(input, sharedState.yy);
       sharedState.yy.lexer = lexer;
       sharedState.yy.parser = this;
-
       if (typeof lexer.yylloc == 'undefined') {
         lexer.yylloc = {};
       }
-
       var yyloc = lexer.yylloc;
       lstack.push(yyloc);
       var ranges = lexer.options && lexer.options.ranges;
-
       if (typeof sharedState.yy.parseError === 'function') {
         this.parseError = sharedState.yy.parseError;
       } else {
         this.parseError = Object.getPrototypeOf(this).parseError;
       }
-
-
+      //_token_stack:
       function lex() {
         var token;
         token = lexer.lex() || EOF;
-
         if (typeof token !== 'number') {
           token = self.symbols_[token] || token;
         }
-
         return token;
       }
-
       var symbol,
-          state,
-          action,
-          r,
-          yyval = {},
-          p,
-          len,
-          newState,
-          expected;
-
+        state,
+        action,
+        r,
+        yyval = {},
+        p,
+        len,
+        newState,
+        expected;
       while (true) {
         state = stack[stack.length - 1];
-
         if (this.defaultActions[state]) {
           action = this.defaultActions[state];
         } else {
           if (symbol === null || typeof symbol == 'undefined') {
             symbol = lex();
           }
-
           action = table[state] && table[state][symbol];
         }
-
         if (typeof action === 'undefined' || !action.length || !action[0]) {
           var errStr = '';
           expected = [];
-
           for (p in table[state]) {
             if (this.terminals_[p] && p > TERROR) {
               expected.push('\'' + this.terminals_[p] + '\'');
             }
           }
-
           if (lexer.showPosition) {
             errStr = 'Parse error on line ' + (yylineno + 1) + ':\n' + lexer.showPosition() + '\nExpecting ' + expected.join(', ') + ', got \'' + (this.terminals_[symbol] || symbol) + '\'';
           } else {
             errStr = 'Parse error on line ' + (yylineno + 1) + ': Unexpected ' + (symbol == EOF ? 'end of input' : '\'' + (this.terminals_[symbol] || symbol) + '\'');
           }
-
           this.parseError(errStr, {
             text: lexer.match,
             token: this.terminals_[symbol] || symbol,
@@ -398,11 +361,9 @@ var parser$1 = function () {
             expected: expected
           });
         }
-
         if (action[0] instanceof Array && action.length > 1) {
           throw new Error('Parse Error: multiple actions possible at state: ' + state + ', token: ' + symbol);
         }
-
         switch (action[0]) {
           case 1:
             stack.push(symbol);
@@ -410,16 +371,13 @@ var parser$1 = function () {
             lstack.push(lexer.yylloc);
             stack.push(action[1]);
             symbol = null;
-
             {
               yyleng = lexer.yyleng;
               yytext = lexer.yytext;
               yylineno = lexer.yylineno;
               yyloc = lexer.yylloc;
             }
-
             break;
-
           case 2:
             len = this.productions_[action[1]][1];
             yyval.$ = vstack[vstack.length - len];
@@ -429,40 +387,32 @@ var parser$1 = function () {
               first_column: lstack[lstack.length - (len || 1)].first_column,
               last_column: lstack[lstack.length - 1].last_column
             };
-
             if (ranges) {
               yyval._$.range = [lstack[lstack.length - (len || 1)].range[0], lstack[lstack.length - 1].range[1]];
             }
-
             r = this.performAction.apply(yyval, [yytext, yyleng, yylineno, sharedState.yy, action[1], vstack, lstack].concat(args));
-
             if (typeof r !== 'undefined') {
               return r;
             }
-
             if (len) {
               stack = stack.slice(0, -1 * len * 2);
               vstack = vstack.slice(0, -1 * len);
               lstack = lstack.slice(0, -1 * len);
             }
-
             stack.push(this.productions_[action[1]][0]);
             vstack.push(yyval.$);
             lstack.push(yyval._$);
             newState = table[stack[stack.length - 2]][stack[stack.length - 1]];
             stack.push(newState);
             break;
-
           case 3:
             return true;
         }
       }
-
       return true;
     }
   };
   /* generated by jison-lex 0.3.4 */
-
   var lexer = function () {
     var lexer = {
       EOF: 1,
@@ -487,11 +437,9 @@ var parser$1 = function () {
           last_line: 1,
           last_column: 0
         };
-
         if (this.options.ranges) {
           this.yylloc.range = [0, 0];
         }
-
         this.offset = 0;
         return this;
       },
@@ -504,18 +452,15 @@ var parser$1 = function () {
         this.match += ch;
         this.matched += ch;
         var lines = ch.match(/(?:\r\n?|\n).*/g);
-
         if (lines) {
           this.yylineno++;
           this.yylloc.last_line++;
         } else {
           this.yylloc.last_column++;
         }
-
         if (this.options.ranges) {
           this.yylloc.range[1]++;
         }
-
         this._input = this._input.slice(1);
         return ch;
       },
@@ -524,17 +469,15 @@ var parser$1 = function () {
         var len = ch.length;
         var lines = ch.split(/(?:\r\n?|\n)/g);
         this._input = ch + this._input;
-        this.yytext = this.yytext.substr(0, this.yytext.length - len); //this.yyleng -= len;
-
+        this.yytext = this.yytext.substr(0, this.yytext.length - len);
+        //this.yyleng -= len;
         this.offset -= len;
         var oldLines = this.match.split(/(?:\r\n?|\n)/g);
         this.match = this.match.substr(0, this.match.length - 1);
         this.matched = this.matched.substr(0, this.matched.length - 1);
-
         if (lines.length - 1) {
           this.yylineno -= lines.length - 1;
         }
-
         var r = this.yylloc.range;
         this.yylloc = {
           first_line: this.yylloc.first_line,
@@ -542,11 +485,9 @@ var parser$1 = function () {
           first_column: this.yylloc.first_column,
           last_column: lines ? (lines.length === oldLines.length ? this.yylloc.first_column : 0) + oldLines[oldLines.length - lines.length].length - lines[0].length : this.yylloc.first_column - len
         };
-
         if (this.options.ranges) {
           this.yylloc.range = [r[0], r[0] + this.yyleng - len];
         }
-
         this.yyleng = this.yytext.length;
         return this;
       },
@@ -566,7 +507,6 @@ var parser$1 = function () {
             line: this.yylineno
           });
         }
-
         return this;
       },
       // retain first n characters of the match
@@ -581,11 +521,9 @@ var parser$1 = function () {
       // displays upcoming input, i.e. for error messages
       upcomingInput: function upcomingInput() {
         var next = this.match;
-
         if (next.length < 20) {
           next += this._input.substr(0, 20 - next.length);
         }
-
         return (next.substr(0, 20) + (next.length > 20 ? '...' : '')).replace(/\n/g, "");
       },
       // displays the character position where the lexing error occurred, i.e. for error messages
@@ -597,7 +535,6 @@ var parser$1 = function () {
       // test the lexed token: return FALSE when not a match, otherwise return token
       test_match: function test_match(match, indexed_rule) {
         var token, lines, backup;
-
         if (this.options.backtrack_lexer) {
           // save context
           backup = {
@@ -620,18 +557,14 @@ var parser$1 = function () {
             conditionStack: this.conditionStack.slice(0),
             done: this.done
           };
-
           if (this.options.ranges) {
             backup.yylloc.range = this.yylloc.range.slice(0);
           }
         }
-
         lines = match[0].match(/(?:\r\n?|\n).*/g);
-
         if (lines) {
           this.yylineno += lines.length;
         }
-
         this.yylloc = {
           first_line: this.yylloc.last_line,
           last_line: this.yylineno + 1,
@@ -642,21 +575,17 @@ var parser$1 = function () {
         this.match += match[0];
         this.matches = match;
         this.yyleng = this.yytext.length;
-
         if (this.options.ranges) {
           this.yylloc.range = [this.offset, this.offset += this.yyleng];
         }
-
         this._more = false;
         this._backtrack = false;
         this._input = this._input.slice(match[0].length);
         this.matched += match[0];
         token = this.performAction.call(this, this.yy, this, indexed_rule, this.conditionStack[this.conditionStack.length - 1]);
-
         if (this.done && this._input) {
           this.done = false;
         }
-
         if (token) {
           return token;
         } else if (this._backtrack) {
@@ -664,7 +593,6 @@ var parser$1 = function () {
           for (var k in backup) {
             this[k] = backup[k];
           }
-
           return false; // rule action called reject() implying the next rule should be tested instead.
         }
 
@@ -675,30 +603,22 @@ var parser$1 = function () {
         if (this.done) {
           return this.EOF;
         }
-
         if (!this._input) {
           this.done = true;
         }
-
         var token, match, tempMatch, index;
-
         if (!this._more) {
           this.yytext = '';
           this.match = '';
         }
-
         var rules = this._currentRules();
-
         for (var i = 0; i < rules.length; i++) {
           tempMatch = this._input.match(this.rules[rules[i]]);
-
           if (tempMatch && (!match || tempMatch[0].length > match[0].length)) {
             match = tempMatch;
             index = i;
-
             if (this.options.backtrack_lexer) {
               token = this.test_match(tempMatch, rules[i]);
-
               if (token !== false) {
                 return token;
               } else if (this._backtrack) {
@@ -713,18 +633,14 @@ var parser$1 = function () {
             }
           }
         }
-
         if (match) {
           token = this.test_match(match, rules[index]);
-
           if (token !== false) {
             return token;
-          } // else: this is a lexer rule which consumes input without producing a token (e.g. whitespace)
-
-
+          }
+          // else: this is a lexer rule which consumes input without producing a token (e.g. whitespace)
           return false;
         }
-
         if (this._input === "") {
           return this.EOF;
         } else {
@@ -738,7 +654,6 @@ var parser$1 = function () {
       // return next match that has a token
       lex: function lex() {
         var r = this.next();
-
         if (r) {
           return r;
         } else {
@@ -752,7 +667,6 @@ var parser$1 = function () {
       // pop the previously active lexer condition state off the condition stack
       popState: function popState() {
         var n = this.conditionStack.length - 1;
-
         if (n > 0) {
           return this.conditionStack.pop();
         } else {
@@ -770,7 +684,6 @@ var parser$1 = function () {
       // return the currently active lexer condition state; when an index argument is provided it produces the N-th previous condition state, if available
       topState: function topState(n) {
         n = this.conditionStack.length - 1 - Math.abs(n || 0);
-
         if (n >= 0) {
           return this.conditionStack[n];
         } else {
@@ -787,48 +700,34 @@ var parser$1 = function () {
       },
       options: {},
       performAction: function anonymous(yy, yy_, $avoiding_name_collisions, YY_START) {
-
         switch ($avoiding_name_collisions) {
           case 0:
             return 11;
-
           case 1:
             return '(';
-
           case 2:
             return ')';
-
           case 3:
             return 8;
-
           case 4:
             return 15;
-
           case 5:
             return 13;
-
           case 6:
             return 18;
-
           case 7:
             return 19;
-
           case 8:
             return 20;
-
           case 9:
             return 17;
-
           case 10:
             return 17;
-
           case 11:
             return 17;
-
           case 12:
             /* skip whitespace */
             break;
-
           case 13:
             return 6;
         }
@@ -843,23 +742,19 @@ var parser$1 = function () {
     };
     return lexer;
   }();
-
   parser.lexer = lexer;
-
   function Parser() {
     this.yy = {};
   }
-
   Parser.prototype = parser;
   parser.Parser = Parser;
   return new Parser();
 }();
-
 var unitParser = parser$1;
 
 // This is a @generated file
-/* parser generated by jison 0.4.15 */
 
+/* parser generated by jison 0.4.15 */
 /*
   Returns a Parser object of the following structure:
 
@@ -932,40 +827,37 @@ var unitParser = parser$1;
     recoverable: (boolean: TRUE when the parser has a error recovery rule available for this particular error)
   }
 */
-
 var parser = function () {
   var o = function o(k, v, _o, l) {
-    for (_o = _o || {}, l = k.length; l--; _o[k[l]] = v) {
-    }
-
-    return _o;
-  },
-      $V0 = [1, 7],
-      $V1 = [1, 17],
-      $V2 = [1, 13],
-      $V3 = [1, 14],
-      $V4 = [1, 15],
-      $V5 = [1, 32],
-      $V6 = [1, 22],
-      $V7 = [1, 23],
-      $V8 = [1, 24],
-      $V9 = [1, 25],
-      $Va = [1, 26],
-      $Vb = [1, 33],
-      $Vc = [1, 27],
-      $Vd = [1, 28],
-      $Ve = [1, 29],
-      $Vf = [1, 30],
-      $Vg = [1, 20],
-      $Vh = [1, 36],
-      $Vi = [1, 37],
-      $Vj = [5, 6, 8, 10, 33, 35, 41, 43, 45],
-      $Vk = [1, 39],
-      $Vl = [1, 40],
-      $Vm = [5, 6, 8, 10, 12, 14, 16, 19, 21, 22, 28, 29, 30, 31, 32, 33, 34, 35, 37, 39, 41, 42, 43, 44, 45, 46],
-      $Vn = [10, 16, 19, 21, 22, 28, 29, 30, 31, 32, 34, 37, 39, 42, 43, 44, 46],
-      $Vo = [5, 6, 8, 10, 12, 14, 16, 18, 19, 21, 22, 28, 29, 30, 31, 32, 33, 34, 35, 37, 39, 41, 42, 43, 44, 45, 46];
-
+      for (_o = _o || {}, l = k.length; l--; _o[k[l]] = v) {
+      }
+      return _o;
+    },
+    $V0 = [1, 7],
+    $V1 = [1, 17],
+    $V2 = [1, 13],
+    $V3 = [1, 14],
+    $V4 = [1, 15],
+    $V5 = [1, 32],
+    $V6 = [1, 22],
+    $V7 = [1, 23],
+    $V8 = [1, 24],
+    $V9 = [1, 25],
+    $Va = [1, 26],
+    $Vb = [1, 33],
+    $Vc = [1, 27],
+    $Vd = [1, 28],
+    $Ve = [1, 29],
+    $Vf = [1, 30],
+    $Vg = [1, 20],
+    $Vh = [1, 36],
+    $Vi = [1, 37],
+    $Vj = [5, 6, 8, 10, 33, 35, 41, 43, 45],
+    $Vk = [1, 39],
+    $Vl = [1, 40],
+    $Vm = [5, 6, 8, 10, 12, 14, 16, 19, 21, 22, 28, 29, 30, 31, 32, 33, 34, 35, 37, 39, 41, 42, 43, 44, 45, 46],
+    $Vn = [10, 16, 19, 21, 22, 28, 29, 30, 31, 32, 34, 37, 39, 42, 43, 44, 46],
+    $Vo = [5, 6, 8, 10, 12, 14, 16, 18, 19, 21, 22, 28, 29, 30, 31, 32, 33, 34, 35, 37, 39, 41, 42, 43, 44, 45, 46];
   var parser = {
     trace: function trace() {},
     yy: {},
@@ -1051,26 +943,17 @@ var parser = function () {
       46: "FRAC"
     },
     productions_: [0, [3, 4], [3, 2], [3, 1], [4, 1], [7, 3], [7, 3], [7, 1], [9, 2], [9, 3], [9, 3], [9, 1], [13, 2], [13, 1], [15, 1], [17, 1], [17, 3], [17, 1], [20, 1], [20, 1], [20, 3], [11, 2], [11, 2], [11, 1], [25, 3], [25, 1], [27, 1], [24, 3], [24, 1], [24, 1], [24, 1], [24, 1], [24, 3], [24, 3], [36, 1], [38, 4], [38, 4], [38, 7], [38, 4], [38, 3], [38, 3], [38, 4], [26, 1], [26, 1], [26, 7]],
-    performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate
-    /* action[1] */
-    , $$
-    /* vstack */
-    , _$
-    /* lstack */
-    ) {
+    performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate /* action[1] */, $$ /* vstack */, _$ /* lstack */) {
       /* this == yyval */
-      var $0 = $$.length - 1;
 
+      var $0 = $$.length - 1;
       switch (yystate) {
         case 1:
           return new yy.Eq($$[$0 - 3], $$[$0 - 2], $$[$0 - 1]);
-
         case 2:
           return $$[$0 - 1];
-
         case 3:
           return new yy.Add([]);
-
         case 4:
         case 7:
         case 11:
@@ -1083,112 +966,86 @@ var parser = function () {
         case 43:
           this.$ = $$[$0];
           break;
-
         case 5:
           this.$ = yy.Add.createOrAppend($$[$0 - 2], $$[$0]);
           break;
-
         case 6:
           this.$ = yy.Add.createOrAppend($$[$0 - 2], yy.Mul.handleNegative($$[$0], "subtract"));
           break;
-
         case 8:
           this.$ = yy.Mul.fold(yy.Mul.createOrAppend($$[$0 - 1], $$[$0]));
           break;
-
         case 9:
           this.$ = yy.Mul.fold(yy.Mul.createOrAppend($$[$0 - 2], $$[$0]));
           break;
-
         case 10:
           this.$ = yy.Mul.fold(yy.Mul.handleDivide($$[$0 - 2], $$[$0]));
           break;
-
         case 12:
           this.$ = yy.Mul.handleNegative($$[$0]);
           break;
-
         case 14:
         case 17:
           this.$ = [yytext];
           break;
-
         case 16:
           this.$ = $$[$0 - 2].concat($$[$0]);
           break;
-
         case 18:
           this.$ = yy.Log.natural();
           break;
-
         case 19:
           this.$ = yy.Log.common();
           break;
-
         case 21:
           this.$ = yy.Trig.create($$[$0 - 1], $$[$0]);
           break;
-
         case 22:
           this.$ = yy.Log.create($$[$0 - 1], $$[$0]);
           break;
-
         case 24:
           this.$ = new yy.Pow($$[$0 - 2], $$[$0]);
           break;
-
         case 26:
         case 34:
           this.$ = yytext;
           break;
-
         case 27:
           this.$ = new yy.Var($$[$0 - 2], $$[$0]);
           break;
-
         case 28:
           this.$ = new yy.Var($$[$0]);
           break;
-
         case 29:
           this.$ = new yy.Const(yytext.toLowerCase());
           break;
-
         case 30:
           this.$ = yy.Int.create(Number(yytext));
           break;
-
         case 31:
           this.$ = yy.Float.create(Number(yytext));
           break;
-
         case 32:
           this.$ = $$[$0 - 1].completeParse();
           break;
-
         case 33:
           this.$ = $$[$0 - 1].completeParse().addHint('parens');
           break;
-
         case 35:
         case 36:
           this.$ = yy.Pow.sqrt($$[$0 - 1]);
           break;
-
         case 37:
           this.$ = new yy.Pow.nthroot($$[$0 - 1], $$[$0 - 4]);
           break;
-
         case 38:
         case 39:
         case 40:
           this.$ = new yy.Abs($$[$0 - 1]);
           break;
-
         case 41:
           this.$ = new yy.Func($$[$0 - 3], $$[$0 - 1]);
           break;
-
         case 44:
           this.$ = yy.Mul.handleDivide($$[$0 - 4], $$[$0 - 1]);
           break;
@@ -2101,96 +1958,80 @@ var parser = function () {
     },
     parse: function parse(input) {
       var self = this,
-          stack = [0],
-          vstack = [null],
-          lstack = [],
-          table = this.table,
-          yytext = '',
-          yylineno = 0,
-          yyleng = 0,
-          TERROR = 2,
-          EOF = 1;
+        stack = [0],
+        vstack = [null],
+        lstack = [],
+        table = this.table,
+        yytext = '',
+        yylineno = 0,
+        yyleng = 0,
+        TERROR = 2,
+        EOF = 1;
       var args = lstack.slice.call(arguments, 1);
       var lexer = Object.create(this.lexer);
       var sharedState = {
         yy: {}
       };
-
       for (var k in this.yy) {
         if (Object.prototype.hasOwnProperty.call(this.yy, k)) {
           sharedState.yy[k] = this.yy[k];
         }
       }
-
       lexer.setInput(input, sharedState.yy);
       sharedState.yy.lexer = lexer;
       sharedState.yy.parser = this;
-
       if (typeof lexer.yylloc == 'undefined') {
         lexer.yylloc = {};
       }
-
       var yyloc = lexer.yylloc;
       lstack.push(yyloc);
       var ranges = lexer.options && lexer.options.ranges;
-
       if (typeof sharedState.yy.parseError === 'function') {
         this.parseError = sharedState.yy.parseError;
       } else {
         this.parseError = Object.getPrototypeOf(this).parseError;
       }
-
-
+      //_token_stack:
       function lex() {
         var token;
         token = lexer.lex() || EOF;
-
         if (typeof token !== 'number') {
           token = self.symbols_[token] || token;
         }
-
         return token;
       }
-
       var symbol,
-          state,
-          action,
-          r,
-          yyval = {},
-          p,
-          len,
-          newState,
-          expected;
-
+        state,
+        action,
+        r,
+        yyval = {},
+        p,
+        len,
+        newState,
+        expected;
       while (true) {
         state = stack[stack.length - 1];
-
         if (this.defaultActions[state]) {
           action = this.defaultActions[state];
         } else {
           if (symbol === null || typeof symbol == 'undefined') {
             symbol = lex();
           }
-
           action = table[state] && table[state][symbol];
         }
-
         if (typeof action === 'undefined' || !action.length || !action[0]) {
           var errStr = '';
           expected = [];
-
           for (p in table[state]) {
             if (this.terminals_[p] && p > TERROR) {
               expected.push('\'' + this.terminals_[p] + '\'');
             }
           }
-
           if (lexer.showPosition) {
             errStr = 'Parse error on line ' + (yylineno + 1) + ':\n' + lexer.showPosition() + '\nExpecting ' + expected.join(', ') + ', got \'' + (this.terminals_[symbol] || symbol) + '\'';
           } else {
             errStr = 'Parse error on line ' + (yylineno + 1) + ': Unexpected ' + (symbol == EOF ? 'end of input' : '\'' + (this.terminals_[symbol] || symbol) + '\'');
           }
-
           this.parseError(errStr, {
             text: lexer.match,
             token: this.terminals_[symbol] || symbol,
@@ -2199,11 +2040,9 @@ var parser = function () {
             expected: expected
           });
         }
-
         if (action[0] instanceof Array && action.length > 1) {
           throw new Error('Parse Error: multiple actions possible at state: ' + state + ', token: ' + symbol);
         }
-
         switch (action[0]) {
           case 1:
             stack.push(symbol);
@@ -2211,16 +2050,13 @@ var parser = function () {
             lstack.push(lexer.yylloc);
             stack.push(action[1]);
             symbol = null;
-
             {
               yyleng = lexer.yyleng;
               yytext = lexer.yytext;
               yylineno = lexer.yylineno;
               yyloc = lexer.yylloc;
             }
-
             break;
-
           case 2:
             len = this.productions_[action[1]][1];
             yyval.$ = vstack[vstack.length - len];
@@ -2230,40 +2066,32 @@ var parser = function () {
               first_column: lstack[lstack.length - (len || 1)].first_column,
               last_column: lstack[lstack.length - 1].last_column
             };
-
             if (ranges) {
               yyval._$.range = [lstack[lstack.length - (len || 1)].range[0], lstack[lstack.length - 1].range[1]];
             }
-
             r = this.performAction.apply(yyval, [yytext, yyleng, yylineno, sharedState.yy, action[1], vstack, lstack].concat(args));
-
             if (typeof r !== 'undefined') {
               return r;
             }
-
             if (len) {
               stack = stack.slice(0, -1 * len * 2);
               vstack = vstack.slice(0, -1 * len);
               lstack = lstack.slice(0, -1 * len);
             }
-
             stack.push(this.productions_[action[1]][0]);
             vstack.push(yyval.$);
             lstack.push(yyval._$);
             newState = table[stack[stack.length - 2]][stack[stack.length - 1]];
             stack.push(newState);
             break;
-
           case 3:
             return true;
         }
       }
-
       return true;
     }
   };
   /* generated by jison-lex 0.3.4 */
-
   var lexer = function () {
     var lexer = {
       EOF: 1,
@@ -2288,11 +2116,9 @@ var parser = function () {
           last_line: 1,
           last_column: 0
         };
-
         if (this.options.ranges) {
           this.yylloc.range = [0, 0];
         }
-
         this.offset = 0;
         return this;
       },
@@ -2305,18 +2131,15 @@ var parser = function () {
         this.match += ch;
         this.matched += ch;
         var lines = ch.match(/(?:\r\n?|\n).*/g);
-
         if (lines) {
           this.yylineno++;
           this.yylloc.last_line++;
         } else {
           this.yylloc.last_column++;
         }
-
         if (this.options.ranges) {
           this.yylloc.range[1]++;
         }
-
         this._input = this._input.slice(1);
         return ch;
       },
@@ -2325,17 +2148,15 @@ var parser = function () {
         var len = ch.length;
         var lines = ch.split(/(?:\r\n?|\n)/g);
         this._input = ch + this._input;
-        this.yytext = this.yytext.substr(0, this.yytext.length - len); //this.yyleng -= len;
-
+        this.yytext = this.yytext.substr(0, this.yytext.length - len);
+        //this.yyleng -= len;
         this.offset -= len;
         var oldLines = this.match.split(/(?:\r\n?|\n)/g);
         this.match = this.match.substr(0, this.match.length - 1);
         this.matched = this.matched.substr(0, this.matched.length - 1);
-
         if (lines.length - 1) {
           this.yylineno -= lines.length - 1;
         }
-
         var r = this.yylloc.range;
         this.yylloc = {
           first_line: this.yylloc.first_line,
@@ -2343,11 +2164,9 @@ var parser = function () {
           first_column: this.yylloc.first_column,
           last_column: lines ? (lines.length === oldLines.length ? this.yylloc.first_column : 0) + oldLines[oldLines.length - lines.length].length - lines[0].length : this.yylloc.first_column - len
         };
-
         if (this.options.ranges) {
           this.yylloc.range = [r[0], r[0] + this.yyleng - len];
         }
-
         this.yyleng = this.yytext.length;
         return this;
       },
@@ -2367,7 +2186,6 @@ var parser = function () {
             line: this.yylineno
           });
         }
-
         return this;
       },
       // retain first n characters of the match
@@ -2382,11 +2200,9 @@ var parser = function () {
       // displays upcoming input, i.e. for error messages
       upcomingInput: function upcomingInput() {
         var next = this.match;
-
         if (next.length < 20) {
           next += this._input.substr(0, 20 - next.length);
         }
-
         return (next.substr(0, 20) + (next.length > 20 ? '...' : '')).replace(/\n/g, "");
       },
       // displays the character position where the lexing error occurred, i.e. for error messages
@@ -2398,7 +2214,6 @@ var parser = function () {
       // test the lexed token: return FALSE when not a match, otherwise return token
       test_match: function test_match(match, indexed_rule) {
         var token, lines, backup;
-
         if (this.options.backtrack_lexer) {
           // save context
           backup = {
@@ -2421,18 +2236,14 @@ var parser = function () {
             conditionStack: this.conditionStack.slice(0),
             done: this.done
           };
-
           if (this.options.ranges) {
             backup.yylloc.range = this.yylloc.range.slice(0);
           }
         }
-
         lines = match[0].match(/(?:\r\n?|\n).*/g);
-
         if (lines) {
           this.yylineno += lines.length;
         }
-
         this.yylloc = {
           first_line: this.yylloc.last_line,
           last_line: this.yylineno + 1,
@@ -2443,21 +2254,17 @@ var parser = function () {
         this.match += match[0];
         this.matches = match;
         this.yyleng = this.yytext.length;
-
         if (this.options.ranges) {
           this.yylloc.range = [this.offset, this.offset += this.yyleng];
         }
-
         this._more = false;
         this._backtrack = false;
         this._input = this._input.slice(match[0].length);
         this.matched += match[0];
         token = this.performAction.call(this, this.yy, this, indexed_rule, this.conditionStack[this.conditionStack.length - 1]);
-
         if (this.done && this._input) {
           this.done = false;
         }
-
         if (token) {
           return token;
         } else if (this._backtrack) {
@@ -2465,7 +2272,6 @@ var parser = function () {
           for (var k in backup) {
             this[k] = backup[k];
           }
-
           return false; // rule action called reject() implying the next rule should be tested instead.
         }
 
@@ -2476,30 +2282,22 @@ var parser = function () {
         if (this.done) {
           return this.EOF;
         }
-
         if (!this._input) {
           this.done = true;
         }
-
         var token, match, tempMatch, index;
-
         if (!this._more) {
           this.yytext = '';
           this.match = '';
         }
-
         var rules = this._currentRules();
-
         for (var i = 0; i < rules.length; i++) {
           tempMatch = this._input.match(this.rules[rules[i]]);
-
           if (tempMatch && (!match || tempMatch[0].length > match[0].length)) {
             match = tempMatch;
             index = i;
-
             if (this.options.backtrack_lexer) {
               token = this.test_match(tempMatch, rules[i]);
-
               if (token !== false) {
                 return token;
               } else if (this._backtrack) {
@@ -2514,18 +2312,14 @@ var parser = function () {
             }
           }
         }
-
         if (match) {
           token = this.test_match(match, rules[index]);
-
           if (token !== false) {
             return token;
-          } // else: this is a lexer rule which consumes input without producing a token (e.g. whitespace)
-
-
+          }
+          // else: this is a lexer rule which consumes input without producing a token (e.g. whitespace)
           return false;
         }
-
         if (this._input === "") {
           return this.EOF;
         } else {
@@ -2539,7 +2333,6 @@ var parser = function () {
       // return next match that has a token
       lex: function lex() {
         var r = this.next();
-
         if (r) {
           return r;
         } else {
@@ -2553,7 +2346,6 @@ var parser = function () {
       // pop the previously active lexer condition state off the condition stack
       popState: function popState() {
         var n = this.conditionStack.length - 1;
-
         if (n > 0) {
           return this.conditionStack.pop();
         } else {
@@ -2571,7 +2363,6 @@ var parser = function () {
       // return the currently active lexer condition state; when an index argument is provided it produces the N-th previous condition state, if available
       topState: function topState(n) {
         n = this.conditionStack.length - 1 - Math.abs(n || 0);
-
         if (n >= 0) {
           return this.conditionStack[n];
         } else {
@@ -2590,297 +2381,212 @@ var parser = function () {
         "flex": true
       },
       performAction: function anonymous(yy, yy_, $avoiding_name_collisions, YY_START) {
-
         switch ($avoiding_name_collisions) {
           case 0:
             /* skip whitespace */
             break;
-
           case 1:
             /* skip \space */
             break;
-
           case 2:
             /* skip '\ ' */
             break;
-
           case 3:
             return "INT";
-
           case 4:
             return "FLOAT";
-
           case 5:
             return "^";
-
           case 6:
             return "*";
-
           case 7:
             return "*";
-
           case 8:
             return "*";
-
           case 9:
             return "*";
-
           case 10:
             return "/";
-
           case 11:
             return "/";
-
           case 12:
             return "-";
-
           case 13:
             return "-";
-
           case 14:
             return "+";
-
           case 15:
             return "^";
-
           case 16:
             return "(";
-
           case 17:
             return ")";
-
           case 18:
             return "(";
-
           case 19:
             return ")";
-
           case 20:
             return "[";
-
           case 21:
             return "]";
-
           case 22:
             return "{";
-
           case 23:
             return "}";
-
           case 24:
             return "{";
-
           case 25:
             return "}";
-
           case 26:
             return "_";
-
           case 27:
             return "|";
-
           case 28:
             return "LEFT|";
-
           case 29:
             return "RIGHT|";
-
           case 30:
             return "!";
-
           case 31:
             return "SIGN";
-
           case 32:
             yy_.yytext = "<=";
             return "SIGN";
-
           case 33:
             yy_.yytext = ">=";
             return "SIGN";
-
           case 34:
             yy_.yytext = "<=";
             return "SIGN";
-
           case 35:
             yy_.yytext = ">=";
             return "SIGN";
-
           case 36:
             yy_.yytext = "<>";
             return "SIGN";
-
           case 37:
             yy_.yytext = "<>";
             return "SIGN";
-
           case 38:
             yy_.yytext = "<>";
             return "SIGN";
-
           case 39:
             yy_.yytext = "<>";
             return "SIGN";
-
           case 40:
             yy_.yytext = "<=";
             return "SIGN";
-
           case 41:
             yy_.yytext = ">=";
             return "SIGN";
-
           case 42:
             return "FRAC";
-
           case 43:
             return "FRAC";
-
           case 44:
             return "sqrt";
-
           case 45:
             return "abs";
-
           case 46:
             return "ln";
-
           case 47:
             return "log";
-
           case 48:
             return "TRIG";
-
           case 49:
             return "TRIG";
-
           case 50:
             return "TRIG";
-
           case 51:
             return "TRIG";
-
           case 52:
             yy_.yytext = "sin";
             return "TRIG";
-
           case 53:
             yy_.yytext = "cos";
             return "TRIG";
-
           case 54:
             yy_.yytext = "tan";
             return "TRIG";
-
           case 55:
             yy_.yytext = "csc";
             return "TRIG";
-
           case 56:
             yy_.yytext = "sec";
             return "TRIG";
-
           case 57:
             yy_.yytext = "cot";
             return "TRIG";
-
           case 58:
             yy_.yytext = "arcsin";
             return "TRIG";
-
           case 59:
             yy_.yytext = "arccos";
             return "TRIG";
-
           case 60:
             yy_.yytext = "arctan";
             return "TRIG";
-
           case 61:
             yy_.yytext = "arccsc";
             return "TRIG";
-
           case 62:
             yy_.yytext = "arcsec";
             return "TRIG";
-
           case 63:
             yy_.yytext = "arccot";
             return "TRIG";
-
           case 64:
             return "TRIGINV";
-
           case 65:
             return "TRIGINV";
-
           case 66:
             yy_.yytext = "sinh";
             return "TRIG";
-
           case 67:
             yy_.yytext = "cosh";
             return "TRIG";
-
           case 68:
             yy_.yytext = "tanh";
             return "TRIG";
-
           case 69:
             yy_.yytext = "csch";
             return "TRIG";
-
           case 70:
             yy_.yytext = "sech";
             return "TRIG";
-
           case 71:
             yy_.yytext = "tanh";
             return "TRIG";
-
           case 72:
             return "CONST";
-
           case 73:
             yy_.yytext = "pi";
             return "CONST";
-
           case 74:
             yy_.yytext = "pi";
             return "CONST";
-
           case 75:
             return "VAR";
-
           case 76:
             yy_.yytext = "theta";
             return "VAR";
-
           case 77:
             yy_.yytext = "theta";
             return "VAR";
-
           case 78:
             return "VAR";
-
           case 79:
             yy_.yytext = "phi";
             return "VAR";
-
           case 80:
             yy_.yytext = "phi";
             return "VAR";
-
           case 81:
             return yy.symbolLexer(yy_.yytext);
-
           case 82:
             return "EOF";
-
           case 83:
             return "INVALID";
-
           case 84:
             console.log(yy_.yytext);
             break;
@@ -2896,19 +2602,17 @@ var parser = function () {
     };
     return lexer;
   }();
-
   parser.lexer = lexer;
-
   function Parser() {
     this.yy = {};
   }
-
   Parser.prototype = parser;
   parser.Parser = Parser;
   return new Parser();
 }();
 
 /* eslint-disable prettier/prettier */
+
 /*  The node hierarcy is as follows:
 
     (Expr)
@@ -2939,40 +2643,38 @@ var parser = function () {
 */
 
 /* non user-facing functions */
-// assert that all abstract methods have been overridden
 
+// assert that all abstract methods have been overridden
 var abstract = function abstract() {
   // Try to give people a bit of information when this happens
-  throw new Error("Abstract method - must override for expr: " + // eslint-disable-next-line @babel/no-invalid-this
+  throw new Error("Abstract method - must override for expr: " +
+  // eslint-disable-next-line @babel/no-invalid-this
   this.print());
-}; // throw an error that is meant to be caught by the test suite (not user facing)
-
+};
 
+// throw an error that is meant to be caught by the test suite (not user facing)
 var error = function error(message) {
   throw new Error(message);
-}; // reliably detect NaN
-
+};
 
+// reliably detect NaN
 var isNaN = function isNaN(object) {
   return object !== object;
-}; // return a random float between min (inclusive) and max (exclusive),
-// not that inclusivity means much, probabilistically, on floats
-
+};
 
+// return a random float between min (inclusive) and max (exclusive),
+// not that inclusivity means much, probabilistically, on floats
 var randomFloat = function randomFloat(min, max) {
   var extent = max - min;
   return Math.random() * extent + min;
 };
-/* constants */
-
 
+/* constants */
 var ITERATIONS = 12;
 var TOLERANCE = 9; // decimal places
 
 /* abstract base expression node */
-
 function Expr() {}
-
 _.extend(Expr.prototype, {
   // this node's immediate constructor
   func: abstract,
@@ -2987,11 +2689,9 @@ _.extend(Expr.prototype, {
   // an abstraction for chainable, bottom-up recursion
   recurse: function recurse(method) {
     var passed = Array.prototype.slice.call(arguments, 1);
-
     var args = _.map(this.args(), function (arg) {
       return _.isString(arg) ? arg : arg[method].apply(arg, passed);
     });
-
     return this.construct(args);
   },
   // evaluate numerically with given variable mapping
@@ -2999,7 +2699,6 @@ _.extend(Expr.prototype, {
   codegen: abstract,
   compile: function compile() {
     var code = this.codegen();
-
     try {
       return new Function("vars", "return " + code + ";");
     } catch (e) {
@@ -3015,28 +2714,22 @@ _.extend(Expr.prototype, {
   // returns a TeX string, modified by the given options
   asTex: function asTex(options) {
     options = options || {};
-
     _.defaults(options, {
       display: true,
       dynamic: true,
       times: false
     });
-
     var tex = this.tex();
-
     if (options.display) {
       tex = "\\displaystyle " + tex;
     }
-
     if (options.dynamic) {
       tex = tex.replace(/\(/g, "\\left(");
       tex = tex.replace(/\)/g, "\\right)");
     }
-
     if (options.times) {
       tex = tex.replace(/\\cdot/g, "\\times");
     }
-
     return tex;
   },
   // returns the name of this expression's constructor as a string
@@ -3082,26 +2775,28 @@ _.extend(Expr.prototype, {
   simplify: function simplify(options) {
     options = _.extend({
       once: false
-    }, options); // Attempt to factor and collect
+    }, options);
 
+    // Attempt to factor and collect
     var step1 = this.factor(options);
-    var step2 = step1.collect(options); // Rollback if collect didn't do anything
+    var step2 = step1.collect(options);
 
+    // Rollback if collect didn't do anything
     if (step1.equals(step2)) {
       step2 = this.collect(options);
-    } // Attempt to expand and collect
-
+    }
 
+    // Attempt to expand and collect
     var step3 = step2.expand(options);
-    var step4 = step3.collect(options); // Rollback if collect didn't do anything
+    var step4 = step3.collect(options);
 
+    // Rollback if collect didn't do anything
     if (step3.equals(step4)) {
       step4 = step2.collect(options);
-    } // One round of simplification complete
-
+    }
 
+    // One round of simplification complete
     var simplified = step4;
-
     if (options.once || this.equals(simplified)) {
       return simplified;
     } else {
@@ -3137,7 +2832,6 @@ _.extend(Expr.prototype, {
     if (this instanceof func) {
       return true;
     }
-
     return _.any(this.exprArgs(), function (arg) {
       return arg.has(func);
     });
@@ -3165,17 +2859,16 @@ _.extend(Expr.prototype, {
   // check that the variables in both expressions are the same
   sameVars: function sameVars(other) {
     var vars1 = this.getVars();
-    var vars2 = other.getVars(); // the other Expr can have more variables than this one
-    // this lets you multiply equations by other variables
+    var vars2 = other.getVars();
 
+    // the other Expr can have more variables than this one
+    // this lets you multiply equations by other variables
     var same = function same(array1, array2) {
       return !_.difference(array1, array2).length;
     };
-
     var lower = function lower(array) {
       return _.uniq(_.invoke(array, "toLowerCase")).sort();
     };
-
     var equal = same(vars1, vars2);
     var equalIgnoringCase = same(lower(vars1), lower(vars2));
     return {
@@ -3191,16 +2884,11 @@ _.extend(Expr.prototype, {
     if (other instanceof Eq) {
       return false;
     }
+    var varList = _.union(this.getVars( /* excludeFunc */true), other.getVars( /* excludeFunc */true));
 
-    var varList = _.union(this.getVars(
-    /* excludeFunc */
-    true), other.getVars(
-    /* excludeFunc */
-    true)); // If the numbers are large we would like to do a relative comparison
+    // If the numbers are large we would like to do a relative comparison
     // rather than an absolute one, but if they're small enough then an
     // absolute comparison makes more sense
-
-
     var getDelta = function getDelta(num1, num2) {
       if (Math.abs(num1) < 1 || Math.abs(num2) < 1) {
         return Math.abs(num1 - num2);
@@ -3208,30 +2896,28 @@ _.extend(Expr.prototype, {
         return Math.abs(1 - num1 / num2);
       }
     };
-
     var equalNumbers = function equalNumbers(num1, num2) {
       var delta = getDelta(num1, num2);
-      return num1 === num2 ||
-      /* needed if either is +/- Infinity */
-      isNaN(num1) && isNaN(num2) || delta < Math.pow(10, -TOLERANCE);
-    }; // if no variables, only need to evaluate once
-
+      return num1 === num2 /* needed if either is +/- Infinity */ || isNaN(num1) && isNaN(num2) || delta < Math.pow(10, -TOLERANCE);
+    };
 
+    // if no variables, only need to evaluate once
     if (!varList.length && !this.has(Unit) && !other.has(Unit)) {
       return equalNumbers(this.eval(), other.eval());
-    } // collect here to avoid sometimes dividing by zero, and sometimes not
+    }
+
+    // collect here to avoid sometimes dividing by zero, and sometimes not
     // it is better to be deterministic, e.g. x/x -> 1
     // TODO(alex): may want to keep track of assumptions as they're made
-
-
     var expr1 = this.collect();
     var expr2 = other.collect();
     var unitList1 = this.getUnits();
     var unitList2 = other.getUnits();
-
     if (!_.isEqual(unitList1, unitList2)) {
       return false;
-    } // Compare at a set number (currently 12) of points to determine
+    }
+
+    // Compare at a set number (currently 12) of points to determine
     // equality.
     //
     // `range` (and `vars`) is the only variable that varies through the
@@ -3240,12 +2926,13 @@ _.extend(Expr.prototype, {
     //
     // Note that because there are 12 iterations and three ranges, each
     // range is checked four times.
-
-
     for (var i = 0; i < ITERATIONS; i++) {
-      var vars = {}; // One third total iterations each with range 10, 100, and 1000
+      var vars = {};
 
-      var range = Math.pow(10, 1 + Math.floor(3 * i / ITERATIONS)); // Half of the iterations should only use integer values.
+      // One third total iterations each with range 10, 100, and 1000
+      var range = Math.pow(10, 1 + Math.floor(3 * i / ITERATIONS));
+
+      // Half of the iterations should only use integer values.
       // This is because expressions like (-2)^x are common but result
       // in NaN when evaluated in JS with non-integer values of x.
       // Without this, (-2)^x and (-2)^(x+1) both end up always being NaN
@@ -3259,15 +2946,11 @@ _.extend(Expr.prototype, {
       // Integrate a library for handling complex numbers.
       //
       // TODO(alex): Add support for complex numbers, then remove this.
-
       var useFloats = i % 2 === 0;
-
       _.each(varList, function (v) {
         vars[v] = useFloats ? randomFloat(-range, range) : _.random(-range, range);
       });
-
       var equal;
-
       if (expr1.has(Func) || expr2.has(Func) || expr1.has(Unit) || expr2.has(Unit)) {
         var result1 = expr1.partialEval(vars);
         var result2 = expr2.partialEval(vars);
@@ -3277,12 +2960,10 @@ _.extend(Expr.prototype, {
         var result2 = expr2.eval(vars);
         equal = equalNumbers(result1, result2);
       }
-
       if (!equal) {
         return false;
       }
     }
-
     return true;
   },
   // evaluate as much of the expression as possible
@@ -3333,7 +3014,6 @@ _.extend(Expr.prototype, {
     if (!hint) {
       return this;
     }
-
     var expr = this.construct(this.args());
     expr.hints = _.clone(this.hints);
     expr.hints[hint] = true;
@@ -3355,13 +3035,10 @@ _.extend(Expr.prototype, {
     return new Mul(Num.Neg, this);
   }
 });
-/* abstract sequence node */
-
 
+/* abstract sequence node */
 function Seq() {}
-
 Seq.prototype = new Expr();
-
 _.extend(Seq.prototype, {
   args: function args() {
     return this.terms;
@@ -3370,7 +3047,6 @@ _.extend(Seq.prototype, {
     var terms = _.sortBy(_.invoke(this.terms, "normalize"), function (term) {
       return term.print();
     });
-
     return new this.func(terms);
   },
   expand: function expand() {
@@ -3381,11 +3057,11 @@ _.extend(Seq.prototype, {
   partition: function partition() {
     var terms = _.groupBy(this.terms, function (term) {
       return term instanceof Num;
-    }); // XXX using a boolean as a key just converts it to a string. I don't
+    });
+
+    // XXX using a boolean as a key just converts it to a string. I don't
     // think this code was written with that in mind. Probably doesn't
     // matter except for readability.
-
-
     var numbers = terms[true] || [];
     var others = terms[false] || [];
     return [new this.func(numbers), new this.func(others)];
@@ -3394,29 +3070,23 @@ _.extend(Seq.prototype, {
   // this is a shallow flattening and will return a non-Seq if terms.length <= 1
   flatten: function flatten() {
     var type = this;
-
     var terms = _.reject(this.terms, function (term) {
       return term.equals(type.identity);
     });
-
     if (terms.length === 0) {
       return type.identity;
     }
-
     if (terms.length === 1) {
       return terms[0];
     }
-
     var grouped = _.groupBy(terms, function (term) {
       return term instanceof type.func;
-    }); // same contains the children which are Seqs of the same type as this Seq
-
+    });
 
+    // same contains the children which are Seqs of the same type as this Seq
     var same = grouped[true] || [];
     var others = grouped[false] || [];
-    var flattened = others.concat(_.flatten(_.pluck(same, "terms"),
-    /* shallow: */
-    true));
+    var flattened = others.concat(_.flatten(_.pluck(same, "terms"), /* shallow: */true));
     return new type.func(flattened);
   },
   // the identity associated with the sequence
@@ -3425,7 +3095,6 @@ _.extend(Seq.prototype, {
   reduce: abstract,
   isPositive: function isPositive() {
     var terms = _.invoke(this.terms, "collect");
-
     return _.all(_.invoke(terms, "isPositive"));
   },
   // return a new Seq with a given term replaced by a different term
@@ -3433,21 +3102,17 @@ _.extend(Seq.prototype, {
   // if no new term is provided, the old one is simply removed
   replace: function replace(oldTerm, newTerm) {
     var index;
-
     if (oldTerm instanceof Expr) {
       index = _.indexOf(this.terms, oldTerm);
     } else {
       index = oldTerm;
     }
-
     var newTerms = [];
-
     if (_.isArray(newTerm)) {
       newTerms = newTerm;
     } else if (newTerm) {
       newTerms = [newTerm];
     }
-
     var terms = this.terms.slice(0, index).concat(newTerms).concat(this.terms.slice(index + 1));
     return new this.func(terms);
   },
@@ -3460,9 +3125,8 @@ _.extend(Seq.prototype, {
     return new Mul(_.invoke(this.terms, "getDenominator")).flatten();
   }
 });
-/* sequence of additive terms */
-
 
+/* sequence of additive terms */
 function Add() {
   if (arguments.length === 1) {
     this.terms = arguments[0];
@@ -3471,7 +3135,6 @@ function Add() {
   }
 }
 Add.prototype = new Seq();
-
 _.extend(Add.prototype, {
   func: Add,
   eval: function _eval(vars, options) {
@@ -3489,7 +3152,6 @@ _.extend(Add.prototype, {
   },
   tex: function tex() {
     var tex = "";
-
     _.each(this.terms, function (term) {
       if (!tex || term.isSubtract()) {
         tex += term.tex();
@@ -3497,15 +3159,13 @@ _.extend(Add.prototype, {
         tex += "+" + term.tex();
       }
     });
-
     return tex;
   },
   collect: function collect(options) {
-    var terms = _.invoke(this.terms, "collect", options); // [Expr expr, Num coefficient]
-
+    var terms = _.invoke(this.terms, "collect", options);
 
+    // [Expr expr, Num coefficient]
     var pairs = [];
-
     _.each(terms, function (term) {
       if (term instanceof Mul) {
         var muls = term.partition();
@@ -3515,21 +3175,21 @@ _.extend(Add.prototype, {
       } else {
         pairs.push([term, Num.One]);
       }
-    }); // { (Expr expr).print(): [[Expr expr, Num coefficient]] }
-
+    });
 
+    // { (Expr expr).print(): [[Expr expr, Num coefficient]] }
     var grouped = _.groupBy(pairs, function (pair) {
       return pair[0].normalize().print();
     });
-
     var collected = _.compact(_.map(grouped, function (pairs) {
       var expr = pairs[0][0];
       var sum = new Add(_.zip.apply(_, pairs)[1]);
       var coefficient = sum.reduce(options);
       return new Mul(coefficient, expr).collect(options);
-    })); // TODO(alex): use the Pythagorean identity here
-    // e.g. x*sin^2(y) + x*cos^2(y) -> x
+    }));
 
+    // TODO(alex): use the Pythagorean identity here
+    // e.g. x*sin^2(y) + x*cos^2(y) -> x
 
     return new Add(collected).flatten();
   },
@@ -3539,33 +3199,25 @@ _.extend(Add.prototype, {
     options = _.extend({
       keepNegative: false
     }, options);
-
     var terms = _.invoke(this.terms, "collect");
-
     var factors;
-
     if (terms[0] instanceof Mul) {
       factors = terms[0].terms;
     } else {
       factors = [terms[0]];
     }
-
     _.each(_.rest(this.terms), function (term) {
       factors = _.map(factors, function (factor) {
         return term.findGCD(factor);
       });
     });
-
     if (!options.keepNegative && this.isNegative()) {
       factors.push(Num.Neg);
     }
-
     factors = new Mul(factors).flatten().collect();
-
     var remainder = _.map(terms, function (term) {
       return Mul.handleDivide(term, factors).simplify();
     });
-
     remainder = new Add(remainder).flatten();
     return Mul.createOrAppend(factors, remainder).flatten();
   },
@@ -3579,16 +3231,14 @@ _.extend(Add.prototype, {
   },
   isNegative: function isNegative() {
     var terms = _.invoke(this.terms, "collect");
-
     return _.all(_.invoke(terms, "isNegative"));
   },
   negate: function negate() {
     return new Add(_.invoke(this.terms, "negate"));
   }
 });
-/* sequence of multiplicative terms */
-
 
+/* sequence of multiplicative terms */
 function Mul() {
   if (arguments.length === 1) {
     this.terms = arguments[0];
@@ -3597,7 +3247,6 @@ function Mul() {
   }
 }
 Mul.prototype = new Seq();
-
 _.extend(Mul.prototype, {
   func: Mul,
   eval: function _eval(vars, options) {
@@ -3619,7 +3268,6 @@ _.extend(Mul.prototype, {
     var tmUnits = _(this.terms).chain().map(function (term) {
       return term.getUnits();
     }).flatten().value();
-
     tmUnits.sort((a, b) => a.unit.localeCompare(b.unit));
     return tmUnits;
   },
@@ -3627,7 +3275,6 @@ _.extend(Mul.prototype, {
   // so we follow convention: first any negatives, then any numbers, then everything else
   tex: function tex() {
     var cdot = " \\cdot ";
-
     var terms = _.groupBy(this.terms, function (term) {
       if (term.isDivide()) {
         return "inverse";
@@ -3637,18 +3284,17 @@ _.extend(Mul.prototype, {
         return "other";
       }
     });
-
     var inverses = terms.inverse || [];
     var numbers = terms.number || [];
     var others = terms.other || [];
     var negatives = "";
-    var numerator; // check all the numbers to see if there is a rational we can extract,
+    var numerator;
+
+    // check all the numbers to see if there is a rational we can extract,
     // since we would like 1/2x/y to come out as \frac{1}{2}\frac{x}{y},
     // and not \frac{1x}{2y}.
-
     for (var i = 0; i < numbers.length; i++) {
       var isRational = numbers[i] instanceof Rational && !(numbers[i] instanceof Int);
-
       if (isRational && others.length > 0 && inverses.length > 0) {
         var withThisRemoved = numbers.slice();
         withThisRemoved.splice(i, 1);
@@ -3656,11 +3302,9 @@ _.extend(Mul.prototype, {
         return numbers[i].tex() + new Mul(newTerms).tex();
       }
     }
-
     numbers = _.compact(_.map(numbers, function (term) {
       var hasDenom = term instanceof Rational && !(term instanceof Int);
       var shouldPushDown = !term.hints.fraction || inverses.length > 0;
-
       if (hasDenom && shouldPushDown) {
         // e.g. 3x/4 -> 3/4*x (internally) -> 3x/4 (rendered)
         inverses.push(new Pow(new Int(term.d), Num.Div));
@@ -3671,13 +3315,11 @@ _.extend(Mul.prototype, {
         return term;
       }
     }));
-
     if (numbers.length === 0 && others.length === 1) {
       // e.g. (x+y)/z -> \frac{x+y}{z}
       numerator = others[0].tex();
     } else {
       var tex = "";
-
       _.each(numbers, function (term) {
         if (term.hints.subtract && term.hints.entered) {
           negatives += "-";
@@ -3691,7 +3333,6 @@ _.extend(Mul.prototype, {
           tex += (tex ? cdot : "") + term.tex();
         }
       });
-
       _.each(others, function (term) {
         if (term.needsExplicitMul()) {
           // e.g. 2*2^3 -> 2(dot)2^3
@@ -3704,10 +3345,8 @@ _.extend(Mul.prototype, {
           tex += term.tex();
         }
       });
-
       numerator = tex ? tex : "1";
     }
-
     if (!inverses.length) {
       return negatives + numerator;
     } else {
@@ -3719,7 +3358,6 @@ _.extend(Mul.prototype, {
     var terms = _.map(this.terms, function (term) {
       return term instanceof Num ? term.abs() : term.strip();
     });
-
     return new Mul(terms).flatten();
   },
   // expand numerator and denominator separately
@@ -3727,36 +3365,27 @@ _.extend(Mul.prototype, {
     var isAdd = function isAdd(term) {
       return term instanceof Add;
     };
-
     var isInverse = function isInverse(term) {
       return term instanceof Pow && term.exp.isNegative();
     };
-
     var isInverseAdd = function isInverseAdd(term) {
       return isInverse(term) && isAdd(term.base);
     };
-
     var mul = this.recurse("expand").flatten();
-
     var hasAdd = _.any(mul.terms, isAdd);
-
     var hasInverseAdd = _.any(mul.terms, isInverseAdd);
-
     if (!(hasAdd || hasInverseAdd)) {
       return mul;
     }
-
     var terms = _.groupBy(mul.terms, isInverse);
-
     var normals = terms[false] || [];
     var inverses = terms[true] || [];
-
     if (hasAdd) {
       var grouped = _.groupBy(normals, isAdd);
-
       var adds = grouped[true] || [];
-      var others = grouped[false] || []; // loop over each additive sequence
+      var others = grouped[false] || [];
 
+      // loop over each additive sequence
       var expanded = _.reduce(adds, function (expanded, add) {
         // loop over each expanded array of terms
         return _.reduce(expanded, function (temp, array) {
@@ -3765,38 +3394,34 @@ _.extend(Mul.prototype, {
             return array.concat(term);
           }));
         }, []);
-      }, [[]]); // join each fully expanded array of factors with remaining multiplicative factors
-
+      }, [[]]);
 
+      // join each fully expanded array of factors with remaining multiplicative factors
       var muls = _.map(expanded, function (array) {
         return new Mul(others.concat(array)).flatten();
       });
-
       normals = [new Add(muls)];
     }
-
     if (hasInverseAdd) {
       var denominator = new Mul(_.invoke(inverses, "getDenominator")).flatten();
       inverses = [new Pow(denominator.expand(), Num.Div)];
     }
-
     return new Mul(normals.concat(inverses)).flatten();
   },
   factor: function factor(options) {
     var factored = this.recurse("factor", options).flatten();
-
     if (!(factored instanceof Mul)) {
       return factored;
-    } // Combine any factored out Rationals into one, but don't collect
-
+    }
 
+    // Combine any factored out Rationals into one, but don't collect
     var grouped = _.groupBy(factored.terms, function (term) {
       return term instanceof Rational;
-    }); // Could also accomplish this by passing a new option
+    });
+
+    // Could also accomplish this by passing a new option
     // e.g. return  memo.mul(term, {autocollect: false});
     // TODO(alex): Decide whether this is a good use of options or not
-
-
     var rational = _.reduce(grouped[true], function (memo, term) {
       return {
         n: memo.n * term.n,
@@ -3806,61 +3431,58 @@ _.extend(Mul.prototype, {
       n: 1,
       d: 1
     });
-
     if (rational.d === 1) {
       rational = new Int(rational.n);
     } else {
       rational = new Rational(rational.n, rational.d);
     }
-
     return new Mul((grouped[false] || []).concat(rational)).flatten();
   },
   collect: function collect(options) {
     var partitioned = this.recurse("collect", options).partition();
-    var number = partitioned[0].reduce(options); // e.g. 0*x -> 0
+    var number = partitioned[0].reduce(options);
 
+    // e.g. 0*x -> 0
     if (number.eval() === 0) {
       return Num.Zero;
     }
+    var others = partitioned[1].flatten();
 
-    var others = partitioned[1].flatten(); // e.g. 2*2 -> 4
+    // e.g. 2*2 -> 4
     // e.g. 2*2*x -> 4*x
-
     if (!(others instanceof Mul)) {
       return new Mul(number, others).flatten();
     }
+    others = others.terms;
 
-    others = others.terms; // [Expr base, Expr exp]
-
+    // [Expr base, Expr exp]
     var pairs = [];
-
     _.each(others, function (term) {
       if (term instanceof Pow) {
         pairs.push([term.base, term.exp]);
       } else {
         pairs.push([term, Num.One]);
       }
-    }); // {(Expr base).print(): [[Expr base, Expr exp]]}
-
+    });
 
+    // {(Expr base).print(): [[Expr base, Expr exp]]}
     var grouped = _.groupBy(pairs, function (pair) {
       return pair[0].normalize().print();
-    }); // [[Expr base, Expr exp]]
-
+    });
 
+    // [[Expr base, Expr exp]]
     var summed = _.compact(_.map(grouped, function (pairs) {
       var base = pairs[0][0];
       var sum = new Add(_.zip.apply(_, pairs)[1]);
       var exp = sum.collect(options);
-
       if (exp instanceof Num && exp.eval() === 0) {
         return null;
       } else {
         return [base, exp];
       }
-    })); // XXX `pairs` is shadowed four or five times in this function
-
+    }));
 
+    // XXX `pairs` is shadowed four or five times in this function
     var pairs = _.groupBy(summed, function (pair) {
       if (pair[0] instanceof Trig && pair[0].isBasic()) {
         return "trig";
@@ -3870,32 +3492,28 @@ _.extend(Mul.prototype, {
         return "expr";
       }
     });
-
     var trigs = pairs.trig || [];
     var logs = pairs.log || [];
     var exprs = pairs.expr || [];
-
     if (trigs.length > 1) {
       // combine sines and cosines into other trig functions
+
       // {Trig.arg.print(): [[Trig base, Expr exp]]}
       var byArg = _.groupBy(trigs, function (pair) {
         return pair[0].arg.normalize().print();
       });
-
       trigs = [];
-
       _.each(byArg, function (pairs) {
-        var arg = pairs[0][0].arg; // {Trig.type: Expr exp}
+        var arg = pairs[0][0].arg;
 
+        // {Trig.type: Expr exp}
         var funcs = {
           sin: Num.Zero,
           cos: Num.Zero
         };
-
         _.each(pairs, function (pair) {
           funcs[pair[0].type] = pair[1];
         });
-
         if (Mul.handleNegative(funcs.sin).collect(options).equals(funcs.cos)) {
           // e.g. sin^x(y)/cos^x(y) -> tan^x(y)
           if (funcs.cos.isNegative()) {
@@ -3907,25 +3525,24 @@ _.extend(Mul.prototype, {
               cot: funcs.cos
             };
           }
-        } // TODO(alex): combine even if exponents not a perfect match
-        // TODO(alex): transform 1/sin and 1/cos into csc and sec
+        }
 
+        // TODO(alex): combine even if exponents not a perfect match
+        // TODO(alex): transform 1/sin and 1/cos into csc and sec
 
         _.each(funcs, function (exp, type) {
           trigs.push([new Trig(type, arg), exp]);
         });
       });
     }
-
     if (logs.length > 1) {
       // combine logs with the same base
+
       // {Log.base.print(): [[Log base, Expr exp]]}
       var byBase = _.groupBy(logs, function (pair) {
         return pair[0].base.normalize().print();
       });
-
       logs = [];
-
       _.each(byBase, function (pairs) {
         // only combine two logs of the same base, otherwise commutative
         // differences result in different equally valid output
@@ -3941,16 +3558,15 @@ _.extend(Mul.prototype, {
         } else {
           logs = logs.concat(pairs);
         }
-      }); // TODO(alex): combine if all inverses are the same e.g. ln(y)*ln(z)/ln(x)/ln(x)
+      });
 
+      // TODO(alex): combine if all inverses are the same e.g. ln(y)*ln(z)/ln(x)/ln(x)
     }
 
     pairs = trigs.concat(logs).concat(exprs);
-
     var collected = _.map(pairs, function (pair) {
       return new Pow(pair[0], pair[1]).collect(options);
     });
-
     return new Mul([number].concat(collected)).flatten();
   },
   isSubtract: function isSubtract() {
@@ -3963,11 +3579,9 @@ _.extend(Mul.prototype, {
   factorIn: function factorIn(hint) {
     var partitioned = this.partition();
     var numbers = partitioned[0].terms;
-
     var fold = numbers.length && _.all(numbers, function (num) {
       return num.n > 0;
     });
-
     if (fold) {
       // e.g. - x*2*3 -> x*-2*3
       var num = numbers[0].negate();
@@ -3983,7 +3597,6 @@ _.extend(Mul.prototype, {
   // TODO(alex): make more general or rename to be more specific
   factorOut: function factorOut() {
     var factored = false;
-
     var terms = _.compact(_.map(this.terms, function (term, i, list) {
       if (!factored && term instanceof Num && term.hints.divide) {
         factored = true;
@@ -3992,7 +3605,6 @@ _.extend(Mul.prototype, {
         return term;
       }
     }));
-
     if (terms.length === 1) {
       return terms[0];
     } else {
@@ -4015,7 +3627,6 @@ _.extend(Mul.prototype, {
       return this;
     } else {
       var terms = _.invoke(this.collect().terms, "asPositiveFactor");
-
       return new Mul(terms).flatten();
     }
   },
@@ -4029,18 +3640,16 @@ _.extend(Mul.prototype, {
     var isNum = function isNum(expr) {
       return expr instanceof Num;
     };
-
     if (_.any(this.terms, isNum)) {
       var num = _.find(this.terms, isNum);
-
       return this.replace(num, num.negate());
     } else {
       return new Mul([Num.Neg].concat(this.terms));
     }
   }
-}); // static methods for the sequence types
-
+});
 
+// static methods for the sequence types
 _.each([Add, Mul], function (type) {
   _.extend(type, {
     // create a new sequence unless left is already one (returns a copy)
@@ -4053,7 +3662,6 @@ _.each([Add, Mul], function (type) {
     }
   });
 });
-
 _.extend(Mul, {
   // negative signs should be folded into numbers whenever possible
   // never fold into a Num that's already negative or a Mul that has a negative Num
@@ -4062,8 +3670,8 @@ _.extend(Mul, {
   handleNegative: function handleNegative(expr, hint) {
     if (expr instanceof Num && expr.n > 0) {
       // e.g. - 2 -> -2
-      var negated = expr.negate(); // TODO(alex): rework hint system so that this isn't necessary
-
+      var negated = expr.negate();
+      // TODO(alex): rework hint system so that this isn't necessary
       negated.hints = expr.hints;
       return negated.addHint(hint);
     } else if (expr instanceof Mul) {
@@ -4084,35 +3692,30 @@ _.extend(Mul, {
       var rest = new Mul(_.rest(right.terms)).flatten();
       return Mul.handleDivide(first, rest);
     }
-
     var isInt = function isInt(expr) {
       return expr instanceof Int;
     };
-
     var isRational = function isRational(expr) {
       return expr instanceof Rational;
-    }; // for simplification purposes, fold Ints into Rationals if possible
-    // e.g. 3x / 4 -> 3/4 * x (will still render as 3x/4)
-
+    };
 
+    // for simplification purposes, fold Ints into Rationals if possible
+    // e.g. 3x / 4 -> 3/4 * x (will still render as 3x/4)
     if (isInt(right) && left instanceof Mul && _.any(left.terms, isInt)) {
       // search from the right
       var reversed = left.terms.slice().reverse();
-
       var num = _.find(reversed, isRational);
-
       if (!isInt(num)) {
         return new Mul(left.terms.concat([new Rational(1, right.n).addHint("fraction")]));
       }
-
       var rational = new Rational(num.n, right.n);
-      rational.hints = num.hints; // in the case of something like 1/3 * 6/8, we want the
-      // 6/8 to be considered a fraction, not just a division
+      rational.hints = num.hints;
 
+      // in the case of something like 1/3 * 6/8, we want the
+      // 6/8 to be considered a fraction, not just a division
       if (num === reversed[0]) {
         rational = rational.addHint("fraction");
       }
-
       if (num.n < 0 && right.n < 0) {
         rational.d = -rational.d;
         return left.replace(num, [Num.Neg, rational]);
@@ -4120,7 +3723,6 @@ _.extend(Mul, {
         return left.replace(num, rational);
       }
     }
-
     var divide = function divide(a, b) {
       if (b instanceof Int) {
         if (a instanceof Int) {
@@ -4137,7 +3739,6 @@ _.extend(Mul, {
           // e.g. x / 3 -> x*1/3
           // e.g. x / -3 -> x*-1/3
           var inverse = new Rational(1, b.eval());
-
           if (b.eval() < 0) {
             return [a, inverse.addHint("negate")];
           } else {
@@ -4146,14 +3747,12 @@ _.extend(Mul, {
         }
       } else {
         var pow;
-
         if (b instanceof Trig && b.exp) {
           // e.g. sin^2(x) -> sin(x)^2
           var exp = b.exp;
           b.exp = undefined;
           b = new Pow(b, exp);
         }
-
         if (b instanceof Pow) {
           // e.g. (x^2) ^ -1 -> x^-2
           // e.g. (x^y) ^ -1 -> x^(-1*y)
@@ -4163,7 +3762,6 @@ _.extend(Mul, {
           // e.g. x ^ -1 -> x^-1
           pow = new Pow(b, Num.Div);
         }
-
         if (a instanceof Int && a.n === 1) {
           // e.g. 1 / x -> x^-1
           return [pow];
@@ -4173,7 +3771,6 @@ _.extend(Mul, {
         }
       }
     };
-
     if (left instanceof Mul) {
       var divided = divide(_.last(left.terms), right);
       return new Mul(_.initial(left.terms).concat(divided));
@@ -4188,6 +3785,7 @@ _.extend(Mul, {
   // e.g. -2*x    ->  -2*x    simplified
   // e.g. -x*2    ->  -1*x*2  not simplified -> x*-2 simplified
   // e.g. -1*x*2  ->  -1*x*2  not simplified
+
   // also fold multiplicative terms into open Trig and Log nodes
   // e.g. (sin x)*x -> sin(x)*x
   // e.g. sin(x)*x -> sin(x)*x
@@ -4199,23 +3797,18 @@ _.extend(Mul, {
       var trigLog = _.find(_.initial(expr.terms), function (term) {
         return (term instanceof Trig || term instanceof Log) && term.hints.open;
       });
-
       var index = _.indexOf(expr.terms, trigLog);
-
       if (trigLog) {
         var last = _.last(expr.terms);
-
         if (trigLog.hints.parens || last.hints.parens || last.has(Trig) || last.has(Log)) {
           trigLog.hints.open = false;
         } else {
           var newTrigLog;
-
           if (trigLog instanceof Trig) {
             newTrigLog = Trig.create([trigLog.type, trigLog.exp], Mul.createOrAppend(trigLog.arg, last).fold());
           } else {
             newTrigLog = Log.create(trigLog.base, Mul.createOrAppend(trigLog.power, last).fold());
           }
-
           if (index === 0) {
             return newTrigLog;
           } else {
@@ -4223,47 +3816,39 @@ _.extend(Mul, {
           }
         }
       }
-
       var partitioned = expr.partition();
       var numbers = partitioned[0].terms;
-
       var pos = function pos(num) {
         return num.n > 0;
       };
-
       var neg = function neg(num) {
         return num.n === -1 && num.hints.negate;
       };
-
       var posOrNeg = function posOrNeg(num) {
         return pos(num) || neg(num);
       };
-
       if (numbers.length > 1 && _.some(numbers, neg) && _.some(numbers, pos) && _.every(numbers, posOrNeg)) {
         var firstNeg = _.indexOf(expr.terms, _.find(expr.terms, neg));
+        var firstNum = _.indexOf(expr.terms, _.find(expr.terms, pos));
 
-        var firstNum = _.indexOf(expr.terms, _.find(expr.terms, pos)); // e.g. -x*2 -> x*-2
-
-
+        // e.g. -x*2 -> x*-2
         if (firstNeg < firstNum) {
           return expr.replace(firstNum, expr.terms[firstNum].negate()).remove(firstNeg);
         }
       }
-    } // in all other cases, make no change
-
+    }
 
+    // in all other cases, make no change
     return expr;
   }
 });
-/* exponentiation */
-
 
+/* exponentiation */
 function Pow(base, exp) {
   this.base = base;
   this.exp = exp;
 }
 Pow.prototype = new Expr();
-
 _.extend(Pow.prototype, {
   func: Pow,
   args: function args() {
@@ -4271,7 +3856,9 @@ _.extend(Pow.prototype, {
   },
   eval: function _eval(vars, options) {
     var evaledBase = this.base.eval(vars, options);
-    var evaledExp = this.exp.eval(vars, options); // Math.pow unequivocally returns NaN when provided with both a
+    var evaledExp = this.exp.eval(vars, options);
+
+    // Math.pow unequivocally returns NaN when provided with both a
     // negative base and a fractional exponent. However, in some cases, we
     // know that our exponent is actually valid for use with negative
     // bases (e.g., (-5)^(1/3)).
@@ -4280,10 +3867,10 @@ _.extend(Pow.prototype, {
     // limited subset (by requiring that the exponent is rational with an
     // odd denominator), but it's still useful.
     //   See: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/pow
-
     if (evaledBase < 0) {
-      var simplifiedExp = this.exp.simplify(); // If Float, convert to a Rational to enable the logic below
+      var simplifiedExp = this.exp.simplify();
 
+      // If Float, convert to a Rational to enable the logic below
       if (simplifiedExp instanceof Float) {
         var num = simplifiedExp.n;
         var decimals = (num - num.toFixed()).toString().length - 2;
@@ -4291,10 +3878,8 @@ _.extend(Pow.prototype, {
         var rationalExp = new Rational(num * denominator, denominator);
         simplifiedExp = rationalExp.simplify();
       }
-
       if (simplifiedExp instanceof Rational) {
         var oddDenominator = Math.abs(simplifiedExp.d) % 2 === 1;
-
         if (oddDenominator) {
           var oddNumerator = Math.abs(simplifiedExp.n) % 2 === 1;
           var sign = oddNumerator ? -1 : 1;
@@ -4302,7 +3887,6 @@ _.extend(Pow.prototype, {
         }
       }
     }
-
     return Math.pow(evaledBase, evaledExp);
   },
   getUnits: function getUnits() {
@@ -4318,11 +3902,9 @@ _.extend(Pow.prototype, {
   },
   print: function print() {
     var base = this.base.print();
-
     if (this.base instanceof Seq || this.base instanceof Pow) {
       base = "(" + base + ")";
     }
-
     return base + "^(" + this.exp.print() + ")";
   },
   tex: function tex() {
@@ -4333,7 +3915,6 @@ _.extend(Pow.prototype, {
       if (this.exp.n !== 1) {
         error("Node marked with hint 'root' does not have exponent " + "of form 1/x.");
       }
-
       if (this.exp.d === 2) {
         // e.g. x ^ 1/2 w/hint -> sqrt{x}
         return "\\sqrt{" + this.base.tex() + "}";
@@ -4350,7 +3931,6 @@ _.extend(Pow.prototype, {
     } else {
       // e.g. x ^ y -> x^y
       var base = this.base.tex();
-
       if (this.base instanceof Seq || this.base instanceof Pow || this.base instanceof Num && !this.base.isSimple()) {
         // e.g. a+b ^ c -> (a+b)^c
         base = "(" + base + ")";
@@ -4358,7 +3938,6 @@ _.extend(Pow.prototype, {
         // e.g. ln(x) ^ 2 -> [ln(x)]^2
         base = "[" + base + "]";
       }
-
       return base + "^{" + this.exp.tex() + "}";
     }
   },
@@ -4367,55 +3946,53 @@ _.extend(Pow.prototype, {
   },
   expand: function expand() {
     var pow = this.recurse("expand");
-
     if (pow.base instanceof Mul) {
       // e.g. (ab)^c -> a^c*b^c
+
       var terms = _.map(pow.base.terms, function (term) {
         return new Pow(term, pow.exp);
       });
-
       return new Mul(terms).expand();
     } else if (pow.base instanceof Add && pow.exp instanceof Int && pow.exp.abs().eval() > 1) {
       // e.g. (a+b)^2 -> a*a+a*b+a*b+b*b
       // e.g. (a+b)^-2 -> (a*a+a*b+a*b+b*b)^-1
+
       var positive = pow.exp.eval() > 0;
       var n = pow.exp.abs().eval();
-
       var signed = function signed(mul) {
         return positive ? mul : new Pow(mul, Num.Div);
-      }; // compute and cache powers of 2 up to n
-
+      };
 
+      // compute and cache powers of 2 up to n
       var cache = {
         1: pow.base
       };
-
       for (var i = 2; i <= n; i *= 2) {
         var mul = new Mul(cache[i / 2], cache[i / 2]);
         cache[i] = mul.expand().collect();
-      } // if n is a power of 2, you're done!
-
+      }
 
+      // if n is a power of 2, you're done!
       if (_.has(cache, n)) {
         return signed(cache[n]);
-      } // otherwise decompose n into powers of 2 ...
-
+      }
 
+      // otherwise decompose n into powers of 2 ...
       var indices = _.map(n.toString(2).split(""), function (str, i, list) {
         return Number(str) * Math.pow(2, list.length - i - 1);
       });
+      indices = _.without(indices, 0);
 
-      indices = _.without(indices, 0); // ... then combine
-
+      // ... then combine
       var mul = new Mul(_.pick(cache, indices)).expand().collect();
       return signed(mul);
     } else if (pow.exp instanceof Add) {
       // DEFINITELY want behind super-simplify() flag
       // e.g. x^(a+b) -> x^a*x^b
+
       var terms = _.map(pow.exp.terms, function (term) {
         return new Pow(pow.base, term).expand();
       });
-
       return new Mul(terms).expand();
     } else {
       return pow;
@@ -4423,7 +4000,6 @@ _.extend(Pow.prototype, {
   },
   factor: function factor() {
     var pow = this.recurse("factor");
-
     if (pow.base instanceof Mul) {
       var terms = _.map(pow.base.terms, function (term) {
         if (term instanceof Int && pow.exp.equals(Num.Div)) {
@@ -4434,7 +4010,6 @@ _.extend(Pow.prototype, {
           return new Pow(term, pow.exp);
         }
       });
-
       return new Mul(terms);
     } else {
       return pow;
@@ -4449,13 +4024,10 @@ _.extend(Pow.prototype, {
       var exp = Mul.createOrAppend(this.base.exp, this.exp);
       return new Pow(base, exp).collect(options);
     }
-
     var pow = this.recurse("collect", options);
-
     var isSimilarLog = function isSimilarLog(term) {
       return term instanceof Log && term.base.equals(pow.base);
     };
-
     if (pow.exp instanceof Num && pow.exp.eval() === 0) {
       // e.g. x^0 -> 1
       return Num.One;
@@ -4468,7 +4040,6 @@ _.extend(Pow.prototype, {
     } else if (pow.exp instanceof Mul && _.any(pow.exp.terms, isSimilarLog)) {
       // e.g. b^(2*y*log_b(x)) -> x^(2*y)
       var log = _.find(pow.exp.terms, isSimilarLog);
-
       var base = log.power;
       var exp = pow.exp.remove(log).flatten();
       return new Pow(base, exp).collect(options);
@@ -4478,6 +4049,7 @@ _.extend(Pow.prototype, {
       if (options && options.preciseFloats) {
         // Avoid creating an imprecise float
         // e.g. 23^1.5 -> 12167^0.5, not ~110.304
+
         // If you take the root as specified by the denominator and
         // end up with more digits after the decimal point,
         // the result is imprecise. This works for rationals as well
@@ -4488,16 +4060,15 @@ _.extend(Pow.prototype, {
         var decimalsInBase = pow.base.getDecimalPlaces();
         var root = new Pow(pow.base, new Rational(1, exp.d));
         var decimalsInRoot = root.collect().getDecimalPlaces();
-
         if (decimalsInRoot > decimalsInBase) {
           // Collecting over this denominator would result in an
           // imprecise float, so avoid doing so.
           var newBase = new Pow(pow.base, new Int(exp.n)).collect();
           return new Pow(newBase, new Rational(1, exp.d));
         }
-      } // e.g. 4^1.5 -> 8
-
+      }
 
+      // e.g. 4^1.5 -> 8
       return pow.base.raiseToThe(pow.exp, options);
     } else {
       return pow;
@@ -4508,7 +4079,6 @@ _.extend(Pow.prototype, {
     var isDiv = function isDiv(arg) {
       return arg instanceof Num && arg.hints.divide;
     };
-
     return isDiv(this.exp) || this.exp instanceof Mul && _.any(this.exp.terms, isDiv);
   },
   // assuming this Pow represents user-entered division, returns the denominator
@@ -4550,16 +4120,15 @@ _.extend(Pow.prototype, {
   },
   findGCD: function findGCD(factor) {
     var base, exp;
-
     if (factor instanceof Pow) {
       base = factor.base;
       exp = factor.exp;
     } else {
       base = factor;
       exp = Num.One;
-    } // GCD is only relevant if same base
-
+    }
 
+    // GCD is only relevant if same base
     if (this.base.equals(base)) {
       if (this.exp.equals(exp)) {
         // exact match
@@ -4574,10 +4143,8 @@ _.extend(Pow.prototype, {
         // e.g. GCD(x^2, x^y) -> 1
         return Num.One;
       }
-
       var expA = this.exp.asMul().partition();
       var expB = exp.asMul().partition();
-
       if (expA[1].equals(expB[1])) {
         // exponents match except for coefficient
         // e.g. GCD(x^3y, x^y) -> x^y
@@ -4586,14 +4153,12 @@ _.extend(Pow.prototype, {
         return new Pow(base, mul).collect();
       }
     }
-
     return Num.One;
   },
   isPositive: function isPositive() {
     if (this.base.isPositive()) {
       return true;
     }
-
     var exp = this.exp.simplify();
     return exp instanceof Int && exp.eval() % 2 === 0;
   },
@@ -4602,10 +4167,8 @@ _.extend(Pow.prototype, {
       return this;
     } else {
       var exp = this.exp.simplify();
-
       if (exp instanceof Int) {
         var n = exp.eval();
-
         if (n > 2) {
           // e.g. x^3 -> x^2
           return new Pow(this.base, new Int(n - 1));
@@ -4614,32 +4177,29 @@ _.extend(Pow.prototype, {
           return new Pow(this.base, new Int(n + 1));
         }
       }
-
       return Num.One;
     }
   }
 });
-
 _.extend(Pow, {
   sqrt: function sqrt(arg) {
     return new Pow(arg, Num.Sqrt);
   },
   nthroot: function nthroot(radicand, degree) {
-    var exp = Mul.fold(Mul.handleDivide(new Int(1), degree)); // FIXME(johnsullivan): If oneOverDegree ends up being a pow object,
-    //     this "root" hint is lost between here and when tex() is called.
+    var exp = Mul.fold(Mul.handleDivide(new Int(1), degree));
 
+    // FIXME(johnsullivan): If oneOverDegree ends up being a pow object,
+    //     this "root" hint is lost between here and when tex() is called.
     return new Pow(radicand, exp.addHint("root"));
   }
 });
-/* logarithm */
-
 
+/* logarithm */
 function Log(base, power) {
   this.base = base;
   this.power = power;
 }
 Log.prototype = new Expr();
-
 _.extend(Log.prototype, {
   func: Log,
   args: function args() {
@@ -4653,7 +4213,6 @@ _.extend(Log.prototype, {
   },
   print: function print() {
     var power = "(" + this.power.print() + ")";
-
     if (this.isNatural()) {
       return "ln" + power;
     } else {
@@ -4662,7 +4221,6 @@ _.extend(Log.prototype, {
   },
   tex: function tex() {
     var power = "(" + this.power.tex() + ")";
-
     if (this.isNatural()) {
       return "\\ln" + power;
     } else {
@@ -4671,7 +4229,6 @@ _.extend(Log.prototype, {
   },
   collect: function collect(options) {
     var log = this.recurse("collect", options);
-
     if (log.power instanceof Num && log.power.eval() === 1) {
       // e.g. ln(1) -> 0
       return Num.Zero;
@@ -4687,21 +4244,22 @@ _.extend(Log.prototype, {
   },
   expand: function expand() {
     var log = this.recurse("expand");
-
     if (log.power instanceof Mul) {
       // might want behind super-simplify() flag
       // e.g. ln(xy) -> ln(x) + ln(y)
+
       var terms = _.map(log.power.terms, function (term) {
         // need to expand again in case new log powers are Pows
         return new Log(log.base, term).expand();
       });
-
       return new Add(terms);
     } else if (log.power instanceof Pow) {
       // e.g. ln(x^y) -> y*ln(x)
+
       return new Mul(log.power.exp, new Log(log.base, log.power.base).expand()).flatten();
     } else if (!log.isNatural()) {
       // e.g. log_b(x) -> ln(x)/ln(b)
+
       return Mul.handleDivide(new Log(Const.e, log.power), new Log(Const.e, log.base));
     } else {
       return log;
@@ -4712,7 +4270,6 @@ _.extend(Log.prototype, {
   }),
   isPositive: function isPositive() {
     var log = this.collect();
-
     if (log.base instanceof Num && log.power instanceof Num) {
       return this.eval() > 0;
     } else {
@@ -4726,7 +4283,6 @@ _.extend(Log.prototype, {
     return this.base.equals(Const.e);
   }
 });
-
 _.extend(Log, {
   natural: function natural() {
     return Const.e;
@@ -4736,23 +4292,19 @@ _.extend(Log, {
   },
   create: function create(base, power) {
     var log = new Log(base, power);
-
     if (!power.hints.parens) {
       log = log.addHint("open");
     }
-
     return log;
   }
 });
-/* trigonometric functions */
-
 
+/* trigonometric functions */
 function Trig(type, arg) {
   this.type = type;
   this.arg = arg;
 }
 Trig.prototype = new Expr();
-
 _.extend(Trig.prototype, {
   func: Trig,
   args: function args() {
@@ -4938,7 +4490,6 @@ _.extend(Trig.prototype, {
   },
   codegen: function codegen() {
     var func = this.functions[this.type].codegen;
-
     if (typeof func === "function") {
       return func(this.arg.codegen());
     } else if (typeof func === "string") {
@@ -4960,7 +4511,6 @@ _.extend(Trig.prototype, {
   }),
   isPositive: function isPositive() {
     var trig = this.collect();
-
     if (trig.arg instanceof Num) {
       return this.eval() > 0;
     } else {
@@ -4982,7 +4532,6 @@ _.extend(Trig.prototype, {
   },
   expand: function expand() {
     var trig = this.recurse("expand");
-
     if (!trig.isInverse()) {
       // e.g. tan(x) -> sin(x)/cos(x)
       var expand = trig.functions[trig.type].expand;
@@ -4993,16 +4542,13 @@ _.extend(Trig.prototype, {
   },
   collect: function collect(options) {
     var trig = this.recurse("collect", options);
-
     if (!trig.isInverse() && trig.arg.isNegative()) {
       var arg;
-
       if (trig.arg instanceof Num) {
         arg = trig.arg.abs();
       } else {
         arg = Mul.handleDivide(trig.arg, Num.Neg).collect(options);
       }
-
       if (trig.isEven()) {
         // e.g. cos(-x) -> cos(x)
         return new Trig(trig.type, arg);
@@ -5015,28 +4561,22 @@ _.extend(Trig.prototype, {
     }
   }
 });
-
 _.extend(Trig, {
   create: function create(pair, arg) {
     var type = pair[0];
     var exp = pair[1];
-
     if (exp && exp.equals(Num.Neg)) {
       // e.g. sin^-1(x) -> arcsin(x)
       type = "arc" + type;
       exp = undefined;
     }
-
     var trig = new Trig(type, arg);
-
     if (!arg.hints.parens) {
       trig = trig.addHint("open");
     }
-
     if (exp) {
       trig.exp = exp;
     }
-
     return trig;
   },
   sin: function sin(arg) {
@@ -5052,12 +4592,10 @@ _.extend(Trig, {
     return new Trig("cosh", arg);
   }
 });
-
 function Abs(arg) {
   this.arg = arg;
 }
 Abs.prototype = new Expr();
-
 _.extend(Abs.prototype, {
   func: Abs,
   args: function args() {
@@ -5077,7 +4615,6 @@ _.extend(Abs.prototype, {
   },
   collect: function collect(options) {
     var abs = this.recurse("collect", options);
-
     if (abs.arg.isPositive()) {
       // e.g. |2^x| -> 2^x
       return abs.arg;
@@ -5095,13 +4632,10 @@ _.extend(Abs.prototype, {
           return "other";
         }
       });
-
       var positives = terms.positive.concat(_.invoke(terms.number, "abs"));
-
       if (terms.other.length) {
         positives.push(new Abs(new Mul(terms.other).flatten()));
       }
-
       return new Mul(positives).flatten();
     } else {
       return abs;
@@ -5110,13 +4644,11 @@ _.extend(Abs.prototype, {
   // this should definitely be behind a super-simplify flag
   expand: function expand() {
     var abs = this.recurse("expand");
-
     if (abs.arg instanceof Mul) {
       // e.g. |xyz| -> |x|*|y|*|z|
       var terms = _.map(abs.arg.terms, function (term) {
         return new Abs(term);
       });
-
       return new Mul(terms);
     } else {
       return abs;
@@ -5126,16 +4658,14 @@ _.extend(Abs.prototype, {
     return true;
   }
 });
-/* equation */
-
 
+/* equation */
 function Eq(left, type, right) {
   this.left = left;
   this.type = type;
   this.right = right;
 }
 Eq.prototype = new Expr();
-
 _.extend(Eq.prototype, {
   func: Eq,
   args: function args() {
@@ -5160,7 +4690,6 @@ _.extend(Eq.prototype, {
   },
   normalize: function normalize() {
     var eq = this.recurse("normalize");
-
     if (_.contains([">", ">="], eq.type)) {
       // inequalities should have the smaller side on the left
       return new Eq(eq.right, eq.type.replace(">", "<"), eq.left);
@@ -5175,40 +4704,39 @@ _.extend(Eq.prototype, {
   asExpr: function asExpr(unfactored) {
     var isZero = function isZero(expr) {
       return expr instanceof Num && expr.isSimple() && expr.eval() === 0;
-    }; // first convert to a sequence of additive terms
-
+    };
 
+    // first convert to a sequence of additive terms
     var terms = [];
-
     if (this.left instanceof Add) {
       terms = _.clone(this.left.terms);
     } else if (!isZero(this.left)) {
       terms = [this.left];
     }
-
     if (this.right instanceof Add) {
       terms = terms.concat(this.right.negate().terms);
     } else if (!isZero(this.right)) {
       terms.push(this.right.negate());
     }
+    var isInequality = !this.isEquality();
 
-    var isInequality = !this.isEquality(); // Collect over each term individually to transform simple expressions
+    // Collect over each term individually to transform simple expressions
     // into numbers that might have denominators, taking into account
     // float precision. We have to be very careful to not introduce any
     // irrational floats before asExpr() returns, because by definition
     // they do not have exact denominators...
-
     terms = _.invoke(terms, "collect", {
       preciseFloats: true
-    }); // ...and we multiply through by every denominator.
+    });
 
+    // ...and we multiply through by every denominator.
     for (var i = 0; i < terms.length; i++) {
-      var denominator = terms[i].getDenominator(); // Can't multiply inequalities by non 100% positive factors
+      var denominator = terms[i].getDenominator();
 
+      // Can't multiply inequalities by non 100% positive factors
       if (isInequality && !denominator.isPositive()) {
         denominator = denominator.asPositiveFactor();
       }
-
       if (!denominator.equals(Num.One)) {
         terms = _.map(terms, function (term) {
           return Mul.createOrAppend(term, denominator).simplify({
@@ -5218,7 +4746,6 @@ _.extend(Eq.prototype, {
         });
       }
     }
-
     var add = new Add(terms).flatten();
     return unfactored ? add : this.divideThrough(add);
   },
@@ -5234,58 +4761,48 @@ _.extend(Eq.prototype, {
     var factored = simplified.factor({
       keepNegative: isInequality
     });
-
     if (!(factored instanceof Mul)) {
       return expr;
     }
-
     var terms = factored.terms;
-
     var isAdd = function isAdd(term) {
       return term instanceof Add;
     };
-
     var hasVar = function hasVar(term) {
       return !!term.getVars().length;
     };
-
     var isOne = function isOne(term) {
       return term.equals(Num.One);
     };
-
     var grouped = _.groupBy(terms, isAdd);
-
     var adds = grouped[true] || [];
     var others = grouped[false] || [];
-
     if (adds.length && this.isEquality()) {
       // keep only Adds
       // e.g. 2xy(z+1)(=0) -> z+1(=0)
       return new Mul(adds).flatten();
     }
-
     var denominator = others;
-
     if (!adds.length) {
       // if no Adds, keep all variable terms to preserve meaning
       // e.g. 42xyz(=0) -> xyz(=0)
       denominator = _.reject(denominator, hasVar);
     }
-
     if (isInequality) {
       // can't divide inequalities by non 100% positive factors
       // e.g. 42x^2y(z+1)(=0) -> y(z+1)(=0)
       denominator = _.invoke(denominator, "asPositiveFactor");
-    } // don't need to divide by one
-
+    }
 
+    // don't need to divide by one
     denominator = _.reject(denominator, isOne);
     denominator = _.map(denominator, function (term) {
       return new Pow(term, Num.Div);
     });
-    var dividedResult = new Mul(terms.concat(denominator)).collect(); // If the end result is the same as the original factoring,
-    // rollback the factoring and discard all intermediate steps.
+    var dividedResult = new Mul(terms.concat(denominator)).collect();
 
+    // If the end result is the same as the original factoring,
+    // rollback the factoring and discard all intermediate steps.
     if (dividedResult.equals(factored)) {
       return simplified;
     } else {
@@ -5300,23 +4817,16 @@ _.extend(Eq.prototype, {
     if (!(other instanceof Eq)) {
       return false;
     }
-
     var eq1 = this.normalize();
     var eq2 = other.normalize();
-
     if (eq1.type !== eq2.type) {
       return false;
-    } // need to collect to properly factor out common factors
-    // e.g x+2x=6 -> 3x=6 -> 3x-6(=0) -> x-2(=0)
-
-
-    var expr1 = eq1.divideThrough(eq1.asExpr(
-    /* unfactored */
-    true).collect());
-    var expr2 = eq2.divideThrough(eq2.asExpr(
-    /* unfactored */
-    true).collect());
+    }
 
+    // need to collect to properly factor out common factors
+    // e.g x+2x=6 -> 3x=6 -> 3x-6(=0) -> x-2(=0)
+    var expr1 = eq1.divideThrough(eq1.asExpr( /* unfactored */true).collect());
+    var expr2 = eq2.divideThrough(eq2.asExpr( /* unfactored */true).collect());
     if (eq1.isEquality()) {
       // equals and not-equals can be subtracted either way
       return expr1.compare(expr2) || expr1.compare(Mul.handleNegative(expr2));
@@ -5329,7 +4839,6 @@ _.extend(Eq.prototype, {
     var eq1 = this.normalize();
     var eq2 = other.normalize();
     var same = eq1.left.sameForm(eq2.left) && eq1.right.sameForm(eq2.right);
-
     if (eq1.isEquality()) {
       // equals and not-equals can be commutative with respect to the sign
       return same || eq1.left.sameForm(eq2.right) && eq1.right.sameForm(eq2.left);
@@ -5340,29 +4849,22 @@ _.extend(Eq.prototype, {
   // we don't want to override collect because it would turn y=x into y-x(=0)
   // instead, we ask if the equation was in that form, would it be simplified?
   isSimplified: function isSimplified() {
-    var expr = this.asExpr(
-    /* unfactored */
-    true);
+    var expr = this.asExpr( /* unfactored */true);
     var simplified = this.divideThrough(expr).simplify();
     return expr.equals(simplified) && this.left.isSimplified() && this.right.isSimplified();
   }
 });
-
 _.extend(Eq.prototype, {
   // Assumptions: Expression is of the form a+bx, and we solve for x
   solveLinearEquationForVariable: function solveLinearEquationForVariable(variable) {
     var expr = this.asExpr();
-
     if (!expr.is(Add) || expr.terms.length !== 2) {
       throw new Error("Can only handle linear equations of the form " + "a + bx (= 0)");
     }
-
     var hasVar = function hasVar(term) {
       return term.has(Var) && _.contains(term.getVars(), variable.symbol);
     };
-
     var a, b;
-
     if (hasVar(expr.terms[0])) {
       a = Mul.handleNegative(expr.terms[1]);
       b = Mul.handleDivide(expr.terms[0], variable);
@@ -5370,17 +4872,13 @@ _.extend(Eq.prototype, {
       a = Mul.handleNegative(expr.terms[0]);
       b = Mul.handleDivide(expr.terms[1], variable);
     }
-
     return Mul.handleDivide(a, b).simplify();
   }
 });
-/* abstract symbol node */
-
 
+/* abstract symbol node */
 function Symbol() {}
-
 Symbol.prototype = new Expr();
-
 _.extend(Symbol.prototype, {
   needsExplicitMul: function needsExplicitMul() {
     return false;
@@ -5393,15 +4891,13 @@ _.extend(Symbol.prototype, {
     }
   }
 });
-/* function variable */
-
 
+/* function variable */
 function Func(symbol, arg) {
   this.symbol = symbol;
   this.arg = arg;
 }
 Func.prototype = new Symbol();
-
 _.extend(Func.prototype, {
   func: Func,
   args: function args() {
@@ -5416,22 +4912,18 @@ _.extend(Func.prototype, {
   eval: function _eval(vars, options) {
     var arg = this.arg;
     var func = vars[this.symbol];
-
     var newVars = _.extend(_.clone(vars), {
       x: arg.eval(vars, options)
     });
-
     var parsedFunc = parse(func, options);
-
     if (parsedFunc.parsed) {
       return parsedFunc.expr.eval(newVars, options);
-    } // If parsedFunc isn't actually parsed, return its error
-
-
+    }
+    // If parsedFunc isn't actually parsed, return its error
     return parsedFunc;
   },
   codegen: function codegen() {
-    return 'vars["' + this.symbol + '"](' + this.arg.codegen() + ')';
+    return 'vars["' + this.symbol + '"](' + this.arg.codegen() + ")";
   },
   getUnits: function getUnits() {
     return this.arg.getUnits();
@@ -5447,15 +4939,13 @@ _.extend(Func.prototype, {
     return this.arg.getConsts();
   }
 });
-/* variable */
-
 
+/* variable */
 function Var(symbol, subscript) {
   this.symbol = symbol;
   this.subscript = subscript;
 }
 Var.prototype = new Symbol();
-
 _.extend(Var.prototype, {
   func: Var,
   args: function args() {
@@ -5469,18 +4959,15 @@ _.extend(Var.prototype, {
   },
   print: function print() {
     var sub = "";
-
     if (this.subscript) {
       sub = "_(" + this.subscript.print() + ")";
     }
-
     return this.symbol + sub;
   },
   // Provide a way to easily evalate expressions with the common case,
   // subscripts that consist of a single number or symbol e.g. x_a or x_42
   prettyPrint: function prettyPrint() {
     var sub = this.subscript;
-
     if (sub && (sub instanceof Num || sub instanceof Symbol)) {
       return this.symbol + "_" + sub.print();
     } else {
@@ -5489,11 +4976,9 @@ _.extend(Var.prototype, {
   },
   tex: function tex() {
     var sub = "";
-
     if (this.subscript) {
       sub = "_{" + this.subscript.tex() + "}";
     }
-
     var prefix = this.symbol.length > 1 ? "\\" : "";
     return prefix + this.symbol + sub;
   },
@@ -5513,14 +4998,12 @@ _.extend(Var.prototype, {
     return false;
   }
 });
-/* constant */
-
 
+/* constant */
 function Const(symbol) {
   this.symbol = symbol;
 }
 Const.prototype = new Symbol();
-
 _.extend(Const.prototype, {
   func: Const,
   args: function args() {
@@ -5567,15 +5050,12 @@ _.extend(Const.prototype, {
     return [this.print()];
   }
 });
-
 Const.e = new Const("e");
 Const.pi = new Const("pi");
-/* abstract number node */
 
+/* abstract number node */
 function Num() {}
-
 Num.prototype = new Expr();
-
 _.extend(Num.prototype, {
   repr: function repr() {
     return this.print();
@@ -5627,10 +5107,11 @@ _.extend(Num.prototype, {
   // Based on http://stackoverflow.com/a/10454560/2571482
   getDecimalPlaces: function getDecimalPlaces() {
     var match = ("" + this.n).match(/(?:\.(\d+))?(?:[eE]([+-]?\d+))?$/);
-
     if (match) {
-      return Math.max(0, // Number of digits right of decimal point
-      (match[1] ? match[1].length : 0) - ( // Adjust for scientific notation
+      return Math.max(0,
+      // Number of digits right of decimal point
+      (match[1] ? match[1].length : 0) - (
+      // Adjust for scientific notation
       match[2] ? +match[2] : 0));
     } else {
       return 0;
@@ -5638,23 +5119,19 @@ _.extend(Num.prototype, {
   },
   asRational: abstract
 });
-/* rational number (n: numerator, d: denominator) */
-
 
+/* rational number (n: numerator, d: denominator) */
 function Rational(numerator, denominator) {
   var n = numerator;
   var d = denominator;
-
   if (d < 0) {
     n = -n;
     d = -d;
   }
-
   this.n = n;
   this.d = d;
 }
 Rational.prototype = new Num();
-
 _.extend(Rational.prototype, {
   func: Rational,
   args: function args() {
@@ -5688,7 +5165,6 @@ _.extend(Rational.prototype, {
     var gcd = Num.findGCD(this.n, this.d);
     var n = this.n / gcd;
     var d = this.d / gcd;
-
     if (d === 1) {
       return new Int(n);
     } else {
@@ -5708,8 +5184,8 @@ _.extend(Rational.prototype, {
       // For more background, see
       // http://math.stackexchange.com/questions/151081/gcd-of-rationals
       var numerator = Num.findGCD(this.n * factor.d, factor.n * this.d);
-      var denominator = this.d * factor.d; // Create the rational, then call .collect() to simplify it
-
+      var denominator = this.d * factor.d;
+      // Create the rational, then call .collect() to simplify it
       return new Rational(numerator, denominator).collect();
     } else if (factor instanceof Int) {
       return new Rational(Num.findGCD(this.n, factor.n), this.d);
@@ -5724,7 +5200,6 @@ _.extend(Rational.prototype, {
       var abs = exp.abs().eval();
       var n = Math.pow(this.n, abs);
       var d = Math.pow(this.d, abs);
-
       if (positive) {
         return new Rational(n, d).collect();
       } else {
@@ -5744,14 +5219,12 @@ _.extend(Rational.prototype, {
     return this;
   }
 });
-/* integer (n: numerator/number) */
-
 
+/* integer (n: numerator/number) */
 function Int(number) {
   this.n = number;
 }
 Int.prototype = new Rational(0, 1);
-
 _.extend(Int.prototype, {
   func: Int,
   args: function args() {
@@ -5780,20 +5253,17 @@ _.extend(Int.prototype, {
     }
   }
 });
-
 _.extend(Int, {
   create: function create(n) {
     return new Int(n).addHint("entered");
   }
 });
-/* float (n: number) */
-
 
+/* float (n: number) */
 function Float(number) {
   this.n = number;
 }
 Float.prototype = new Num();
-
 _.extend(Float.prototype, {
   func: Float,
   args: function args() {
@@ -5853,7 +5323,6 @@ _.extend(Float.prototype, {
   // only to be used on non-repeating decimals (e.g. user-provided)
   asRational: function asRational() {
     var parts = this.n.toString().split(".");
-
     if (parts.length === 1) {
       return new Rational(this.n, 1);
     } else {
@@ -5869,7 +5338,6 @@ _.extend(Float.prototype, {
     return true;
   }
 });
-
 _.extend(Float, {
   create: function create(n) {
     return new Float(n).addHint("entered");
@@ -5879,9 +5347,9 @@ _.extend(Float, {
   toDecimalPlaces: function toDecimalPlaces(n, places) {
     return new Float(+n.toFixed(Math.min(places, 20))).collect();
   }
-}); // static methods and fields that are best defined on Num
-
+});
 
+// static methods and fields that are best defined on Num
 _.extend(Num, {
   negativeOne: function negativeOne(hint) {
     if (hint === "subtract") {
@@ -5896,20 +5364,19 @@ _.extend(Num, {
   findGCD: function findGCD(a, b) {
     var mod;
     a = Math.abs(a);
-    b = Math.abs(b); // Euclid's method doesn't handle non-integers very well. For now
+    b = Math.abs(b);
+
+    // Euclid's method doesn't handle non-integers very well. For now
     // we just say we can't pull out a common factor. It might be
     // reasonable to do better than this in the future.
-
     if (a !== Math.floor(a) || b !== Math.floor(b)) {
       return 1;
     }
-
     while (b) {
       mod = a % b;
       a = b;
       b = mod;
     }
-
     return a;
   },
   min: function min() {
@@ -5923,25 +5390,24 @@ _.extend(Num, {
     });
   }
 });
-
 Num.Neg = new Int(-1).addHint("negate");
 Num.Sub = new Int(-1).addHint("subtract");
 Num.Div = new Int(-1).addHint("divide");
 Num.Sqrt = new Rational(1, 2).addHint("root");
 Num.Zero = new Int(0);
 Num.One = new Int(1);
-Num.Ten = new Int(10); // set identities here
+Num.Ten = new Int(10);
 
+// set identities here
 Add.prototype.identity = Num.Zero;
 Mul.prototype.identity = Num.One;
-
 var parseError = function parseError(str, hash) {
   // return int location of parsing error
   throw new Error(hash.loc.first_column);
-}; // expose concrete nodes to parser scope
-// see http://zaach.github.io/jison/docs/#sharing-scope
-
+};
 
+// expose concrete nodes to parser scope
+// see http://zaach.github.io/jison/docs/#sharing-scope
 parser.yy = {
   Add: Add,
   Mul: Mul,
@@ -5974,16 +5440,15 @@ var parse = function parse(input, options) {
       parser.yy.functions = _.without(options.functions, "i");
     } else {
       parser.yy.functions = [];
-    } // If ',' is the decimal dividor in your country, replace any ','s
+    }
+
+    // If ',' is the decimal dividor in your country, replace any ','s
     // with '.'s.
     // This isn't perfect, since the output will all still have '.'s.
     // TODO(jack): Fix the output to have ','s in this case
-
-
     if (options && options.decimal_separator) {
       input = input.split(options.decimal_separator).join(".");
     }
-
     var expr = parser.parse(input).completeParse();
     return {
       parsed: true,
@@ -5996,34 +5461,35 @@ var parse = function parse(input, options) {
     };
   }
 };
-/* unit */
 
+/* unit */
 function Unit(symbol) {
   this.symbol = symbol;
 }
-Unit.prototype = new Symbol(); // If possible, replace unit prefixes with a multiplication.
+Unit.prototype = new Symbol();
+
+// If possible, replace unit prefixes with a multiplication.
 //
 // "g" -> Unit("g")
 // "kg" -> 1000 * Unit("g")
-
 var unprefixify = function unprefixify(symbol) {
   if (_(baseUnits).has(symbol) || _(derivedUnits).has(symbol)) {
     return new Unit(symbol);
-  } // check for prefix
-
+  }
 
+  // check for prefix
   var prefix = _(_(siPrefixes).keys()).find(function (testPrefix) {
     return new RegExp("^" + testPrefix).test(symbol);
   });
-
   if (prefix) {
-    var base = symbol.replace(new RegExp("^" + prefix), ""); // It's okay to be here if either:
+    var base = symbol.replace(new RegExp("^" + prefix), "");
+
+    // It's okay to be here if either:
     // * `base` is a base unit (the seven units listed in baseUnits)
     // * `base` is a derived unit which allows prefixes
     //
     // Otherwise, we're trying to parse a unit label which is not
     // allowed (mwk, mBTU, etc).
-
     if (_(baseUnits).has(base) || derivedUnits[base] && derivedUnits[base].prefixes === hasPrefixes) {
       return new Mul(siPrefixes[prefix], new Unit(base));
     } else {
@@ -6033,10 +5499,11 @@ var unprefixify = function unprefixify(symbol) {
     return new Unit(symbol);
   }
 };
-
 var unitParse = function unitParse(input) {
   try {
-    var parseResult = unitParser.parse(input); // parseResult looks like:
+    var parseResult = unitParser.parse(input);
+
+    // parseResult looks like:
     // {
     //   magnitude: "5",
     //   unit: {
@@ -6052,17 +5519,13 @@ var unitParse = function unitParse(input) {
     // denom is optionally null
 
     var unitArray = [];
-
     _(parseResult.unit.num).each(function (unitSpec) {
       unitArray.push(new Pow(unprefixify(unitSpec.name), new Int(unitSpec.pow)));
     });
-
     _(parseResult.unit.denom).each(function (unitSpec) {
       unitArray.push(new Pow(unprefixify(unitSpec.name), new Int(-1 * unitSpec.pow)));
     });
-
     var unit = new Mul(unitArray).flatten();
-
     if (parseResult.type === "unitMagnitude") {
       // in the first case we have a magnitude coefficient as well as the
       // unit itself.
@@ -6090,7 +5553,6 @@ var unitParse = function unitParse(input) {
     };
   }
 };
-
 _.extend(Unit.prototype, {
   func: Unit,
   args: function args() {
@@ -6135,7 +5597,6 @@ _.extend(Unit.prototype, {
     }
   }
 });
-
 var baseUnits = {
   m: new Unit("m"),
   // Note: kg is the SI base unit but we use g for consistency
@@ -6165,24 +5626,21 @@ var siPrefixes = {
   E: new Pow(new Int(10), new Int(18)),
   // http://en.wikipedia.org/wiki/Metric_prefix#.22Hella.22_prefix_proposal
   hella: new Pow(new Int(10), new Int(27))
-}; // Use these two values to mark a unit as either SI-prefixable or not.
+};
 
+// Use these two values to mark a unit as either SI-prefixable or not.
 var hasPrefixes = {};
 var hasntPrefixes = {};
-
 var makeAlias = function makeAlias(str, prefixes) {
   var splits = str.split("|");
   var coefficientStr = splits[0].trim();
   var unitsStr = splits[1].trim();
   var coefficient = Num.One;
-
   if (coefficientStr !== "") {
     coefficient = parse(coefficientStr).expr;
   }
-
   var numdenomStr = unitsStr.split("/");
   var numdenom = [coefficient];
-
   if (numdenomStr[0]) {
     numdenomStr[0].split(" ").filter(function (x) {
       return x !== "";
@@ -6190,7 +5648,6 @@ var makeAlias = function makeAlias(str, prefixes) {
       numdenom.push(new Unit(x));
     });
   }
-
   if (numdenomStr[1]) {
     numdenomStr[1].split(" ").filter(function (x) {
       return x !== "";
@@ -6198,12 +5655,13 @@ var makeAlias = function makeAlias(str, prefixes) {
       numdenom.push(new Pow(new Unit(x), Num.Div));
     });
   }
-
   return {
     conversion: new Mul(numdenom),
     prefixes: prefixes
   };
-}; // This is a mapping of derived units (or different names for a unit) to their
+};
+
+// This is a mapping of derived units (or different names for a unit) to their
 // definitions. For example, an inch is defined as 0.0254 m.
 //
 // Definitions don't need to be in terms of base units. For example, tsp is
@@ -6225,148 +5683,147 @@ var makeAlias = function makeAlias(str, prefixes) {
 //
 // Where possible, these units are taken from "The International System of
 // Units (SI)" 8th edition (2006).
-
-
 var derivedUnits = {
   // mass
   // The atomic mass unit / dalton.
   Da: makeAlias("1.6605388628 x 10^-24 | g", hasPrefixes),
   u: makeAlias("| Da", hasntPrefixes),
   // length
-  "meter": makeAlias("| m", hasntPrefixes),
-  "meters": makeAlias("| m", hasntPrefixes),
-  "in": makeAlias("254 / 10000 | m", hasntPrefixes),
-  "ft": makeAlias("3048  / 10000 | m", hasntPrefixes),
-  "yd": makeAlias("9144  / 10000 | m", hasntPrefixes),
-  "mi": makeAlias("1609344 / 1000 | m", hasntPrefixes),
-  "ly": makeAlias("9.4607 x 10^15 | m", hasntPrefixes),
-  "nmi": makeAlias("1852 | m", hasntPrefixes),
-  "Å": makeAlias("10^-10 | m", hasntPrefixes),
-  "pc": makeAlias("3.0857 x 10^16 | m", hasntPrefixes),
+  meter: makeAlias("| m", hasntPrefixes),
+  meters: makeAlias("| m", hasntPrefixes),
+  in: makeAlias("254 / 10000 | m", hasntPrefixes),
+  ft: makeAlias("3048  / 10000 | m", hasntPrefixes),
+  yd: makeAlias("9144  / 10000 | m", hasntPrefixes),
+  mi: makeAlias("1609344 / 1000 | m", hasntPrefixes),
+  ly: makeAlias("9.4607 x 10^15 | m", hasntPrefixes),
+  nmi: makeAlias("1852 | m", hasntPrefixes),
+  Å: makeAlias("10^-10 | m", hasntPrefixes),
+  pc: makeAlias("3.0857 x 10^16 | m", hasntPrefixes),
   // time
-  "min": makeAlias("60 | s", hasntPrefixes),
-  "hr": makeAlias("3600 | s", hasntPrefixes),
-  "sec": makeAlias("| s", hasntPrefixes),
+  min: makeAlias("60 | s", hasntPrefixes),
+  hr: makeAlias("3600 | s", hasntPrefixes),
+  sec: makeAlias("| s", hasntPrefixes),
   // TODO(joel) make day work
-  "day": makeAlias("86400 | s", hasntPrefixes),
-  "wk": makeAlias("604800 | s", hasntPrefixes),
-  "fortnight": makeAlias("14 | day", hasntPrefixes),
-  "shake": makeAlias("10^-8 | s", hasntPrefixes),
-  "olympiad": makeAlias("126200000 | s", hasntPrefixes),
+  day: makeAlias("86400 | s", hasntPrefixes),
+  wk: makeAlias("604800 | s", hasntPrefixes),
+  fortnight: makeAlias("14 | day", hasntPrefixes),
+  shake: makeAlias("10^-8 | s", hasntPrefixes),
+  olympiad: makeAlias("126200000 | s", hasntPrefixes),
   // temperature
   "°C": makeAlias("1 | K", hasntPrefixes),
   "°F": makeAlias("5/9 | K", hasntPrefixes),
   "°R": makeAlias("5/9 | K", hasntPrefixes),
   // electric charge
-  "e": makeAlias("1.6021765314 x 10^-19 | C", hasntPrefixes),
+  e: makeAlias("1.6021765314 x 10^-19 | C", hasntPrefixes),
   // speed
-  "c": makeAlias("299792458 | m / s", hasntPrefixes),
-  "kn": makeAlias("514/1000 | m / s", hasntPrefixes),
-  "kt": makeAlias("| kn", hasntPrefixes),
-  "knot": makeAlias("| kn", hasntPrefixes),
+  c: makeAlias("299792458 | m / s", hasntPrefixes),
+  kn: makeAlias("514/1000 | m / s", hasntPrefixes),
+  kt: makeAlias("| kn", hasntPrefixes),
+  knot: makeAlias("| kn", hasntPrefixes),
   // energy
-  "J": makeAlias("| N m", hasPrefixes),
-  "BTU": makeAlias("1060 | J", hasntPrefixes),
-  "cal": makeAlias("4184 / 1000 | J", hasPrefixes),
-  "eV": makeAlias("1.602176514 x 10^-19 | J", hasPrefixes),
-  "erg": makeAlias("10^−7 | J", hasPrefixes),
+  J: makeAlias("| N m", hasPrefixes),
+  BTU: makeAlias("1060 | J", hasntPrefixes),
+  cal: makeAlias("4184 / 1000 | J", hasPrefixes),
+  eV: makeAlias("1.602176514 x 10^-19 | J", hasPrefixes),
+  erg: makeAlias("10^−7 | J", hasPrefixes),
   // power
-  "W": makeAlias("| J / s", hasPrefixes),
+  W: makeAlias("| J / s", hasPrefixes),
   "H-e": makeAlias("80 | W", hasntPrefixes),
   // force
-  "N": makeAlias("1000 | g m / s s", hasPrefixes),
+  N: makeAlias("1000 | g m / s s", hasPrefixes),
   // "lb": makeAlias("4448 / 1000 | N", hasntPrefixes),
   // 4.4482216152605
-  "lb": makeAlias("4448221615 / 1000000000 | N", hasntPrefixes),
-  "dyn": makeAlias("10^-5 | N", hasntPrefixes),
+  lb: makeAlias("4448221615 / 1000000000 | N", hasntPrefixes),
+  dyn: makeAlias("10^-5 | N", hasntPrefixes),
   // pressure
-  "Pa": makeAlias("1 | N / m m m", hasPrefixes),
-  "bar": makeAlias("10^5 | Pa", hasPrefixes),
+  Pa: makeAlias("1 | N / m m m", hasPrefixes),
+  bar: makeAlias("10^5 | Pa", hasPrefixes),
   "㏔": makeAlias("1/1000 | bar", hasntPrefixes),
   "㍴": makeAlias("| bar", hasntPrefixes),
-  "atm": makeAlias("101325 | Pa", hasntPrefixes),
-  "Torr": makeAlias("1/760 | atm", hasntPrefixes),
-  "mmHg": makeAlias("| Torr", hasntPrefixes),
+  atm: makeAlias("101325 | Pa", hasntPrefixes),
+  Torr: makeAlias("1/760 | atm", hasntPrefixes),
+  mmHg: makeAlias("| Torr", hasntPrefixes),
   // area
-  "ha": makeAlias("10^4 | m m", hasntPrefixes),
-  "b": makeAlias("10^−28 | m m", hasPrefixes),
-  "barn": makeAlias("| b", hasPrefixes),
-  "acre": makeAlias("4046.87 | m m", hasntPrefixes),
-  "skilodge": makeAlias("10^-31 | m m", hasntPrefixes),
-  "outhouse": makeAlias("10^-34 | m m", hasntPrefixes),
-  "shed": makeAlias("10^-52 | m m", hasntPrefixes),
+  ha: makeAlias("10^4 | m m", hasntPrefixes),
+  b: makeAlias("10^−28 | m m", hasPrefixes),
+  barn: makeAlias("| b", hasPrefixes),
+  acre: makeAlias("4046.87 | m m", hasntPrefixes),
+  skilodge: makeAlias("10^-31 | m m", hasntPrefixes),
+  outhouse: makeAlias("10^-34 | m m", hasntPrefixes),
+  shed: makeAlias("10^-52 | m m", hasntPrefixes),
   // volume
-  "L": makeAlias("1/1000 | m m m", hasPrefixes),
-  "gal": makeAlias("3785/1000 | L", hasPrefixes),
-  "cup": makeAlias("1/16 | gal", hasntPrefixes),
-  "qt": makeAlias("1/4 | gal", hasntPrefixes),
-  "quart": makeAlias("| qt", hasntPrefixes),
-  "p": makeAlias("1/8 | gal", hasntPrefixes),
-  "pt": makeAlias("| p", hasntPrefixes),
-  "pint": makeAlias("| p", hasntPrefixes),
+  L: makeAlias("1/1000 | m m m", hasPrefixes),
+  gal: makeAlias("3785/1000 | L", hasPrefixes),
+  cup: makeAlias("1/16 | gal", hasntPrefixes),
+  qt: makeAlias("1/4 | gal", hasntPrefixes),
+  quart: makeAlias("| qt", hasntPrefixes),
+  p: makeAlias("1/8 | gal", hasntPrefixes),
+  pt: makeAlias("| p", hasntPrefixes),
+  pint: makeAlias("| p", hasntPrefixes),
   "fl oz": makeAlias("1/8 | cup", hasntPrefixes),
   "fl. oz.": makeAlias("1/8 | cup", hasntPrefixes),
-  "tbsp": makeAlias("1/16 | cup", hasntPrefixes),
-  "tsp": makeAlias("1/3 | tbsp", hasntPrefixes),
+  tbsp: makeAlias("1/16 | cup", hasntPrefixes),
+  tsp: makeAlias("1/3 | tbsp", hasntPrefixes),
   // rotational
   // "rad":
-  "rev": makeAlias("2 pi | rad", hasntPrefixes),
-  "deg": makeAlias("180 pi | rad", hasntPrefixes),
+  rev: makeAlias("2 pi | rad", hasntPrefixes),
+  deg: makeAlias("180 pi | rad", hasntPrefixes),
   "°": makeAlias("| deg", hasntPrefixes),
-  "arcminute": makeAlias("1/60 | deg", hasntPrefixes),
-  "arcsec": makeAlias("1/3600 | deg", hasntPrefixes),
+  arcminute: makeAlias("1/60 | deg", hasntPrefixes),
+  arcsec: makeAlias("1/3600 | deg", hasntPrefixes),
   // dimensionless
   // "B": makeAlias("10 | dB", hasntPrefixes), // XXX danger - logarithmic
   // "dB"
   // "nP"
-  "Hu": makeAlias("1000 | dB", hasPrefixes),
-  "dozen": makeAlias("12 |", hasntPrefixes),
+  Hu: makeAlias("1000 | dB", hasPrefixes),
+  dozen: makeAlias("12 |", hasntPrefixes),
   // XXX
-  "mol": makeAlias("6.0221412927 x 10^23 |", hasPrefixes),
+  mol: makeAlias("6.0221412927 x 10^23 |", hasPrefixes),
   "%": makeAlias("1/100 |", hasntPrefixes),
-  "percent": makeAlias("| %", hasntPrefixes),
-  "ppm": makeAlias("1/1000000 |", hasntPrefixes),
+  percent: makeAlias("| %", hasntPrefixes),
+  ppm: makeAlias("1/1000000 |", hasntPrefixes),
   // electric / magnetic
-  "V": makeAlias("1000 | g m m / s s C", hasPrefixes),
-  "C": makeAlias("| A s", hasPrefixes),
-  "ampere": makeAlias("| A", hasntPrefixes),
-  "Ω": makeAlias("| V / A", hasPrefixes),
-  "ohm": makeAlias("| Ω", hasntPrefixes),
-  "F": makeAlias("| C / V", hasPrefixes),
-  "H": makeAlias("| ohm s", hasPrefixes),
-  "T": makeAlias("1000 | g / C s", hasPrefixes),
-  "Wb": makeAlias("1000 | g m m / C s", hasPrefixes),
+  V: makeAlias("1000 | g m m / s s C", hasPrefixes),
+  C: makeAlias("| A s", hasPrefixes),
+  ampere: makeAlias("| A", hasntPrefixes),
+  Ω: makeAlias("| V / A", hasPrefixes),
+  ohm: makeAlias("| Ω", hasntPrefixes),
+  F: makeAlias("| C / V", hasPrefixes),
+  H: makeAlias("| ohm s", hasPrefixes),
+  T: makeAlias("1000 | g / C s", hasPrefixes),
+  Wb: makeAlias("1000 | g m m / C s", hasPrefixes),
   // photometry
   // TODO not sure this is right
-  "lm": makeAlias("pi x 10^4 | cd / m m", hasntPrefixes),
-  "lx": makeAlias("| lm / m m", hasntPrefixes),
-  "nit": makeAlias("| cd / m m", hasntPrefixes),
-  "sb": makeAlias("10^4 | cd / m m", hasntPrefixes),
-  "stilb": makeAlias("1 | sb", hasntPrefixes),
-  "apostilb": makeAlias("1 / pi x 10^(-4) | sb", hasntPrefixes),
-  "blondel": makeAlias("| apostilb", hasntPrefixes),
-  "asb": makeAlias("| apostilb", hasntPrefixes),
-  "la": makeAlias("| lm", hasntPrefixes),
-  "Lb": makeAlias("| lm", hasntPrefixes),
-  "sk": makeAlias("10^-7 | lm", hasntPrefixes),
-  "skot": makeAlias("| sk", hasntPrefixes),
-  "bril": makeAlias("10^-11 | lm", hasntPrefixes),
+  lm: makeAlias("pi x 10^4 | cd / m m", hasntPrefixes),
+  lx: makeAlias("| lm / m m", hasntPrefixes),
+  nit: makeAlias("| cd / m m", hasntPrefixes),
+  sb: makeAlias("10^4 | cd / m m", hasntPrefixes),
+  stilb: makeAlias("1 | sb", hasntPrefixes),
+  apostilb: makeAlias("1 / pi x 10^(-4) | sb", hasntPrefixes),
+  blondel: makeAlias("| apostilb", hasntPrefixes),
+  asb: makeAlias("| apostilb", hasntPrefixes),
+  la: makeAlias("| lm", hasntPrefixes),
+  Lb: makeAlias("| lm", hasntPrefixes),
+  sk: makeAlias("10^-7 | lm", hasntPrefixes),
+  skot: makeAlias("| sk", hasntPrefixes),
+  bril: makeAlias("10^-11 | lm", hasntPrefixes),
   // other
-  "Hz": makeAlias("| / s", hasPrefixes)
+  Hz: makeAlias("| / s", hasPrefixes)
 };
 var Zero = Num.Zero;
 var One = Num.One;
 
 /* eslint-disable */
-// TODO(alex): be able to pass a random() function to compare()
 
+// Assumes that both expressions have already been parsed
+// TODO(alex): be able to pass a random() function to compare()
 var compare = function compare(expr1, expr2, options) {
   var defaults = {
     form: false,
     // Check that the two expressions have the same form
     simplify: false // Check that the second expression is simplified
-
   };
+
   /* Options that could be added in the future:
       * - Allow ratios: e.g. 3/1 and 3 should both be accepted for something
       *   like slope
@@ -6378,53 +5835,50 @@ var compare = function compare(expr1, expr2, options) {
     options = _.extend(defaults, options);
   } else {
     options = defaults;
-  } // TODO(CP-1614): Figure out how to make these messages translatable
-  // Variable check
+  }
 
+  // TODO(CP-1614): Figure out how to make these messages translatable
 
+  // Variable check
   var vars = expr1.sameVars(expr2);
-
   if (!vars.equal) {
     var message;
-
     if (vars.equalIgnoringCase) {
       message = "Check your variables; one or more are using " + "the wrong case (upper or lower).";
     } else {
       message = "Check your variables; you may have used the wrong " + "letter for one or more of them.";
     }
-
     return {
       equal: false,
       wrongVariableCase: vars.equalIgnoringCase,
       wrongVariableNames: !vars.equalIgnoringCase,
       message: message
     };
-  } // Semantic check
-
+  }
 
+  // Semantic check
   if (!expr1.compare(expr2)) {
     return {
       equal: false,
       message: null
     };
-  } // Syntactic check
-
+  }
 
+  // Syntactic check
   if (options.form && !expr1.sameForm(expr2)) {
     return {
       equal: false,
       message: "Your answer is not in the correct form."
     };
-  } // Syntactic check
-
+  }
 
+  // Syntactic check
   if (options.simplify && !expr1.isSimplified()) {
     return {
       equal: false,
       message: "Your answer is not fully expanded and simplified."
     };
   }
-
   return {
     equal: true,
     message: null