Fix increment on nullable

test/codegen/expect/dart/core.js

 var core;
 (function(exports) {
   'use strict';
   // Function _symbolToString: (Symbol) → String
   function _symbolToString(symbol) {
     return _internal.Symbol.getName(dart.as(symbol, _internal.Symbol));
   }
   // Function _symbolMapToStringMap: (Map<Symbol, dynamic>) → dynamic
   function _symbolMapToStringMap(map) {
     if (map === null)
@@ skipping 123 matching lines @@
             let minuteDifference = parseIntOrZero(match.get(11));
             minuteDifference = 60 * dart.notNull(hourDifference);
             minute = dart.notNull(sign) * dart.notNull(minuteDifference);
           }
         }
         let millisecondsSinceEpoch = _brokenDownDateToMillisecondsSinceEpoch(years, month, day, hour, minute, second, millisecond, isUtc);
         if (millisecondsSinceEpoch === null) {
           throw new FormatException("Time out of range", formattedString);
         }
         if (addOneMillisecond)
-          dart.notNull(millisecondsSinceEpoch)++;
+          millisecondsSinceEpoch = dart.notNull(millisecondsSinceEpoch) + 1;
         return new DateTime.fromMillisecondsSinceEpoch(millisecondsSinceEpoch, {isUtc: isUtc});
       } else {
         throw new FormatException("Invalid date format", formattedString);
       }
     }
     DateTime$fromMillisecondsSinceEpoch(millisecondsSinceEpoch, opt$) {
       let isUtc = opt$.isUtc === void 0 ? false : opt$.isUtc;
       this.millisecondsSinceEpoch = millisecondsSinceEpoch;
       this.isUtc = isUtc;
       if (dart.notNull(millisecondsSinceEpoch.abs()) > dart.notNull(_MAX_MILLISECONDS_SINCE_EPOCH)) {
@@ skipping 551 matching lines @@
       this[_memberName] = memberName;
       this[_arguments] = positionalArguments;
       this[_namedArguments] = namedArguments;
       this[_existingArgumentNames] = existingArgumentNames;
       super.Error();
     }
     toString() {
       let sb = new StringBuffer();
       let i = 0;
       if (this[_arguments] !== null) {
-        for (; dart.notNull(i) < dart.notNull(this[_arguments].length); dart.notNull(i)++) {
+        for (; dart.notNull(i) < dart.notNull(this[_arguments].length); i = dart.notNull(i) + 1) {
           if (dart.notNull(i) > 0) {
             sb.write(", ");
           }
           sb.write(Error.safeToString(this[_arguments].get(i)));
         }
       }
       if (this[_namedArguments] !== null) {
         this[_namedArguments].forEach(((key, value) => {
           if (dart.notNull(i) > 0) {
             sb.write(", ");
           }
           sb.write(_symbolToString(key));
           sb.write(": ");
           sb.write(Error.safeToString(value));
-          dart.notNull(i)++;
+          i = dart.notNull(i) + 1;
         }).bind(this));
       }
       if (this[_existingArgumentNames] === null) {
         return `NoSuchMethodError : method not found: '${this[_memberName]}'\n` + `Receiver: ${Error.safeToString(this[_receiver])}\n` + `Arguments: [${sb}]`;
       } else {
         let actualParameters = sb.toString();
         sb = new StringBuffer();
-        for (let i = 0; dart.notNull(i) < dart.notNull(this[_existingArgumentNames].length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(this[_existingArgumentNames].length); i = dart.notNull(i) + 1) {
           if (dart.notNull(i) > 0) {
             sb.write(", ");
           }
           sb.write(this[_existingArgumentNames].get(i));
         }
         let formalParameters = sb.toString();
         return "NoSuchMethodError: incorrect number of arguments passed to " + `method named '${this[_memberName]}'\n` + `Receiver: ${Error.safeToString(this[_receiver])}\n` + `Tried calling: ${this[_memberName]}(${actualParameters})\n` + `Found: ${this[_memberName]}(${formalParameters})`;
       }
     }
   }
@@ skipping 120 matching lines @@
       if (offset === -1) {
         let source = dart.as(this.source, String);
         if (dart.notNull(source.length) > 78) {
           source = String['+'](source.substring(0, 75), "...");
         }
         return `${report}\n${source}`;
       }
       let lineNum = 1;
       let lineStart = 0;
       let lastWasCR = null;
-      for (let i = 0; dart.notNull(i) < dart.notNull(offset); dart.notNull(i)++) {
+      for (let i = 0; dart.notNull(i) < dart.notNull(offset); i = dart.notNull(i) + 1) {
         let char = dart.as(dart.dinvoke(this.source, 'codeUnitAt', i), int);
         if (char === 10) {
           if (lineStart !== i || !dart.notNull(lastWasCR)) {
-            dart.notNull(lineNum)++;
+            lineNum = dart.notNull(lineNum) + 1;
           }
           lineStart = dart.notNull(i) + 1;
           lastWasCR = false;
         } else if (char === 13) {
-          dart.notNull(lineNum)++;
+          lineNum = dart.notNull(lineNum) + 1;
           lineStart = dart.notNull(i) + 1;
           lastWasCR = true;
         }
       }
       if (dart.notNull(lineNum) > 1) {
         report = ` (at line ${lineNum}, character ${dart.notNull(offset) - dart.notNull(lineStart) + 1})\n`;
       } else {
         report = ` (at character ${dart.notNull(offset) + 1})\n`;
       }
       let lineEnd = dart.as(dart.dload(this.source, 'length'), int);
-      for (let i = offset; i['<'](dart.dload(this.source, 'length')); dart.notNull(i)++) {
+      for (let i = offset; i['<'](dart.dload(this.source, 'length')); i = dart.notNull(i) + 1) {
         let char = dart.as(dart.dinvoke(this.source, 'codeUnitAt', i), int);
         if (char === 10 || char === 13) {
           lineEnd = i;
           break;
         }
       }
       let length = dart.notNull(lineEnd) - dart.notNull(lineStart);
       let start = lineStart;
       let end = lineEnd;
       let prefix = "";
@@ skipping 43 matching lines @@
         let values = _js_helper.Primitives.getProperty(object, _EXPANDO_PROPERTY_NAME);
         if (values === null) {
           values = new Object();
           _js_helper.Primitives.setProperty(object, _EXPANDO_PROPERTY_NAME, values);
         }
         _js_helper.Primitives.setProperty(values, this[_getKey](), value);
       }
       [_getKey]() {
         let key = dart.as(_js_helper.Primitives.getProperty(this, _KEY_PROPERTY_NAME), String);
         if (key === null) {
-          key = `expando$key$${dart.notNull(_keyCount)++}`;
+          key = `expando$key$${(($tmp) => _keyCount = dart.notNull($tmp) + 1, $tmp)(_keyCount)}`;
           _js_helper.Primitives.setProperty(this, _KEY_PROPERTY_NAME, key);
         }
         return key;
       }
     }
     Expando._KEY_PROPERTY_NAME = 'expando$key';
     Expando._EXPANDO_PROPERTY_NAME = 'expando$values';
     Expando._keyCount = 0;
     return Expando;
   });
@@ skipping 126 matching lines @@
     class _GeneratorIterator extends dart.Object {
       _GeneratorIterator($_index, $_end, $_generator) {
         this[_index] = $_index;
         this[_end] = $_end;
         this[_generator] = $_generator;
         this[_current] = null;
       }
       moveNext() {
         if (dart.notNull(this[_index]) < dart.notNull(this[_end])) {
           this[_current] = this[_generator](this[_index]);
-          dart.notNull(this[_index])++;
+          this[_index] = dart.notNull(this[_index]) + 1;
           return true;
         } else {
           this[_current] = null;
           return false;
         }
       }
       get current() {
         return this[_current];
       }
     }
@@ skipping 18 matching lines @@
         if (length === void 0)
           length = new _ListConstructorSentinel();
         if (length === new _ListConstructorSentinel()) {
           return new _interceptors.JSArray.emptyGrowable();
         }
         return new _interceptors.JSArray.fixed(length);
       }
       List$filled(length, fill) {
         let result = new _interceptors.JSArray.fixed(length);
         if (length !== 0 && dart.notNull(fill !== null)) {
-          for (let i = 0; dart.notNull(i) < dart.notNull(result.length); dart.notNull(i)++) {
+          for (let i = 0; dart.notNull(i) < dart.notNull(result.length); i = dart.notNull(i) + 1) {
             result.set(i, fill);
           }
         }
         return dart.as(result, List$(E));
       }
       List$from(elements, opt$) {
         let growable = opt$.growable === void 0 ? true : opt$.growable;
         let list = new List();
         for (let e of elements) {
           list.add(e);
         }
         if (growable)
           return list;
         return dart.as(_internal.makeListFixedLength(list), List$(E));
       }
       List$generate(length, generator, opt$) {
         let growable = opt$.growable === void 0 ? true : opt$.growable;
         let result = null;
         if (growable) {
           result = ((_) => {
             _.length = length;
             return _;
           }).bind(this)(new List.from([]));
         } else {
           result = new List(length);
         }
-        for (let i = 0; dart.notNull(i) < dart.notNull(length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
           result.set(i, generator(i));
         }
         return result;
       }
     }
     dart.defineNamedConstructor(List, 'filled');
     dart.defineNamedConstructor(List, 'from');
     dart.defineNamedConstructor(List, 'generate');
     return List;
   });
@@ skipping 219 matching lines @@
       let defaultValue = opt$.defaultValue === void 0 ? null : opt$.defaultValue;
       throw new UnsupportedError('String.fromEnvironment can only be used as a const constructor');
     }
     static [_stringFromIterable](charCodes, start, end) {
       if (dart.notNull(start) < 0)
         throw new RangeError.range(start, 0, charCodes.length);
       if (end !== null && dart.notNull(end) < dart.notNull(start)) {
         throw new RangeError.range(end, start, charCodes.length);
       }
       let it = charCodes.iterator;
-      for (let i = 0; dart.notNull(i) < dart.notNull(start); dart.notNull(i)++) {
+      for (let i = 0; dart.notNull(i) < dart.notNull(start); i = dart.notNull(i) + 1) {
         if (!dart.notNull(it.moveNext())) {
           throw new RangeError.range(start, 0, i);
         }
       }
       let list = new List.from([]);
       if (end === null) {
         while (it.moveNext())
           list.add(it.current);
       } else {
-        for (let i = start; dart.notNull(i) < dart.notNull(end); dart.notNull(i)++) {
+        for (let i = start; dart.notNull(i) < dart.notNull(end); i = dart.notNull(i) + 1) {
           if (!dart.notNull(it.moveNext())) {
             throw new RangeError.range(end, start, i);
           }
           list.add(it.current);
         }
       }
       return _js_helper.Primitives.stringFromCharCodes(list);
     }
   }
   dart.defineNamedConstructor(String, 'fromCharCodes');
@@ skipping 322 matching lines @@
             lastColon = -1;
             let endBracket = uri.indexOf(']', dart.notNull(index) + 1);
             if (endBracket === -1) {
               index = uri.length;
               char = EOI;
               break;
             } else {
               index = endBracket;
             }
           }
-          dart.notNull(index)++;
+          index = dart.notNull(index) + 1;
           char = EOI;
         }
         let hostStart = authStart;
         let hostEnd = index;
         if (dart.notNull(lastAt) >= 0) {
           userinfo = _makeUserInfo(uri, authStart, lastAt);
           hostStart = dart.notNull(lastAt) + 1;
         }
         if (dart.notNull(lastColon) >= 0) {
           let portNumber = null;
           if (dart.notNull(lastColon) + 1 < dart.notNull(index)) {
             portNumber = 0;
-            for (let i = dart.notNull(lastColon) + 1; dart.notNull(i) < dart.notNull(index); dart.notNull(i)++) {
+            for (let i = dart.notNull(lastColon) + 1; dart.notNull(i) < dart.notNull(index); i = dart.notNull(i) + 1) {
               let digit = uri.codeUnitAt(i);
               if (dart.notNull(_ZERO) > dart.notNull(digit) || dart.notNull(_NINE) < dart.notNull(digit)) {
                 _fail(uri, i, "Invalid port number");
               }
               portNumber = dart.notNull(portNumber) * 10 + (dart.notNull(digit) - dart.notNull(_ZERO));
             }
           }
           port = _makePort(portNumber, scheme);
           hostEnd = lastColon;
         }
@@ skipping 14 matching lines @@
           break;
         }
         if (char === _SLASH) {
           state = i === 0 ? ALLOW_AUTH : IN_PATH;
           break;
         }
         if (char === _COLON) {
           if (i === 0)
             _fail(uri, 0, "Invalid empty scheme");
           scheme = _makeScheme(uri, i);
-          dart.notNull(i)++;
+          i = dart.notNull(i) + 1;
           pathStart = i;
           if (i === uri.length) {
             char = EOI;
             state = NOT_IN_PATH;
           } else {
             char = uri.codeUnitAt(i);
             if (char === _QUESTION || char === _NUMBER_SIGN) {
               state = NOT_IN_PATH;
             } else if (char === _SLASH) {
               state = ALLOW_AUTH;
             } else {
               state = IN_PATH;
             }
           }
           break;
         }
-        dart.notNull(i)++;
+        i = dart.notNull(i) + 1;
         char = EOI;
       }
       index = i;
       if (state === ALLOW_AUTH) {
         dart.assert(char === _SLASH);
-        dart.notNull(index)++;
+        index = dart.notNull(index) + 1;
         if (index === uri.length) {
           char = EOI;
           state = NOT_IN_PATH;
         } else {
           char = uri.codeUnitAt(index);
           if (char === _SLASH) {
-            dart.notNull(index)++;
+            index = dart.notNull(index) + 1;
             parseAuth();
             pathStart = index;
           }
           if (char === _QUESTION || char === _NUMBER_SIGN || char === EOI) {
             state = NOT_IN_PATH;
           } else {
             state = IN_PATH;
           }
         }
       }
       dart.assert(state === IN_PATH || state === NOT_IN_PATH);
       if (state === IN_PATH) {
-        while (++dart.notNull(index) < dart.notNull(uri.length)) {
+        while ((index = dart.notNull(index) + 1) < dart.notNull(uri.length)) {
           char = uri.codeUnitAt(index);
           if (char === _QUESTION || char === _NUMBER_SIGN) {
             break;
           }
           char = EOI;
         }
         state = NOT_IN_PATH;
       }
       dart.assert(state === NOT_IN_PATH);
       let isFile = dart.equals(scheme, "file");
@@ skipping 62 matching lines @@
         queryParameters = null;
       return _makeHttpUri("https", authority, unencodedPath, queryParameters);
     }
     static [_makeHttpUri](scheme, authority, unencodedPath, queryParameters) {
       let userInfo = "";
       let host = null;
       let port = null;
       if (dart.notNull(authority !== null) && dart.notNull(authority.isNotEmpty)) {
         let hostStart = 0;
         let hasUserInfo = false;
-        for (let i = 0; dart.notNull(i) < dart.notNull(authority.length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(authority.length); i = dart.notNull(i) + 1) {
           if (authority.codeUnitAt(i) === _AT_SIGN) {
             hasUserInfo = true;
             userInfo = authority.substring(0, i);
             hostStart = dart.notNull(i) + 1;
             break;
           }
         }
         let hostEnd = hostStart;
         if (dart.notNull(hostStart) < dart.notNull(authority.length) && authority.codeUnitAt(hostStart) === _LEFT_BRACKET) {
-          for (; dart.notNull(hostEnd) < dart.notNull(authority.length); dart.notNull(hostEnd)++) {
+          for (; dart.notNull(hostEnd) < dart.notNull(authority.length); hostEnd = dart.notNull(hostEnd) + 1) {
             if (authority.codeUnitAt(hostEnd) === _RIGHT_BRACKET)
               break;
           }
           if (hostEnd === authority.length) {
             throw new FormatException("Invalid IPv6 host entry.", authority, hostStart);
           }
           parseIPv6Address(authority, dart.notNull(hostStart) + 1, hostEnd);
-          dart.notNull(hostEnd)++;
+          hostEnd = dart.notNull(hostEnd) + 1;
           if (hostEnd !== authority.length && authority.codeUnitAt(hostEnd) !== _COLON) {
             throw new FormatException("Invalid end of authority", authority, hostEnd);
           }
         }
         let hasPort = false;
-        for (; dart.notNull(hostEnd) < dart.notNull(authority.length); dart.notNull(hostEnd)++) {
+        for (; dart.notNull(hostEnd) < dart.notNull(authority.length); hostEnd = dart.notNull(hostEnd) + 1) {
           if (authority.codeUnitAt(hostEnd) === _COLON) {
             let portString = authority.substring(dart.notNull(hostEnd) + 1);
             if (portString.isNotEmpty)
               port = int.parse(portString);
             break;
           }
         }
         host = authority.substring(hostStart, hostEnd);
       }
       return new Uri({scheme: scheme, userInfo: userInfo, host: dart.as(host, String), port: dart.as(port, int), pathSegments: unencodedPath.split("/"), queryParameters: queryParameters});
@@ skipping 179 matching lines @@
       if (start === end)
         return "";
       if (host.codeUnitAt(start) === _LEFT_BRACKET) {
         if (host.codeUnitAt(dart.notNull(end) - 1) !== _RIGHT_BRACKET) {
           _fail(host, start, 'Missing end `]` to match `[` in host');
         }
         parseIPv6Address(host, dart.notNull(start) + 1, dart.notNull(end) - 1);
         return host.substring(start, end).toLowerCase();
       }
       if (!dart.notNull(strictIPv6)) {
-        for (let i = start; dart.notNull(i) < dart.notNull(end); dart.notNull(i)++) {
+        for (let i = start; dart.notNull(i) < dart.notNull(end); i = dart.notNull(i) + 1) {
           if (host.codeUnitAt(i) === _COLON) {
             parseIPv6Address(host, start, end);
             return `[${host}]`;
           }
         }
       }
       return _normalizeRegName(host, start, end);
     }
     static [_isRegNameChar](char) {
       return dart.notNull(char) < 127 && dart.notNull(!dart.equals(dart.dbinary(dart.dindex(_regNameTable, dart.notNull(char) >> 4), '&', 1 << (dart.notNull(char) & 15)), 0));
@@ skipping 31 matching lines @@
         } else if (_isRegNameChar(char)) {
           if (dart.notNull(isNormalized) && dart.notNull(_UPPER_CASE_A) <= dart.notNull(char) && dart.notNull(_UPPER_CASE_Z) >= dart.notNull(char)) {
             if (buffer === null)
               buffer = new StringBuffer();
             if (dart.notNull(sectionStart) < dart.notNull(index)) {
               buffer.write(host.substring(sectionStart, index));
               sectionStart = index;
             }
             isNormalized = false;
           }
-          dart.notNull(index)++;
+          index = dart.notNull(index) + 1;
         } else if (_isGeneralDelimiter(char)) {
           _fail(host, index, "Invalid character");
         } else {
           let sourceLength = 1;
           if ((dart.notNull(char) & 64512) === 55296 && dart.notNull(index) + 1 < dart.notNull(end)) {
             let tail = host.codeUnitAt(dart.notNull(index) + 1);
             if ((dart.notNull(tail) & 64512) === 56320) {
               char = 65536 | (dart.notNull(char) & 1023) << 10 | dart.notNull(tail) & 1023;
               sourceLength = 2;
             }
@@ skipping 20 matching lines @@
       return buffer.toString();
     }
     static [_makeScheme](scheme, end) {
       if (end === 0)
         return "";
       let firstCodeUnit = scheme.codeUnitAt(0);
       if (!dart.notNull(_isAlphabeticCharacter(firstCodeUnit))) {
         _fail(scheme, 0, "Scheme not starting with alphabetic character");
       }
       let allLowercase = dart.notNull(firstCodeUnit) >= dart.notNull(_LOWER_CASE_A);
-      for (let i = 0; dart.notNull(i) < dart.notNull(end); dart.notNull(i)++) {
+      for (let i = 0; dart.notNull(i) < dart.notNull(end); i = dart.notNull(i) + 1) {
         let codeUnit = scheme.codeUnitAt(i);
         if (!dart.notNull(_isSchemeCharacter(codeUnit))) {
           _fail(scheme, i, "Illegal scheme character");
         }
         if (dart.notNull(codeUnit) < dart.notNull(_LOWER_CASE_A) || dart.notNull(codeUnit) > dart.notNull(_LOWER_CASE_Z)) {
           allLowercase = false;
         }
       }
       scheme = scheme.substring(0, end);
       if (!dart.notNull(allLowercase))
@@ skipping 109 matching lines @@
         if (dart.dbinary(char, '>', 2047)) {
           flag = 224;
           encodedBytes = 3;
           if (dart.dbinary(char, '>', 65535)) {
             encodedBytes = 4;
             flag = 240;
           }
         }
         codeUnits = new List(3 * dart.notNull(encodedBytes));
         let index = 0;
-        while (--dart.notNull(encodedBytes) >= 0) {
+        while ((encodedBytes = dart.notNull(encodedBytes) - 1) >= 0) {
           let byte = dart.as(dart.dbinary(dart.dbinary(dart.dbinary(char, '>>', 6 * dart.notNull(encodedBytes)), '&', 63), '|', flag), int);
           codeUnits.set(index, _PERCENT);
           codeUnits.set(dart.notNull(index) + 1, hexDigits.codeUnitAt(dart.notNull(byte) >> 4));
           codeUnits.set(dart.notNull(index) + 2, hexDigits.codeUnitAt(dart.notNull(byte) & 15));
           index = 3;
           flag = 128;
         }
       }
       return new String.fromCharCodes(dart.as(codeUnits, Iterable$(int)));
     }
     static [_normalize](component, start, end, charTable) {
       let buffer = null;
       let sectionStart = start;
       let index = start;
       while (dart.notNull(index) < dart.notNull(end)) {
         let char = component.codeUnitAt(index);
         if (dart.notNull(char) < 127 && (dart.notNull(charTable.get(dart.notNull(char) >> 4)) & 1 << (dart.notNull(char) & 15)) !== 0) {
-          dart.notNull(index)++;
+          index = dart.notNull(index) + 1;
         } else {
           let replacement = null;
           let sourceLength = null;
           if (char === _PERCENT) {
             replacement = _normalizeEscape(component, index, false);
             if (replacement === null) {
               index = 3;
               continue;
             }
             if (dart.equals("%", replacement)) {
@@ skipping 42 matching lines @@
     get isAbsolute() {
       return dart.notNull(!dart.equals(this.scheme, "")) && dart.notNull(dart.equals(this.fragment, ""));
     }
     [_merge](base, reference) {
       if (base.isEmpty)
         return `/${reference}`;
       let backCount = 0;
       let refStart = 0;
       while (reference.startsWith("../", refStart)) {
         refStart = 3;
-        dart.notNull(backCount)++;
+        backCount = dart.notNull(backCount) + 1;
       }
       let baseEnd = base.lastIndexOf('/');
       while (dart.notNull(baseEnd) > 0 && dart.notNull(backCount) > 0) {
         let newEnd = base.lastIndexOf('/', dart.notNull(baseEnd) - 1);
         if (dart.notNull(newEnd) < 0) {
           break;
         }
         let delta = dart.notNull(baseEnd) - dart.notNull(newEnd);
         if ((delta === 2 || delta === 3) && base.codeUnitAt(dart.notNull(newEnd) + 1) === _DOT && (delta === 2 || base.codeUnitAt(dart.notNull(newEnd) + 2) === _DOT)) {
           break;
         }
         baseEnd = newEnd;
-        dart.notNull(backCount)--;
+        backCount = dart.notNull(backCount) - 1;
       }
       return String['+'](base.substring(0, dart.notNull(baseEnd) + 1), reference.substring(dart.notNull(refStart) - 3 * dart.notNull(backCount)));
     }
     [_hasDotSegments](path) {
       if (dart.notNull(path.length) > 0 && path.codeUnitAt(0) === _DOT)
         return true;
       let index = path.indexOf("/.");
       return index !== -1;
     }
     [_removeDotSegments](path) {
@@ skipping 273 matching lines @@
         if (dart.notNull(value) < 0 || dart.notNull(value) > (1 << 16) - 1) {
           error('each part must be in the range of `0x0..0xFFFF`', start);
         }
         return value;
       }
       if (dart.notNull(host.length) < 2)
         error('address is too short');
       let parts = dart.as(new List.from([]), List$(int));
       let wildcardSeen = false;
       let partStart = start;
-      for (let i = start; dart.notNull(i) < dart.notNull(end); dart.notNull(i)++) {
+      for (let i = start; dart.notNull(i) < dart.notNull(end); i = dart.notNull(i) + 1) {
         if (host.codeUnitAt(i) === _COLON) {
           if (i === start) {
-            dart.notNull(i)++;
+            i = dart.notNull(i) + 1;
             if (host.codeUnitAt(i) !== _COLON) {
               error('invalid start colon.', i);
             }
             partStart = i;
           }
           if (i === partStart) {
             if (wildcardSeen) {
               error('only one wildcard `::` is allowed', i);
             }
             wildcardSeen = true;
@@ skipping 27 matching lines @@
 
       }
       if (wildcardSeen) {
         if (dart.notNull(parts.length) > 7) {
           error('an address with a wildcard must have less than 7 parts');
         }
       } else if (parts.length !== 8) {
         error('an address without a wildcard must contain exactly 8 parts');
       }
       let bytes = new List(16);
-      for (let i = 0, index = 0; dart.notNull(i) < dart.notNull(parts.length); dart.notNull(i)++) {
+      for (let i = 0, index = 0; dart.notNull(i) < dart.notNull(parts.length); i = dart.notNull(i) + 1) {
         let value = parts.get(i);
         if (value === -1) {
           let wildCardLength = 9 - dart.notNull(parts.length);
-          for (let j = 0; dart.notNull(j) < dart.notNull(wildCardLength); dart.notNull(j)++) {
+          for (let j = 0; dart.notNull(j) < dart.notNull(wildCardLength); j = dart.notNull(j) + 1) {
             bytes.set(index, 0);
             bytes.set(dart.notNull(index) + 1, 0);
             index = 2;
           }
         } else {
           bytes.set(index, dart.notNull(value) >> 8);
           bytes.set(dart.notNull(index) + 1, dart.notNull(value) & 255);
           index = 2;
         }
       }
       return dart.as(bytes, List$(int));
     }
     static [_uriEncode](canonicalTable, text, opt$) {
       let encoding = opt$.encoding === void 0 ? convert.UTF8 : opt$.encoding;
       let spaceToPlus = opt$.spaceToPlus === void 0 ? false : opt$.spaceToPlus;
       // Function byteToHex: (dynamic, dynamic) → dynamic
       function byteToHex(byte, buffer) {
         let hex = '0123456789ABCDEF';
         dart.dinvoke(buffer, 'writeCharCode', hex.codeUnitAt(dart.as(dart.dbinary(byte, '>>', 4), int)));
         dart.dinvoke(buffer, 'writeCharCode', hex.codeUnitAt(dart.as(dart.dbinary(byte, '&', 15), int)));
       }
       let result = new StringBuffer();
       let bytes = encoding.encode(text);
-      for (let i = 0; dart.notNull(i) < dart.notNull(bytes.length); dart.notNull(i)++) {
+      for (let i = 0; dart.notNull(i) < dart.notNull(bytes.length); i = dart.notNull(i) + 1) {
         let byte = bytes.get(i);
         if (dart.notNull(byte) < 128 && (dart.notNull(canonicalTable.get(dart.notNull(byte) >> 4)) & 1 << (dart.notNull(byte) & 15)) !== 0) {
           result.writeCharCode(byte);
         } else if (dart.notNull(spaceToPlus) && byte === _SPACE) {
           result.writeCharCode(_PLUS);
         } else {
           result.writeCharCode(_PERCENT);
           byteToHex(byte, result);
         }
       }
       return result.toString();
     }
     static [_hexCharPairToByte](s, pos) {
       let byte = 0;
-      for (let i = 0; dart.notNull(i) < 2; dart.notNull(i)++) {
+      for (let i = 0; dart.notNull(i) < 2; i = dart.notNull(i) + 1) {
         let charCode = s.codeUnitAt(dart.notNull(pos) + dart.notNull(i));
         if (48 <= dart.notNull(charCode) && dart.notNull(charCode) <= 57) {
           byte = dart.notNull(byte) * 16 + dart.notNull(charCode) - 48;
         } else {
           charCode = 32;
           if (97 <= dart.notNull(charCode) && dart.notNull(charCode) <= 102) {
             byte = dart.notNull(byte) * 16 + dart.notNull(charCode) - 87;
           } else {
             throw new ArgumentError("Invalid URL encoding");
           }
         }
       }
       return byte;
     }
     static [_uriDecode](text, opt$) {
       let plusToSpace = opt$.plusToSpace === void 0 ? false : opt$.plusToSpace;
       let encoding = opt$.encoding === void 0 ? convert.UTF8 : opt$.encoding;
       let simple = true;
-      for (let i = 0; dart.notNull(i) < dart.notNull(text.length) && dart.notNull(simple); dart.notNull(i)++) {
+      for (let i = 0; dart.notNull(i) < dart.notNull(text.length) && dart.notNull(simple); i = dart.notNull(i) + 1) {
         let codeUnit = text.codeUnitAt(i);
         simple = codeUnit !== _PERCENT && codeUnit !== _PLUS;
       }
       let bytes = null;
       if (simple) {
         if (dart.notNull(dart.equals(encoding, convert.UTF8)) || dart.notNull(dart.equals(encoding, convert.LATIN1))) {
           return text;
         } else {
           bytes = text.codeUnits;
         }
       } else {
         bytes = dart.as(new List(), List$(int));
-        for (let i = 0; dart.notNull(i) < dart.notNull(text.length); dart.notNull(i)++) {
+        for (let i = 0; dart.notNull(i) < dart.notNull(text.length); i = dart.notNull(i) + 1) {
           let codeUnit = text.codeUnitAt(i);
           if (dart.notNull(codeUnit) > 127) {
             throw new ArgumentError("Illegal percent encoding in URI");
           }
           if (codeUnit === _PERCENT) {
             if (dart.notNull(i) + 3 > dart.notNull(text.length)) {
               throw new ArgumentError('Truncated URI');
             }
             bytes.add(_hexCharPairToByte(text, dart.notNull(i) + 1));
             i = 2;
@@ skipping 115 matching lines @@
   exports.Stopwatch = Stopwatch;
   exports.String = String;
   exports.Runes = Runes;
   exports.RuneIterator = RuneIterator;
   exports.StringBuffer = StringBuffer;
   exports.StringSink = StringSink;
   exports.Symbol = Symbol;
   exports.Type = Type;
   exports.Uri = Uri;
 })(core || (core = {}));