mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-29 18:36:26 +00:00
DONE Fix nested evaluation
and commenting out debugging statements
This commit is contained in:
parent
66faa937f8
commit
34cf22bdaa
|
@ -96,12 +96,12 @@ return nil."
|
||||||
(when (string-match "^\\(.+?\\)\(\\(.*\\)\)$" ref)
|
(when (string-match "^\\(.+?\\)\(\\(.*\\)\)$" ref)
|
||||||
(setq new-refere (match-string 1 ref))
|
(setq new-refere (match-string 1 ref))
|
||||||
(setq new-referent (match-string 2 ref))
|
(setq new-referent (match-string 2 ref))
|
||||||
(message "new-refere=%S, new-referent=%S" new-refere new-referent) ;; debugging
|
;; (message "new-refere=%S, new-referent=%S" new-refere new-referent) ;; debugging
|
||||||
(when (> (length new-refere) 0)
|
(when (> (length new-refere) 0)
|
||||||
(if (> (length new-referent) 0)
|
(if (> (length new-referent) 0)
|
||||||
(setq args (mapcar (lambda (ref) (cons :var ref))
|
(setq args (mapcar (lambda (ref) (cons :var ref))
|
||||||
(org-babel-ref-split-args new-referent))))
|
(org-babel-ref-split-args new-referent))))
|
||||||
(message "args=%S" args)
|
;; (message "args=%S" args) ;; debugging
|
||||||
(setq ref new-refere)))
|
(setq ref new-refere)))
|
||||||
(when (string-match "\\(.+\\):\\(.+\\)" ref)
|
(when (string-match "\\(.+\\):\\(.+\\)" ref)
|
||||||
(find-file (match-string 1 ref))
|
(find-file (match-string 1 ref))
|
||||||
|
@ -134,7 +134,7 @@ return nil."
|
||||||
(beginning-of-line)
|
(beginning-of-line)
|
||||||
(if (or (= (point) (point-min)) (= (point) (point-max)))
|
(if (or (= (point) (point-min)) (= (point) (point-max)))
|
||||||
(error "reference not found"))))
|
(error "reference not found"))))
|
||||||
(message "type=%S" type) ;; debugging
|
;; (message "type=%S" type) ;; debugging
|
||||||
(case type
|
(case type
|
||||||
('results-line (org-babel-ref-read-result))
|
('results-line (org-babel-ref-read-result))
|
||||||
('table (org-babel-ref-read-table))
|
('table (org-babel-ref-read-table))
|
||||||
|
|
|
@ -2283,8 +2283,8 @@ plot data using 1:2 with lines
|
||||||
(see [[* file result types][file result types]])
|
(see [[* file result types][file result types]])
|
||||||
|
|
||||||
|
|
||||||
* Bugs [24/36]
|
* Bugs [25/36]
|
||||||
** STARTED Fix nested evaluation
|
** DONE Fix nested evaluation
|
||||||
The current parser / evaluator fails with greater levels of nested
|
The current parser / evaluator fails with greater levels of nested
|
||||||
function block calls (example below).
|
function block calls (example below).
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue