Compare commits

...

5 Commits

Author SHA1 Message Date
Jordi Baylina
cb9a5b536e 0.0.14 2018-10-24 20:06:09 +02:00
Jordi Baylina
70c88be334 One and only one file compilation at a time 2018-10-24 20:05:50 +02:00
Jordi Baylina
25759e53cd 0.0.13 2018-10-24 20:00:07 +02:00
Jordi Baylina
4fa0c79e26 If without else 2018-10-24 19:59:50 +02:00
Jordi Baylina
e685392523 Fix title in readme 2018-10-23 08:06:23 +02:00
7 changed files with 24 additions and 9 deletions

View File

@@ -1,4 +1,4 @@
# Circon
# Circom
Circon is a language designed to write arithmetic circuits that can be used in zero knowledge proofs.

9
cli.js
View File

@@ -41,11 +41,20 @@ const argv = require("yargs")
repo directory at https://github.com/iden3/circom `)
.argv;
if (argv._.length == 0) {
console.log("File to compile not specified");
process.exit(1);
} else if (argv._.length > 1) {
console.log("Only one circuit at a time is permited");
process.exit(1);
}
const fullFileName = path.resolve(process.cwd(), argv._[0]);
const outName = argv.output ? argv.output : "circuit.json";
compiler(fullFileName).then( (cir) => {
fs.writeFileSync(outName, JSON.stringify(cir, null, 1), "utf8");
process.exit(0);
}, (err) => {
console.log(err);
console.error(`ERROR at ${err.errFile}:${err.pos.first_line},${err.pos.first_column}-${err.pos.last_line},${err.pos.last_column} ${err.errStr}`);

2
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "circom",
"version": "0.0.12",
"version": "0.0.14",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

@@ -1,6 +1,6 @@
{
"name": "circom",
"version": "0.0.12",
"version": "0.0.14",
"description": "Language to generate logic circuits",
"main": "index.js",
"directories": {

View File

@@ -31,7 +31,7 @@ module.exports = compile;
const parser = require("../parser/jaz.js").parser;
const timeout = ms => new Promise(res => setTimeout(res, ms))
const timeout = ms => new Promise(res => setTimeout(res, ms));
async function compile(srcFile) {
const fullFileName = srcFile;

View File

@@ -578,9 +578,11 @@ function execIf(ctx, ast) {
exec(ctx, ast.then);
if (ctx.error) return;
} else {
if (ast.else) {
exec(ctx, ast.else);
if (ctx.error) return;
}
}
}

View File

@@ -246,9 +246,13 @@ function genIf(ctx, ast) {
if (ctx.error) return;
const thenBody = gen(ctx, ast.then);
if (ctx.error) return;
if (ast.else) {
const elseBody = gen(ctx, ast.else);
if (ctx.error) return;
return `if (${condition}) {\n${thenBody}\n} else {\n${elseBody}\n}\n`;
} else {
return `if (${condition}) {\n${thenBody}\n}\n`;
}
}