---

yaml
---
r: 11405
b: refs/heads/master
c: 7599d2d
h: refs/heads/master
i:
  11403: 3ac62a4
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 96e3031675aba427c1cff8967f2c1cbbcdb6b5ff
+refs/heads/master: 7599d2dd51eb76892c929404dd7b49265e9f7c8f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustdoc/astsrv.rs

@@ -21,7 +21,7 @@ import rustc::middle::resolve;
 
 export ctxt;
 export ctxt_handler;
-export srv;
+export srv::{};
 export from_str;
 export from_file;
 export exec;
@@ -34,31 +34,71 @@ type ctxt = {
 
 type srv_owner<T> = fn(srv: srv) -> T;
 type ctxt_handler<T> = fn~(ctxt: ctxt) -> T;
+type parser = fn~(session::session, str) -> @ast::crate;
 
-type srv = {
-    ctxt: ctxt
+enum msg {
+    handle_request(fn~(ctxt)),
+    exit
+}
+
+enum srv = {
+    ch: comm::chan<msg>
 };
 
 fn from_str<T>(source: str, owner: srv_owner<T>) -> T {
-    let (sess, ignore_errors) = build_session();
+    run(owner, source, parse::from_str_sess)
+}
 
-    let srv = {
-        ctxt: build_ctxt(sess, parse::from_str_sess(sess, source),
-                         ignore_errors)
-    };
+fn from_file<T>(file: str, owner: srv_owner<T>) -> T {
+    run(owner, file, parse::from_file_sess)
+}
+
+fn run<T>(owner: srv_owner<T>, source: str, parse: parser) -> T {
+
+    let srv_ = srv({
+        ch: task::spawn_listener {|po|
+            act(po, source, parse);
+        }
+    });
 
-    owner(srv)
+    let res = owner(srv_);
+    comm::send(srv_.ch, exit);
+    ret res;
 }
 
-fn from_file<T>(file: str, owner: srv_owner<T>) -> T {
+fn act(po: comm::port<msg>, source: str, parse: parser) {
     let (sess, ignore_errors) = build_session();
 
-    let srv = {
-        ctxt: build_ctxt(sess, parse::from_file_sess(sess, file),
-                         ignore_errors)
-    };
+    let ctxt = build_ctxt(
+        sess,
+        parse(sess, source),
+        ignore_errors
+    );
+
+    let keep_going = true;
+    while keep_going {
+        alt comm::recv(po) {
+          handle_request(f) {
+            f(ctxt);
+          }
+          exit {
+            keep_going = false;
+          }
+        }
+    }
+}
 
-    owner(srv)
+fn exec<T:send>(
+    srv: srv,
+    +f: fn~(ctxt: ctxt) -> T
+) -> T {
+    let po = comm::port();
+    let ch = comm::chan(po);
+    let msg = handle_request(fn~[move f](ctxt: ctxt) {
+        comm::send(ch, f(ctxt))
+    });
+    comm::send(srv.ch, msg);
+    comm::recv(po)
 }
 
 fn build_ctxt(sess: session::session, ast: @ast::crate,
@@ -242,13 +282,6 @@ fn should_ignore_external_import_paths_that_dont_exist() {
     from_str(source) {|_srv| }
 }
 
-fn exec<T:send>(
-    srv: srv,
-    f: fn~(ctxt: ctxt) -> T
-) -> T {
-    f(srv.ctxt)
-}
-
 #[test]
 fn srv_should_return_request_result() {
     let source = "fn a() { }";