Change syntax for matrices to `matrix[R, C]T`

4 files changed, 24 insertions, 24 deletions

diff --git a/src/check_expr.cpp b/src/check_expr.cpp
index 1ca5b895d..a75334e6c 100644
--- a/src/check_expr.cpp
+++ b/src/check_expr.cpp
@@ -9138,7 +9138,7 @@ gbString write_expr_to_string(gbString str, Ast *node, bool shorthand) {
 		str = write_expr_to_string(str, mie->expr, shorthand);
 		str = gb_string_append_rune(str, '[');
 		str = write_expr_to_string(str, mie->row_index, shorthand);
-		str = gb_string_appendc(str, "; ");
+		str = gb_string_appendc(str, ", ");
 		str = write_expr_to_string(str, mie->column_index, shorthand);
 		str = gb_string_append_rune(str, ']');
 	case_end;
@@ -9216,9 +9216,9 @@ gbString write_expr_to_string(gbString str, Ast *node, bool shorthand) {
 	case_end;
 	
 	case_ast_node(mt, MatrixType, node);
-		str = gb_string_append_rune(str, '[');
+		str = gb_string_appendc(str, "matrix[");
 		str = write_expr_to_string(str, mt->row_count, shorthand);
-		str = gb_string_appendc(str, "; ");
+		str = gb_string_appendc(str, ", ");
 		str = write_expr_to_string(str, mt->column_count, shorthand);
 		str = gb_string_append_rune(str, ']');
 		str = write_expr_to_string(str, mt->elem, shorthand);
diff --git a/src/parser.cpp b/src/parser.cpp
index 499bd337b..c29cf70d9 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -2241,18 +2241,6 @@ Ast *parse_operand(AstFile *f, bool lhs) {
 			count_expr = parse_expr(f, false);
 			f->expr_level--;
 		}
-		if (allow_token(f, Token_Semicolon)) {
-			Ast *row_count = count_expr;
-			Ast *column_count = nullptr;
-			
-			f->expr_level++;
-			column_count = parse_expr(f, false);
-			f->expr_level--;
-			
-			expect_token(f, Token_CloseBracket);	
-			
-			return ast_matrix_type(f, token, row_count, column_count, parse_type(f));
-		}
 		
 		expect_token(f, Token_CloseBracket);
 		return ast_array_type(f, token, count_expr, parse_type(f));
@@ -2271,6 +2259,23 @@ Ast *parse_operand(AstFile *f, bool lhs) {
 
 		return ast_map_type(f, token, key, value);
 	} break;
+	
+	case Token_matrix: {
+		Token token = expect_token(f, Token_matrix);
+		Ast *row_count = nullptr;
+		Ast *column_count = nullptr;
+		Ast *type = nullptr;
+		Token open, close;
+		
+		open  = expect_token_after(f, Token_OpenBracket, "matrix");
+		row_count = parse_expr(f, true);
+		expect_token(f, Token_Comma);
+		column_count = parse_expr(f, true);
+		close = expect_token(f, Token_CloseBracket);
+		type = parse_type(f);
+		
+		return ast_matrix_type(f, token, row_count, column_count, type);
+	} break;
 
 	case Token_struct: {
 		Token    token = expect_token(f, Token_struct);
@@ -2716,11 +2721,7 @@ Ast *parse_atom_expr(AstFile *f, Ast *operand, bool lhs) {
 			case Token_RangeHalf:
 				syntax_error(f->curr_token, "Expected a colon, not a range");
 				/* fallthrough */
-			case Token_Semicolon:  // matrix index
-				if (f->curr_token.kind == Token_Semicolon && f->curr_token.string == "\n") {
-					syntax_error(f->curr_token, "Expected a ';', not a newline");
-				}
-				/* fallthrough */
+			case Token_Comma:  // matrix index
 			case Token_Colon:
 				interval = advance_token(f);
 				is_interval = true;
@@ -2736,7 +2737,7 @@ Ast *parse_atom_expr(AstFile *f, Ast *operand, bool lhs) {
 			close = expect_token(f, Token_CloseBracket);
 
 			if (is_interval) {
-				if (interval.kind == Token_Semicolon) {
+				if (interval.kind == Token_Comma) {
 					if (indices[0] == nullptr || indices[1] == nullptr) {
 						syntax_error(open, "Matrix index expressions require both row and column indices");
 					}
diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp
index c7627d09c..10b4494d7 100644
--- a/src/tokenizer.cpp
+++ b/src/tokenizer.cpp
@@ -117,6 +117,7 @@ TOKEN_KIND(Token__KeywordBegin, ""), \
 	TOKEN_KIND(Token_or_else,     "or_else"),     \
 	TOKEN_KIND(Token_or_return,   "or_return"),   \
 	TOKEN_KIND(Token_asm,         "asm"),         \
+	TOKEN_KIND(Token_matrix,      "matrix"),      \
 TOKEN_KIND(Token__KeywordEnd, ""), \
 	TOKEN_KIND(Token_Count, "")
 
diff --git a/src/types.cpp b/src/types.cpp
index 8bce69cf3..8e64a10c1 100644
--- a/src/types.cpp
+++ b/src/types.cpp
@@ -3956,9 +3956,7 @@ gbString write_type_to_string(gbString str, Type *type) {
 		break;
 		
 	case Type_Matrix:
-		str = gb_string_appendc(str, gb_bprintf("[%d", cast(int)type->Matrix.row_count));
-		str = gb_string_appendc(str, "; ");
-		str = gb_string_appendc(str, gb_bprintf("%d]", cast(int)type->Matrix.column_count));
+		str = gb_string_appendc(str, gb_bprintf("matrix[%d, %d]", cast(int)type->Matrix.row_count, cast(int)type->Matrix.column_count));
 		str = write_type_to_string(str, type->Matrix.elem);
 		break;
 	}