mirror
/
remix-project
mirror of https://github.com/ethereum/remix-project.git
2
0
Fork 0
Code Issues Releases Wiki Activity

Move to json compilation.

Browse Source
pull/1/head
chriseth 10 years ago
parent 1d3e62c3a5
commit 9fbfcf026c
3 changed files with 49 additions and 9 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. 52
      index.html
  2. 4
      libs/jquery-2.1.3.min.js
  3. 2
      stylesheets/styles.css

52
index.html
Unescape View File

@ -34,23 +34,32 @@ body {
right: 10px; right: 10px;
bottom: 0px; bottom: 0px;
font-size: 14px; font-size: 14px;
overflow: auto;
} }
#header { #header {
margin-bottom: 4px; margin-bottom: 4px;
} }
.col1 {
width: 18ex;
display: inline-block;
}
.col2 {
width: 60ex;
}
</style> </style>
<script src="libs/jquery-2.1.3.min.js"></script>
<script src="libs/ace.js"></script> <script src="libs/ace.js"></script>
<script src="mode-solidity.js"></script> <script src="mode-solidity.js"></script>
<script src="soljs.js"></script> <script src="soljson.js"></script>
</head> </head>
<body> <body>
<h1 id="header">Solidity realtime compiler</h1> <h1 id="header">Solidity realtime compiler</h1>
Source code on the left, compiled code and AST on the right (or error).<br/> Source code on the left, compiled code and AST on the right (or error).<br/>
<b>Note:</b> Chrome/Chromium currently reports &quot;Uncaught JavaScript Exception&quot;. <b>Note:</b> Chrome/Chromium currently reports &quot;Uncaught JavaScript Exception&quot;.
To work around this problem, enable the debug console (Ctrl+Shift+i) and reload.<br/> To work around this problem, enable the debug console (Ctrl+Shift+i) and reload.<br/>
Version: <a href="https://github.com/ethereum/cpp-ethereum/commit/bb30afcbe8d168e8bd7ebf99bd3256376470c36e">bb30afcbe8...</a> 2015-04-17 Version: <a href="https://github.com/ethereum/cpp-ethereum/commit/2329a5af24e78c90c161dab553f6cf78f04ddea2">2329a5af...</a> 2015-04-22
<div id="optimizeBox"> <div id="optimizeBox">
<input id="optimize" type="checkbox" checked="checked"><label for="optimize">optimize</label> <input id="optimize" type="checkbox"><label for="optimize">optimize</label>
</div> </div>
<div id="input"> contract Ballot { <div id="input"> contract Ballot {
// Create a new ballot with $(_numProposals) different proposals. // Create a new ballot with $(_numProposals) different proposals.
@ -110,7 +119,7 @@ Version: <a href="https://github.com/ethereum/cpp-ethereum/commit/bb30afcbe8d168
mapping(uint8 => uint256) voteCounts; mapping(uint8 => uint256) voteCounts;
} }
</div> </div>
<pre id="output"></pre> <div id="output"></div>
<div style="height: 100px;"></div> <div style="height: 100px;"></div>
<p><small>Theme by <a href="https://github.com/orderedlist">orderedlist</a></small></p> <p><small>Theme by <a href="https://github.com/orderedlist">orderedlist</a></small></p>
@ -122,22 +131,26 @@ editor.getSession().setMode("ace/mode/javascript");
editor.getSession().setTabSize(4); editor.getSession().setTabSize(4);
editor.getSession().setUseSoftTabs(true); editor.getSession().setUseSoftTabs(true);
var compileString = Module.cwrap("compileString", "string", ["string", "number"]); var compileJSON = Module.cwrap("compileJSON", "string", ["string", "number"]);
var ready = false; var ready = false;
Module['onRuntimeInitialized'] = function() { ready = true; onChange(); }; Module['onRuntimeInitialized'] = function() { ready = true; onChange(); };
var previousInput = ''; var previousInput = '';
var outputArea = document.querySelector('#output');
var compile = function() { var compile = function() {
if (!ready) if (!ready)
return; return;
var input = editor.getValue(); var input = editor.getValue();
var optimize = document.querySelector('#optimize').checked; var optimize = document.querySelector('#optimize').checked;
try { try {
outputArea.innerHTML = compileString(input, optimize ? 1 : 0); var data = $.parseJSON(compileJSON(input, optimize ? 1 : 0));
} catch (exception) { } catch (exception) {
outputArea.innerHTML = "Uncaught JavaScript Exception:\n" + exception; renderError("Uncaught JavaScript Exception:\n" + exception);
return;
} }
if (data['error'] !== undefined)
renderError(data['error']);
else
renderContracts(data);
} }
var compileTimeout = null; var compileTimeout = null;
var onChange = function() { var onChange = function() {
@ -153,6 +166,29 @@ var onChange = function() {
editor.getSession().on('change', onChange); editor.getSession().on('change', onChange);
document.querySelector('#optimize').addEventListener('change', compile); document.querySelector('#optimize').addEventListener('change', compile);
var renderError = function(message) {
$('#output').empty().append($('<pre></pre>').text(message));
};
var renderContracts = function(data) {
$('#output').empty();
for (var contractName in data.contracts) {
var contract = data.contracts[contractName];
var contractOutput = $('<div class="contractOutput"/>')
.append($('<h3/>').text(contractName))
.append($('<div/>').text((contract.bytecode.length / 2) + ' bytes'))
.append(tableRow('Bytecode', contract.bytecode))
.append(tableRow('Interface', contract['interface']))
.append(tableRow('Solidity Interface', contract.solidity_interface))
.append(tableRow('Opcodes', contract.opcodes));
$('#output').append(contractOutput);
}
};
var tableRow = function(description, data) {
return $('<div/>')
.append($('<span class="col1">').text(description))
.append($('<input readonly="readonly" class="col2">').val(data));
};
</script> </script>
</body> </body>
</html> </html>

4
libs/jquery-2.1.3.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
stylesheets/styles.css
Unescape View File

@ -9,7 +9,7 @@ body {
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {
color:#222; color:#222;
margin:0 0 20px; margin: 20px 0 10px;
} }
p, ul, ol, table, pre, dl { p, ul, ol, table, pre, dl {

Write Preview
Loading…
Cancel
Save