Started wiki mode

Tried with the parsec parsing

4 files changed, 121 insertions, 2 deletions

diff --git a/emacs/.emacs.d/init/ycp-prog.el b/emacs/.emacs.d/init/ycp-prog.el
index 12522f4..b7db188 100644
--- a/emacs/.emacs.d/init/ycp-prog.el
+++ b/emacs/.emacs.d/init/ycp-prog.el
@@ -70,6 +70,9 @@
   (:delay 5)
   (setq sh-basic-offset 2)
   (add-to-list 'auto-mode-alist '("PKGBUILD" . sh-mode))
+  (require 'executable)
+  (add-hook 'after-save-hook
+            #'executable-make-buffer-file-executable-if-script-p)
   )
 
 (my-package gud
@@ -442,10 +445,14 @@
                  '(haskell-mode . haskell))
     (add-to-list 'tree-sitter-major-mode-language-alist
                  '(phps-mode . php))
+    (add-to-list 'tree-sitter-major-mode-language-alist
+                 '(wiki-mode . wiki))
     ;; disable tree sitter for c/c++ and use eglot instead
     ;; FIXME: make it so it is only disabled with eglot on
     (add-to-list 'tree-sitter-major-mode-language-alist
                  '(c-mode))
+    (add-to-list 'tree-sitter-major-mode-language-alist
+                 '(c++-mode))
     (global-tree-sitter-mode)
     (add-hook 'tree-sitter-after-on-hook #'tree-sitter-hl-mode)))
 
diff --git a/emacs/.emacs.d/lisp/my/my-mediawiki.el b/emacs/.emacs.d/lisp/my/my-mediawiki.el
new file mode 100644
index 0000000..309bc40
--- /dev/null
+++ b/emacs/.emacs.d/lisp/my/my-mediawiki.el
@@ -0,0 +1,38 @@
+;;; my-mediawiki.el -- A mediawiki client -*- lexical-binding: t -*-
+
+;; Copyright (C) 2023 Free Software Foundation.
+
+;; Author: Yuchen Pei <id@ypei.org>
+;; Package-Requires: ((emacs "28.2"))
+
+;; This file is part of dotted.
+
+;; dotted is free software: you can redistribute it and/or modify it under
+;; the terms of the GNU Affero General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; dotted 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 Affero General
+;; Public License for more details.
+
+;; You should have received a copy of the GNU Affero General Public
+;; License along with dotted.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; A mediawiki client.
+
+;;; Code:
+
+(defun my-mediawiki-fetch-wiki (host path)
+  (my-fetch-url (format "%s%s?action=raw" host path))
+  )
+
+(defun my-mediawiki-fetch-wiki-url (url)
+  (interactive)
+  (my-fetch-url (format "%s?action=raw" url)))
+
+(provide 'my-mediawiki)
+;;; my-mediawiki.el ends here
diff --git a/emacs/.emacs.d/lisp/my/my-wikipedia.el b/emacs/.emacs.d/lisp/my/my-wikipedia.el
index 557c553..a97d20c 100644
--- a/emacs/.emacs.d/lisp/my/my-wikipedia.el
+++ b/emacs/.emacs.d/lisp/my/my-wikipedia.el
@@ -30,6 +30,7 @@
 (require 'my-utils)
 (require 'my-markup)
 (require 'my-net)
+(require 'my-mediawiki)
 
 ;; TODO: much of these can be generalised to any mediawiki site
 (defvar my-wikipedia-lang "en")
@@ -165,7 +166,7 @@
                        my-wikipedia-host
                        (alist-get 'title info))))
 
-(defun my-wikipedia-fetch-wiki ()
+(defun my-wikipedia-fetch-wiki-at-point ()
   (interactive)
   (my-fetch-url (format "/wiki/%s?action=raw"
                         my-wikipedia-host
@@ -175,7 +176,7 @@
 (defvar my-wikipedia-button-keymap
   (let ((kmap (make-sparse-keymap)))
     (set-keymap-parent kmap button-map)
-    (define-key kmap "f" 'my-wikipedia-fetch-wiki)
+    (define-key kmap "f" 'my-wikipedia-fetch-wiki-at-point)
     kmap))
 
 (provide 'my-wikipedia)
diff --git a/emacs/.emacs.d/lisp/my/wiki.el b/emacs/.emacs.d/lisp/my/wiki.el
new file mode 100644
index 0000000..0ef52e3
--- /dev/null
+++ b/emacs/.emacs.d/lisp/my/wiki.el
@@ -0,0 +1,73 @@
+;;; wiki.el -- A wikitext mode -*- lexical-binding: t -*-
+
+;; Copyright (C) 2023 Free Software Foundation.
+
+;; Author: Yuchen Pei <id@ypei.org>
+;; Package-Requires: ((emacs "28.2"))
+
+;; This file is part of dotted.
+
+;; dotted is free software: you can redistribute it and/or modify it under
+;; the terms of the GNU Affero General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; dotted 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 Affero General
+;; Public License for more details.
+
+;; You should have received a copy of the GNU Affero General Public
+;; License along with dotted.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; A wikitext mode.
+
+;;; Code:
+(require 'parsec)
+
+(defun wiki-file ()
+  (parsec-many (wiki-block)))
+
+(defun wiki-block ()
+  (parsec-or (wiki-header)))
+
+(defun wiki-header ()
+  (let* ((marker (parsec-many-s (parsec-ch ?=)))
+         (raw-content
+          (string-trim
+           (parsec-many-till-s
+            (parsec-none-of ?\n)
+            (parsec-try
+             (parsec-and
+               (parsec-str marker)
+               (wiki-header-end)))))))
+    (list 'Header
+          (length marker)
+          (parsec-with-input raw-content
+            (wiki-inlines)))))
+
+(defun wiki-header-end ()
+  (parsec-and
+    (parsec-many (wiki-space))
+    (parsec-eol-or-eof)))
+
+(defun wiki-space ()
+  (parsec-one-of ?\s ?\t))
+
+(defun wiki-inlines ()
+  (parsec-many (wiki-inline)))
+
+(defun wiki-inline ()
+  (parsec-or (wiki-plain)))
+
+(defun wiki-plain ()
+  (list 'Plain (parsec-many1-as-string (parsec-any-ch))))
+
+(define-derived-mode wiki-mode text-mode "Wiki"
+  "A wikitext mode.")
+
+(provide 'wiki)
+;;; wiki.el ends here
+