TheDude
/
solidity-coverage
mirror of https://github.com/sc-forks/solidity-coverage
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DRYer code

Browse Source
uport
Alex Rea 8 years ago
parent eb5ab7c988
commit c1fcb0b522
1 changed files with 26 additions and 72 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 98
      instrumentSolidity.js

98
instrumentSolidity.js
Unescape View File

@ -22,6 +22,14 @@ module.exports = function(pathToFile, instrumentingActive){
var fileName = path.basename(pathToFile); var fileName = path.basename(pathToFile);
var injectionPoints = {}; var injectionPoints = {};
function createOrAppendInjectionPoint(key, value){
if (injectionPoints[key]){
injectionPoints[key].push(value);
}else{
injectionPoints[key] = [value];
}
}
function instrumentAssignmentExpression(expression){ function instrumentAssignmentExpression(expression){
//The only time we instrument an assignment expression is if there's a conditional expression on //The only time we instrument an assignment expression is if there's a conditional expression on
//the right //the right
@ -29,11 +37,7 @@ module.exports = function(pathToFile, instrumentingActive){
if (expression.left.type==='DeclarativeExpression'){ if (expression.left.type==='DeclarativeExpression'){
//Then we need to go from bytes32 varname = (conditional expression) //Then we need to go from bytes32 varname = (conditional expression)
//to bytes32 varname; (,varname) = (conditional expression) //to bytes32 varname; (,varname) = (conditional expression)
if (injectionPoints[expression.left.end]){ createOrAppendInjectionPoint(expression.left.end, {type:"literal", string:"; (," + expression.left.name + ")"});
injectionPoints[expression.left.end].push({type:"literal", string:"; (," + expression.left.name});
}else{
injectionPoints[expression.left.end] = [{type:"literal", string:"; (," + expression.left.name + ")"}];
}
}else { }else {
console.log(expression.left) console.log(expression.left)
process.exit(); process.exit();
@ -61,33 +65,14 @@ module.exports = function(pathToFile, instrumentingActive){
//Wrap the consequent //Wrap the consequent
if (injectionPoints[expression.consequent.start]){ createOrAppendInjectionPoint(expression.consequent.start, {type:"openParen"});
injectionPoints[expression.consequent.start].push({type:"openParen"}); createOrAppendInjectionPoint(expression.consequent.start, {type:"callBranchEvent",comma:true, branchId: branchId, locationIdx: 0});
}else{ createOrAppendInjectionPoint(expression.consequent.end, {type:"closeParen"});
injectionPoints[expression.consequent.start] = [{type:"openParen"}];
}
injectionPoints[expression.consequent.start].push({type:"callBranchEvent",comma:true, branchId: branchId, locationIdx: 0});
if (injectionPoints[expression.consequent.end]){
injectionPoints[expression.consequent.end].push({type:"closeParen"});
}else{
injectionPoints[expression.consequent.end] = [{type:"closeParen"}];
}
//Wrap the alternate //Wrap the alternate
if (injectionPoints[expression.alternate.start]){ createOrAppendInjectionPoint(expression.alternate.start, {type:"openParen"});
injectionPoints[expression.alternate.start].push({type:"openParen"}); createOrAppendInjectionPoint(expression.alternate.start, {type:"callBranchEvent",comma:true, branchId: branchId, locationIdx: 1});
}else{ createOrAppendInjectionPoint(expression.alternate.end, {type:"closeParen"});
injectionPoints[expression.alternate.start] = [{type:"openParen"}];
}
injectionPoints[expression.alternate.start].push({type:"callBranchEvent",comma:true, branchId: branchId, locationIdx: 1});
if (injectionPoints[expression.alternate.end]){
injectionPoints[expression.alternate.end].push({type:"closeParen"});
}else{
injectionPoints[expression.alternate.end] = [{type:"closeParen"}];
}
} }
function instrumentStatement(expression){ function instrumentStatement(expression){
@ -125,11 +110,7 @@ module.exports = function(pathToFile, instrumentingActive){
} }
statementMap[statementId] = {start:{line: startline, column:startcol},end:{line:endline, column:endcol}} statementMap[statementId] = {start:{line: startline, column:startcol},end:{line:endline, column:endcol}}
if (injectionPoints[expression.start]){ createOrAppendInjectionPoint(expression.start, {type:"statement", statementId: statementId});
injectionPoints[expression.start].push({type:"statement", statementId: statementId});
}else{
injectionPoints[expression.start] = [{type:"statement", statementId: statementId}];
}
} }
function instrumentLine(expression){ function instrumentLine(expression){
@ -146,11 +127,7 @@ module.exports = function(pathToFile, instrumentingActive){
} }
// Is everything before us and after us on this line whitespace? // Is everything before us and after us on this line whitespace?
if (contract.slice(lastNewLine, startchar).trim().length===0 && contract.slice(endchar,nextNewLine).replace(';','').trim().length===0){ if (contract.slice(lastNewLine, startchar).trim().length===0 && contract.slice(endchar,nextNewLine).replace(';','').trim().length===0){
if (injectionPoints[lastNewLine+1]){ createOrAppendInjectionPoint(lastNewLine+1,{type:"callEvent"});
injectionPoints[lastNewLine+1].push({type:"callEvent"});
}else{
injectionPoints[lastNewLine+1] = [{type:"callEvent"}];
}
} }
} }
@ -165,11 +142,7 @@ module.exports = function(pathToFile, instrumentingActive){
var endline = startline + (functionDefinition.match(/\n/g)||[]).length; var endline = startline + (functionDefinition.match(/\n/g)||[]).length;
var endcol = functionDefinition.length - functionDefinition.lastIndexOf('\n') var endcol = functionDefinition.length - functionDefinition.lastIndexOf('\n')
fnMap[fnId] = {name: expression.name, line: linecount, loc:{start:{line: startline, column:startcol},end:{line:endline, column:endcol}}} fnMap[fnId] = {name: expression.name, line: linecount, loc:{start:{line: startline, column:startcol},end:{line:endline, column:endcol}}}
if (injectionPoints[expression.start + endlineDelta +1]){ createOrAppendInjectionPoint(expression.start + endlineDelta+1,{type: "callFunctionEvent", fnId: fnId} );
injectionPoints[expression.start + endlineDelta +1].push({type: "callFunctionEvent", fnId: fnId});
}else{
injectionPoints[expression.start + endlineDelta +1] = [{type: "callFunctionEvent", fnId: fnId}];
}
} }
function instrumentIfStatement(expression){ function instrumentIfStatement(expression){
@ -178,35 +151,15 @@ module.exports = function(pathToFile, instrumentingActive){
var startcol = expression.start - contract.slice(0,expression.start).lastIndexOf('\n') -1; var startcol = expression.start - contract.slice(0,expression.start).lastIndexOf('\n') -1;
//NB locations for if branches in istanbul are zero length and associated with the start of the if. //NB locations for if branches in istanbul are zero length and associated with the start of the if.
branchMap[branchId] = {line:linecount, type:'if', locations:[{start:{line:startline, column:startcol},end:{line:startline,column:startcol}},{start:{line:startline, column:startcol},end:{line:startline,column:startcol}}]} branchMap[branchId] = {line:linecount, type:'if', locations:[{start:{line:startline, column:startcol},end:{line:startline,column:startcol}},{start:{line:startline, column:startcol},end:{line:startline,column:startcol}}]}
if (injectionPoints[expression.consequent.start+1]){ createOrAppendInjectionPoint(expression.consequent.start+1,{type: "callBranchEvent", branchId: branchId, locationIdx: 0} )
injectionPoints[expression.consequent.start+1].push({type: "callBranchEvent", branchId: branchId, locationIdx: 0})
}else{
injectionPoints[expression.consequent.start+1] = [{type: "callBranchEvent", branchId: branchId, locationIdx: 0}];
}
if (expression.alternate && expression.alternate.type==='IfStatement'){ if (expression.alternate && expression.alternate.type==='IfStatement'){
if (injectionPoints[expression.alternate.start]){ createOrAppendInjectionPoint(expression.alternate.start, {type: "callBranchEvent", branchId: branchId, locationIdx:1, openBracket: true})
injectionPoints[expression.alternate.start].push({type: "callBranchEvent", branchId: branchId, locationIdx:1, openBracket: true}); createOrAppendInjectionPoint(expression.alternate.end, {type:"closeBracket"});
}else{
injectionPoints[expression.alternate.start] = [{type: "callBranchEvent", branchId: branchId, locationIdx:1, openBracket: true}];
}
if (injectionPoints[expression.alternate.end]){
injectionPoints[expression.alternate.end].push({type: "closeBracket"});
}else{
injectionPoints[expression.alternate.end] = [{type: "closeBracket"}];
}
//It should get instrumented when we parse it //It should get instrumented when we parse it
} else if (expression.alternate){ } else if (expression.alternate){
if (injectionPoints[expression.alternate.start+1]){ createOrAppendInjectionPoint(expression.alternate.start+1, {type: "callBranchEvent", branchId: branchId, locationIdx: 1})
injectionPoints[expression.alternate.start+1].push({type: "callBranchEvent", branchId: branchId, locationIdx: 1});
}else{
injectionPoints[expression.alternate.start+1] = [{type: "callBranchEvent", branchId: branchId, locationIdx: 1}];
}
} else { } else {
if (injectionPoints[expression.consequent.end]){ createOrAppendInjectionPoint(expression.consequent.end, {type: "callEmptyBranchEvent", branchId: branchId, locationIdx: 1});
injectionPoints[expression.consequent.end].push({type: "callEmptyBranchEvent", branchId: branchId, locationIdx: 1});
}else{
injectionPoints[expression.consequent.end] = [{type: "callEmptyBranchEvent", branchId: branchId, locationIdx: 1}];
}
} }
} }
@ -434,9 +387,10 @@ module.exports = function(pathToFile, instrumentingActive){
contract = contract.slice(0, injectionPoint) + injection.string + contract.slice(injectionPoint); contract = contract.slice(0, injectionPoint) + injection.string + contract.slice(injectionPoint);
}else if (injection.type==='statement'){ }else if (injection.type==='statement'){
contract = contract.slice(0, injectionPoint) + " StatementCoverage('" + fileName + "'," + injection.statementId + ");\n" + contract.slice(injectionPoint); contract = contract.slice(0, injectionPoint) + " StatementCoverage('" + fileName + "'," + injection.statementId + ");\n" + contract.slice(injectionPoint);
}else{ }else if (injection.type==='eventDefinition'){
console.log(injection.type);
contract = contract.slice(0, injectionPoint) + "event Coverage(string fileName, uint256 lineNumber);\nevent FunctionCoverage(string fileName, uint256 fnId);\nevent StatementCoverage(string fileName, uint256 statementId);\nevent BranchCoverage(string fileName, uint256 branchId, uint256 locationIdx);\n" + contract.slice(injectionPoint); contract = contract.slice(0, injectionPoint) + "event Coverage(string fileName, uint256 lineNumber);\nevent FunctionCoverage(string fileName, uint256 fnId);\nevent StatementCoverage(string fileName, uint256 statementId);\nevent BranchCoverage(string fileName, uint256 branchId, uint256 locationIdx);\n" + contract.slice(injectionPoint);
}else{
console.log('Unknown injection.type');
} }
} }
} }

Write Preview
Loading…
Cancel
Save