File tree 1 file changed +10
-17
lines changed
1 file changed +10
-17
lines changed Original file line number Diff line number Diff line change @@ -47,7 +47,7 @@ comparison
47
47
;
48
48
49
49
assignment
50
- : (ID | vectorElementReference | matrixElementReference ) assignmentOperator expression SEMICOLON
50
+ : (ID | elementReference ) assignmentOperator expression SEMICOLON
51
51
;
52
52
53
53
print
@@ -66,17 +66,18 @@ expression
66
66
| expression op = (MAT_MULTIPLY | MAT_DIVIDE ) expression
67
67
| expression op = (PLUS | MINUS ) expression
68
68
| expression op = (MAT_PLUS | MAT_MINUS ) expression
69
- | ZEROS OPEN_BRACKET_ROUND INT CLOSE_BRACKET_ROUND
70
- | ONES OPEN_BRACKET_ROUND INT CLOSE_BRACKET_ROUND
71
- | EYE OPEN_BRACKET_ROUND INT CLOSE_BRACKET_ROUND
69
+ | specialMatrixFunction
72
70
| ID
73
71
| INT
74
72
| FLOAT
75
73
| STRING
76
- | vectorElementReference
77
- | matrixElementReference
74
+ | elementReference
75
+ | elementReference
78
76
| vector
79
- | matrix
77
+ ;
78
+
79
+ specialMatrixFunction
80
+ : (ZEROS | ONES | EYE ) OPEN_BRACKET_ROUND INT CLOSE_BRACKET_ROUND
80
81
;
81
82
82
83
break
@@ -87,20 +88,12 @@ continue
87
88
: CONTINUE SEMICOLON
88
89
;
89
90
90
- matrix
91
- : OPEN_BRACKET_SQUARE vector (COMMA vector)* CLOSE_BRACKET_SQUARE
92
- ;
93
-
94
91
vector
95
92
: OPEN_BRACKET_SQUARE expression (COMMA expression)* CLOSE_BRACKET_SQUARE
96
93
;
97
94
98
- matrixElementReference
99
- : ID OPEN_BRACKET_SQUARE INT COMMA INT CLOSE_BRACKET_SQUARE
100
- ;
101
-
102
- vectorElementReference
103
- : ID OPEN_BRACKET_SQUARE INT CLOSE_BRACKET_SQUARE
95
+ elementReference
96
+ : ID OPEN_BRACKET_SQUARE INT (COMMA INT )* CLOSE_BRACKET_SQUARE
104
97
;
105
98
106
99
assignmentOperator
You can’t perform that action at this time.
0 commit comments