gh-184: Replace * with # in wildcard slices.

Author: python-processing-unit

docs/SPECIFICATION.html

@@ -104,7 +104,7 @@
 
 Indexed assignment to a map MUST use the same form as ordinary map access, such as `map<k1, k2> = expression`. Intermediate nested maps MUST be created on demand when assigning to deeper keys. Reassigning an existing key to a value of a different static type MUST raise a runtime error.
 
-If a tensor target uses slice indices such as `lo:hi` or `*`, the right-hand side MUST evaluate to a `TNS` whose shape exactly matches the selected slice, and every written element MUST satisfy the target's static type constraints.
+If a tensor target uses slice indices such as `lo:hi` or `#`, the right-hand side MUST evaluate to a `TNS` whose shape exactly matches the selected slice, and every written element MUST satisfy the target's static type constraints.
 
 ---
 
@@ -328,7 +328,7 @@
 
 `TNS` indexing MUST use square brackets (`[` and `]`) with a comma-separated list of indices. Indexing MUST be one-based. Negative indices MUST count backwards from the end of the dimension.
 
-Slice indexing MUST be supported in any index position using a range of the form `lo:hi`. The selected slice MUST be inclusive of both endpoints. The symbol `*` MAY be used in an index position to denote a full-dimension slice, selecting every element along that axis.
+Slice indexing MUST be supported in any index position using a range of the form `lo:hi`. The selected slice MUST be inclusive of both endpoints. The symbol `#` MAY be used in an index position to denote a full-dimension slice, selecting every element along that axis.
 
 ---
 

lib/std/image/init.pre

@@ -36,23 +36,23 @@ FUNC INT CHANNELS(TNS img){
 }
 
 FUNC TNS R(TNS img){
-    RETURN(img[*, *, 0d1])
+    RETURN(img[# , # , 0d1])
 }
 
 FUNC TNS G(TNS img){
-    RETURN(img[*, *, 0d2])
+    RETURN(img[# , # , 0d2])
 }
 
 FUNC TNS B(TNS img){
-    RETURN(img[*, *, 0d3])
+    RETURN(img[# , # , 0d3])
 }
 
 FUNC TNS A(TNS img){
-    RETURN(img[*, *, 0d4])
+    RETURN(img[# , # , 0d4])
 }
 
 FUNC TNS PIXEL(TNS img, INT x, INT y){
-    RETURN(img[x, y, *])
+    RETURN(img[x, y, #])
 }
 
 FUNC INT PIXEL_R(TNS img, INT x, INT y){
@@ -81,7 +81,7 @@ FUNC TNS FLIP_H(TNS img){
 
 FUNC TNS INVERT(TNS img){
     TNS return = MSUB(TNS(SHAPE(img), 0xFF), img)
-    return[*, *, 0d4] = img[*, *, 0d4] ! Preserve alpha
+    return[# , # , 0d4] = img[# , # , 0d4] ! Preserve alpha
     POP(return)
 }
 
@@ -120,7 +120,7 @@ FUNC TNS CROP(TNS img, TNS corners){
     IF(NEQ(SHAPE(corners), [0d4, 0d2])){
         THROW("CROP corners must be a 0d4 by 0d2 tensor: [[tl_x, tl_y], [tr_x, tr_y], [bl_x, bl_y], [br_x, br_y]]")
     }
-    RETURN(img[MIN(corners[*, 0d1]):MAX(corners[*, 0d1]), MIN(corners[*, 0d2]):MAX(corners[*, 0d2]), *])
+    RETURN(img[MIN(corners[# , 0d1]):MAX(corners[# , 0d1]), MIN(corners[# , 0d2]):MAX(corners[# , 0d2]), #])
 }
 
 FUNC BOOL SHOW(TNS img){

src/lexer.c

@@ -262,7 +262,7 @@ Token lexer_next_token(Lexer* lexer) {
         if (c == ':') { advance(lexer); return make_token(lexer, TOKEN_COLON, ":", 1); }
         if (c == '@') { advance(lexer); return make_token(lexer, TOKEN_AT, "@", 1); }
         if (c == '~') { advance(lexer); return make_token(lexer, TOKEN_TILDE, "~", 1); }
-        if (c == '*') { advance(lexer); return make_token(lexer, TOKEN_STAR, "*", 1); }
+        if (c == '#') { advance(lexer); return make_token(lexer, TOKEN_HASH, "#", 1); }
         if (c == '.') { advance(lexer); return make_token(lexer, TOKEN_DOT, ".", 1); }
 
         if (c == '"' || c == '\'') {

src/parser.c

@@ -711,7 +711,7 @@ static Expr* parse_call(Parser* parser) {
             }
             while (parser->current_token.type != TOKEN_RBRACKET && parser->current_token.type != TOKEN_EOF) {
                 // wildcard
-                if (match(parser, TOKEN_STAR)) {
+                if (match(parser, TOKEN_HASH)) {
                     Expr* wc = expr_wildcard(parser->previous_token.line, parser->previous_token.column);
                     expr_list_add(&idx->as.index.indices, wc);
                 } else {
@@ -958,7 +958,7 @@ static Stmt* parse_statement(Parser* parser) {
                         return NULL;
                     }
                     while (parser->current_token.type != TOKEN_RBRACKET && parser->current_token.type != TOKEN_EOF) {
-                        if (match(parser, TOKEN_STAR)) {
+                        if (match(parser, TOKEN_HASH)) {
                             Expr* wc = expr_wildcard(parser->previous_token.line, parser->previous_token.column);
                             expr_list_add(&idx->as.index.indices, wc);
                         } else {

src/token.c

@@ -22,7 +22,7 @@ const char* token_type_to_string(PTokenType type) {
         case TOKEN_COLON: return "COLON";
         case TOKEN_AT: return "AT";
         case TOKEN_TILDE: return "TILDE";
-        case TOKEN_STAR: return "STAR";
+        case TOKEN_HASH: return "HASH";
         case TOKEN_DOT: return "DOT";
         case TOKEN_DASH: return "DASH";
         case TOKEN_TRY: return "TRY";

src/token.h

@@ -29,7 +29,7 @@ typedef enum {
     TOKEN_COLON,    // :
     TOKEN_AT,       // @
     TOKEN_TILDE,    // ~
-    TOKEN_STAR,     // *
+    TOKEN_HASH,     // #
     TOKEN_DOT,      // .
     TOKEN_DASH,     // - (reserved; negative numeric literals are part of NUMBER/FLOAT; standalone '-' is a syntax error)
 

tests/cases/failing/tns-slice-dim-mismatch.pre

@@ -1,2 +1,2 @@
 TNS matrix = [[0d1, 0d2], [0d3, 0d4]]
-ASSIGN(matrix[*, 0d2], [[0d9], [0d10]])
+ASSIGN(matrix[# , 0d2], [[0d9], [0d10]])

tests/cases/failing/tns-slice-shape-mismatch.pre

@@ -1,2 +1,2 @@
 TNS matrix = [[0d1, 0d2], [0d3, 0d4]]
-ASSIGN(matrix[*, *], [[0d9, 0d10, 0d11], [0d12, 0d13, 0d14]])
+ASSIGN(matrix[# , #], [[0d9, 0d10, 0d11], [0d12, 0d13, 0d14]])

tests/cases/passing/tns-indexing.pre

@@ -13,19 +13,19 @@ ASSERT(EQ(matrix[0d2], [0d3, 0d4]))
 ASSERT(EQ(cube[0d2, 0d1], [0d5, 0d6]))
 ASSERT(EQ(cube[0d2, 0d2, 0d1], 0d7))
 ASSERT(EQ(cube[0d1], [[0d1, 0d2], [0d3, 0d4]]))
-ASSERT(EQ(cube[0d1, *], [[0d1, 0d2], [0d3, 0d4]]))
+ASSERT(EQ(cube[0d1, #], [[0d1, 0d2], [0d3, 0d4]]))
 
 ASSERT(EQ(vec[0d1:0d2], [0d1, 0d2]))
 ASSERT(EQ(vec[0d2:0d2], 0d2))
 ASSERT(EQ(vec[0d1:-0d1], [0d1, 0d2, 0d3]))
 ASSERT(EQ(vec[0d0:0d4], [0d1, 0d2, 0d3]))
 
-ASSERT(EQ(matrix[*, *], matrix))
-ASSERT(EQ(matrix[*, 0d1], [0d1, 0d3]))
-ASSERT(EQ(matrix[0d1, *], [0d1, 0d2]))
+ASSERT(EQ(matrix[# , #], matrix))
+ASSERT(EQ(matrix[# , 0d1], [0d1, 0d3]))
+ASSERT(EQ(matrix[0d1, #], [0d1, 0d2]))
 ASSERT(EQ(matrix[0d1:0d2, 0d1:0d2], matrix))
 ASSERT(EQ(matrix[0d1:-0d1, 0d1], [0d1, 0d3]))
-ASSERT(EQ(cube[*, 0d2, 0d1], [0d3, 0d7]))
+ASSERT(EQ(cube[# , 0d2, 0d1], [0d3, 0d7]))
 
 INT errors_caught = 0d0
 

tests/cases/passing/tns-slice-assign-2d.pre

@@ -1,4 +1,4 @@
 TNS matrix = [[0d1, 0d2], [0d3, 0d4]]
 
-ASSERT(EQ(ASSIGN(matrix[*, 0d2], [0d9, 0d10]), [0d9, 0d10]))
+ASSERT(EQ(ASSIGN(matrix[# , 0d2], [0d9, 0d10]), [0d9, 0d10]))
 ASSERT(EQ(matrix, [[0d1, 0d9], [0d3, 0d10]]))