From 4a8e8328dd6c2fda75158763193f601847b915b7 Mon Sep 17 00:00:00 2001 From: vdhoeven Date: Mon, 19 Jan 2009 14:31:25 +0000 Subject: [PATCH] Renamings git-svn-id: svn://svn.savannah.gnu.org/texmacs/trunk@2545 64cb5145-927a-446d-8aed-2fb7b4773692 --- src/TeXmacs/progs/dynamic/session-edit.scm | 6 +- src/TeXmacs/progs/dynamic/session-menu.scm | 4 +- src/TeXmacs/progs/utils/plugins/plugin-cmd.scm | 84 +++++++++++++------------- src/src/System/Link/connection.cpp | 4 +- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/src/TeXmacs/progs/dynamic/session-edit.scm b/src/TeXmacs/progs/dynamic/session-edit.scm index 215bdad0..747c90dd 100644 --- a/src/TeXmacs/progs/dynamic/session-edit.scm +++ b/src/TeXmacs/progs/dynamic/session-edit.scm @@ -164,7 +164,7 @@ (tm-define (make-session lan ses) (let* ((ban `(output (document ""))) (l (if (session-math-input?) 'folded-io-math 'folded-io)) - (p (connection-prompt lan ses)) + (p (plugin-prompt lan ses)) (in `(,l (document ,p) (document "") (document))) (s `(session ,lan ,ses (document ,ban ,in)))) (insert-go-to s '(2 1 1 0 0)) @@ -181,7 +181,7 @@ (tree-assign-node! t 'unfolded-io-math)) (let* ((lan (get-env "prog-language")) (ses (get-env "prog-session")) - (p (connection-prompt lan ses)) + (p (plugin-prompt lan ses)) (in (tree->stree (tree-ref t 1))) (out (tree-ref t 2)) (opts '())) @@ -370,7 +370,7 @@ (with-innermost t input-context? (let* ((lan (get-env "prog-language")) (ses (get-env "prog-session")) - (p (connection-prompt lan ses))) + (p (plugin-prompt lan ses))) (tree-go-to (io-create t p forwards?) 1 :end)))) (tm-define (io-insert-text forward?) diff --git a/src/TeXmacs/progs/dynamic/session-menu.scm b/src/TeXmacs/progs/dynamic/session-menu.scm index e284709c..160d7adb 100644 --- a/src/TeXmacs/progs/dynamic/session-menu.scm +++ b/src/TeXmacs/progs/dynamic/session-menu.scm @@ -78,7 +78,7 @@ (-> "Session" (link session-session-menu)) --- (-> "Evaluate" (link session-evaluate-menu)) - ("Interrupt execution" (connection-break)) + ("Interrupt execution" (plugin-interrupt)) ("Close session" (connection-stop))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -99,7 +99,7 @@ (link session-evaluate-menu)) (if (!= (get-env "prog-language") "scheme") ((balloon (icon "tm_stop.xpm") "Interrupt execution") - (connection-break)) + (plugin-interrupt)) ((balloon (icon "tm_clsession.xpm") "Close session") (connection-stop))) (if (in-math?) diff --git a/src/TeXmacs/progs/utils/plugins/plugin-cmd.scm b/src/TeXmacs/progs/utils/plugins/plugin-cmd.scm index 21a4d113..5187307c 100644 --- a/src/TeXmacs/progs/utils/plugins/plugin-cmd.scm +++ b/src/TeXmacs/progs/utils/plugins/plugin-cmd.scm @@ -177,96 +177,96 @@ ;; New connection management ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(define connection-pending (make-ahash-table)) -(define connection-starts (make-ahash-table)) -(define connection-prompts (make-ahash-table)) +(define plugin-pending (make-ahash-table)) +(define plugin-started (make-ahash-table)) +(define plugin-prompts (make-ahash-table)) (define (pending-ref lan ses) - (or (ahash-ref connection-pending (list lan ses)) '())) + (or (ahash-ref plugin-pending (list lan ses)) '())) (define (pending-set lan ses l) - (ahash-set! connection-pending (list lan ses) l)) + (ahash-set! plugin-pending (list lan ses) l)) -(define (var-connection-status lan ses) +(define (plugin-status lan ses) (if (!= lan "scheme") (connection-status lan ses) 2)) -(define (var-connection-start lan ses again?) +(define (plugin-start lan ses again?) (if (!= lan "scheme") (connection-start lan ses again?))) -(define (var-connection-write lan ses t) +(define (plugin-write lan ses t) (if (!= lan "scheme") (connection-write lan ses t) (delayed - (connection-notify-status lan ses 3) + (plugin-notify-status lan ses 3) (with r (package-evaluate lan ses t) (if (not (func? r 'document)) (set! r (tree 'document r))) - (connection-notify lan ses "output" r)) - (connection-notify-status lan ses 2)))) + (plugin-notify lan ses "output" r)) + (plugin-notify-status lan ses 2)))) -(define (connection-do lan ses) +(define (plugin-do lan ses) (with l (pending-ref lan ses) (when (nnull? l) - (with status (var-connection-status lan ses) + (with status (plugin-status lan ses) (cond ((and (> (length (car l)) 2) (== (second (car l)) :start)) (if (== status 0) - (var-connection-start lan ses #f) - (connection-next lan ses))) + (plugin-start lan ses #f) + (plugin-next lan ses))) ((== status 0) (with p (silent-encode :start noop '()) (pending-set lan ses (cons p l)) - (connection-do lan ses))) + (plugin-do lan ses))) (#t ((first (caar l)) lan ses))))))) -(define (connection-next lan ses) +(define (plugin-next lan ses) (with l (pending-ref lan ses) (when (nnull? l) ((third (caar l)) lan ses) (pending-set lan ses (cdr l)) - (connection-do lan ses)))) + (plugin-do lan ses)))) -(define (connection-cancel lan ses dead?) +(define (plugin-cancel lan ses dead?) (with l (pending-ref lan ses) (when (nnull? l) ((fourth (caar l)) lan ses dead?) (pending-set lan ses (cdr l)) - (connection-cancel lan ses dead?)))) + (plugin-cancel lan ses dead?)))) -(tm-define (connection-prompt lan ses) - (with p (ahash-ref connection-prompts (list lan ses)) +(tm-define (plugin-prompt lan ses) + (with p (ahash-ref plugin-prompts (list lan ses)) (if p (tree-copy p) (string-append (upcase-first lan) "] ")))) -(tm-define (connection-feed lan ses do notify next cancel args) +(tm-define (plugin-feed lan ses do notify next cancel args) (with l (pending-ref lan ses) (pending-set lan ses (rcons l (cons (list do notify next cancel) args))) - (if (null? l) (connection-do lan ses)))) + (if (null? l) (plugin-do lan ses)))) -(tm-define (connection-notify lan ses ch t) +(tm-define (plugin-notify lan ses ch t) ;;(display* "Notify " lan ", " ses ", " ch ", " t "\n") (with l (pending-ref lan ses) (when (nnull? l) (if (== ch "prompt") - (ahash-set! connection-prompts (list lan ses) (tree-copy t))) + (ahash-set! plugin-prompts (list lan ses) (tree-copy t))) ((second (caar l)) lan ses ch t)))) -(tm-define (connection-notify-status lan ses st) +(tm-define (plugin-notify-status lan ses st) ;;(display* "Notify status " lan ", " ses ", " st "\n") (when (== st 0) - (ahash-remove! connection-starts (list lan ses)) - (ahash-remove! connection-prompts (list lan ses)) - (connection-cancel lan ses #t)) + (ahash-remove! plugin-started (list lan ses)) + (ahash-remove! plugin-prompts (list lan ses)) + (plugin-cancel lan ses #t)) (when (== st 2) - (connection-next lan ses))) + (plugin-next lan ses))) -(tm-define (connection-break) +(tm-define (plugin-interrupt) (connection-interrupt) (let* ((lan (get-env "prog-language")) (ses (get-env "prog-session"))) - (connection-cancel lan ses #f))) + (plugin-cancel lan ses #f))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Sessions @@ -293,18 +293,18 @@ (set! in (plugin-preprocess lan ses in opts)) (tree-assign! out '(document (script-busy))) (with x (session-encode in out next opts) - (apply connection-feed `(,lan ,ses ,@(car x) ,(cdr x))))) + (apply plugin-feed `(,lan ,ses ,@(car x) ,(cdr x))))) (tm-define (session-do lan ses) (with l (pending-ref lan ses) (with (in out next opts) (session-decode (car l)) ;;(display* "Session do " lan ", " ses ", " in "\n") (if (tree-empty? in) - (connection-next lan ses) + (plugin-next lan ses) (begin - (var-connection-write lan ses in) - (tree-set out :up 0 (connection-prompt lan ses)) - (ahash-set! connection-starts (list lan ses) (texmacs-time))))))) + (plugin-write lan ses in) + (tree-set out :up 0 (plugin-prompt lan ses)) + (ahash-set! plugin-started (list lan ses) (texmacs-time))))))) (tm-define (session-next lan ses) ;;(display* "Session next " lan ", " ses "\n") @@ -312,7 +312,7 @@ (with (in out next opts) (session-decode (car l)) (when (and (tm-func? out 'document) (tm-func? (tree-ref out :last) 'script-busy)) - (let* ((t1 (ahash-ref connection-starts (list lan ses))) + (let* ((t1 (ahash-ref plugin-started (list lan ses))) (t2 (texmacs-time)) (dt (- t2 (or t1 t2))) (ts (if (< dt 1000) @@ -400,7 +400,7 @@ (cons (plugin-postprocess lan ses (car x) opts) (plugin-postprocess lan ses (cdr x) opts))))) (with x (silent-encode in ret opts) - (apply connection-feed `(,lan ,ses ,@(car x) ,(cdr x)))))) + (apply plugin-feed `(,lan ,ses ,@(car x) ,(cdr x)))))) (tm-define (silent-feed* lan ses in return opts) (with ret (lambda (x) @@ -416,8 +416,8 @@ (with (in out err return opts) (silent-decode (car l)) ;;(display* "Silent do " lan ", " ses ", " in "\n") (if (tree-empty? in) - (connection-next lan ses) - (var-connection-write lan ses in))))) + (plugin-next lan ses) + (plugin-write lan ses in))))) (tm-define (silent-next lan ses) ;;(display* "Silent next " lan ", " ses "\n") diff --git a/src/src/System/Link/connection.cpp b/src/src/System/Link/connection.cpp index 9c014435..990b0ad7 100644 --- a/src/src/System/Link/connection.cpp +++ b/src/src/System/Link/connection.cpp @@ -142,7 +142,7 @@ connection_rep::interrupt () { void connection_notify (connection con, string ch, tree t) { if (t == "") return; - call ("connection-notify", + call ("plugin-notify", object (con->name), object (con->session), object (ch), @@ -154,7 +154,7 @@ connection_notify_status (connection con) { int status= (con->status == CONNECTION_DYING? WAITING_FOR_OUTPUT: con->status); if (status == con->prev_status) return; - call ("connection-notify-status", + call ("plugin-notify-status", object (con->name), object (con->session), object (status)); -- 2.11.4.GIT