Perform ternary conditional injections before branch injections (#828)

Author: cgewecke

lib/instrumenter.js

@@ -96,8 +96,10 @@ class Instrumenter {
       // Line instrumentation has to happen first
       contract.injectionPoints[injectionPoint].sort((a, b) => {
         const injections = [
-          'injectLogicalOR',
           'injectBranch',
+          'injectOpenParen',
+          'injectOrFalse',
+          'injectAndTrue',
           'injectEmptyBranch',
           'injectLine'
         ];

test/sources/solidity/contracts/conditional/ternary-with-unbracketed-else.sol

@@ -0,0 +1,8 @@
+pragma solidity ^0.7.0;
+
+contract Test {
+    function a() public {
+        int i = 0;
+        if (false) {} else i == 0 ? i = 0 : i--;
+    }
+}

test/units/conditional.js

@@ -229,4 +229,8 @@ describe('ternary conditionals', () => {
     });
   });
 
+  it('should compile after instrumenting a ternary conditional which follows an unbracketed else', () => {
+    const info = util.instrumentAndCompile('conditional/ternary-with-unbracketed-else');
+    util.report(info.solcOutput.errors);
+  });
 });