(c-backward-syntactic-ws)
(point))))
uppercased-package uppercased-class
- capitalized-package capitalized-class)
+ capitalized-package capitalized-class capitalized-parent)
(c-forward-syntactic-ws)
(c-forward-token-2 3)
(setq uppercased-package (split-string
(c-backward-syntactic-ws)
(point)))
"_"))
+ (c-forward-syntactic-ws)
+ (c-forward-token-2)
+ (setq capitalized-parent (gnome-c-snippet--parse-name
+ (buffer-substring (point)
+ (progn
+ (c-forward-token-2)
+ (c-backward-syntactic-ws)
+ (point)))))
(catch 'error
(let ((index 0))
(dolist (uppercased uppercased-package)
(push capitalized capitalized-class)
(setq index (+ index length))))))
(list (nreverse capitalized-package)
- (nreverse capitalized-class)))))
+ (nreverse capitalized-class)
+ capitalized-parent))))
(defun gnome-c-snippet--find-header-buffer ()
(pcase (file-name-extension buffer-file-name)
(symbol-value (intern (format "gnome-c-snippet-%S" symbol)))))))
(defun gnome-c-snippet--guess-name-from-declaration (symbol)
- (when (memq symbol '(package class))
+ (when (memq symbol '(package class parent-package parent-class))
(let ((header-buffer (gnome-c-snippet--find-header-buffer)))
(when header-buffer
(with-current-buffer header-buffer
(when names
(pcase symbol
(`package (car names))
- (`class (nth 1 names)))))))))))
+ (`class (nth 1 names))
+ (`parent-package (list (car (nth 2 names))))
+ (`parent-class (cdr (nth 2 names))))))))))))
(defun gnome-c-snippet--guess-name-from-file-name (symbol)
(when (memq symbol '(package class))
class
parent-package
parent-class
- abstract)
+ abstract
+ code)
(insert "\
-G_DEFINE_" (if abstract "ABSTRACT_" "") "TYPE (" (gnome-c-snippet--format-PackageClass package class) ", "
-(gnome-c-snippet--format-package_class package class) ", " (gnome-c-snippet--format-PACKAGE parent-package) "_TYPE_" (gnome-c-snippet--format-CLASS parent-class) ")
+G_DEFINE_" (if abstract "ABSTRACT_" "") "TYPE" (if code "WITH_CODE" "") " (" (gnome-c-snippet--format-PackageClass package class) ", "
+(gnome-c-snippet--format-package_class package class) ", " (gnome-c-snippet--format-PACKAGE parent-package) "_TYPE_" (gnome-c-snippet--format-CLASS parent-class) (if code ", " "") ")"))
-static void
-" (gnome-c-snippet--format-package_class package class) "_class_init (" (gnome-c-snippet--format-PackageClass package class) "Class *klass)
-{
-}
+(defun gnome-c-snippet-insert-G_DEFINE_TYPE (package
+ class
+ parent-package
+ parent-class)
+ "Insert G_DEFINE_TYPE for PACKAGE and CLASS."
+ (interactive (gnome-c-snippet--read-package-and-class t))
+ (gnome-c-snippet--insert-class-definition package
+ class
+ parent-package
+ parent-class
+ nil
+ nil))
-static void
-" (gnome-c-snippet--format-package_class package class) "_init (" (gnome-c-snippet--format-PackageClass package class) " *self)
-{
-}
-"))
+(defun gnome-c-snippet-insert-G_DEFINE_TYPE_WITH_CODE (package
+ class
+ parent-package
+ parent-class)
+ "Insert G_DEFINE_TYPE_WITH_CODE for PACKAGE and CLASS."
+ (interactive (gnome-c-snippet--read-package-and-class t))
+ (gnome-c-snippet--insert-class-definition package
+ class
+ parent-package
+ parent-class
+ nil
+ t))
-(defun gnome-c-snippet-insert-class-definition (package
- class
- parent-package
- parent-class)
- "Insert class definition for PACKAGE and CLASS."
+(defun gnome-c-snippet-insert-G_DEFINE_ABSTRACT_TYPE (package
+ class
+ parent-package
+ parent-class)
+ "Insert G_DEFINE_ABSTRACT_TYPE for PACKAGE and CLASS."
(interactive (gnome-c-snippet--read-package-and-class t))
(gnome-c-snippet--insert-class-definition package
class
parent-package
parent-class
+ t
nil))
-(defun gnome-c-snippet-insert-abstract-class-definition (package
- class
- parent-package
- parent-class)
- "Insert abstract class definition for PACKAGE and CLASS."
+(defun gnome-c-snippet-insert-G_DEFINE_ABSTRACT_TYPE_WITH_CODE (package
+ class
+ parent-package
+ parent-class)
+ "Insert G_DEFINE_ABSTRACT_TYPE_WITH_CODE for PACKAGE and CLASS."
(interactive (gnome-c-snippet--read-package-and-class t))
(gnome-c-snippet--insert-class-definition package
class
parent-package
parent-class
+ t
t))
(defun gnome-c-snippet-insert-constructor (package class)
")
(indent-region body-start (point))))
+(defun gnome-c-snippet-insert-class-init (package class)
+ "Insert '_class_init' function for PACKAGE and CLASS."
+ (interactive (gnome-c-snippet--read-package-and-class nil))
+ (insert "\
+static void
+" (gnome-c-snippet--format-package_class package class) "_class_init (" (gnome-c-snippet--format-PackageClass package class) "Class *klass)\n")
+ (insert "{
+}
+"))
+
+(defun gnome-c-snippet-insert-init (package class)
+ "Insert '_init' function for PACKAGE and CLASS."
+ (interactive (gnome-c-snippet--read-package-and-class nil))
+ (insert "\
+static void
+" (gnome-c-snippet--format-package_class package class) "_init (" (gnome-c-snippet--format-PackageClass package class) " *self)\n")
+ (insert "{
+}
+"))
+
(defvar gnome-c-snippet-snippet-commands
'(("G_DECLARE_INTERFACE" . gnome-c-snippet-insert-interface-declaration)
("G_DECLARE_FINAL_TYPE" . gnome-c-snippet-insert-final-class-declaration)
("G_DECLARE_DERIVABLE_TYPE" .
gnome-c-snippet-insert-derivable-class-declaration)
("G_DEFINE_INTERFACE" . gnome-c-snippet-insert-interface-definition)
- ("G_DEFINE_TYPE" . gnome-c-snippet-insert-class-definition)
+ ("G_DEFINE_TYPE" . gnome-c-snippet-insert-G_DEFINE_TYPE)
+ ("G_DEFINE_TYPE_WITH_CODE" . gnome-c-snippet-insert-G_DEFINE_TYPE_WITH_CODE)
("G_DEFINE_ABSTRACT_TYPE" .
- gnome-c-snippet-insert-abstract-class-definition)
+ gnome-c-snippet-insert-G_DEFINE_ABSTRACT_TYPE)
+ ("G_DEFINE_ABSTRACT_TYPE_WITH_CODE" .
+ gnome-c-snippet-insert-G_DEFINE_ABSTRACT_TYPE_WITH_CODE)
("GObjectClass.constructor" . gnome-c-snippet-insert-constructor)
("GObjectClass.set_property" . gnome-c-snippet-insert-set_property)
("GObjectClass.get_property" . gnome-c-snippet-insert-get_property)
("GObjectClass.dispatch_properties_changed" .
gnome-c-snippet-insert-dispatch_properties_changed)
("GObjectClass.notify" . gnome-c-snippet-insert-notify)
- ("GObjectClass.constructed" . gnome-c-snippet-insert-constructed)))
+ ("GObjectClass.constructed" . gnome-c-snippet-insert-constructed)
+ ;; Will be overridden by `gnome-c-snippet-insert'.
+ ("_class_init" . gnome-c-snippet-insert-class-init)
+ ;; Will be overridden by `gnome-c-snippet-insert'.
+ ("_init" . gnome-c-snippet-insert-init)))
;;;###autoload
-(defun gnome-c-snippet-insert (snippet)
+(defun gnome-c-snippet-insert (command)
(interactive
- (list (completing-read "Snippet: " gnome-c-snippet-snippet-commands nil t)))
- (let ((entry (assoc snippet gnome-c-snippet-snippet-commands)))
- (unless entry
- (error "Unknown snippet: %s" snippet))
- (call-interactively (cdr entry))))
+ (let ((commands (copy-tree gnome-c-snippet-snippet-commands)))
+ (when (and gnome-c-snippet-package gnome-c-snippet-class)
+ (setcar (assoc "_class_init" commands)
+ (concat (gnome-c-snippet--format-package_class
+ gnome-c-snippet-package gnome-c-snippet-class)
+ "_class_init"))
+ (setcar (assoc "_init" commands)
+ (concat (gnome-c-snippet--format-package_class
+ gnome-c-snippet-package gnome-c-snippet-class)
+ "_init")))
+ (let* ((name (completing-read "Snippet: " commands nil t))
+ (entry (assoc name commands)))
+ (unless entry
+ (error "Unknown snippet: %s" name))
+ (list (cdr entry)))))
+ (call-interactively command))
(provide 'gnome-c-snippet)