Support for for-loops

blackbird_python/blackbird/auxiliary.py

@@ -58,7 +58,6 @@
 
 """
 
-
 _PARAMS = []
 """ list[Symbol]: list of free parameters in the Blackbird program
 """
@@ -204,6 +203,10 @@ def _expression(expr):
 
         return _VAR[expr.getText()]
 
+    if isinstance(expr, blackbirdParser.ArrayIdxLabelContext):
+        inner_expr = _expression(expr.expression())
+        return _VAR[expr.NAME().getText()].flatten()[inner_expr]
+
     if isinstance(expr, blackbirdParser.ParameterLabelContext):
         p = Symbol(expr.NAME().getText())
         _PARAMS.append(p)

blackbird_python/blackbird/blackbird.tokens

@@ -4,98 +4,104 @@ TIMES=3
 DIVIDE=4
 PWR=5
 ASSIGN=6
-INT=7
-FLOAT=8
-COMPLEX=9
-STR=10
-BOOL=11
-SEQUENCE=12
-PI=13
-NEWLINE=14
-TAB=15
-SPACE=16
-PROGNAME=17
-VERSION=18
-TARGET=19
-INCLUDE=20
-SQRT=21
-SIN=22
-COS=23
-TAN=24
-ARCSIN=25
-ARCCOS=26
-ARCTAN=27
-SINH=28
-COSH=29
-TANH=30
-ARCSINH=31
-ARCCOSH=32
-ARCTANH=33
-EXP=34
-LOG=35
-PERIOD=36
-COMMA=37
-COLON=38
-QUOTE=39
-LBRAC=40
-RBRAC=41
-LSQBRAC=42
-RSQBRAC=43
-LBRACE=44
-RBRACE=45
-APPLY=46
-TYPE_ARRAY=47
-TYPE_FLOAT=48
-TYPE_COMPLEX=49
-TYPE_INT=50
-TYPE_STR=51
-TYPE_BOOL=52
-REGREF=53
-MEASURE=54
-NAME=55
-DEVICE=56
-COMMENT=57
-ANY=58
+FOR=7
+IN=8
+INT=9
+FLOAT=10
+COMPLEX=11
+STR=12
+BOOL=13
+SEQUENCE=14
+PI=15
+NEWLINE=16
+TAB=17
+SPACE=18
+PROGNAME=19
+VERSION=20
+TARGET=21
+INCLUDE=22
+SQRT=23
+SIN=24
+COS=25
+TAN=26
+ARCSIN=27
+ARCCOS=28
+ARCTAN=29
+SINH=30
+COSH=31
+TANH=32
+ARCSINH=33
+ARCCOSH=34
+ARCTANH=35
+EXP=36
+LOG=37
+PERIOD=38
+COMMA=39
+COLON=40
+QUOTE=41
+LBRAC=42
+RBRAC=43
+LSQBRAC=44
+RSQBRAC=45
+LBRACE=46
+RBRACE=47
+APPLY=48
+TYPE_ARRAY=49
+TYPE_FLOAT=50
+TYPE_COMPLEX=51
+TYPE_INT=52
+TYPE_STR=53
+TYPE_BOOL=54
+TYPE_PAR=55
+REGREF=56
+MEASURE=57
+NAME=58
+DEVICE=59
+COMMENT=60
+ANY=61
 '+'=1
 '-'=2
 '*'=3
 '/'=4
 '**'=5
 '='=6
-'pi'=13
-'name'=17
-'version'=18
-'target'=19
-'include'=20
-'sqrt'=21
-'sin'=22
-'cos'=23
-'tan'=24
-'arcsin'=25
-'arccos'=26
-'arctan'=27
-'sinh'=28
-'cosh'=29
-'tanh'=30
-'arcsinh'=31
-'arccosh'=32
-'arctanh'=33
-'exp'=34
-'log'=35
-'.'=36
-','=37
-':'=38
-'"'=39
-'('=40
-')'=41
-'['=42
-']'=43
-'{'=44
-'}'=45
-'|'=46
-'array'=47
-'float'=48
-'complex'=49
-'int'=50
-'str'=51
-'bool'=52
+'for'=7
+'in'=8
+'pi'=15
+'name'=19
+'version'=20
+'target'=21
+'include'=22
+'sqrt'=23
+'sin'=24
+'cos'=25
+'tan'=26
+'arcsin'=27
+'arccos'=28
+'arctan'=29
+'sinh'=30
+'cosh'=31
+'tanh'=32
+'arcsinh'=33
+'arccosh'=34
+'arctanh'=35
+'exp'=36
+'log'=37
+'.'=38
+','=39
+':'=40
+'"'=41
+'('=42
+')'=43
+'['=44
+']'=45
+'{'=46
+'}'=47
+'|'=48
+'array'=49
+'float'=50
+'complex'=51
+'int'=52
+'str'=53
+'bool'=54
+'par'=55