Commit Graph

53 Commits

Author SHA1 Message Date
Dan Davison 41381781bb Using function call() style source block arguments.
This is a rough, first-pass implementation using some code from
org-babel-ref.el. If we do go with this idea, I think we can find a
better implementation, hopefully using the same code for parsing
`function calls' (parameterised source block calls), whether they are
made directly at a source block, or as a reference in another function
call, or as a LoB call.
2009-07-10 01:35:15 -04:00
Dan Davison 2bddc5fdf8 Revert "Moving non-language specific code out of language-specific files."
This reverts commit 0f541a680d.

See commit note for parent commit. Both reversions made for same reason.
2009-07-08 00:13:07 -04:00
Dan Davison 5cbc2d3803 Using the new org-babel-merge-params function to combine default args with header args provided. 2009-07-07 23:57:49 -04:00
Dan Davison 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
Dan Davison 9d79afb3b3 Merge branch 'working-on-combining-params' into results 2009-07-07 19:46:10 -04:00
Dan Davison 5280e5ea4f Attempt at a working version of the org-babel-merge-params function. 2009-07-07 19:44:27 -04:00
Dan Davison 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
Dan Davison 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
Dan Davison 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
Dan Davison dc702a3152 Revert "making :results replace the default"
This reverts commit a13cbf64b6.

I'm in favour of this change, but it seems that we need a more sophisticated way of combining plists before we can
change the default header args in this way. Otherwise, we get two entries for :results (one from the defaults and one
from the header args), whereas what we want is a single entry for :results with space-separated values.
2009-07-05 21:23:47 -04:00
Dan Davison 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
Dan Davison 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
Dan Davison 3c932ad603 removing mention of 'babel' as a supported interpreter 2009-07-05 13:53:52 -04:00
Dan Davison 6087aa7c31 Making some lines shorter and other trivial cosmetics 2009-07-05 13:52:21 -04:00
Dan Davison a13cbf64b6 making :results replace the default 2009-07-05 13:50:25 -04:00
Eric Schulte 5621c105bf removed org-babel-alist-pop 2009-06-27 13:12:30 -07:00
Eric Schulte 760e811c8c org-babel-alist-pop now actually does modify alist 2009-06-27 12:44:05 -07:00
Eric Schulte d469181978 org-babel-tangle is collecting blocks by language->session 2009-06-25 20:12:12 -07:00
Eric Schulte a5f6423a76 Merge branch 'jumping-to-source-blocks' 2009-06-15 12:43:23 -07:00
Eric Schulte 793f5205e2 org-babel-goto-named-source-block is working 2009-06-15 12:43:15 -07:00
Eric Schulte a902b62c29 better parsing of argument headers 2009-06-15 12:26:58 -07:00
Eric Schulte b60d873724 just getting started 2009-06-15 09:28:01 -07:00
Eric Schulte f7c002bcb7 partial 2009-06-15 09:22:36 -07:00
Eric Schulte e7591f5a14 removing the org-babel-named-src-block-regexp variable which is not used 2009-06-15 09:06:14 -07:00
Eric Schulte ec38cffff0 not yet working 2009-06-14 22:06:11 -07:00
Eric Schulte 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
Eric Schulte fb2dcaf58a implemented infrastructure for loading source-blocks from files 2009-06-14 14:10:04 -07:00
Eric Schulte 2212742c54 python can now pop-to-session 2009-06-14 11:34:06 -07:00
Eric Schulte d1bcb5e425 cleaned version of body is now added to kill ring 2009-06-14 11:10:09 -07:00
Eric Schulte 1b39a64fbe ruby blocks can now pop to session buffer (optionally evaluating header-args) 2009-06-14 11:08:12 -07:00
Eric Schulte 7d063efd28 removed debugging statement from org-babel.el 2009-06-14 10:27:29 -07:00
Eric Schulte 0019cc9c14 all tests seem to be passing 2009-06-14 10:23:44 -07:00
Dan Davison 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
Dan Davison 81ee8944ae Correcting errors in previously untested code. 2009-06-13 22:48:44 -04:00
Eric Schulte dd0392a4f2 extracted the "capture all output from comint session" behavior into a macro 2009-06-13 17:08:42 -07:00
Dan Davison 317a062a9a New variable org-babel-named-src-block-regexp to match src block with
srcname, and function org-babel-named-src-block-regexp-for-name
returning regexp matching a block with a particular
name. org-babel-named-src-block-regexp is set by
org-babel-set-interpreters.
2009-06-13 18:46:26 -04:00
Dan Davison e0909d8458 New variable org-babel-named-src-block-regexp, to match a block with its srcname, and simple version of function org-babel-find-named-block. 2009-06-13 18:43:24 -04:00
Dan Davison 90094f9b7c Started again with lob implementation.
I'm now proposing to implement it, at least temporarily, as a
degenerate source block (has no body), with interpreter name
'babel'. These 'babel' blocks will use a :srcname header arg to refer
to the source code block that they will use for their body. This
source code block might be in the 'library of babel'. If so it will
use a conventional variable name for its 'main data argument' such as
__data__. Then the babel block (not to be confused with a code block
in the lob) would use :var __data__=ref, where ref is a resource
reference resolved as usual.
2009-06-12 23:45:14 -04:00
Eric Schulte b56e6b0285 removing Austin F. Frank from copyright and author lines 2009-06-12 16:55:42 -07:00
Eric Schulte d41466e5bc now really passing all basic tests 2009-06-12 16:23:28 -07:00
Eric Schulte 39a4a85ba1 protecting against spurious spaces in header arguments 2009-06-12 13:46:40 -07:00
Eric Schulte 8ab8bf6ed4 quoting "%"s in messages 2009-06-12 13:07:56 -07:00
Eric Schulte 005e682948 making progress bringing org-babel-R.el into the new evaluation schema 2009-06-11 17:04:42 -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 23c61abf90 more robust org-babel-chomp 2009-06-10 16:17:04 -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 bba80bb837 working on sessions 2009-06-02 16:26:57 -07: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