From ff14ea0097350b6066da3d49e52f4fa75195e02e Mon Sep 17 00:00:00 2001
From: Timothy Sample <samplet@ngyro.com>
Date: Wed, 17 Oct 2018 14:40:38 -0400
Subject: [PATCH] Rename '<sh-define>' to '<sh-defun>' and simplify

This change is already in the syntax document.

* geesh/parser.scm (make-parser): Rename '<sh-define>' to '<sh-defun>'
and use the function name directly instead of making it a singleton
list.
* tests/parser.scm: Update tests.
* .dir-locals.el: Update indentation.
---
 .dir-locals.el   | 2 +-
 geesh/parser.scm | 2 +-
 tests/parser.scm | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.dir-locals.el b/.dir-locals.el
index f96ab13..2f08f9a 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -1,7 +1,7 @@
 ((scheme-mode
   .
   ((eval . (put '<sh-case> 'scheme-indent-function 1))
-   (eval . (put '<sh-define> 'scheme-indent-function 1))
+   (eval . (put '<sh-defun> 'scheme-indent-function 1))
    (eval . (put '<sh-exec-let> 'scheme-indent-function 1))
    (eval . (put '<sh-for> 'scheme-indent-function 1))
    (eval . (put '<sh-until> 'scheme-indent-function 1))
diff --git a/geesh/parser.scm b/geesh/parser.scm
index 246b0a1..8cc5891 100644
--- a/geesh/parser.scm
+++ b/geesh/parser.scm
@@ -444,7 +444,7 @@ the same number of times.)"
 
    (function-definition
     (fname LPAREN! RPAREN! linebreak function-body)
-    : `(<sh-define> (,$1) ,$5))
+    : `(<sh-defun> ,$1 ,$5))
 
    (function-body
     (compound-command)
diff --git a/tests/parser.scm b/tests/parser.scm
index 11730f4..aa54a0b 100644
--- a/tests/parser.scm
+++ b/tests/parser.scm
@@ -304,7 +304,7 @@
 ;; Functions
 
 (test-equal "Parses functions"
-  '(<sh-define> ("foo")
+  '(<sh-defun> "foo"
      (<sh-exec> "echo" "foo"))
   (parse "foo() { echo foo; }"))