From d3499573ef817ce737f924f4641dade14e6233fd Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Mon, 24 Mar 2014 22:34:08 -0400
Subject: Break down NumPy yasnippets

Make individual snippets for the parameters and returns headings.
---
 snippets/python-mode/numpyclass        | 32 --------------------------------
 snippets/python-mode/numpyfunc         | 34 ----------------------------------
 snippets/python-mode/numpymethod       | 30 ------------------------------
 snippets/python-mode/parameter-item    |  7 +++++++
 snippets/python-mode/parameters-header |  7 +++++++
 snippets/python-mode/returns-header    |  7 +++++++
 6 files changed, 21 insertions(+), 96 deletions(-)
 delete mode 100644 snippets/python-mode/numpyclass
 delete mode 100644 snippets/python-mode/numpyfunc
 delete mode 100644 snippets/python-mode/numpymethod
 create mode 100644 snippets/python-mode/parameter-item
 create mode 100644 snippets/python-mode/parameters-header
 create mode 100644 snippets/python-mode/returns-header

(limited to 'snippets')

diff --git a/snippets/python-mode/numpyclass b/snippets/python-mode/numpyclass
deleted file mode 100644
index ce619cc..0000000
--- a/snippets/python-mode/numpyclass
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- coding: utf-8 -*-
-# name: numpy class
-# key: classn
-# --
-class ${1:ClassName}(${2:object}):
-    """$3
-    $0${4:$
-    (let* ((indent
-            (concat "\n" (make-string (current-column) 32)))
-           (args
-            (mapconcat
-             '(lambda (x)
-                (if (not (string= (nth 0 x) ""))
-                    (concat "  " (nth 0 x) " : ")))
-             (mapcar
-              '(lambda (x)
-                 (mapcar
-                  (lambda (x)
-                    (replace-regexp-in-string "[[:blank:]]*$" ""
-                     (replace-regexp-in-string "^[[:blank:]]*" "" x))) x))
-              (mapcar '(lambda (x) (split-string x "="))
-                      (split-string text ",")))
-             indent)))
-      (mapconcat
-       'identity
-       (list "" "Parameters" "----------" args)
-       indent))
-    }
-
-    """
-
-    def __init__(self, $4):
diff --git a/snippets/python-mode/numpyfunc b/snippets/python-mode/numpyfunc
deleted file mode 100644
index 9ed7666..0000000
--- a/snippets/python-mode/numpyfunc
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- coding: utf-8 -*-
-# name: numpy definition
-# key: defn
-# --
-def ${1:name}($2):
-    """$3
-    $0${2:$
-    (let* ((indent
-        (concat "\n" (make-string (current-column) 32)))
-           (args
-        (mapconcat
-         '(lambda (x)
-            (if (not (string= (nth 0 x) ""))
-                (concat "  " (nth 0 x) " : ")))
-         (mapcar
-          '(lambda (x)
-             (mapcar
-              '(lambda (x)
-                 (replace-regexp-in-string "[[:blank:]]*$" ""
-                                           (replace-regexp-in-string "^[[:blank:]]*" "" x)))
-              x))
-          (mapcar '(lambda (x) (split-string x "="))
-                  (split-string text ",")))
-         indent)))
-      (mapconcat
-       'identity
-       (list "" "Parameters" "----------" args)
-       indent))
-    }
-
-    Returns
-    -------
-
-    """
\ No newline at end of file
diff --git a/snippets/python-mode/numpymethod b/snippets/python-mode/numpymethod
deleted file mode 100644
index 9f448a9..0000000
--- a/snippets/python-mode/numpymethod
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-# name: numpy method
-# key: defmn
-# --
-def ${1:name}(self, $2):
-    """$3
-    $0${2:$
-    (let* ((indent
-        (concat "\n" (make-string (current-column) 32)))
-           (args
-        (mapconcat
-         '(lambda (x)
-            (if (not (string= (nth 0 x) ""))
-                (concat "  " (nth 0 x) " : ")))
-         (mapcar
-          '(lambda (x)
-             (mapcar
-              '(lambda (x)
-                 (replace-regexp-in-string "[[:blank:]]*$" ""
-                                           (replace-regexp-in-string "^[[:blank:]]*" "" x)))
-              x))
-          (mapcar '(lambda (x) (split-string x "="))
-                  (split-string text ",")))
-         indent)))
-      (mapconcat
-       'identity
-       (list "" "Parameters" "----------" args)
-       indent))
-    }
-    """
\ No newline at end of file
diff --git a/snippets/python-mode/parameter-item b/snippets/python-mode/parameter-item
new file mode 100644
index 0000000..296059f
--- /dev/null
+++ b/snippets/python-mode/parameter-item
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: parameter item
+# key: par
+# expand-env: ((yas-indent-line 'fixed))
+# --
+${1:param} : ${2:type}
+    $0
diff --git a/snippets/python-mode/parameters-header b/snippets/python-mode/parameters-header
new file mode 100644
index 0000000..74311d1
--- /dev/null
+++ b/snippets/python-mode/parameters-header
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: parameters header
+# key: ph
+# --
+Parameters
+----------
+$0
diff --git a/snippets/python-mode/returns-header b/snippets/python-mode/returns-header
new file mode 100644
index 0000000..713f69b
--- /dev/null
+++ b/snippets/python-mode/returns-header
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: Returns header
+# key: rh
+# --
+Returns
+-------
+$0
-- 
cgit v1.2.3