0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-19 11:39:58 +00:00
Commit graph

173 commits

Author SHA1 Message Date
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 d8001facab Altering org-babel-execute:emacs-lisp in accordance with preceding changes. 2009-07-05 23:09:28 -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 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
Dan Davison 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
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 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
Dan Davison 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
Dan Davison 500285da97 Removing results processing code from org-babel-ruby.el. 2009-07-05 19:16:44 -04:00
Dan Davison 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
Dan Davison f4eaee5b46 Trivial cosmetic: shortening lines to fit screen 2009-07-05 19:12:06 -04:00
Dan Davison 337f77c10c Removing results processing from org-babel-python.el 2009-07-05 19:11:40 -04:00
Dan Davison afdf02b910 Removing results processing from org-babel-sh.el 2009-07-05 19:10:45 -04:00
Dan Davison 2fb922aaa7 Trivial cosmetic: shortening a line to make it fit on screen 2009-07-05 16:08:07 -04:00
Dan Davison a06c910f37 cosmetic: removing commented debugging code; shortening some lines 2009-07-05 15:52:41 -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
Dan Davison adcfa3c54b Some todos/bug notes in org-babel.org 2009-06-30 20:46:51 -04:00
Eric Schulte 74b9c8f125 slight simplification 2009-06-27 17:26:07 -07:00
Eric Schulte 978104f1ae broke tangled source block collection out into it's own function 2009-06-27 17:25:01 -07:00
Eric Schulte 87e07ee66d added completion message to `org-babel-tangle' 2009-06-27 13:36:51 -07:00
Eric Schulte e9c2c6a590 removing debugging statements from org-babel-tangle.el, and beefing up test-tangle.org 2009-06-27 13:24:49 -07:00
Eric Schulte 6518065f28 now working with multiple source-blocks 2009-06-27 13:13:37 -07:00
Eric Schulte 5621c105bf removed org-babel-alist-pop 2009-06-27 13:12:30 -07:00
Eric Schulte 50abb08479 misc tweaks 2009-06-27 12:44:12 -07:00
Eric Schulte 760e811c8c org-babel-alist-pop now actually does modify alist 2009-06-27 12:44:05 -07:00
Eric Schulte 0d3952ecf6 inserting links in a comment before source-code blocks 2009-06-27 11:58:13 -07:00
Eric Schulte e05ddae2f7 now requiring cl 2009-06-27 11:58:00 -07:00
Eric Schulte fba47f3651 now able to generate source files (not really tested or complete) 2009-06-26 12:12:23 -07:00
Eric Schulte c09041b785 more fleshing out of writing to file 2009-06-26 11:43:50 -07:00
Eric Schulte e16c896c80 some more work on writing out to files 2009-06-26 10:25:31 -07:00
Eric Schulte 89f4d92829 Merge branch 'master' into tangle 2009-06-26 10:20:17 -07:00
Eric Schulte 2014a95767 now loading utility files before language-specific files 2009-06-26 10:10:29 -07:00
Eric Schulte fed7056833 stubbed out functions for inserting source-blocks into files 2009-06-25 20:17:21 -07:00
Eric Schulte d469181978 org-babel-tangle is collecting blocks by language->session 2009-06-25 20:12:12 -07:00
Eric Schulte 3ab7412410 started on implementation 2009-06-15 15:35:11 -07:00
Eric Schulte 1c1b40636a now using org-babel-tangle-langs to track file extensions and shebang lines 2009-06-15 15:25:46 -07:00
Eric Schulte dd7ba333a7 Library of Babel should only try to ingest named source blocks 2009-06-15 12:55:02 -07:00
Eric Schulte 3920102905 Library of Babel should only try to ingest named source blocks 2009-06-15 12:54:29 -07:00
Eric Schulte 9e5f634135 Merge branch 'master' into tangle 2009-06-15 12:53:00 -07:00
Eric Schulte c678059deb passing all tests 2009-06-15 12:47:10 -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 aa5c9985bd fixed bug in ruby session evaluation 2009-06-15 12:30:36 -07:00