Fix parsing crash when return is ternary conditional product

lib/instrumenter.js

@@ -61,8 +61,6 @@ class Instrumenter {
 
     // First, we run over the original contract to get the source mapping.
     let ast = SolidityParser.parse(contract.source, {range: true});
-    //console.log(JSON.stringify(ast, null, ' '))
-
     parse[ast.type](contract, ast);
     const retValue = JSON.parse(JSON.stringify(contract)); // Possibly apotropaic.
 

lib/parse.js

@@ -70,10 +70,13 @@ parse.FunctionCall = function(contract, expression, skipStatementRegistry) {
   }
 };
 
-parse.Conditional = function(contract, expression) {
+parse.Conditional = function(contract, expression, skipStatementRegistry) {
-  register.statement(contract, expression);
+  if (!skipStatementRegistry){
-  // TODO: Investigate node structure
+    register.statement(contract, expression);
-  // There are potential substatements here we aren't measuring
+  }
+
+  parse[expression.condition.type] &&
+  parse[expression.condition.type](contract, expression.condition, skipStatementRegistry);
 };
 
 parse.ContractDefinition = function(contract, expression) {

test/sources/solidity/contracts/return/ternary-return.sol

@@ -0,0 +1,11 @@
+pragma solidity ^0.5.0;
+
+contract Test {
+    function a(uint x) public pure returns (uint) {
+        return x > 3 ? x : 1;
+    }
+
+    function b(uint x) public pure returns (uint) {
+        return (x > 3) ? x : 1;
+    }
+}

test/units/expressions.js

@@ -17,8 +17,13 @@ describe('generic expressions / misc', () => {
     util.report(info.solcOutput.errors);
   });
 
-  it('should compile after instrumenting function the returns void', () => {
+  it('should compile after instrumenting function that returns void', () => {
     const info = util.instrumentAndCompile('return/empty-return');
     util.report(info.solcOutput.errors);
   });
+
+  it('should compile after instrumenting function that returns via ternary conditional', () => {
+    const info = util.instrumentAndCompile('return/ternary-return');
+    util.report(info.solcOutput.errors);
+  });
 });