7e80d01571
Now we have a function for merging params lists, so in theory this reversion can be reverted.
...
Revert "Revert "making :results replace the default""
This reverts commit dc702a3152
2009-07-07 19:48:19 -04:00
9d79afb3b3
Merge branch 'working-on-combining-params' into results
2009-07-07 19:46:10 -04:00
5280e5ea4f
Attempt at a working version of the org-babel-merge-params function.
2009-07-07 19:44:27 -04:00
d8001facab
Altering org-babel-execute:emacs-lisp in accordance with preceding changes.
2009-07-05 23:09:28 -04:00
0f541a680d
Moving non-language specific code out of language-specific files.
...
Moved reference resolution out of language-specific files; changed
things so that we parse the header args list in org-babel.el, and
changed the argument list of the org-babel-execute:LANG functions
accordingly. In addition to hopefully resulting in easier maintenance,
this results in more streamlined org-babel-execute:LANG functions, and
hence less work to do when adding interpreters.
2009-07-05 22:36:51 -04:00
6143bb7aad
Streamlining/fiddling with org-babel-execute-src-block.
...
This includes an explicit implementation of the idea that no result is
returned in the case of :results output.
2009-07-05 21:57:42 -04:00
f7ea8ccb2e
Added comment to org-babel-process-result explaining
...
results-processing changes and state they are currently in. Here's the
comment:
You can see below the various fragments of results-processing
code that were present in the language-specific files. Out of
those fragments, I've moved the
org-babel-python-table-or-results and
org-babel-import-elisp-from-file functionality into the
org-babel-*-evaluate functions. I think those should only be
used in the :results value case, as in the 'output case we are
not concerned with creating elisp versions of results.
The rest of the functionality below, concerned with vectorising
or scalarising results is commented out, has not yet been
replaced, and may need to be reinstated in this function
2009-07-05 21:37:00 -04:00
dc702a3152
Revert "making :results replace the default"
...
This reverts commit a13cbf64b6
2009-07-05 21:23:47 -04:00
df3b1b7223
Fixing results processing code.
...
When :results is 'value, the org-babel-LANG-evaluate functions are
responsible for returning an elisp representation of the *value* of
the block. This stage is maintained in the language-specific code
because different languages have different ways of doing it: python
and ruby use org-babel-LANG-table-or-string, whereas R and shell write
to file and then use org-babel-import-elisp-from-file. It could
however be put in the org-babel-execute:LANG function.
2009-07-05 21:23:17 -04:00
9750226de7
Ruby version of previous commit.
...
Bug fix: I was missing out org-babel-table-or-string with external
process evaluation (non-session).
Also, I have renamed org-babel-ruby-table-or-results to org-babel-ruby-table-or-string.
(the previous commit's message should have read org-babel-python-table-or-results...)
2009-07-05 19:59:24 -04:00
e45cf15b06
Bug fix: I was missing out org-babel-table-or-string with external
...
process evaluation (non-session).
Also, I have renamed org-babel-table-or-results to org-babel-table-or-string.
2009-07-05 19:55:54 -04:00
305c90b892
First stage of results code simplification.
...
Results processing code has been moved out of language-specific
files (which all contained similar versions of essentially the same
code) and into the central org-babel.el. This commit maintains the
removed language-specific fragments commented out in org-babel.el. It
does not make an attempt to replace their functionality (the new
function org-babel-process-result currently does nothing).
Similarly, I intend to move the reference resolution code out of
language-specific files.
2009-07-05 19:23:32 -04:00
07b69e8646
Removing results processing code from org-babel-R.el.
...
And removing default results-type case (results-type must always be
either output or value)
2009-07-05 19:19:14 -04:00
a285289603
Simplifying ruby results code.
...
Moving org-babel-ruby-table-or-results into the :results value branch of org-babel-evaluate-ruby
2009-07-05 19:17:47 -04:00
500285da97
Removing results processing code from org-babel-ruby.el.
2009-07-05 19:16:44 -04:00
93a964d236
Simplifying python results code.
...
Move org-babel-python-table-or-results into the :results value branch
of org-babel-python-evaluate, and get rid of default case (result-type
must always be either output or value). I wonder if the org-babel-trim
s are necessary: they don't seem to be needed in the code for ruby.
2009-07-05 19:16:08 -04:00
f4eaee5b46
Trivial cosmetic: shortening lines to fit screen
2009-07-05 19:12:06 -04:00
337f77c10c
Removing results processing from org-babel-python.el
2009-07-05 19:11:40 -04:00
afdf02b910
Removing results processing from org-babel-sh.el
2009-07-05 19:10:45 -04:00
2fb922aaa7
Trivial cosmetic: shortening a line to make it fit on screen
2009-07-05 16:08:07 -04:00
a06c910f37
cosmetic: removing commented debugging code; shortening some lines
2009-07-05 15:52:41 -04:00
3c932ad603
removing mention of 'babel' as a supported interpreter
2009-07-05 13:53:52 -04:00
6087aa7c31
Making some lines shorter and other trivial cosmetics
2009-07-05 13:52:21 -04:00
a13cbf64b6
making :results replace the default
2009-07-05 13:50:25 -04:00
adcfa3c54b
Some todos/bug notes in org-babel.org
2009-06-30 20:46:51 -04:00
74b9c8f125
slight simplification
2009-06-27 17:26:07 -07:00
978104f1ae
broke tangled source block collection out into it's own function
2009-06-27 17:25:01 -07:00
87e07ee66d
added completion message to `org-babel-tangle'
2009-06-27 13:36:51 -07:00
e9c2c6a590
removing debugging statements from org-babel-tangle.el, and beefing up test-tangle.org
2009-06-27 13:24:49 -07:00
6518065f28
now working with multiple source-blocks
2009-06-27 13:13:37 -07:00
5621c105bf
removed org-babel-alist-pop
2009-06-27 13:12:30 -07:00
50abb08479
misc tweaks
2009-06-27 12:44:12 -07:00
760e811c8c
org-babel-alist-pop now actually does modify alist
2009-06-27 12:44:05 -07:00
0d3952ecf6
inserting links in a comment before source-code blocks
2009-06-27 11:58:13 -07:00
e05ddae2f7
now requiring cl
2009-06-27 11:58:00 -07:00
fba47f3651
now able to generate source files (not really tested or complete)
2009-06-26 12:12:23 -07:00
c09041b785
more fleshing out of writing to file
2009-06-26 11:43:50 -07:00
e16c896c80
some more work on writing out to files
2009-06-26 10:25:31 -07:00
89f4d92829
Merge branch 'master' into tangle
2009-06-26 10:20:17 -07:00
2014a95767
now loading utility files before language-specific files
2009-06-26 10:10:29 -07:00
fed7056833
stubbed out functions for inserting source-blocks into files
2009-06-25 20:17:21 -07:00
d469181978
org-babel-tangle is collecting blocks by language->session
2009-06-25 20:12:12 -07:00
3ab7412410
started on implementation
2009-06-15 15:35:11 -07:00
1c1b40636a
now using org-babel-tangle-langs to track file extensions and shebang lines
2009-06-15 15:25:46 -07:00
dd7ba333a7
Library of Babel should only try to ingest named source blocks
2009-06-15 12:55:02 -07:00
3920102905
Library of Babel should only try to ingest named source blocks
2009-06-15 12:54:29 -07:00
9e5f634135
Merge branch 'master' into tangle
2009-06-15 12:53:00 -07:00
c678059deb
passing all tests
2009-06-15 12:47:10 -07:00
a5f6423a76
Merge branch 'jumping-to-source-blocks'
2009-06-15 12:43:23 -07:00
793f5205e2
org-babel-goto-named-source-block is working
2009-06-15 12:43:15 -07:00
aa5c9985bd
fixed bug in ruby session evaluation
2009-06-15 12:30:36 -07:00
a902b62c29
better parsing of argument headers
2009-06-15 12:26:58 -07:00
112c7d9236
fixed non-session variable assignment in R
2009-06-15 12:17:58 -07:00
a44c98b376
cleaning up debugging messages in python
2009-06-15 12:14:02 -07:00
0cd60d5c5a
removing message debugging statements
2009-06-15 11:49:35 -07:00
82ecab19fb
R is working with no session
2009-06-15 11:49:06 -07:00
e2d3cc7830
shell commands are working
2009-06-15 11:29:25 -07:00
f2aaba8ca6
adding support for python with :session none
2009-06-15 11:14:32 -07:00
2fd494477b
cleaned up ruby
2009-06-15 10:54:14 -07:00
00365e1fbe
ruby can now be run with NO session
2009-06-15 10:13:48 -07:00
ce1726713a
expanding
2009-06-15 09:35:02 -07:00
b60d873724
just getting started
2009-06-15 09:28:01 -07:00
f7c002bcb7
partial
2009-06-15 09:22:36 -07:00
e7591f5a14
removing the org-babel-named-src-block-regexp variable which is not used
2009-06-15 09:06:14 -07:00
ec38cffff0
not yet working
2009-06-14 22:06:11 -07:00
08565fd5c7
Merge branch 'master' into tangle
...
Conflicts:
lisp/org-babel-init.el
2009-06-14 18:58:25 -07:00
623831ddab
added util directory, including newest inf-ruby.el, should fix ruby bug
2009-06-14 18:42:44 -07:00
d71ee1116b
adding shell of org-babel-tangle.el
2009-06-14 18:30:29 -07:00
8605c848bf
Merge branch 'master' into library-of-babel
...
Conflicts:
lisp/org-babel-ref.el
org-babel.org
2009-06-14 15:24:41 -07:00
d72b438f5e
Library of Babel source blocks are now available from any org-mode file
2009-06-14 15:01:55 -07:00
f1302d1cca
implemented *much* simpler lob one-liner syntax
2009-06-14 14:18:58 -07:00
fb2dcaf58a
implemented infrastructure for loading source-blocks from files
2009-06-14 14:10:04 -07:00
0866961436
Merge branch 'session' of git@github.com:eschulte/org-babel into session
...
Conflicts:
lisp/langs/org-babel-sh.el
org-babel.org
2009-06-14 12:16:17 -07:00
8360a676b9
passing all tests
2009-06-14 12:09:36 -07:00
a85cadced8
*** DONE function to bring up inferior-process buffer [4/4]
2009-06-14 12:02:25 -07:00
4fd1abecc5
move lisp/langs/org-babel-shell.el to lisp/langs/org-babel-sh.el
2009-06-14 11:54:31 -07:00
e962e83741
adding pop/prep session commands to org-babel-shell.el
2009-06-14 11:53:56 -07:00
88048186ac
R know how to prep and pop-to sessions
2009-06-14 11:48:11 -07:00
f2444e39e9
added some `sit-for' statements to make ruby inf session prep more reliable
2009-06-14 11:44:29 -07:00
70cc6cb90f
A couple of bug reports.
...
(1) Shell evaluation is broken by weird escape chars in prompt;
(2) ruby evaluation not working for me as run-ruby expects one argument on my system.
Also fixed a harmless copy-paste error and whitespace adjustment to shorten lines.
2009-06-14 14:38:15 -04:00
2212742c54
python can now pop-to-session
2009-06-14 11:34:06 -07:00
d1bcb5e425
cleaned version of body is now added to kill ring
2009-06-14 11:10:09 -07:00
1b39a64fbe
ruby blocks can now pop to session buffer (optionally evaluating header-args)
2009-06-14 11:08:12 -07:00
7d063efd28
removed debugging statement from org-babel.el
2009-06-14 10:27:29 -07:00
0019cc9c14
all tests seem to be passing
2009-06-14 10:23:44 -07:00
ba2756447d
correctly using the ARTIFICIAL flag with comint-send-input
2009-06-14 10:21:14 -07:00
3cd99d0c2f
** DONE defunct R sessions
...
turns out I just had to use inferior-ess-send-input instead of comint-send-input
2009-06-14 10:20:59 -07:00
f31b3b2af2
fixed problem with new ruby sessions sometimes not initializing
2009-06-14 09:12:19 -07:00
0b75d89ccf
fixed error parsing empty results from ruby
2009-06-14 08:41:52 -07:00
82e9587c72
added alternate single-line syntax for Library of Babel evaluation
2009-06-14 07:54:55 -07:00
04be81dfe4
Cleaner implementation of org-babel-execute:babel.
...
It now searches for a srcname first in the current buffer, and then in
the lob.
2009-06-14 01:11:04 -04:00
66b27cb951
Added get-all-src-block-infos, which creates a hash of the 'info' lists
...
for all source blocks in a buffer, keyed by srcname.
2009-06-14 01:08:27 -04:00
81ee8944ae
Correcting errors in previously untested code.
2009-06-13 22:48:44 -04:00
08f92aebe5
passing some session tests, but still failing some tests
2009-06-13 19:35:48 -07:00
391f677fc7
`org-babel-comint-with-output' is now robust to errors
2009-06-13 18:28:06 -07:00
da08c26d33
applying org-babel-comint-with-output macro to org-babel-shell.el
2009-06-13 17:39:19 -07:00
7d1cbd43ea
removing debugging statements from org-babel-ref.el
2009-06-13 17:35:39 -07:00
cd5fb8460d
slightly more graceful use of let*
2009-06-13 17:35:01 -07:00
e39b5e848e
applying org-babel-comint-with-output macro to org-babel-R.el
2009-06-13 17:34:51 -07:00
f4a1193a6e
now using org-babel-comint-with-output in org-babel-python.el
2009-06-13 17:30:02 -07:00
Dan Davison
Eric Schulte