From: Akshay S. <ak...@us...> - 2012-07-07 16:01:08
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "matlisp". The branch, tensor has been updated via cfd1ff7fa12112dcb0df038f9ecd60a5d637aa18 (commit) from 6876d4167f165dbd6b9326251171d94020c99d64 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit cfd1ff7fa12112dcb0df038f9ecd60a5d637aa18 Author: Akshay Srinivasan <aks...@gm...> Date: Sat Jul 7 21:25:06 2012 +0530 o Moved reader.lisp, and Mark Kantrowitz' "infix" to srcdir;src;reader diff --git a/src/old/reader.lisp b/src/old/reader.lisp index 6a92ee1..db81edb 100644 --- a/src/old/reader.lisp +++ b/src/old/reader.lisp @@ -279,7 +279,6 @@ (peek-ahead-no-hang stream nil nil t) (return val)))))) - (with-input-from-string (ostr "[1 2; 3 4]") (parse-matrix-expression ostr #\[)) diff --git a/lib-src/infix/infix.asd b/src/reader/infix/infix.asd similarity index 100% rename from lib-src/infix/infix.asd rename to src/reader/infix/infix.asd diff --git a/lib-src/infix/src.lisp b/src/reader/infix/src.lisp similarity index 100% rename from lib-src/infix/src.lisp rename to src/reader/infix/src.lisp diff --git a/src/reader.lisp b/src/reader/reader.lisp similarity index 96% rename from src/reader.lisp rename to src/reader/reader.lisp index dd39176..97eaaa2 100644 --- a/src/reader.lisp +++ b/src/reader/reader.lisp @@ -1,10 +1,10 @@ (in-package #:matlisp) - ;;TODO move things from old/reader.lisp; must adapt things to reading tensors. (define-constant +parser-ignored-characters+ '(#\^m #\space #\tab #\return #\newline)) (define-constant +newline-characters+ '(#\newline #\^m #\linefeed #\return)) +;;General stuff--------------------------------------------------;; (defun peek-ahead-no-hang (&optional (stream *standard-input*) (eof-error t) eof-value recursive-p) (symbol-macrolet ((pop-char (read-char-no-hang stream eof-error eof-value recursive-p))) (loop @@ -35,7 +35,9 @@ ((member char +parser-ignored-characters+) nil) (t t)) finally (return char)))) -;;---------------------------------------------------------------;; + + +;;Array slicer---------------------------------------------------;; (defun get-slicing-subscript (lst) (flet ((idxp (x) (or (consp x) @@ -171,3 +173,5 @@ #+nil(with-input-from-string (ostr "x[0:5, 0, 0]$ ") (parse-indexing-expression ostr #\$)) + +;;Tensor reader--------------------------------------------------;; ----------------------------------------------------------------------- Summary of changes: src/old/reader.lisp | 1 - {lib-src => src/reader}/infix/infix.asd | 0 {lib-src => src/reader}/infix/src.lisp | 0 src/{ => reader}/reader.lisp | 8 ++++++-- 4 files changed, 6 insertions(+), 3 deletions(-) rename {lib-src => src/reader}/infix/infix.asd (100%) rename {lib-src => src/reader}/infix/src.lisp (100%) rename src/{ => reader}/reader.lisp (96%) hooks/post-receive -- matlisp |