Browse Source

Error reporting fixes

feature/c-tester-linux
Jordi Baylina 4 years ago
parent
commit
ca7379995e
No known key found for this signature in database GPG Key ID: 7480C80C1BE43112
1 changed files with 5 additions and 3 deletions
  1. +5
    -3
      src/construction_phase.js

+ 5
- 3
src/construction_phase.js

@ -359,7 +359,7 @@ function execAssignement(ctx, ast) {
} }
if (!left.s) return ctx.throwError(ast, "variable. not defined yet");
if ((!left)||(!left.s)) return ctx.throwError(ast, "variable. not defined yet");
if (left.t == "C") return execInstantiateComponet(ctx, left, ast.values[1], leftSels); if (left.t == "C") return execInstantiateComponet(ctx, left, ast.values[1], leftSels);
if ((left.t == "S")&&( ["<--", "<==", "-->", "==>"].indexOf(ast.op) < 0)) return ctx.throwError(ast, "Cannot assign to a signal with `=` use <-- or <== ops"); if ((left.t == "S")&&( ["<--", "<==", "-->", "==>"].indexOf(ast.op) < 0)) return ctx.throwError(ast, "Cannot assign to a signal with `=` use <-- or <== ops");
@ -444,14 +444,14 @@ function execInstantiateComponet(ctx, vr, fn, sels) {
const templateName = fn.name; const templateName = fn.name;
const template = ctx.templates[templateName]; const template = ctx.templates[templateName];
if (!template) return ctx.throwError("Invalid Template");
if (!template) return ctx.throwError(fn, "Invalid Template");
const paramValues = []; const paramValues = [];
for (let i=0; i< fn.params.length; i++) { for (let i=0; i< fn.params.length; i++) {
const v = exec(ctx, fn.params[i]); const v = exec(ctx, fn.params[i]);
if (ctx.error) return; if (ctx.error) return;
for (let j=0; j<v.s[0]; j++) { for (let j=0; j<v.s[0]; j++) {
if (v.v[j].t != "N") ctx.throwError("Parameters of a template must be constant");
if (v.v[j].t != "N") ctx.throwError(fn, "Parameters of a template must be constant");
} }
paramValues.push(v); paramValues.push(v);
} }
@ -873,6 +873,8 @@ function execOpOp(ctx, ast, op, lr) {
right = {t:"N", v: ctx.field.one}; right = {t:"N", v: ctx.field.one};
} }
if (!right) return ctx.throwError(ast, "adding a no number");
const resAfter = ctx.lc[op](resBefore, right); const resAfter = ctx.lc[op](resBefore, right);
left.v[o] = resAfter; left.v[o] = resAfter;

Loading…
Cancel
Save