fix merge artifacts
This commit is contained in:
parent
b24cfbc328
commit
8e13caae84
|
@ -1,8 +1,5 @@
|
|||
Various scripts used for development, benchmarking and testing.
|
||||
|
||||
<<<<<<< HEAD
|
||||
None of these are bundled in NPM package yet.
|
||||
=======
|
||||
None of these are bundled in the NPM package yet.
|
||||
|
||||
# run.mjs
|
||||
|
@ -26,4 +23,3 @@ Time: 3.18 Ok
|
|||
```
|
||||
|
||||
To see the result and bindings, add the `-o` or `--output` flag.
|
||||
>>>>>>> develop
|
||||
|
|
|
@ -14,20 +14,11 @@ const measure = (cb, times = 1) => {
|
|||
return (t2 - t1) / 1000;
|
||||
};
|
||||
|
||||
<<<<<<< HEAD
|
||||
const red = (s) => `\x1b[31m${s}\x1b[0m`;
|
||||
const green = (s) => `\x1b[32m${s}\x1b[0m`;
|
||||
|
||||
const program = new Command();
|
||||
|
||||
program.option("-t, --time");
|
||||
=======
|
||||
const red = (str) => `\x1b[31m${str}\x1b[0m`;
|
||||
const green = (str) => `\x1b[32m${str}\x1b[0m`;
|
||||
|
||||
const program = new Command();
|
||||
|
||||
>>>>>>> develop
|
||||
program.option("-o, --output");
|
||||
program.arguments("<string>");
|
||||
|
||||
|
@ -48,11 +39,7 @@ if (!src) {
|
|||
}
|
||||
|
||||
project.setSource("main", src);
|
||||
<<<<<<< HEAD
|
||||
const t = measure(() => project.run("main"));
|
||||
=======
|
||||
const time = measure(() => project.run("main"));
|
||||
>>>>>>> develop
|
||||
|
||||
const bindings = project.getBindings("main");
|
||||
const result = project.getResult("main");
|
||||
|
@ -62,20 +49,9 @@ if (options.output) {
|
|||
console.log("Bindings:", bindings.toString());
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
if (options.time) {
|
||||
console.log(
|
||||
"Time:",
|
||||
String(t),
|
||||
result.tag === "Error" ? red(result.tag) : green(result.tag),
|
||||
result.tag === "Error" ? result.value.toString() : ""
|
||||
);
|
||||
}
|
||||
=======
|
||||
console.log(
|
||||
"Time:",
|
||||
String(time),
|
||||
result.tag === "Error" ? red(result.tag) : green(result.tag),
|
||||
result.tag === "Error" ? result.value.toString() : ""
|
||||
);
|
||||
>>>>>>> develop
|
||||
|
|
Loading…
Reference in New Issue
Block a user