arnaucube/circom
1
0
Fork 0
mirror of https://github.com/arnaucube/circom.git synced 2026-02-06 18:56:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Error with bad assignments

Browse Source
This commit is contained in:
Jordi Baylina
2019-12-04 21:53:39 +01:00
parent aecc28a79b
commit 7181c372d9
1 changed files with 113 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
src/exec.js
View File

@@ -181,24 +181,6 @@ function iterateSelectors(ctx, sizes, baseName, fn) {
return res;
}
function setScope(ctx, name, selectors, value) {
let l = getScopeLevel(ctx, name);
if (l==-1) l= ctx.scopes.length-1;
if (selectors.length == 0) {
ctx.scopes[l][name] = value;
} else {
setScopeArray(ctx.scopes[l][name], selectors);
}
function setScopeArray(a, sels) {
if (sels.length == 1) {
a[sels[0].value] = value;
} else {
setScopeArray(a[sels[0]], sels.slice(1));
}
}
}
function getScope(ctx, name, selectors) {
@@ -221,11 +203,57 @@ function getScope(ctx, name, selectors) {
}
for (let i=ctx.scopes.length-1; i>=0; i--) {
if (ctx.scopes[i][name]) return select(ctx.scopes[i][name], sels);
if (ctx.scopes[i][name]) return select(ctx.scopes[i][name].value, sels);
}
return null;
}
function getScopeRef(ctx, name, selectors) {
const sels = [];
if (selectors) {
for (let i=0; i< selectors.length; i++) {
const idx = exec(ctx, selectors[i]);
if (ctx.error) return;
if (idx.type != "NUMBER") return error(ctx, selectors[i], "expected a number");
sels.push( idx.value.toJSNumber() );
}
}
function select(v, s, t) {
s = s || [];
if (s.length == 0) return [v, sels, t];
return select(v[s[0]], s.slice(1), t);
}
for (let i=ctx.scopes.length-1; i>=0; i--) {
if (ctx.scopes[i][name]) return select(ctx.scopes[i][name].value, sels, ctx.scopes[i][name].type);
}
return [null, [], ""];
}
function setScopeRef(ctx, name, sels, value) {
let l = getScopeLevel(ctx, name);
if (l==-1) l= ctx.scopes.length-1;
if (sels.length == 0) {
ctx.scopes[l][name].value = value;
} else {
setScopeArray(ctx.scopes[l][name].value, sels);
}
function setScopeArray(a, sels) {
if (sels.length == 1) {
a[sels[0]] = value;
} else {
setScopeArray(a[sels[0]], sels.slice(1));
}
}
}
function getScopeLevel(ctx, name) {
for (let i=ctx.scopes.length-1; i>=0; i--) {
if (ctx.scopes[i][name]) return i;
@@ -248,12 +276,15 @@ function execTemplateDef(ctx, ast) {
return error(ctx, ast, "Name already exists: "+ast.name);
}
scope[ast.name] = {
type: "TEMPLATE",
value: {
type: "TEMPLATE",
params: ast.params,
block: ast.block,
fileName: ctx.fileName,
filePath: ctx.filePath,
scopes: copyScope(ctx.scopes)
}
};
}
@@ -265,12 +296,15 @@ function execFunctionDef(ctx, ast) {
}
ctx.functionParams[ast.name] = ast.params;
scope[ast.name] = {
type: "FUNCTION",
value: {
type: "FUNCTION",
params: ast.params,
block: ast.block,
fileName: ctx.fileName,
filePath: ctx.filePath,
scopes: copyScope(ctx.scopes)
}
};
}
@@ -294,7 +328,9 @@ function execDeclareComponent(ctx, ast) {
}
scope[ast.name.name] = iterateSelectors(ctx, sizes, baseName, function(fullName) {
scope[ast.name.name] = {
type: "COMPONENT",
value: iterateSelectors(ctx, sizes, baseName, function(fullName) {
ctx.components[fullName] = "UNINSTANTIATED";
@@ -302,7 +338,8 @@ function execDeclareComponent(ctx, ast) {
type: "COMPONENT",
fullName: fullName
};
});
})
};
return {
type: "VARIABLE",
@@ -378,7 +415,10 @@ function execInstantiateComponet(ctx, vr, fn) {
const scope = {};
for (let i=0; i< template.params.length; i++) {
scope[template.params[i]] = paramValues[i];
scope[template.params[i]] = {
type: "VARIABLE",
value: paramValues[i]
};
ctx.components[ctx.currentComponent].params[template.params[i]] = extractValue(paramValues[i]);
}
@@ -430,7 +470,10 @@ function execFunctionCall(ctx, ast) {
const scope = {};
for (let i=0; i< fnc.params.length; i++) {
scope[fnc.params[i]] = paramValues[i];
scope[fnc.params[i]] = {
type: "VARIABLE",
value: paramValues[i]
};
}
ctx.fileName = fnc.fileName;
@@ -472,7 +515,9 @@ function execDeclareSignal(ctx, ast) {
sizes.push( size.value.toJSNumber() );
}
scope[ast.name.name] = iterateSelectors(ctx, sizes, baseName, function(fullName) {
scope[ast.name.name] = {
type: "SIGNAL",
value: iterateSelectors(ctx, sizes, baseName, function(fullName) {
ctx.signals[fullName] = {
fullName: fullName,
direction: ast.declareType == "SIGNALIN" ? "IN" : (ast.declareType == "SIGNALOUT" ? "OUT" : ""),
@@ -486,7 +531,8 @@ function execDeclareSignal(ctx, ast) {
type: "SIGNAL",
fullName: fullName,
};
});
})
};
return {
type: "VARIABLE",
name: ast.name.name,
@@ -509,12 +555,15 @@ function execDeclareVariable(ctx, ast) {
sizes.push( size.value.toJSNumber() );
}
scope[ast.name.name] = iterateSelectors(ctx, sizes, "", function() {
scope[ast.name.name] = {
type: "VARIABLE",
value: iterateSelectors(ctx, sizes, "", function() {
return {
type: "NUMBER",
value: bigInt(0)
};
});
})
};
return {
type: "VARIABLE",
@@ -631,21 +680,20 @@ function execVarAssignement(ctx, ast) {
} else {
v = ast.values[0];
}
const num = getScope(ctx, v.name, v.selectors);
const [num, sels, typ] = getScopeRef(ctx, v.name, v.selectors);
if (ctx.error) return;
if ((typeof(num) != "object")||(num == null)) return error(ctx, ast, "Variable not defined");
if (num.type == "COMPONENT") return execInstantiateComponet(ctx, v, ast.values[1]);
if (typ == "COMPONENT") return execInstantiateComponet(ctx, v, ast.values[1]);
if (ctx.error) return;
if ((num.type == "SIGNAL")&&(ast.op == "=")) return error(ctx, ast, "Cannot assign to a signal with `=` use <-- or <== ops");
if ((["NUMBER", "COMPONENT"].indexOf(num.type) >= 0 )&&(ast.op != "=")) return error(ctx, ast, `Cannot assign to a var with ${ast.op}. use = op`);
if ((typ == "SIGNAL")&&(ast.op == "=")) return error(ctx, ast, "Cannot assign to a signal with `=` use <-- or <== ops");
if ((["NUMBER", "COMPONENT"].indexOf(typ) >= 0 )&&(ast.op != "=")) return error(ctx, ast, `Cannot assign to a var with ${ast.op}. use = op`);
const res = exec(ctx, ast.values[1]);
if (ctx.error) return;
Object.assign(num, res);
// setScope(ctx, v.name, v.selectors, res);
setScopeRef(ctx, v.name, sels, res);
return v;
}