2010-06-11 23:02:42 +00:00
|
|
|
;;; ob-C.el --- org-babel functions for C and similar languages
|
2010-03-26 19:16:56 +00:00
|
|
|
|
2014-01-07 13:18:17 +00:00
|
|
|
;; Copyright (C) 2010-2014 Free Software Foundation, Inc.
|
2010-03-26 19:16:56 +00:00
|
|
|
|
2013-12-20 18:15:57 +00:00
|
|
|
;; Author: Eric Schulte, Thierry Banel
|
2010-03-26 19:16:56 +00:00
|
|
|
;; Keywords: literate programming, reproducible research
|
|
|
|
;; Homepage: http://orgmode.org
|
|
|
|
|
2010-06-25 16:32:35 +00:00
|
|
|
;; This file is part of GNU Emacs.
|
2010-03-26 19:16:56 +00:00
|
|
|
|
2010-06-25 16:32:35 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2010-03-26 19:16:56 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2010-06-25 16:32:35 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
2010-03-26 19:16:56 +00:00
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;; GNU General Public License for more details.
|
2010-06-25 16:32:35 +00:00
|
|
|
|
2010-03-26 19:16:56 +00:00
|
|
|
;; You should have received a copy of the GNU General Public License
|
2010-06-25 16:32:35 +00:00
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
2010-03-26 19:16:56 +00:00
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
2013-12-20 18:15:57 +00:00
|
|
|
;; Org-Babel support for evaluating C, C++, D code.
|
2010-03-26 19:16:56 +00:00
|
|
|
;;
|
|
|
|
;; very limited implementation:
|
|
|
|
;; - currently only support :results output
|
|
|
|
;; - not much in the way of error feedback
|
|
|
|
|
|
|
|
;;; Code:
|
2010-06-11 23:02:42 +00:00
|
|
|
(require 'ob)
|
2010-03-26 19:16:56 +00:00
|
|
|
(require 'cc-mode)
|
ob-C, ob-clojure, ob-tangle, org-agenda, org, ox: fix byte-compiler warnings
* lisp/ob-C.el, lisp/ob-clojure.e: Require 'cl at compile-time.
* lisp/ob-tangle.el: Do not require 'cl at compile time.
* lisp/org-agenda.el: Declare function `org-columns-remove-overlays´.
* lisp/org.el: Declare functions `org-clocktable-shift´,
`org-clock-update-time-maybe´, `org-clock-remove-overlays´,
`org-babel-tangle-file´, `org-table-blank-field´,
`org-table-insert-row´, `org-add-archive-files´, `org-table-begin´,
`org-table-end´. Move defsubst `org-uniquify´ before its many uses.
* lisp/ox.el: Move defsubst `org-export-get-parent´ before its many
uses.
2013-11-15 19:18:58 +00:00
|
|
|
(eval-when-compile
|
|
|
|
(require 'cl))
|
2010-03-26 19:16:56 +00:00
|
|
|
|
2010-07-03 02:21:31 +00:00
|
|
|
(declare-function org-entry-get "org"
|
|
|
|
(pom property &optional inherit literal-nil))
|
2013-11-24 00:00:24 +00:00
|
|
|
(declare-function org-remove-indentation "org" (code &optional n))
|
2011-06-21 22:34:41 +00:00
|
|
|
|
|
|
|
(defvar org-babel-tangle-lang-exts)
|
2011-02-23 04:20:26 +00:00
|
|
|
(add-to-list 'org-babel-tangle-lang-exts '("C++" . "cpp"))
|
2013-12-20 18:15:57 +00:00
|
|
|
(add-to-list 'org-babel-tangle-lang-exts '("D" . "d"))
|
2010-06-17 17:21:14 +00:00
|
|
|
|
2010-06-25 17:12:54 +00:00
|
|
|
(defvar org-babel-default-header-args:C '())
|
|
|
|
|
2010-03-26 19:16:56 +00:00
|
|
|
(defvar org-babel-C-compiler "gcc"
|
|
|
|
"Command used to compile a C source code file into an
|
2013-06-06 17:49:03 +00:00
|
|
|
executable.")
|
2010-03-26 19:16:56 +00:00
|
|
|
|
2011-02-23 04:20:26 +00:00
|
|
|
(defvar org-babel-C++-compiler "g++"
|
|
|
|
"Command used to compile a C++ source code file into an
|
2013-06-06 17:49:03 +00:00
|
|
|
executable.")
|
2010-03-27 00:52:16 +00:00
|
|
|
|
2013-12-20 18:15:57 +00:00
|
|
|
(defvar org-babel-D-compiler "rdmd"
|
|
|
|
"Command used to compile and execute a D source code file.")
|
|
|
|
|
2010-06-25 17:26:48 +00:00
|
|
|
(defvar org-babel-c-variant nil
|
2013-12-20 18:15:57 +00:00
|
|
|
"Internal variable used to hold which type of C (e.g. C or C++ or D)
|
2010-06-25 17:26:48 +00:00
|
|
|
is currently being evaluated.")
|
|
|
|
|
2010-03-26 19:16:56 +00:00
|
|
|
(defun org-babel-execute:cpp (body params)
|
2013-06-06 17:49:03 +00:00
|
|
|
"Execute BODY according to PARAMS.
|
|
|
|
This function calls `org-babel-execute:C++'."
|
2011-02-23 04:20:26 +00:00
|
|
|
(org-babel-execute:C++ body params))
|
2010-03-26 19:16:56 +00:00
|
|
|
|
2011-02-23 04:20:26 +00:00
|
|
|
(defun org-babel-execute:C++ (body params)
|
2013-06-06 17:49:03 +00:00
|
|
|
"Execute a block of C++ code with org-babel.
|
|
|
|
This function is called by `org-babel-execute-src-block'."
|
2010-06-25 17:26:48 +00:00
|
|
|
(let ((org-babel-c-variant 'cpp)) (org-babel-C-execute body params)))
|
2010-03-26 19:16:56 +00:00
|
|
|
|
2013-12-20 18:15:57 +00:00
|
|
|
;;(defun org-babel-expand-body:C++ (body params) ;; unused
|
|
|
|
;; "Expand a block of C++ code with org-babel according to it's
|
|
|
|
;;header arguments (calls `org-babel-C-expand')."
|
|
|
|
;; (let ((org-babel-c-variant 'cpp)) (org-babel-C-expand body params)))
|
|
|
|
|
|
|
|
(defun org-babel-execute:D (body params)
|
|
|
|
"Execute a block of D code with org-babel.
|
|
|
|
This function is called by `org-babel-execute-src-block'."
|
|
|
|
(let ((org-babel-c-variant 'd)) (org-babel-C-execute body params)))
|
|
|
|
|
|
|
|
;; (defun org-babel-expand-body:D (body params) ;; unused
|
|
|
|
;; "Expand a block of D code with org-babel according to it's
|
|
|
|
;;header arguments (calls `org-babel-C-expand')."
|
|
|
|
;; (let ((org-babel-c-variant 'd)) (org-babel-C-expand body params)))
|
2010-04-11 20:29:02 +00:00
|
|
|
|
2010-03-26 19:16:56 +00:00
|
|
|
(defun org-babel-execute:C (body params)
|
2013-06-06 17:49:03 +00:00
|
|
|
"Execute a block of C code with org-babel.
|
|
|
|
This function is called by `org-babel-execute-src-block'."
|
2010-06-25 17:26:48 +00:00
|
|
|
(let ((org-babel-c-variant 'c)) (org-babel-C-execute body params)))
|
2010-03-27 00:52:16 +00:00
|
|
|
|
2013-12-20 18:15:57 +00:00
|
|
|
;; (defun org-babel-expand-body:c (body params) ;; unused
|
|
|
|
;; "Expand a block of C code with org-babel according to it's
|
|
|
|
;;header arguments (calls `org-babel-C-expand')."
|
|
|
|
;; (let ((org-babel-c-variant 'c)) (org-babel-C-expand body params)))
|
2010-04-11 20:29:02 +00:00
|
|
|
|
2010-03-27 00:52:16 +00:00
|
|
|
(defun org-babel-C-execute (body params)
|
2010-06-12 00:12:15 +00:00
|
|
|
"This function should only be called by `org-babel-execute:C'
|
2013-12-20 18:15:57 +00:00
|
|
|
or `org-babel-execute:C++' or `org-babel-execute:D'."
|
2010-10-21 11:52:24 +00:00
|
|
|
(let* ((tmp-src-file (org-babel-temp-file
|
2010-08-26 01:21:42 +00:00
|
|
|
"C-src-"
|
|
|
|
(cond
|
2013-12-20 18:15:57 +00:00
|
|
|
((equal org-babel-c-variant 'c ) ".c" )
|
|
|
|
((equal org-babel-c-variant 'cpp) ".cpp")
|
|
|
|
((equal org-babel-c-variant 'd ) ".d" ))))
|
|
|
|
(tmp-bin-file (org-babel-temp-file "C-bin-" org-babel-exeext)) ;; not used for D
|
|
|
|
(cmdline (cdr (assoc :cmdline params)))
|
|
|
|
(cmdline (if cmdline (concat " " cmdline) ""))
|
|
|
|
(flags (cdr (assoc :flags params)))
|
|
|
|
(flags (mapconcat 'identity
|
|
|
|
(if (listp flags) flags (list flags)) " "))
|
|
|
|
(full-body
|
|
|
|
(cond ((equal org-babel-c-variant 'c ) (org-babel-C-expand-C body params))
|
|
|
|
((equal org-babel-c-variant 'cpp) (org-babel-C-expand-C++ body params))
|
|
|
|
((equal org-babel-c-variant 'd ) (org-babel-C-expand-D body params)))))
|
|
|
|
(with-temp-file tmp-src-file (insert full-body))
|
|
|
|
(if (memq org-babel-c-variant '(c cpp)) ;; no separate compilation for D
|
|
|
|
(org-babel-eval
|
|
|
|
(format "%s -o %s %s %s"
|
|
|
|
(cond
|
|
|
|
((equal org-babel-c-variant 'c ) org-babel-C-compiler)
|
|
|
|
((equal org-babel-c-variant 'cpp) org-babel-C++-compiler))
|
|
|
|
(org-babel-process-file-name tmp-bin-file)
|
|
|
|
flags
|
|
|
|
(org-babel-process-file-name tmp-src-file)) ""))
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 19:57:31 +00:00
|
|
|
(let ((results
|
2013-12-20 18:15:57 +00:00
|
|
|
(org-babel-trim
|
2013-11-23 22:57:29 +00:00
|
|
|
(org-remove-indentation
|
|
|
|
(org-babel-eval
|
2013-12-20 18:15:57 +00:00
|
|
|
(cond ((memq org-babel-c-variant '(c cpp))
|
|
|
|
(concat tmp-bin-file cmdline))
|
|
|
|
((equal org-babel-c-variant 'd)
|
|
|
|
(format "%s %s %s %s"
|
|
|
|
org-babel-D-compiler
|
|
|
|
flags
|
|
|
|
(org-babel-process-file-name tmp-src-file)
|
|
|
|
cmdline)))
|
|
|
|
"")))))
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 19:57:31 +00:00
|
|
|
(org-babel-reassemble-table
|
|
|
|
(org-babel-result-cond (cdr (assoc :result-params params))
|
2013-11-12 20:11:23 +00:00
|
|
|
(org-babel-read results t)
|
2013-12-20 18:15:57 +00:00
|
|
|
(let ((tmp-file (org-babel-temp-file "c-")))
|
|
|
|
(with-temp-file tmp-file (insert results))
|
|
|
|
(org-babel-import-elisp-from-file tmp-file)))
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 19:57:31 +00:00
|
|
|
(org-babel-pick-name
|
2013-12-20 18:15:57 +00:00
|
|
|
(cdr (assoc :colname-names params)) (cdr (assoc :colnames params)))
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 19:57:31 +00:00
|
|
|
(org-babel-pick-name
|
2013-12-20 18:15:57 +00:00
|
|
|
(cdr (assoc :rowname-names params)) (cdr (assoc :rownames params)))))
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 19:57:31 +00:00
|
|
|
))
|
2010-03-26 23:12:43 +00:00
|
|
|
|
2013-12-20 18:15:57 +00:00
|
|
|
(defun org-babel-C-expand-C++ (body params)
|
|
|
|
"Expand a block of C or C++ code with org-babel according to
|
|
|
|
it's header arguments."
|
|
|
|
(org-babel-C-expand-C body params))
|
|
|
|
|
|
|
|
(defun org-babel-C-expand-C (body params)
|
2010-04-11 20:29:02 +00:00
|
|
|
"Expand a block of C or C++ code with org-babel according to
|
|
|
|
it's header arguments."
|
2010-10-16 03:35:45 +00:00
|
|
|
(let ((vars (mapcar #'cdr (org-babel-get-header params :var)))
|
2013-12-20 18:15:57 +00:00
|
|
|
(main-p (not (string= (cdr (assoc :main params)) "no")))
|
|
|
|
(includes (or (cdr (assoc :includes params))
|
|
|
|
(org-babel-read (org-entry-get nil "includes" t))))
|
|
|
|
(defines (org-babel-read
|
|
|
|
(or (cdr (assoc :defines params))
|
|
|
|
(org-babel-read (org-entry-get nil "defines" t))))))
|
2012-08-11 17:10:44 +00:00
|
|
|
(mapconcat 'identity
|
|
|
|
(list
|
|
|
|
;; includes
|
|
|
|
(mapconcat
|
|
|
|
(lambda (inc) (format "#include %s" inc))
|
|
|
|
(if (listp includes) includes (list includes)) "\n")
|
|
|
|
;; defines
|
|
|
|
(mapconcat
|
|
|
|
(lambda (inc) (format "#define %s" inc))
|
|
|
|
(if (listp defines) defines (list defines)) "\n")
|
|
|
|
;; variables
|
|
|
|
(mapconcat 'org-babel-C-var-to-C vars "\n")
|
|
|
|
;; body
|
|
|
|
(if main-p
|
|
|
|
(org-babel-C-ensure-main-wrap body)
|
|
|
|
body) "\n") "\n")))
|
2010-04-11 20:29:02 +00:00
|
|
|
|
2013-12-20 18:15:57 +00:00
|
|
|
(defun org-babel-C-expand-D (body params)
|
|
|
|
"Expand a block of D code with org-babel according to
|
|
|
|
it's header arguments."
|
|
|
|
(let ((vars (mapcar #'cdr (org-babel-get-header params :var)))
|
|
|
|
(main-p (not (string= (cdr (assoc :main params)) "no")))
|
|
|
|
(imports (or (cdr (assoc :imports params))
|
|
|
|
(org-babel-read (org-entry-get nil "imports" t)))))
|
|
|
|
(mapconcat 'identity
|
|
|
|
(list
|
|
|
|
"module mmm;"
|
|
|
|
;; imports
|
|
|
|
(mapconcat
|
|
|
|
(lambda (inc) (format "import %s;" inc))
|
|
|
|
(if (listp imports) imports (list imports)) "\n")
|
|
|
|
;; variables
|
|
|
|
(mapconcat 'org-babel-C-var-to-C vars "\n")
|
|
|
|
;; body
|
|
|
|
(if main-p
|
|
|
|
(org-babel-C-ensure-main-wrap body)
|
|
|
|
body) "\n") "\n")))
|
|
|
|
|
2010-03-26 23:12:43 +00:00
|
|
|
(defun org-babel-C-ensure-main-wrap (body)
|
2013-06-06 17:49:03 +00:00
|
|
|
"Wrap BODY in a \"main\" function call if none exists."
|
2010-07-25 18:32:48 +00:00
|
|
|
(if (string-match "^[ \t]*[intvod]+[ \t\n\r]*main[ \t]*(.*)" body)
|
2010-03-26 23:12:43 +00:00
|
|
|
body
|
2013-06-06 17:49:03 +00:00
|
|
|
(format "int main() {\n%s\nreturn 0;\n}\n" body)))
|
2010-03-26 19:16:56 +00:00
|
|
|
|
|
|
|
(defun org-babel-prep-session:C (session params)
|
2010-06-12 00:12:15 +00:00
|
|
|
"This function does nothing as C is a compiled language with no
|
|
|
|
support for sessions"
|
2010-03-26 19:16:56 +00:00
|
|
|
(error "C is a compiled languages -- no support for sessions"))
|
|
|
|
|
|
|
|
(defun org-babel-load-session:C (session body params)
|
2010-06-12 00:12:15 +00:00
|
|
|
"This function does nothing as C is a compiled language with no
|
|
|
|
support for sessions"
|
2010-03-26 19:16:56 +00:00
|
|
|
(error "C is a compiled languages -- no support for sessions"))
|
|
|
|
|
|
|
|
;; helper functions
|
|
|
|
|
2013-06-06 17:49:03 +00:00
|
|
|
(defun org-babel-C-format-val (type val)
|
|
|
|
"Handle the FORMAT part of TYPE with the data from VAL."
|
|
|
|
(let ((format-data (cadr type)))
|
|
|
|
(if (stringp format-data)
|
|
|
|
(cons "" (format format-data val))
|
|
|
|
(funcall format-data val))))
|
|
|
|
|
|
|
|
(defun org-babel-C-val-to-C-type (val)
|
|
|
|
"Determine the type of VAL.
|
|
|
|
Return a list (TYPE-NAME FORMAT). TYPE-NAME should be the name of the type.
|
|
|
|
FORMAT can be either a format string or a function which is called with VAL."
|
|
|
|
(cond
|
|
|
|
((integerp val) '("int" "%d"))
|
|
|
|
((floatp val) '("double" "%f"))
|
|
|
|
((or (listp val) (vectorp val))
|
|
|
|
(lexical-let ((type (org-babel-C-val-to-C-list-type val)))
|
|
|
|
(list (car type)
|
|
|
|
(lambda (val)
|
|
|
|
(cons
|
|
|
|
(format "[%d]%s"
|
|
|
|
(length val)
|
|
|
|
(car (org-babel-C-format-val type (elt val 0))))
|
2013-12-20 18:15:57 +00:00
|
|
|
(concat (if (equal org-babel-c-variant 'd) "[ " "{ ")
|
2013-06-06 17:49:03 +00:00
|
|
|
(mapconcat (lambda (v)
|
|
|
|
(cdr (org-babel-C-format-val type v)))
|
|
|
|
val
|
|
|
|
", ")
|
2013-12-20 18:15:57 +00:00
|
|
|
(if (equal org-babel-c-variant 'd) " ]" " }")))))))
|
2013-06-06 17:49:03 +00:00
|
|
|
(t ;; treat unknown types as string
|
2013-12-20 18:15:57 +00:00
|
|
|
(list
|
|
|
|
(if (equal org-babel-c-variant 'd) "string" "const char*")
|
|
|
|
"\"%s\""))))
|
2013-06-06 17:49:03 +00:00
|
|
|
|
|
|
|
(defun org-babel-C-val-to-C-list-type (val)
|
|
|
|
"Determine the C array type of a VAL."
|
|
|
|
(let (type)
|
|
|
|
(mapc
|
|
|
|
#'(lambda (i)
|
|
|
|
(let* ((tmp-type (org-babel-C-val-to-C-type i))
|
|
|
|
(type-name (car type))
|
|
|
|
(tmp-type-name (car tmp-type)))
|
|
|
|
(when (and type (not (string= type-name tmp-type-name)))
|
|
|
|
(if (and (member type-name '("int" "double" "int32_t"))
|
|
|
|
(member tmp-type-name '("int" "double" "int32_t")))
|
2014-03-27 18:27:03 +00:00
|
|
|
(setq tmp-type '("double" "%f"))
|
2013-06-06 17:49:03 +00:00
|
|
|
(error "Only homogeneous lists are supported by C. You can not mix %s and %s"
|
|
|
|
type-name
|
|
|
|
tmp-type-name)))
|
|
|
|
(setq type tmp-type)))
|
|
|
|
val)
|
|
|
|
type))
|
|
|
|
|
2010-03-26 19:16:56 +00:00
|
|
|
(defun org-babel-C-var-to-C (pair)
|
|
|
|
"Convert an elisp val into a string of C code specifying a var
|
2010-06-12 00:12:15 +00:00
|
|
|
of the same value."
|
|
|
|
;; TODO list support
|
2010-03-27 14:20:38 +00:00
|
|
|
(let ((var (car pair))
|
2013-12-20 18:15:57 +00:00
|
|
|
(val (cdr pair)))
|
2010-03-27 14:20:38 +00:00
|
|
|
(when (symbolp val)
|
|
|
|
(setq val (symbol-name val))
|
|
|
|
(when (= (length val) 1)
|
2013-12-20 18:15:57 +00:00
|
|
|
(setq val (string-to-char val))))
|
2013-06-06 17:49:03 +00:00
|
|
|
(let* ((type-data (org-babel-C-val-to-C-type val))
|
|
|
|
(type (car type-data))
|
|
|
|
(formated (org-babel-C-format-val type-data val))
|
|
|
|
(suffix (car formated))
|
|
|
|
(data (cdr formated)))
|
|
|
|
(format "%s %s%s = %s;"
|
|
|
|
type
|
|
|
|
var
|
|
|
|
suffix
|
|
|
|
data))))
|
2010-03-26 19:16:56 +00:00
|
|
|
|
2010-06-11 23:02:42 +00:00
|
|
|
(provide 'ob-C)
|
2010-06-25 16:32:35 +00:00
|
|
|
|
2010-06-11 23:02:42 +00:00
|
|
|
;;; ob-C.el ends here
|