Working version

Author: Héctor Hurtado

mist/lang/classes.py

@@ -40,7 +40,7 @@ async def run(self, stack):
         if self.params:
             fields = [p for p in self.params]
         values = [
-            json.dumps(await get_id(i, stack)) if i.customList or type(await get_id(i, stack)) is list else str(await get_id(i, stack))
+            json.dumps(await get_id(i, stack)) if i.value.__class__.__name__ == 'CustomList' or type(await get_id(i, stack)) is list else str(await get_id(i, stack))
             for i in self.sources
         ]
         await watchedInsert(self.target, stack, values, fields=fields)
@@ -231,7 +231,7 @@ async def run(self, stack):
                 break
         for arg in self.namedArgs:
             if arg.value.source:
-                sourceStream = arg.value.source        
+                sourceStream = arg.value.source
 
         if sourceStream or self.targetStream:
             t = asyncio.create_task(function_runner(self.name, stack[:], sourceStream, self.targetStream, self.args, self.namedArgs))
@@ -241,7 +241,7 @@ async def run(self, stack):
             if self.targetStream:
                 streams.createIfNotExists(self.targetStream)
                 producers.append(t)
-        else:    
+        else:
             result = await function_runner(self.name, stack, sourceStream, self.targetStream, self.args, self.namedArgs, self.commands)
             if self.key:
                 for s in reversed(stack):
@@ -285,7 +285,7 @@ async def run(self, stack):
                 content = f.read()
                 # TODO: pass stack
                 print(await mist.action_run.execute_from_text(content, environment))
-        
+
 
 exports = [DataCommand, SaveCommand, SaveListCommand, CheckCommand,
            PrintCommand, IterateCommand, WatchCommand, AbortCommand,

mist/lang/core.tx

@@ -47,9 +47,29 @@ FunctionInlineCall:
   name=ID ('()' | '(' (namedArgs+=NamedArg[','] | args+=IDorSTRING[',']) ')')
 ;
 
+StringData:
+  data=/(?ms)\'{3}(.*?)\'{3}/
+;
+
+VarReference:
+  id=ID('.'childs+=ID['.'])?
+;
+
+ExtParameter:
+  '%' param=ID
+;
+
+EnvVariable:
+  '$' var=ID
+;
+
+Source:
+  ':' source=ID
+;
+
 IDorSTRING:
-  function=FunctionInlineCall | customList=CustomList | data=/(?ms)\'{3}(.*?)\'{3}/ | (id=ID('.'childs+=ID['.'])?) | string=STRING | intVal=INT | '%'param=ID |
-  '$'var=ID | ':'source=ID
+  value=FunctionInlineCall | value=CustomList | value=StringData | value=VarReference |
+  value=STRING | value=INT | value=ExtParameter | value=EnvVariable | value=Source
 ;
 
 FunctionCall:

mist/sdk/herlpers.py

@@ -136,6 +136,46 @@ async def get_id(id, stack):
     else:
         return get_var(id.id, stack)
 
+def get_id(id):
+
+    if id == None:
+        return None
+
+    if isinstance(id.value, str):
+        if id.value in ("True", "Success"):
+            return True
+        elif id.value in ("False", "Error"):
+            return False
+        else:
+            s = id.value
+            pairs = [(i[1],get_key(i[1])) for i in Formatter().parse(s) if i[1] is not None]
+            for k,v in pairs:
+                s = s.replace('{' + k + '}',str(v),1)
+            return s
+    elif isinstance(id.value, int):
+        return id.value
+    elif id.value.__class__.__name__ == "StringData":
+        return id.value.data
+    elif id.value.__class__.__name__ == "ExtParameter":
+        return params[id.value.param]
+    elif id.value.__class__.__name__ == "EnvVariable":
+        return environment[id.value.var]
+    elif id.value.__class__.__name__ == "FunctionInlineCall":
+        return function_runner(id.value.name, id.value.args, id.value.namedArgs )
+    elif id.value.__class__.__name__ == "CustomList":
+        return [ get_id(c) for c in id.value.components ]
+    elif id.value.__class__.__name__ == "VarReference":
+        if id.value.childs:
+            return getChildFromVar(get_var(id.value.id), id.value.childs)
+        else:
+            return get_var(id.value.id)
+    elif id.value.__class__.__name__ == "Source":
+        return environment[id.value.source]
+    else: # type(id.value is boolean, float, ....)
+        pass
+
+
+
 def get_param(params, key):
     t = [x for x in params if x.key == key]
     return t[0].value if t else None

test.mist

@@ -0,0 +1,20 @@
+data myTable {
+  key
+  value
+}
+
+set key_1 <= 'k1'
+
+set val_1 <= tmpFile()
+
+put key_1 val_1 => myTable
+
+set myList <= ["one","two","three","four"]
+
+iterate myList => v {
+  put v 'value' => myTable
+}
+
+iterate myTable => row {
+  print row.key row.value
+}