feat(fortran): generalised build options for menu

Specifically for when compilation is done through the modeline's Easy
Menu, the commands will use `fpm` or `gfortran` dynamically depending on
whether the current file is present in a project or not.
This commit is contained in:
Colin Woodbury 2022-03-06 12:05:12 -08:00 committed by Henrik Lissner
parent 5c52ba35e7
commit 137fca35d8
2 changed files with 35 additions and 5 deletions

View file

@ -1,5 +1,28 @@
;;; lang/fortran/autoload.el -*- lexical-binding: t; -*- ;;; lang/fortran/autoload.el -*- lexical-binding: t; -*-
;;
;;; Generalised Building
;;;###autoload
(defun +fortran/build ()
"Compile a Fortran project or file.
If the current file is detected to be within an fpm project,
then building will occur with fpm. Otherwise it will default to gfortran."
(interactive)
(if (+fortran--fpm-toml)
(+fortran/fpm-build)
(+fortran/gfortran-compile)))
;;;###autoload
(defun +fortran/run ()
"Run a Fortran project or file.
If the current file is detected to be within an fpm project,
then building will occur with fpm. Otherwise it will default to gfortran."
(interactive)
(if (+fortran--fpm-toml)
(+fortran/fpm-run)
(+fortran/gfortran-run)))
;; ;;
;;; GFortran ;;; GFortran
@ -32,10 +55,17 @@
(sleep-for 1)) (sleep-for 1))
(compile "./a.out")) (compile "./a.out"))
;; ;;
;;; FPM ;;; FPM
;;;###autoload
(defun +fortran--fpm-toml ()
"If this is an fpm project, find its toml file."
(when-let* ((project-root (doom-project-root))
(toml (expand-file-name "fpm.toml" project-root)))
(when (file-exists-p toml)
toml)))
;;;###autoload ;;;###autoload
(defun +fortran/fpm-build () (defun +fortran/fpm-build ()
"Build the current project using fpm." "Build the current project using fpm."

View file

@ -29,10 +29,10 @@
:desc "run (gfortran)" "r" #'+fortran/gfortran-run) :desc "run (gfortran)" "r" #'+fortran/gfortran-run)
(easy-menu-define f90-menu f90-mode-map "Simpler menu for F90 mode." (easy-menu-define f90-menu f90-mode-map "Simpler menu for F90 mode."
'("F90" `("F90"
["Compile" +fortran/fpm-build :active t :help "Compile with FPM"] ["Compile" +fortran/build :active t :help "Compile the Project"]
["Run" +fortran/fpm-run :active t :help "Run the Executable"] ["Run" +fortran/run :active t :help "Run the Executable"]
["Test" +fortran/fpm-test :active t :help "Run the Unit Tests"]))) ["Test" +fortran/fpm-test :active (+fortran--fpm-toml) :help "Run the Unit Tests"])))
(use-package! fortran (use-package! fortran
;; The `.for' extension is automatically recognized by Emacs and invokes ;; The `.for' extension is automatically recognized by Emacs and invokes