Mercurial > hg > octave-max
changeset 1084:9c1511bfda68
[project @ 1995-01-31 02:56:03 by jwe]
author | jwe |
---|---|
date | Tue, 31 Jan 1995 02:56:03 +0000 |
parents | fb8ca633c439 |
children | 9f51d8b235ab |
files | src/parse.y |
diffstat | 1 files changed, 12 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/parse.y +++ b/src/parse.y @@ -1146,12 +1146,19 @@ } ; -rows : matrix_row - | rows ';' // Ignore trailing semicolon. - | rows ';' matrix_row +rows : rows1 + | rows1 ';' // Ignore trailing semicolon. ; -matrix_row : expression // First element on row. +rows1 : matrix_row + | rows1 ';' matrix_row + ; + +matrix_row : matrix_row1 + | matrix_row1 ',' // Ignore trailing comma. + ; + +matrix_row1 : expression // First element on row. { if (mlnm.top ()) { @@ -1168,8 +1175,7 @@ ml.push (tmp); } } - | matrix_row ',' // Ignore trailing comma. - | matrix_row ',' expression + | matrix_row1 ',' expression { tree_matrix *tmp = ml.pop (); tmp = tmp->chain ($3, tree_matrix::md_right);