M src/exec.js → src/exec.js

@@ -181,26 +181,34 @@ }
     return res;
 }
 
-function setScope(ctx, name, selectors, value) {
-    let l = getScopeLevel(ctx, name);
-    if (l==-1) l= ctx.scopes.length-1;
+
+function getScope(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() );
+        }
+    }
 
-    if (selectors.length == 0) {
-        ctx.scopes[l][name] = value;
-    } else {
-        setScopeArray(ctx.scopes[l][name], selectors);
+
+    function select(v, s) {
+        s = s || [];
+        if (s.length == 0)  return v;
+        return select(v[s[0]], s.slice(1));
     }
 
-    function setScopeArray(a, sels) {
-        if (sels.length == 1) {
-            a[sels[0].value] = value;
-        } else {
-            setScopeArray(a[sels[0]], sels.slice(1));
-        }
+    for (let i=ctx.scopes.length-1; i>=0; i--) {
+        if (ctx.scopes[i][name]) return select(ctx.scopes[i][name].value, sels);
     }
+    return null;
 }
 
-function getScope(ctx, name, selectors) {
+function getScopeRef(ctx, name, selectors) {
 
     const sels = [];
     if (selectors) {
@@ -214,16 +222,36 @@ }
     }
 
 
-    function select(v, s) {
+    function select(v, s, t) {
         s = s || [];
-        if (s.length == 0)  return v;
-        return select(v[s[0]], s.slice(1));
+        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], sels);
+        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);
     }
-    return null;
+
+    function setScopeArray(a, sels) {
+        if (sels.length == 1) {
+            a[sels[0]] = value;
+        } else {
+            setScopeArray(a[sels[0]], sels.slice(1));
+        }
+    }
 }
 
 function getScopeLevel(ctx, name) {
@@ -249,11 +277,14 @@ return error(ctx, ast, "Name already exists: "+ast.name);
     }
     scope[ast.name] = {
         type: "TEMPLATE",
-        params: ast.params,
-        block: ast.block,
-        fileName: ctx.fileName,
-        filePath: ctx.filePath,
-        scopes: copyScope(ctx.scopes)
+        value: {
+            type: "TEMPLATE",
+            params: ast.params,
+            block: ast.block,
+            fileName: ctx.fileName,
+            filePath: ctx.filePath,
+            scopes: copyScope(ctx.scopes)
+        }
     };
 }
 
@@ -266,11 +297,14 @@ }
     ctx.functionParams[ast.name] = ast.params;
     scope[ast.name] = {
         type: "FUNCTION",
-        params: ast.params,
-        block: ast.block,
-        fileName: ctx.fileName,
-        filePath: ctx.filePath,
-        scopes: copyScope(ctx.scopes)
+        value: {
+            type: "FUNCTION",
+            params: ast.params,
+            block: ast.block,
+            fileName: ctx.fileName,
+            filePath: ctx.filePath,
+            scopes: copyScope(ctx.scopes)
+        }
     };
 }
 
@@ -294,15 +328,18 @@ sizes.push( size.value.toJSNumber() );
     }
 
 
-    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";
+            ctx.components[fullName] = "UNINSTANTIATED";
 
-        return {
-            type: "COMPONENT",
-            fullName: fullName
-        };
-    });
+            return {
+                type: "COMPONENT",
+                fullName: fullName
+            };
+        })
+    };
 
     return {
         type: "VARIABLE",
@@ -378,7 +415,10 @@ if (template.params.length != paramValues.length) return error(ctx, fn, "Invalid number of parameters: " + templateName);
 
         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 @@ ctx.scopes = oldScopes.slice(0, scopeLevel+1);
 
     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,21 +515,24 @@ if (size.type != "NUMBER") return error(ctx, ast.name.selectors[i], "expected a number");
         sizes.push( size.value.toJSNumber() );
     }
 
-    scope[ast.name.name] = iterateSelectors(ctx, sizes, baseName, function(fullName) {
-        ctx.signals[fullName] = {
-            fullName: fullName,
-            direction: ast.declareType == "SIGNALIN" ? "IN" : (ast.declareType == "SIGNALOUT" ? "OUT" : ""),
-            private: ast.private,
-            component: ctx.currentComponent,
-            equivalence: "",
-            alias: [fullName]
-        };
-        ctx.components[ctx.currentComponent].signals.push(fullName);
-        return {
-            type: "SIGNAL",
-            fullName: 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" : ""),
+                private: ast.private,
+                component: ctx.currentComponent,
+                equivalence: "",
+                alias: [fullName]
+            };
+            ctx.components[ctx.currentComponent].signals.push(fullName);
+            return {
+                type: "SIGNAL",
+                fullName: fullName,
+            };
+        })
+    };
     return {
         type: "VARIABLE",
         name: ast.name.name,
@@ -509,12 +555,15 @@ if (size.type != "NUMBER") return error(ctx, ast.name.selectors[i], "expected a number");
         sizes.push( size.value.toJSNumber() );
     }
 
-    scope[ast.name.name] = iterateSelectors(ctx, sizes, "", function() {
-        return {
-            type: "NUMBER",
-            value: bigInt(0)
-        };
-    });
+    scope[ast.name.name] = {
+        type: "VARIABLE",
+        value: iterateSelectors(ctx, sizes, "", function() {
+            return {
+                type: "NUMBER",
+                value: bigInt(0)
+            };
+        })
+    };
 
     return {
         type: "VARIABLE",
@@ -631,21 +680,20 @@ if (ctx.error) return;
     } 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;
 }