gh-15, gh-16: Fix a number of indexing issues

Author: python-processing-unit

asm-lang.exe

@@ -94,7 +94,7 @@ FUNC VALUE(STR: num, INT: base):INT{
         IF(NOT(KEYIN(digit, digits))){
             THROW(JOIN("Digit \"", digit, "\" not valid for base ", STR(base)))
         }
-        ADD(@value, MUL(digits[digit], POW(base, idx)))
+        ADD(@value, MUL(digits<digit>, POW(base, idx)))
         # compute internal binary value as digit*base^(position from right)
     }
     DEL(digit)
@@ -157,7 +157,7 @@ FUNC CONVERT(STR: num, INT: from, INT: to):STR{
     }
     WHILE(GT(int_value, 0)){
         INT: rem = MOD(int_value, to)
-        STR: remstr = rev[rem]
+        STR: remstr = rev<rem>
         int_result = JOIN(remstr, int_result)
         DIV(@int_value, to)
         DEL(remstr)
@@ -188,7 +188,7 @@ FUNC CONVERT(STR: num, INT: from, INT: to):STR{
         ADD(@iter, 1)
         MUL(@frac_num, to)
         INT: d = DIV(frac_num, denom)
-        STR: dstr = rev[d]
+        STR: dstr = rev<d>
         frac_res = JOIN(frac_res, dstr)
         INT: new_num = MOD(frac_num, denom)
         frac_num = new_num

interpreter.py

@@ -1,10 +1,10 @@
 # LCG-based pseudorandom number generator
 #
 # API:
-# PRNG_SEED(INT: seed) -> INT
-# PRNG_NEXT() -> INT
-# PRNG_RANGE(INT: max) -> INT
-# PRNG_RANGE_MIN_MAX(INT: min, INT: max) -> INT
+# SEED(INT: seed) -> INT
+# NEXT() -> INT
+# RANGE(INT: max) -> INT
+# RANGE_MIN_MAX(INT: min, INT: max) -> INT
 
 INT: MASK32 = SUB( POW(10,100000), 1 )  # 2^32 - 1
 
@@ -13,26 +13,26 @@ INT: LCG_A = 000110010110011000001101          # 1664525
 INT: LCG_C = 00111100011011101111001101011111  # 1013904223
 INT: lcg_state = 1
 
-FUNC PRNG_SEED(INT: seed):INT{
+FUNC SEED(INT: seed):INT{
     lcg_state = BAND(seed, MASK32)
     RETURN(lcg_state)
 }
 
-FUNC PRNG_NEXT():INT{
+FUNC NEXT():INT{
     lcg_state = BAND( ADD( MUL(LCG_A, lcg_state), LCG_C ), MASK32 )
     RETURN(lcg_state)
 }
 
-FUNC PRNG_RANGE(INT: max):INT{
+FUNC RANGE(INT: max):INT{
     ASSERT( GT(max, 0) )
-    RETURN( MOD(PRNG_NEXT(), max) )
+    RETURN( MOD(NEXT(), max) )
 }
 
-FUNC PRNG_RANGE_MIN_MAX(INT: min, INT: max):INT{
+FUNC RANGE_MIN_MAX(INT: min, INT: max):INT{
     ASSERT( LTE(min, max) )
     INT: range = SUB(max, min)
     IF( EQ(range, 0) ){ RETURN(min) }
     ASSERT( GT(range, 0) )
-    INT: offset = PRNG_RANGE(range)
+    INT: offset = RANGE(range)
     RETURN( ADD(offset, min) )
 }

lib/numbers.asmln

@@ -180,6 +180,9 @@ class AsyncExpression(Expression):
 class IndexExpression(Expression):
     base: Expression
     indices: List[Expression]
+    # True when the indices were written with angle-brackets `<...>` (map-style),
+    # False when written with square brackets `[...]` (tensor-style).
+    is_map: bool
 
 
 @dataclass(slots=True)
@@ -615,7 +618,8 @@ def _parse_index_suffix(self, base: Expression) -> IndexExpression:
                 if not self._match("COMMA"):
                     break
         self._consume(closing)
-        return IndexExpression(location=self._location_from_token(lbracket), base=base, indices=indices)
+        is_map = start_tok.type == "LANGLE"
+        return IndexExpression(location=self._location_from_token(lbracket), base=base, indices=indices, is_map=is_map)
 
     def _parse_index_expression(self) -> IndexExpression:
         expr = self._parse_primary()
@@ -710,9 +714,11 @@ def _looks_like_index_assignment(self) -> bool:
         if depth != 0:
             return False
 
-        # Support additional bracketed suffixes like a[1][2].
-        while i < len(tokens) and tokens[i].type == "LBRACKET":
-            depth = 0
+        # Support additional bracketed or angled suffixes like a[1][2] or a[1]<"k">.
+        while i < len(tokens) and tokens[i].type in ("LBRACKET", "LANGLE"):
+            # We advance past the opening bracket/angle and treat that as
+            # one level of depth already; initialize depth=1 accordingly.
+            depth = 1
             i += 1
             while i < len(tokens):
                 tok = tokens[i]

lib/prng.asmln

@@ -582,10 +582,10 @@ FUNC STDLIB_TESTS():INT{
     PRINT("Running library tests...")
 
     # PRNG reproducibility (LCG)
-    prng.PRNG_SEED(1010)   # seed = 10
-    INT: a = prng.PRNG_NEXT()
-    prng.PRNG_SEED(1010)
-    INT: b = prng.PRNG_NEXT()
+    prng.SEED(1010)   # seed = 10
+    INT: a = prng.NEXT()
+    prng.SEED(1010)
+    INT: b = prng.NEXT()
     ASSERT( EQ(a, b) )
     DEL(a)
     DEL(b)