Commit 1164dc67 authored by yann300's avatar yann300

indentation

parent 9e107f8b
...@@ -2,52 +2,52 @@ var React = require('react'); ...@@ -2,52 +2,52 @@ var React = require('react');
module.exports = React.createClass({ module.exports = React.createClass({
getInitialState: function() getInitialState: function()
{ {
return { return {
currentSelected: null, currentSelected: null,
currentAddress: null currentAddress: null
}; };
}, },
getDefaultProps: function() getDefaultProps: function()
{ {
return { return {
vmTrace: null vmTrace: null
}; };
}, },
render: function() render: function()
{ {
if (!this.props.vmTrace || !this.props.vmTrace.vmtrace || this.props.vmTrace.vmtrace.length === 0) if (!this.props.vmTrace || !this.props.vmTrace.vmtrace || this.props.vmTrace.vmtrace.length === 0)
return null; return null;
this.state.currentAddress = this.props.vmTrace.vmtrace[0].address 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] this.state.currentSelected = this.props.vmTrace.codesmap[this.state.currentAddress][this.props.vmTrace.vmtrace[0].pc]
return ( return (
<div> <div>
<div id="action" > <div id="action" >
<button onClick={this.stepIntoBack} >stepIntoBack</button> <button onClick={this.stepIntoBack} >stepIntoBack</button>
<button onClick={this.stepOverBack} >stepOverBack</button> <button onClick={this.stepOverBack} >stepOverBack</button>
<button onClick={this.stepOverForward} >stepOverForward</button> <button onClick={this.stepOverForward} >stepOverForward</button>
<button onClick={this.stepIntoForward} >stepIntoForward</button> <button onClick={this.stepIntoForward} >stepIntoForward</button>
</div> </div>
<div> <div>
<select size="10" ref='itemsList' value={this.state.currentSelected}> <select size="10" ref='itemsList' value={this.state.currentSelected}>
{ this.renderAssemblyItems() } { this.renderAssemblyItems() }
</select> </select>
</div> </div>
</div> </div>
); );
}, },
renderAssemblyItems: function() renderAssemblyItems: function()
{ {
if (this.props.vmTrace) if (this.props.vmTrace)
{ {
var selectedItem = this.state.currentSelected var selectedItem = this.state.currentSelected
return this.props.vmTrace.vmtrace.map(function(item, i) 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({ ...@@ -55,7 +55,7 @@ module.exports = React.createClass({
stepIntoBack: function () stepIntoBack: function ()
{ {
this.moveSelection(-1) this.moveSelection(-1)
}, },
stepOverBack: function() stepOverBack: function()
...@@ -116,39 +116,39 @@ module.exports = React.createClass({ ...@@ -116,39 +116,39 @@ module.exports = React.createClass({
if (depth == 0) if (depth == 0)
break; break;
else depth--; else depth--;
else if (this.isReturnInstruction(i)) else if (this.isReturnInstruction(i))
depth++; depth++;
} }
this.selectState(i); this.selectState(i);
}, },
stepOutForward: function() stepOutForward: function()
{ {
var i = this.state.currentSelected; var i = this.state.currentSelected;
var depth = 0; var depth = 0;
while (++i < this.props.vmTrace.vmtrace.length) { while (++i < this.props.vmTrace.vmtrace.length) {
if (this.isReturnInstruction(i)) if (this.isReturnInstruction(i))
if (depth == 0) if (depth == 0)
break; break;
else else
depth--; depth--;
else if (this.isCallInstruction(i)) else if (this.isCallInstruction(i))
depth++; depth++;
} }
this.selectState(i + 1); this.selectState(i + 1);
}, },
moveSelection: function(incr) moveSelection: function(incr)
{ {
this.selectState(this.state.currentSelected + incr) this.selectState(this.state.currentSelected + incr)
}, },
selectState: function(index) selectState: function(index)
{ {
var newIndex = this.props.vmTrace.codesmap[this.state.currentAddress][this.props.vmTrace.vmtrace[index].pc] var newIndex = this.props.vmTrace.codesmap[this.state.currentAddress][this.props.vmTrace.vmtrace[index].pc]
this.state.currentSelected = index this.state.currentSelected = index
this.refs.itemsList.value = this.state.currentSelected this.refs.itemsList.value = this.state.currentSelected
if (this.props.vmTrace.vmtrace[index].address && this.state.currentAddress !== this.props.vmTrace.vmtrace[index].address) 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 this.state.currentAddress = this.props.vmTrace.vmtrace[index].address
}, },
}) })
...@@ -4,22 +4,22 @@ var VmTraceManager = require('./vmTraceManager'); ...@@ -4,22 +4,22 @@ var VmTraceManager = require('./vmTraceManager');
var VmTraceBrowser = require('./vmTraceBrowser'); var VmTraceBrowser = require('./vmTraceBrowser');
module.exports = React.createClass({ module.exports = React.createClass({
getInitialState: function() { getInitialState: function() {
return {vmTrace: null} return {vmTrace: null}
}, },
render: function() { render: function() {
return ( return (
<div> <div>
<h1>Debugger</h1> <h1>Debugger</h1>
<TxBrowser onNewTxRequested={this.retrieveVmTrace} /> <TxBrowser onNewTxRequested={this.retrieveVmTrace} />
<VmTraceBrowser vmTrace={this.state.vmTrace} /> <VmTraceBrowser vmTrace={this.state.vmTrace} />
</div> </div>
); );
}, },
retrieveVmTrace: function(blockNumber, txNumber) retrieveVmTrace: function(blockNumber, txNumber)
{ {
this.setState({vmTrace: VmTraceManager.retrieveVmTrace(blockNumber, txNumber)}); this.setState({vmTrace: VmTraceManager.retrieveVmTrace(blockNumber, txNumber)});
} }
}); });
...@@ -10,6 +10,6 @@ Web3Admin.extend(web3); ...@@ -10,6 +10,6 @@ Web3Admin.extend(web3);
var Debugger = require('./debugger'); var Debugger = require('./debugger');
ReactDOM.render( ReactDOM.render(
<Debugger/>, <Debugger/>,
document.getElementById('app') document.getElementById('app')
); );
...@@ -15,21 +15,21 @@ module.exports = React.createClass({ ...@@ -15,21 +15,21 @@ module.exports = React.createClass({
}, },
updateBlockN: function(ev) { updateBlockN: function(ev) {
this.state.blockNumber = ev.target.value; this.state.blockNumber = ev.target.value;
}, },
updateTxN: function(ev) { updateTxN: function(ev) {
this.state.txNumber = ev.target.value; this.state.txNumber = ev.target.value;
}, },
render: function() { render: function() {
return ( return (
<div> <div>
<div><h3>Transaction details</h3></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.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> <input onChange={this.updateTxN} type="text" placeholder={"Transaction Number e.g. : " + this.state.txNumber}></input>
<button onClick={this.submit}>Get</button> <button onClick={this.submit}>Get</button>
</div> </div>
); );
} }
}) })
...@@ -2,7 +2,7 @@ var React = require('react'); ...@@ -2,7 +2,7 @@ var React = require('react');
var AssemblyItemsBrowser = require('./assemblyItemsBrowser'); var AssemblyItemsBrowser = require('./assemblyItemsBrowser');
module.exports = React.createClass({ module.exports = React.createClass({
render: function() { render: function() {
return ( <AssemblyItemsBrowser vmTrace={this.props.vmTrace} /> ) 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