Commit 1164dc67 authored by yann300's avatar yann300

indentation

parent 9e107f8b
......@@ -2,52 +2,52 @@ var React = require('react');
module.exports = React.createClass({
getInitialState: function()
{
return {
currentSelected: null,
currentAddress: null
};
},
getInitialState: function()
{
return {
currentSelected: null,
currentAddress: null
};
},
getDefaultProps: function()
{
return {
vmTrace: null
};
},
return {
vmTrace: null
};
},
render: function()
{
if (!this.props.vmTrace || !this.props.vmTrace.vmtrace || this.props.vmTrace.vmtrace.length === 0)
return null;
this.state.currentAddress = this.props.vmTrace.vmtrace[0].address
this.state.currentSelected = this.props.vmTrace.codesmap[this.state.currentAddress][this.props.vmTrace.vmtrace[0].pc]
return (
<div>
if (!this.props.vmTrace || !this.props.vmTrace.vmtrace || this.props.vmTrace.vmtrace.length === 0)
return null;
this.state.currentAddress = this.props.vmTrace.vmtrace[0].address
this.state.currentSelected = this.props.vmTrace.codesmap[this.state.currentAddress][this.props.vmTrace.vmtrace[0].pc]
return (
<div>
<div id="action" >
<button onClick={this.stepIntoBack} >stepIntoBack</button>
<button onClick={this.stepOverBack} >stepOverBack</button>
<button onClick={this.stepOverForward} >stepOverForward</button>
<button onClick={this.stepIntoForward} >stepIntoForward</button>
<button onClick={this.stepIntoBack} >stepIntoBack</button>
<button onClick={this.stepOverBack} >stepOverBack</button>
<button onClick={this.stepOverForward} >stepOverForward</button>
<button onClick={this.stepIntoForward} >stepIntoForward</button>
</div>
<div>
<select size="10" ref='itemsList' value={this.state.currentSelected}>
{ this.renderAssemblyItems() }
</select>
<select size="10" ref='itemsList' value={this.state.currentSelected}>
{ this.renderAssemblyItems() }
</select>
</div>
</div>
);
</div>
);
},
renderAssemblyItems: function()
{
if (this.props.vmTrace)
{
var selectedItem = this.state.currentSelected
var selectedItem = this.state.currentSelected
return this.props.vmTrace.vmtrace.map(function(item, i)
{
return <option key={i} value={i} >{item.instname}</option>;
return <option key={i} value={i} >{item.instname}</option>;
});
}
},
......@@ -55,7 +55,7 @@ module.exports = React.createClass({
stepIntoBack: function ()
{
this.moveSelection(-1)
this.moveSelection(-1)
},
stepOverBack: function()
......@@ -116,39 +116,39 @@ module.exports = React.createClass({
if (depth == 0)
break;
else depth--;
else if (this.isReturnInstruction(i))
depth++;
}
this.selectState(i);
},
stepOutForward: function()
{
var i = this.state.currentSelected;
var depth = 0;
while (++i < this.props.vmTrace.vmtrace.length) {
if (this.isReturnInstruction(i))
if (depth == 0)
break;
else
depth--;
else if (this.isCallInstruction(i))
depth++;
}
this.selectState(i + 1);
},
moveSelection: function(incr)
{
this.selectState(this.state.currentSelected + incr)
},
else if (this.isReturnInstruction(i))
depth++;
}
this.selectState(i);
},
stepOutForward: function()
{
var i = this.state.currentSelected;
var depth = 0;
while (++i < this.props.vmTrace.vmtrace.length) {
if (this.isReturnInstruction(i))
if (depth == 0)
break;
else
depth--;
else if (this.isCallInstruction(i))
depth++;
}
this.selectState(i + 1);
},
moveSelection: function(incr)
{
this.selectState(this.state.currentSelected + incr)
},
selectState: function(index)
{
var newIndex = this.props.vmTrace.codesmap[this.state.currentAddress][this.props.vmTrace.vmtrace[index].pc]
this.state.currentSelected = index
this.refs.itemsList.value = this.state.currentSelected
if (this.props.vmTrace.vmtrace[index].address && this.state.currentAddress !== this.props.vmTrace.vmtrace[index].address)
this.state.currentAddress = this.props.vmTrace.vmtrace[index].address
},
})
selectState: function(index)
{
var newIndex = this.props.vmTrace.codesmap[this.state.currentAddress][this.props.vmTrace.vmtrace[index].pc]
this.state.currentSelected = index
this.refs.itemsList.value = this.state.currentSelected
if (this.props.vmTrace.vmtrace[index].address && this.state.currentAddress !== this.props.vmTrace.vmtrace[index].address)
this.state.currentAddress = this.props.vmTrace.vmtrace[index].address
},
})
......@@ -4,22 +4,22 @@ var VmTraceManager = require('./vmTraceManager');
var VmTraceBrowser = require('./vmTraceBrowser');
module.exports = React.createClass({
getInitialState: function() {
return {vmTrace: null}
},
getInitialState: function() {
return {vmTrace: null}
},
render: function() {
return (
<div>
<h1>Debugger</h1>
<TxBrowser onNewTxRequested={this.retrieveVmTrace} />
<VmTraceBrowser vmTrace={this.state.vmTrace} />
</div>
);
},
render: function() {
return (
<div>
<h1>Debugger</h1>
<TxBrowser onNewTxRequested={this.retrieveVmTrace} />
<VmTraceBrowser vmTrace={this.state.vmTrace} />
</div>
);
},
retrieveVmTrace: function(blockNumber, txNumber)
{
this.setState({vmTrace: VmTraceManager.retrieveVmTrace(blockNumber, txNumber)});
}
retrieveVmTrace: function(blockNumber, txNumber)
{
this.setState({vmTrace: VmTraceManager.retrieveVmTrace(blockNumber, txNumber)});
}
});
......@@ -10,6 +10,6 @@ Web3Admin.extend(web3);
var Debugger = require('./debugger');
ReactDOM.render(
<Debugger/>,
document.getElementById('app')
<Debugger/>,
document.getElementById('app')
);
......@@ -15,21 +15,21 @@ module.exports = React.createClass({
},
updateBlockN: function(ev) {
this.state.blockNumber = ev.target.value;
this.state.blockNumber = ev.target.value;
},
updateTxN: function(ev) {
this.state.txNumber = ev.target.value;
this.state.txNumber = ev.target.value;
},
render: function() {
return (
<div>
<div>
<div><h3>Transaction details</h3></div>
<input onChange={this.updateBlockN} type="text" placeholder= {"Block number e.g. : " + this.state.blockNumber}></input>
<input onChange={this.updateTxN} type="text" placeholder={"Transaction Number e.g. : " + this.state.txNumber}></input>
<button onClick={this.submit}>Get</button>
</div>
);
</div>
);
}
})
......@@ -2,7 +2,7 @@ var React = require('react');
var AssemblyItemsBrowser = require('./assemblyItemsBrowser');
module.exports = React.createClass({
render: function() {
return ( <AssemblyItemsBrowser vmTrace={this.props.vmTrace} /> )
render: function() {
return ( <AssemblyItemsBrowser vmTrace={this.props.vmTrace} /> )
}
});
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment