Minor fixes, add compile to interactive

androlo · androlo · commit 8b7b88f04f98 · 2017-10-24T18:15:12.000+02:00
diff --git a/.solhint.json b/.solhint.json
@@ -14,6 +14,7 @@
       "error",
       140
     ],
+    "no-inline-assembly": false,
     "compiler-fixed": false
   }
 }
diff --git a/bin/commands/option.js b/bin/commands/option.js
@@ -24,7 +24,7 @@ exports.OPTIONS = {
     optAndUnopt: new Option('optAndUnopt', 'O', 'Run the suit both with optimized and un-opttimized code.'),
     extended: new Option('extended', 'E', 'Include the extended tests/performance units.'),
     silent: new Option('silent', 'S', 'Do not show a detailed results from tests or perf.'),
-    diff: new Option('diff', 'D', 'Compare perf results with the results from the previous perf (if any).')
+    diff: new Option('diff', 'I', 'Compare perf results with the results from the previous perf (if any).')
 };
 exports.GLOBAL_OPTIONS = {
     debug: new Option('debug', 'D', 'Enable debug logging.')
diff --git a/bin/commands/option.ts b/bin/commands/option.ts
@@ -30,7 +30,7 @@ export const OPTIONS: { [name: string]: Option } = {
     optAndUnopt: new Option('optAndUnopt', 'O', 'Run the suit both with optimized and un-opttimized code.'),
     extended: new Option('extended', 'E', 'Include the extended tests/performance units.'),
     silent: new Option('silent', 'S', 'Do not show a detailed results from tests or perf.'),
-    diff: new Option('diff', 'D', 'Compare perf results with the results from the previous perf (if any).')
+    diff: new Option('diff', 'I', 'Compare perf results with the results from the previous perf (if any).')
 };
 
 export const GLOBAL_OPTIONS: { [name: string]: Option } = {
diff --git a/bin/prompt/compile_prompt.js b/bin/prompt/compile_prompt.js
@@ -0,0 +1,70 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = y[op[0] & 2 ? "return" : op[0] ? "throw" : "next"]) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [0, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var _this = this;
+Object.defineProperty(exports, "__esModule", { value: true });
+var utils_1 = require("./utils");
+var compile_1 = require("../../script/compile");
+exports.compileMenu = function () { return __awaiter(_this, void 0, void 0, function () {
+    var selected, units, _i, _a, cmpl;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0: return [4 /*yield*/, utils_1.prompt(utils_1.librarySelectionData('compile'))];
+            case 1:
+                selected = _b.sent();
+                if (selected.compile.length === 0) {
+                    return [2 /*return*/];
+                }
+                units = [];
+                for (_i = 0, _a = selected.compile; _i < _a.length; _i++) {
+                    cmpl = _a[_i];
+                    if (cmpl[0] instanceof Array) {
+                        units = units.concat(cmpl);
+                    }
+                    else {
+                        units.push(cmpl);
+                    }
+                }
+                return [4 /*yield*/, compile_1.compile(units)];
+            case 2:
+                _b.sent();
+                return [4 /*yield*/, exports.compileMenu()];
+            case 3:
+                _b.sent();
+                return [2 /*return*/];
+        }
+    });
+}); };
diff --git a/bin/prompt/compile_prompt.ts b/bin/prompt/compile_prompt.ts
@@ -0,0 +1,19 @@
+import {librarySelectionData, prompt} from "./utils";
+import {compile} from "../../script/compile";
+
+export const compileMenu = async (): Promise<void> => {
+    const selected = await prompt(librarySelectionData('compile'));
+    if (selected.compile.length === 0) {
+        return;
+    }
+    let units = [];
+    for (const cmpl of selected.compile) {
+        if (cmpl[0] instanceof Array) {
+            units = units.concat(cmpl);
+        } else {
+            units.push(cmpl);
+        }
+    }
+    await compile(units);
+    await compileMenu();
+};
diff --git a/bin/prompt/main_prompt.js b/bin/prompt/main_prompt.js
@@ -41,11 +41,17 @@ var docs_prompt_1 = require("./docs_prompt");
 var tests_prompt_1 = require("./tests_prompt");
 var perf_prompt_1 = require("./perf_prompt");
 var logs_prompt_1 = require("./logs_prompt");
+var compile_prompt_1 = require("./compile_prompt");
 exports.mainPrompt = {
     type: 'list',
     name: 'main',
     message: 'Select an action to perform',
     choices: [
+        {
+            key: 'c',
+            name: 'Compile contracts',
+            value: 'compile'
+        },
         {
             key: 't',
             name: 'Run tests',
@@ -81,33 +87,39 @@ exports.mainMenu = function () { return __awaiter(_this, void 0, void 0, functio
                     case "perf": return [3 /*break*/, 4];
                     case "logs": return [3 /*break*/, 6];
                     case "docs": return [3 /*break*/, 8];
-                    case "exit": return [3 /*break*/, 10];
+                    case "compile": return [3 /*break*/, 10];
+                    case "exit": return [3 /*break*/, 12];
                 }
-                return [3 /*break*/, 11];
+                return [3 /*break*/, 13];
             case 2: // Options
             return [4 /*yield*/, tests_prompt_1.testsMenu()];
             case 3:
                 _b.sent();
-                return [3 /*break*/, 12];
+                return [3 /*break*/, 14];
             case 4: // Options
             return [4 /*yield*/, perf_prompt_1.perfMenu()];
             case 5:
                 _b.sent();
-                return [3 /*break*/, 12];
+                return [3 /*break*/, 14];
             case 6: // Options
             return [4 /*yield*/, logs_prompt_1.logsMenu()];
             case 7:
                 _b.sent();
-                return [3 /*break*/, 12];
+                return [3 /*break*/, 14];
             case 8: // Options
             return [4 /*yield*/, docs_prompt_1.docsMenu()];
             case 9:
                 _b.sent();
-                return [3 /*break*/, 12];
-            case 10: // Navigation
+                return [3 /*break*/, 14];
+            case 10: // Options
+            return [4 /*yield*/, compile_prompt_1.compileMenu()];
+            case 11:
+                _b.sent();
+                return [3 /*break*/, 14];
+            case 12: // Navigation
             return [2 /*return*/, true];
-            case 11: return [2 /*return*/, false];
-            case 12: return [2 /*return*/, false];
+            case 13: return [2 /*return*/, false];
+            case 14: return [2 /*return*/, false];
         }
     });
 }); };
diff --git a/bin/prompt/main_prompt.ts b/bin/prompt/main_prompt.ts
@@ -3,12 +3,18 @@ import {docsMenu} from "./docs_prompt";
 import {testsMenu} from "./tests_prompt";
 import {perfMenu} from "./perf_prompt";
 import {logsMenu} from "./logs_prompt";
+import {compileMenu} from "./compile_prompt";
 
 export const mainPrompt = {
     type: 'list',
     name: 'main',
     message: 'Select an action to perform',
     choices: [
+        {
+            key: 'c',
+            name: 'Compile contracts',
+            value: 'compile'
+        },
         {
             key: 't',
             name: 'Run tests',
@@ -35,7 +41,7 @@ export const mainPrompt = {
 export const mainMenu = async (): Promise<boolean> => {
     const selected = await prompt(mainPrompt);
     switch (selected.main) {
-        case "tests":                             // Options
+        case "tests":                            // Options
             await testsMenu();
             break;
         case "perf":                             // Options
@@ -47,6 +53,9 @@ export const mainMenu = async (): Promise<boolean> => {
         case "docs":                             // Options
             await docsMenu();
             break;
+        case "compile":                          // Options
+            await compileMenu();
+            break;
         case "exit":                             // Navigation
             return true;
         default:
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -6,9 +6,11 @@
     "solstl": "./bin/main.js"
   },
   "scripts": {
-    "lint": "tslint",
     "test": "jest && node ./bin/main.js tests --silent",
+    "js-lint": "tslint -p .",
+    "js-test": "jest",
     "contract-lint": "solhint src/**/*.sol",
+    "contract-compile": "node ./bin/main.js compile",
     "contract-tests": "node ./bin/main.js tests",
     "contract-perf": "node ./bin/main.js perf"
   },
diff --git a/src/bits/Bits.sol b/src/bits/Bits.sol
@@ -2,6 +2,7 @@ pragma solidity ^0.4.16;
 pragma experimental "v0.5.0";
 pragma experimental "ABIEncoderV2";
 
+
 library Bits {
 
     uint constant internal ONE = uint(1);
diff --git a/src/math/Math.sol b/src/math/Math.sol
@@ -2,6 +2,7 @@ pragma solidity ^0.4.16;
 pragma experimental "v0.5.0";
 pragma experimental "ABIEncoderV2";
 
+
 library Math {
 
     uint constant internal UINT_ZERO = 0;
diff --git a/tslint.json b/tslint.json
@@ -11,4 +11,5 @@
     "no-console": false,
     "member-ordering": false
   }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`"error",`
`15`	`15`	`140`
`16`	`16`	`],`
	`17`	`+ "no-inline-assembly": false,`
`17`	`18`	`"compiler-fixed": false`
`18`	`19`	`}`
`19`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,5 @@`
`11`	`11`	`"no-console": false,`
`12`	`12`	`"member-ordering": false`
`13`	`13`	`}`
	`14`	`+`
`14`	`15`	`}`