Re: [O] [org-babel] a patch with fortran support

2011-07-20 Thread Bastien
Hi Sergey,

Sergey Litvinov slitvi...@gmail.com writes:

 Please consider an implementation of fortran support for
 org-babel. The patch adds contrib/babel/langs/ob-fortran.el
 (modification of lisp/ob-C.el) and
 testing/examples/ob-fortran-test.org with tests.

FWIW: this patch has already been applied: I guess there are some delays
wrt mailing list delivery.

-- 
 Bastien



[O] [org-babel] a patch with fortran support

2011-07-19 Thread Sergey Litvinov
Please consider an implementation of fortran support for
org-babel. The patch adds contrib/babel/langs/ob-fortran.el
(modification of lisp/ob-C.el) and
testing/examples/ob-fortran-test.org with tests.
From a18cbc80770d985d6ca6bdada07120f7daf65c02 Mon Sep 17 00:00:00 2001
From: Litvinov Sergey slitvi...@gmail.com
Date: Sun, 17 Jul 2011 15:31:03 +0200
Subject: [PATCH] Add fortran support to babel

---
 contrib/babel/langs/ob-fortran.el|  191 ++
 testing/examples/ob-fortran-test.org |   67 
 2 files changed, 258 insertions(+), 0 deletions(-)
 create mode 100644 contrib/babel/langs/ob-fortran.el
 create mode 100644 testing/examples/ob-fortran-test.org

diff --git a/contrib/babel/langs/ob-fortran.el b/contrib/babel/langs/ob-fortran.el
new file mode 100644
index 000..bb6948f
--- /dev/null
+++ b/contrib/babel/langs/ob-fortran.el
@@ -0,0 +1,191 @@
+;;; ob-fortran.el --- org-babel functions for fortran
+;; Copyright (C) 2010  Free Software Foundation, Inc.
+
+;; Author: Sergey Litvinov (based on ob-C.el by Eric Schulte)
+;; Keywords: literate programming, reproducible research, fortran
+;; Homepage: http://orgmode.org
+;; Version: 7.6
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; 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,
+;; 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.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see http://www.gnu.org/licenses/.
+
+;;; Commentary:
+
+;; Org-Babel support for evaluating fortran code.
+;;
+
+;;; Code:
+
+;; Org-Babel support for evaluating fortran code.
+;;
+
+(require 'ob)
+(require 'ob-eval)
+(require 'cc-mode)
+
+(declare-function org-entry-get org
+		  (pom property optional inherit literal-nil))
+
+(defvar org-babel-tangle-lang-exts)
+(add-to-list 'org-babel-tangle-lang-exts '(fortran . F90))
+
+(defvar org-babel-default-header-args:fortran '())
+
+(defvar org-babel-fortran-compiler gfortran
+  fortran command used to compile a fortran source code file into an
+  executable.)
+
+(defun org-babel-execute:fortran (body params)
+  Execute BODY according to PARAMS.  This function calls
+`org-babel-execute:fortran'.
+  (org-babel-execute:fortran body params))
+
+(defun org-babel-execute:fortran (body params)
+Execute a block of fortran code with org-babel.  This function is
+called by `org-babel-execute-src-block'.
+  (org-babel-fortran-execute body params))
+
+(defun org-babel-expand-body:fortran (body params)
+  Expand a block of fortran code with org-babel according to it's
+header arguments (calls `org-babel-fortran-expand').
+  (org-babel-fortran-expand body params))
+
+(defun org-babel-execute:fortran (body params)
+  Execute a block of fortran code with org-babel.  This function is
+called by `org-babel-execute-src-block'.
+  (org-babel-fortran-execute body params))
+
+(defun org-babel-expand-body:fortran (body params)
+  Expand a block of fortran code with org-babel according to it's
+header arguments (calls `org-babel-fortran-expand').
+  (org-babel-fortran-expand body params))
+
+(defun org-babel-fortran-execute (body params)
+  This function should only be called by `org-babel-execute:fortran'
+  (let* ((tmp-src-file (org-babel-temp-file
+			fortran-src-
+			.F90))
+ (tmp-bin-file (org-babel-temp-file fortran-bin-))
+ (cmdline (cdr (assoc :cmdline params)))
+ (flags (cdr (assoc :flags params)))
+ (full-body (org-babel-fortran-expand body params))
+ (compile
+	  (progn
+	(with-temp-file tmp-src-file (insert full-body))
+	(org-babel-eval
+	 (format %s -o %s %s %s
+		 org-babel-fortran-compiler
+		 (org-babel-process-file-name tmp-bin-file)
+		 (mapconcat 'identity
+(if (listp flags) flags (list flags))  )
+		 (org-babel-process-file-name tmp-src-file)) 
+((lambda (results)
+   (org-babel-reassemble-table
+	(if (member vector (cdr (assoc :result-params params)))
+	(let ((tmp-file (org-babel-temp-file f-)))
+	  (with-temp-file tmp-file (insert results))
+	  (org-babel-import-elisp-from-file tmp-file))
+	  (org-babel-read results))
+	(org-babel-pick-name
+	 (cdr (assoc :colname-names params)) (cdr (assoc :colnames params)))
+	(org-babel-pick-name
+	 (cdr (assoc :rowname-names params)) (cdr (assoc :rownames params)
+ (org-babel-trim
+   (org-babel-eval
+	(concat tmp-bin-file (if cmdline (concat   cmdline) )) )
+
+(defun org-babel-fortran-expand (body params)
+  Expand a block of fortran or fortran code with org-babel according to
+it's header arguments.

Re: [O] [org-babel] a patch with fortran support

2011-07-19 Thread Eric Schulte
ob-fortran.el is now living in control/babel/langs/ob-fortran.el

Thanks to Sergey for contributing support for a new (well actually very
old) language! -- Eric

Sergey Litvinov slitvi...@gmail.com writes:

 Please consider an implementation of fortran support for
 org-babel. The patch adds contrib/babel/langs/ob-fortran.el
 (modification of lisp/ob-C.el) and
 testing/examples/ob-fortran-test.org with tests.


-- 
Eric Schulte
http://cs.unm.edu/~eschulte/