263 |
(let ((math-parsing-fortran-vector '(end . "\000"))) |
(let ((math-parsing-fortran-vector '(end . "\000"))) |
264 |
(prog1 |
(prog1 |
265 |
(math-read-brackets t "]") |
(math-read-brackets t "]") |
266 |
(setq exp-token (car math-parsing-fortran-vector) |
(setq math-exp-token (car math-parsing-fortran-vector) |
267 |
math-expr-data (cdr math-parsing-fortran-vector))))) |
math-expr-data (cdr math-parsing-fortran-vector))))) |
268 |
|
|
269 |
(defun math-parse-fortran-vector-end (x op) |
(defun math-parse-fortran-vector-end (x op) |
270 |
(if math-parsing-fortran-vector |
(if math-parsing-fortran-vector |
271 |
(progn |
(progn |
272 |
(setq math-parsing-fortran-vector (cons exp-token math-expr-data) |
(setq math-parsing-fortran-vector (cons math-exp-token math-expr-data) |
273 |
exp-token 'end |
math-exp-token 'end |
274 |
math-expr-data "\000") |
math-expr-data "\000") |
275 |
x) |
x) |
276 |
(throw 'syntax "Unmatched closing `/'"))) |
(throw 'syntax "Unmatched closing `/'"))) |
386 |
(let (low high save) |
(let (low high save) |
387 |
(or (equal math-expr-data "_") (throw 'syntax "Expected `_'")) |
(or (equal math-expr-data "_") (throw 'syntax "Expected `_'")) |
388 |
(math-read-token) |
(math-read-token) |
389 |
(setq save exp-old-pos) |
(setq save math-exp-old-pos) |
390 |
(setq low (math-read-factor)) |
(setq low (math-read-factor)) |
391 |
(or (eq (car-safe low) 'calcFunc-eq) |
(or (eq (car-safe low) 'calcFunc-eq) |
392 |
(progn |
(progn |
393 |
(setq exp-old-pos (1+ save)) |
(setq math-exp-old-pos (1+ save)) |
394 |
(throw 'syntax "Expected equation"))) |
(throw 'syntax "Expected equation"))) |
395 |
(or (equal math-expr-data "^") (throw 'syntax "Expected `^'")) |
(or (equal math-expr-data "^") (throw 'syntax "Expected `^'")) |
396 |
(math-read-token) |
(math-read-token) |
504 |
(progn |
(progn |
505 |
(math-read-token) |
(math-read-token) |
506 |
(let ((args (if (or (equal math-expr-data calc-function-close) |
(let ((args (if (or (equal math-expr-data calc-function-close) |
507 |
(eq exp-token 'end)) |
(eq math-exp-token 'end)) |
508 |
nil |
nil |
509 |
(math-read-expr-list)))) |
(math-read-expr-list)))) |
510 |
(if (not (or (equal math-expr-data calc-function-close) |
(if (not (or (equal math-expr-data calc-function-close) |
511 |
(eq exp-token 'end))) |
(eq math-exp-token 'end))) |
512 |
(throw 'syntax "Expected `)'")) |
(throw 'syntax "Expected `)'")) |
513 |
(math-read-token) |
(math-read-token) |
514 |
(cons (intern (format "calcFunc-%s'" (nth 1 x))) args))) |
(cons (intern (format "calcFunc-%s'" (nth 1 x))) args))) |