Eric Schulte
6698edbe83
finally think I'm on the right track for output vs. values, mostly working w/ruby
...
- moved ruby functions into their own buffer
- removed org-babel-sessions.el
- drastically scaled down org-babel-comint.el (may grow later if we
find duplication between language buffers)
- removed org-babel-script.el
- adjusted org-babel-init.el to reflect new file layout
For the big breakthrough see `org-babel-ruby-evaluate' in
org-babel-ruby.el. This will be the model upon which all future
language evaluations will be built.
2009-06-11 15:15:59 -07:00
Eric Schulte
8620cc414c
generalizing command to read results from a file into elisp
2009-06-11 15:04:10 -07:00
Eric Schulte
9040ad657b
adding string manipulation functions to org-babel.el
2009-06-11 14:31:37 -07:00
Eric Schulte
2081b95410
Revert "org-babel-comint-with-output is now fully self-contained and side-effect free"
...
This seems to be causing problems...
This reverts commit 0573fc4d9c
.
2009-06-11 12:55:39 -07:00
Eric Schulte
dc551fab04
beefed up org-babel-comint-wait-for-output but it still sometimes misses multiple outputs
2009-06-11 12:44:14 -07:00
Eric Schulte
f5481ab666
looks like out comint waiting function needs some work...
2009-06-11 12:35:48 -07:00
Eric Schulte
0573fc4d9c
org-babel-comint-with-output is now fully self-contained and side-effect free
2009-06-11 12:16:37 -07:00
Eric Schulte
eacce7b29d
`org-babel-comint-in-buffer' now declares it's indentation
2009-06-11 07:32:31 -07:00
Eric Schulte
aa410df722
added nice little macro to capture output
2009-06-10 22:18:59 -07:00
Eric Schulte
8d0fd18933
working on org-babel-comint for automatically keeping a ring
2009-06-10 17:27:06 -07:00
Eric Schulte
23c61abf90
more robust org-babel-chomp
2009-06-10 16:17:04 -07:00
Eric Schulte
9c70974391
started working on ruby 'script' execution
2009-06-09 16:33:36 -07:00
Eric Schulte
f3da4d0321
functional results now working with org-babel-comint and org-babel-script
2009-06-09 16:10:43 -07:00
Eric Schulte
39d1674f30
org-babel-R is now able to assign variables
2009-06-09 15:28:59 -07:00
Eric Schulte
d3f1d07066
org-babel-R can now run in 'script' mode
2009-06-09 15:02:01 -07:00
Eric Schulte
ccddf78dca
the script/functional return values should be handled by header arguments
...
also, an echo header (like in R) argument would probably be
appropriate as well.
2009-06-08 17:58:53 -07:00
Eric Schulte
d724ca921a
tweaking tasks for sessions and script/functional evaluation
2009-06-08 16:38:13 -07:00
Eric Schulte
e6729c1cae
even more thoughts on evaluation, results, models and options
2009-06-08 16:31:13 -07:00
Eric Schulte
4da3ddc623
Merge branch 'session' of git@github.com:eschulte/org-babel into session
2009-06-08 15:05:08 -07:00
Eric Schulte
cdb41f5106
working on org-babel-script.el (winnowing, and using org-babel-comint.el)
2009-06-08 15:03:04 -07:00
Dan Davison
4446fd1f07
new TODO: figure out how to handle errors during evaluation
2009-06-06 21:29:35 -04:00
Dan Davison
d0938cc70d
More thoughts on scripting vs. functional approaches in org-babel
2009-06-06 21:21:21 -04:00
Dan Davison
1e4c3389b6
As was just done for branch master, removing all support for hlines/colnames -- they persist in branch rowcolnames. Also removing comments. These should never have been present in this branch.
2009-06-06 18:12:42 -04:00
Eric Schulte
b533d9d446
cleaned up org-babel-comint and removed helper functions
2009-06-03 20:52:01 -07:00
Eric Schulte
fe75562a64
org-babel-comint is basically working
2009-06-03 20:51:36 -07:00
Eric Schulte
e1aeec8ab1
begun implementing org-babel-comint
...
a collection of functions to simplify interaction with comint-mode
buffers
2009-06-03 20:18:18 -07:00
Eric Schulte
c175d3ce0d
playing with org-babel-script and comint buffers/functions
2009-06-03 17:37:50 -07:00
Eric Schulte
2a663b9e09
R is now using last output (with default session) and passing all tests
2009-06-03 15:59:27 -07:00
Eric Schulte
49db1e523c
Merge branch 'master' into session
...
Conflicts:
org-babel.org
2009-06-03 15:30:10 -07:00
Eric Schulte
39f7174884
Revert "Revert "Make org table result have header row and hline when appropriate...""
...
This reverts commit dff01091dc
.
Yes, this is a reversion of a reversion, as the original commit has
been reverted in the master branch, I'm now just going to revert the
reversion and then merge with master to maintain inter-branch
cohesion.
oh, did I mention... "revert"
2009-06-03 15:26:32 -07:00
Eric Schulte
b1c103890c
*even more* discussion of session implementation issues
2009-06-03 15:23:45 -07:00
Dan Davison
8ac2a7daa6
Added another multilingual example. One issue is that spaces in the string cause vector output.
2009-06-03 12:33:58 -04:00
Dan Davison
02b265b2e3
Reverted tentative and hackish support for hline in R output. I have left a commented line and an unused function while I am thinking about this, and pending me learning git better. However I haven't yet reverted the ability of R to recognise hlines in var references, so the grades example still works. All sbe tests are passed.
2009-06-03 12:09:52 -04:00
Dan Davison
21d01aea91
Some notes on possible support for named fields / rows / columns in org-babel and supported languages. These are just preliminary and don't outline a solution. My feeling is that this will require a bit more thought to avoid being an unrigorous hack.
2009-06-03 11:32:24 -04:00
Eric Schulte
bbf89dea08
fixed type in org-babel.org
2009-06-02 20:50:10 -07:00
Eric Schulte
dccbe633c9
discuss complication of mixing functional and imperative block evaluation
2009-06-02 20:34:20 -07:00
Eric Schulte
dff01091dc
Revert "Make org table result have header row and hline when appropriate..."
...
This reverts commit e4263daf76
.
I'm reverting this commit in the sesion branch because it is breaking
the tests for R, as it no longer allows R source code blocks to return
scalar values. Hopefully this issue will be fixed in the master
branch before I merge the session branch back in.
2009-06-02 16:29:30 -07:00
Eric Schulte
517253a2d0
beginning to add sessions
2009-06-02 16:28:56 -07:00
Eric Schulte
bba80bb837
working on sessions
2009-06-02 16:26:57 -07:00
Eric Schulte
f383f7e30c
added integration directory for org-tangle (from Eric N.'s into email)
2009-06-02 15:31:26 -07:00
Dan Davison
0df550d84c
Minor updates and responses in the sessions planning subtree.
2009-06-02 16:45:31 -04:00
Eric Schulte
37758310e0
planning *session* task order, and separating "*Org Edit Src Example* buffer" tasks
2009-06-01 17:58:37 -07:00
Eric Schulte
fcd5e8f272
fleshing out the *sessions* discussion and TODOs
2009-06-01 17:28:34 -07:00
Eric Schulte
c38294d21f
DONE Remove protective commas from # comments before evaluating
2009-06-01 16:56:59 -07:00
Dan Davison
8fef1f0509
More notes on sessions: need for header arg evaluation when we edit code, and need for removing protective commas
2009-06-01 15:14:35 -04:00
Dan Davison
f03e3ed603
Further notes on org-babel session and ESS and *Org Edit Src Example* buffers.
2009-05-31 18:07:13 -04:00
Dan Davison
ce96d45374
Added reminder/request that we bear ESS in mind when designing org-babel 'sessions'
2009-05-31 17:48:00 -04:00
Dan Davison
e4263daf76
Make org table result have header row and hline when appropriate. (This should have been included with commit a39d68640e
). The approach I've taken is to make R always write the column names into the tsv file. If the result does not have user-supplied column-names, then R writes default column names of the form V1,V2,...,V$numcols. After reading the tsv back into lisp, we check whether it has "real" column names or the R defaults. If it has real column names, then I give the org table an hline.
...
I expect this will conflict with Eric's work on sessions, but we can deal with that.
There is a remaining quoting issue that needs to be dealt
with. E.g. with an unquoted string in the input, it comes out as
quoted in the result. This seems bad, since if you use the output as
new input you get something different (with extra
quoting). (non-idempotence if that's the right term).
| col1 | col2 | col3 |
|------+---------+------|
| 1 | 2 | 3 |
| 4 | schulte | 6 |
tabel
| "col1" | "col2" | "col3" |
|--------+-----------+--------|
| 1 | 2 | 3 |
| 4 | "schulte" | 6 |
2009-05-30 16:45:26 -04:00
Dan Davison
eb29bef93f
Made org-babel-remove-result interactive. Eric if you agree do you want to decide on a binding?
2009-05-30 15:59:46 -04:00
Dan Davison
e7f860cb19
Altered the python code in the chained references example. AIui the example was producing the correct answer (ruby class Array) but for the wrong reason (python was returning None)
2009-05-30 15:01:55 -04:00