diff options
Diffstat (limited to 'emacs/.emacs.d/site-lisp')
-rw-r--r-- | emacs/.emacs.d/site-lisp/clang-format.el | 222 | ||||
-rw-r--r-- | emacs/.emacs.d/site-lisp/glsl-mode.el | 451 | ||||
-rw-r--r-- | emacs/.emacs.d/site-lisp/n3-mode.el | 44 | ||||
-rw-r--r-- | emacs/.emacs.d/site-lisp/ppindent.el | 138 | ||||
-rw-r--r-- | emacs/.emacs.d/site-lisp/ttl-mode.el | 209 | ||||
m--------- | emacs/.emacs.d/site-lisp/turtle-mode | 0 |
6 files changed, 673 insertions, 391 deletions
diff --git a/emacs/.emacs.d/site-lisp/clang-format.el b/emacs/.emacs.d/site-lisp/clang-format.el new file mode 100644 index 0000000..4abafcb --- /dev/null +++ b/emacs/.emacs.d/site-lisp/clang-format.el @@ -0,0 +1,222 @@ +;;; clang-format.el --- Format code using clang-format -*- lexical-binding: t; -*- + +;; Keywords: tools, c +;; Package-Version: 20191106.950 +;; Package-Commit: e48ff8ae18dc7ab6118c1f6752deb48cb1fc83ac +;; Package-Requires: ((cl-lib "0.3")) +;; SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception + +;;; Commentary: + +;; This package allows to filter code through clang-format to fix its formatting. +;; clang-format is a tool that formats C/C++/Obj-C code according to a set of +;; style options, see <http://clang.llvm.org/docs/ClangFormatStyleOptions.html>. +;; Note that clang-format 3.4 or newer is required. + +;; clang-format.el is available via MELPA and can be installed via +;; +;; M-x package-install clang-format +;; +;; when ("melpa" . "http://melpa.org/packages/") is included in +;; `package-archives'. Alternatively, ensure the directory of this +;; file is in your `load-path' and add +;; +;; (require 'clang-format) +;; +;; to your .emacs configuration. + +;; You may also want to bind `clang-format-region' to a key: +;; +;; (global-set-key [C-M-tab] 'clang-format-region) + +;;; Code: + +(require 'cl-lib) +(require 'xml) + +(defgroup clang-format nil + "Format code using clang-format." + :group 'tools) + +(defcustom clang-format-executable + (or (executable-find "clang-format") + "clang-format") + "Location of the clang-format executable. + +A string containing the name or the full path of the executable." + :group 'clang-format + :type '(file :must-match t) + :risky t) + +(defcustom clang-format-style nil + "Style argument to pass to clang-format. + +By default clang-format will load the style configuration from +a file named .clang-format located in one of the parent directories +of the buffer." + :group 'clang-format + :type '(choice (string) (const nil)) + :safe #'stringp) +(make-variable-buffer-local 'clang-format-style) + +(defcustom clang-format-fallback-style "none" + "Fallback style to pass to clang-format. + +This style will be used if clang-format-style is set to \"file\" +and no .clang-format is found in the directory of the buffer or +one of parent directories. Set to \"none\" to disable formatting +in such buffers." + :group 'clang-format + :type 'string + :safe #'stringp) +(make-variable-buffer-local 'clang-format-fallback-style) + +(defun clang-format--extract (xml-node) + "Extract replacements and cursor information from XML-NODE." + (unless (and (listp xml-node) (eq (xml-node-name xml-node) 'replacements)) + (error "Expected <replacements> node")) + (let ((nodes (xml-node-children xml-node)) + (incomplete-format (xml-get-attribute xml-node 'incomplete_format)) + replacements + cursor) + (dolist (node nodes) + (when (listp node) + (let* ((children (xml-node-children node)) + (text (car children))) + (cl-case (xml-node-name node) + ('replacement + (let* ((offset (xml-get-attribute-or-nil node 'offset)) + (length (xml-get-attribute-or-nil node 'length))) + (when (or (null offset) (null length)) + (error "<replacement> node does not have offset and length attributes")) + (when (cdr children) + (error "More than one child node in <replacement> node")) + + (setq offset (string-to-number offset)) + (setq length (string-to-number length)) + (push (list offset length text) replacements))) + ('cursor + (setq cursor (string-to-number text))))))) + + ;; Sort by decreasing offset, length. + (setq replacements (sort (delq nil replacements) + (lambda (a b) + (or (> (car a) (car b)) + (and (= (car a) (car b)) + (> (cadr a) (cadr b))))))) + + (list replacements cursor (string= incomplete-format "true")))) + +(defun clang-format--replace (offset length &optional text) + "Replace the region defined by OFFSET and LENGTH with TEXT. +OFFSET and LENGTH are measured in bytes, not characters. OFFSET +is a zero-based file offset, assuming ‘utf-8-unix’ coding." + (let ((start (clang-format--filepos-to-bufferpos offset 'exact 'utf-8-unix)) + (end (clang-format--filepos-to-bufferpos (+ offset length) 'exact + 'utf-8-unix))) + (goto-char start) + (delete-region start end) + (when text + (insert text)))) + +;; ‘bufferpos-to-filepos’ and ‘filepos-to-bufferpos’ are new in Emacs 25.1. +;; Provide fallbacks for older versions. +(defalias 'clang-format--bufferpos-to-filepos + (if (fboundp 'bufferpos-to-filepos) + 'bufferpos-to-filepos + (lambda (position &optional _quality _coding-system) + (1- (position-bytes position))))) + +(defalias 'clang-format--filepos-to-bufferpos + (if (fboundp 'filepos-to-bufferpos) + 'filepos-to-bufferpos + (lambda (byte &optional _quality _coding-system) + (byte-to-position (1+ byte))))) + +;;;###autoload +(defun clang-format-region (start end &optional style assume-file-name) + "Use clang-format to format the code between START and END according to STYLE. +If called interactively uses the region or the current statement if there is no +no active region. If no STYLE is given uses `clang-format-style'. Use +ASSUME-FILE-NAME to locate a style config file, if no ASSUME-FILE-NAME is given +uses the function `buffer-file-name'." + (interactive + (if (use-region-p) + (list (region-beginning) (region-end)) + (list (point) (point)))) + + (unless style + (setq style clang-format-style)) + + (unless assume-file-name + (setq assume-file-name buffer-file-name)) + + (let ((file-start (clang-format--bufferpos-to-filepos start 'approximate + 'utf-8-unix)) + (file-end (clang-format--bufferpos-to-filepos end 'approximate + 'utf-8-unix)) + (cursor (clang-format--bufferpos-to-filepos (point) 'exact 'utf-8-unix)) + (temp-buffer (generate-new-buffer " *clang-format-temp*")) + (temp-file (make-temp-file "clang-format")) + ;; Output is XML, which is always UTF-8. Input encoding should match + ;; the encoding used to convert between buffer and file positions, + ;; otherwise the offsets calculated above are off. For simplicity, we + ;; always use ‘utf-8-unix’ and ignore the buffer coding system. + (default-process-coding-system '(utf-8-unix . utf-8-unix))) + (unwind-protect + (let ((status (apply #'call-process-region + nil nil clang-format-executable + nil `(,temp-buffer ,temp-file) nil + `("-output-replacements-xml" + ;; Guard against a nil assume-file-name. + ;; If the clang-format option -assume-filename + ;; is given a blank string it will crash as per + ;; the following bug report + ;; https://bugs.llvm.org/show_bug.cgi?id=34667 + ,@(and assume-file-name + (list "-assume-filename" assume-file-name)) + ,@(and style (list "-style" style)) + "-fallback-style" ,clang-format-fallback-style + "-offset" ,(number-to-string file-start) + "-length" ,(number-to-string (- file-end file-start)) + "-cursor" ,(number-to-string cursor)))) + (stderr (with-temp-buffer + (unless (zerop (cadr (insert-file-contents temp-file))) + (insert ": ")) + (buffer-substring-no-properties + (point-min) (line-end-position))))) + (cond + ((stringp status) + (error "(clang-format killed by signal %s%s)" status stderr)) + ((not (zerop status)) + (error "(clang-format failed with code %d%s)" status stderr))) + + (cl-destructuring-bind (replacements cursor incomplete-format) + (with-current-buffer temp-buffer + (clang-format--extract (car (xml-parse-region)))) + (save-excursion + (dolist (rpl replacements) + (apply #'clang-format--replace rpl))) + (when cursor + (goto-char (clang-format--filepos-to-bufferpos cursor 'exact + 'utf-8-unix))) + (if incomplete-format + (message "(clang-format: incomplete (syntax errors)%s)" stderr) + (message "(clang-format: success%s)" stderr)))) + (delete-file temp-file) + (when (buffer-name temp-buffer) (kill-buffer temp-buffer))))) + +;;;###autoload +(defun clang-format-buffer (&optional style assume-file-name) + "Use clang-format to format the current buffer according to STYLE. +If no STYLE is given uses `clang-format-style'. Use ASSUME-FILE-NAME +to locate a style config file. If no ASSUME-FILE-NAME is given uses +the function `buffer-file-name'." + (interactive) + (clang-format-region (point-min) (point-max) style assume-file-name)) + +;;;###autoload +(defalias 'clang-format 'clang-format-region) + +(provide 'clang-format) +;;; clang-format.el ends here diff --git a/emacs/.emacs.d/site-lisp/glsl-mode.el b/emacs/.emacs.d/site-lisp/glsl-mode.el new file mode 100644 index 0000000..8068b75 --- /dev/null +++ b/emacs/.emacs.d/site-lisp/glsl-mode.el @@ -0,0 +1,451 @@ +;;; glsl-mode.el --- major mode for Open GLSL shader files + +;; Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc. +;; Copyright (C) 2011, 2014, 2019 Jim Hourihan +;; +;; Authors: Xavier.Decoret@imag.fr, +;; Jim Hourihan <jimhourihan ~at~ gmail.com> (updated for 4.6, etc) +;; Keywords: languages OpenGL GPU SPIR-V Vulkan +;; Version: 2.4 +;; X-URL: https://github.com/jimhourihan/glsl-mode +;; +;; Original X-URL http://artis.inrialpes.fr/~Xavier.Decoret/resources/glsl-mode/ + +;; This file is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 3, or (at your option) +;; any later version. + +;; This file 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 General Public License for more details. + +;; For a full copy of the GNU General Public License +;; see <http://www.gnu.org/licenses/>. + +;;; Commentary: + +;; Major mode for editing OpenGLSL grammar files, usually files ending with +;; `.vert', `.frag', `.glsl', `.geom'. Is is based on c-mode plus some +;; features and pre-specified fontifications. +;; +;; Modifications from the 1.0 version of glsl-mode (jimhourihan): +;; * Removed original optimized regexps for font-lock-keywords and +;; replaced with keyword lists for easier maintenance +;; * Added customization group and faces +;; * Preprocessor faces +;; * Updated to GLSL 4.6 +;; * Separate deprecated symbols +;; * Made _ part of a word +;; * man page lookup at opengl.org + +;; This package provides the following features: +;; * Syntax coloring (via font-lock) for grammar symbols and +;; builtin functions and variables for up to GLSL version 4.6 +;; * Indentation for the current line (TAB) and selected region (C-M-\). +;; * Switching between file.vert and file.frag +;; with S-lefttab (via ff-find-other-file) +;; * interactive function glsl-find-man-page prompts for glsl built +;; in function, formats opengl.org url and passes to browse-url + +;;; Installation: + +;; This file requires Emacs-20.3 or higher and package cc-mode. + +;; If glsl-mode is not part of your distribution, put this file into your +;; load-path and the following into your ~/.emacs: +;; (autoload 'glsl-mode "glsl-mode" nil t) +;; (add-to-list 'auto-mode-alist '("\\.glsl\\'" . glsl-mode)) +;; (add-to-list 'auto-mode-alist '("\\.vert\\'" . glsl-mode)) +;; (add-to-list 'auto-mode-alist '("\\.frag\\'" . glsl-mode)) +;; (add-to-list 'auto-mode-alist '("\\.geom\\'" . glsl-mode)) + +;; Reference: +;; https://www.khronos.org/registry/OpenGL/specs/gl/GLSLangSpec.4.60.pdf + +;;; Code: + +(provide 'glsl-mode) + +(eval-when-compile ; required and optional libraries + (require 'cc-mode) + (require 'find-file)) + +(require 'align) + +(defgroup glsl nil + "OpenGL Shading Language Major Mode" + :group 'languages) + +(defconst glsl-language-version "4.6" + "GLSL language version number.") + +(defconst gl-version "4.6" + "OpenGL major mode version number.") + +(defvar glsl-mode-menu nil "Menu for GLSL mode") + +(defvar glsl-mode-hook nil "GLSL mode hook") + +(defvar glsl-type-face 'glsl-type-face) +(defface glsl-type-face + '((t (:inherit font-lock-type-face))) "glsl: type face" + :group 'glsl) + +(defvar glsl-builtin-face 'glsl-builtin-face) +(defface glsl-builtin-face + '((t (:inherit font-lock-builtin-face))) "glsl: builtin face" + :group 'glsl) + +(defvar glsl-deprecated-builtin-face 'glsl-deprecated-builtin-face) +(defface glsl-deprecated-builtin-face + '((t (:inherit font-lock-warning-face))) "glsl: deprecated builtin face" + :group 'glsl) + +(defvar glsl-qualifier-face 'glsl-qualifier-face) +(defface glsl-qualifier-face + '((t (:inherit font-lock-keyword-face))) "glsl: qualifier face" + :group 'glsl) + +(defvar glsl-keyword-face 'glsl-keyword-face) +(defface glsl-keyword-face + '((t (:inherit font-lock-keyword-face))) "glsl: keyword face" + :group 'glsl) + +(defvar glsl-deprecated-keyword-face 'glsl-deprecated-keyword-face) +(defface glsl-deprecated-keyword-face + '((t (:inherit font-lock-warning-face))) "glsl: deprecated keyword face" + :group 'glsl) + +(defvar glsl-variable-name-face 'glsl-variable-name-face) +(defface glsl-variable-name-face + '((t (:inherit font-lock-variable-name-face))) "glsl: variable face" + :group 'glsl) + +(defvar glsl-deprecated-variable-name-face 'glsl-deprecated-variable-name-face) +(defface glsl-deprecated-variable-name-face + '((t (:inherit font-lock-warning-face))) "glsl: deprecated variable face" + :group 'glsl) + +(defvar glsl-reserved-keyword-face 'glsl-reserved-keyword-face) +(defface glsl-reserved-keyword-face + '((t (:inherit glsl-keyword-face))) "glsl: reserved keyword face" + :group 'glsl) + +(defvar glsl-preprocessor-face 'glsl-preprocessor-face) +(defface glsl-preprocessor-face + '((t (:inherit font-lock-preprocessor-face))) "glsl: preprocessor face" + :group 'glsl) + +(defcustom glsl-additional-types nil + "List of additional keywords to be considered types. These are +added to the `glsl-type-list' and are fontified using the +`glsl-type-face'. Examples of existing types include \"float\", \"vec4\", + and \"int\"." + :type '(repeat (string :tag "Type Name")) + :group 'glsl) + +(defcustom glsl-additional-qualifiers nil + "List of additional keywords to be considered qualifiers. These +are added to the `glsl-qualifier-list' and are fontified using +the `glsl-qualifier-face'. Examples of existing qualifiers +include \"const\", \"in\", and \"out\"." + :type '(repeat (string :tag "Qualifier Name")) + :group 'glsl) + +(defcustom glsl-additional-keywords nil + "List of additional GLSL keywords. These are added to the +`glsl-keyword-list' and are fontified using the +`glsl-keyword-face'. Example existing keywords include \"while\", +\"if\", and \"return\"." + :type '(repeat (string :tag "Keyword")) + :group 'glsl) + +(defcustom glsl-additional-built-ins nil + "List of additional functions to be considered built-in. These +are added to the `glsl-builtin-list' and are fontified using the +`glsl-builtin-face'." + :type '(repeat (string :tag "Keyword")) + :group 'glsl) + +(defvar glsl-mode-hook nil) + +(defvar glsl-mode-map + (let ((glsl-mode-map (make-sparse-keymap))) + (define-key glsl-mode-map [S-iso-lefttab] 'ff-find-other-file) + glsl-mode-map) + "Keymap for GLSL major mode.") + +(defcustom glsl-browse-url-function 'browse-url + "Function used to display GLSL man pages. E.g. browse-url, eww, w3m, etc" + :type 'function + :group 'glsl) + +(defcustom glsl-man-pages-base-url "http://www.opengl.org/sdk/docs/man/html/" + "Location of GL man pages." + :type 'string + :group 'glsl) + +;;;###autoload +(progn + (add-to-list 'auto-mode-alist '("\\.vert\\'" . glsl-mode)) + (add-to-list 'auto-mode-alist '("\\.frag\\'" . glsl-mode)) + (add-to-list 'auto-mode-alist '("\\.geom\\'" . glsl-mode)) + (add-to-list 'auto-mode-alist '("\\.glsl\\'" . glsl-mode))) + +(eval-and-compile + ;; These vars are useful for completion so keep them around after + ;; compile as well. The goal here is to have the byte compiled code + ;; have optimized regexps so its not done at eval time. + (defvar glsl-type-list + '("float" "double" "int" "void" "bool" "true" "false" "mat2" "mat3" + "mat4" "dmat2" "dmat3" "dmat4" "mat2x2" "mat2x3" "mat2x4" "dmat2x2" + "dmat2x3" "dmat2x4" "mat3x2" "mat3x3" "mat3x4" "dmat3x2" "dmat3x3" + "dmat3x4" "mat4x2" "mat4x3" "mat4x4" "dmat4x2" "dmat4x3" "dmat4x4" "vec2" + "vec3" "vec4" "ivec2" "ivec3" "ivec4" "bvec2" "bvec3" "bvec4" "dvec2" + "dvec3" "dvec4" "uint" "uvec2" "uvec3" "uvec4" "atomic_uint" + "sampler1D" "sampler2D" "sampler3D" "samplerCube" "sampler1DShadow" + "sampler2DShadow" "samplerCubeShadow" "sampler1DArray" "sampler2DArray" + "sampler1DArrayShadow" "sampler2DArrayShadow" "isampler1D" "isampler2D" + "isampler3D" "isamplerCube" "isampler1DArray" "isampler2DArray" + "usampler1D" "usampler2D" "usampler3D" "usamplerCube" "usampler1DArray" + "usampler2DArray" "sampler2DRect" "sampler2DRectShadow" "isampler2DRect" + "usampler2DRect" "samplerBuffer" "isamplerBuffer" "usamplerBuffer" + "sampler2DMS" "isampler2DMS" "usampler2DMS" "sampler2DMSArray" + "isampler2DMSArray" "usampler2DMSArray" "samplerCubeArray" + "samplerCubeArrayShadow" "isamplerCubeArray" "usamplerCubeArray" + "image1D" "iimage1D" "uimage1D" "image2D" "iimage2D" "uimage2D" "image3D" + "iimage3D" "uimage3D" "image2DRect" "iimage2DRect" "uimage2DRect" + "imageCube" "iimageCube" "uimageCube" "imageBuffer" "iimageBuffer" + "uimageBuffer" "image1DArray" "iimage1DArray" "uimage1DArray" + "image2DArray" "iimage2DArray" "uimage2DArray" "imageCubeArray" + "iimageCubeArray" "uimageCubeArray" "image2DMS" "iimage2DMS" "uimage2DMS" + "image2DMSArray" "iimage2DMSArray" "uimage2DMSArray")) + + (defvar glsl-qualifier-list + '("attribute" "const" "uniform" "varying" "buffer" "shared" "coherent" + "volatile" "restrict" "readonly" "writeonly" "layout" "centroid" "flat" + "smooth" "noperspective" "patch" "sample" "in" "out" "inout" + "invariant" "lowp" "mediump" "highp")) + + (defvar glsl-keyword-list + '("break" "continue" "do" "for" "while" "if" "else" "subroutine" + "discard" "return" "precision" "struct" "switch" "default" "case")) + + (defvar glsl-reserved-list + '("input" "output" "asm" "class" "union" "enum" "typedef" "template" "this" + "packed" "resource" "goto" "inline" "noinline" + "common" "partition" "active" "long" "short" "half" "fixed" "unsigned" "superp" + "public" "static" "extern" "external" "interface" + "hvec2" "hvec3" "hvec4" "fvec2" "fvec3" "fvec4" + "filter" "sizeof" "cast" "namespace" "using" + "sampler3DRect")) + + (defvar glsl-deprecated-qualifier-list + '("varying" "attribute")) ; centroid is deprecated when used with varying + + (defvar glsl-builtin-list + '("abs" "acos" "acosh" "all" "any" "anyInvocation" "allInvocations" + "allInvocationsEqual" "asin" "asinh" "atan" "atanh" + "atomicAdd" "atomicMin" "atomicMax" "atomicAnd" "atomicOr" + "atomicXor" "atomicExchange" "atomicCompSwap" + "atomicCounter" "atomicCounterDecrement" "atomicCounterIncrement" + "atomicCounterAdd" "atomicCounterSubtract" "atomicCounterMin" + "atomicCounterMax" "atomicCounterAnd" "atomicCounterOr" + "atomicCounterXor" "atomicCounterExchange" "atomicCounterCompSwap" + "barrier" "bitCount" "bitfieldExtract" "bitfieldInsert" "bitfieldReverse" + "ceil" "clamp" "cos" "cosh" "cross" "degrees" "determinant" "dFdx" "dFdy" + "dFdyFine" "dFdxFine" "dFdyCoarse" "dFdxCoarse" "distance" "dot" + "fwidthFine" "fwidthCoarse" + "EmitStreamVertex" "EmitStreamPrimitive" "EmitVertex" "EndPrimitive" + "EndStreamPrimitive" "equal" "exp" "exp2" "faceforward" "findLSB" + "findMSB" "floatBitsToInt" "floatBitsToUint" "floor" "fma" "fract" + "frexp" "fwidth" "greaterThan" "greaterThanEqual" "groupMemoryBarrier" + "imageAtomicAdd" "imageAtomicAnd" "imageAtomicCompSwap" "imageAtomicExchange" + "imageAtomicMax" "imageAtomicMin" "imageAtomicOr" "imageAtomicXor" + "imageLoad" "imageSize" "imageStore" "imulExtended" "intBitsToFloat" + "imageSamples" "interpolateAtCentroid" "interpolateAtOffset" "interpolateAtSample" + "inverse" "inversesqrt" "isinf" "isnan" "ldexp" "length" "lessThan" + "lessThanEqual" "log" "log2" "matrixCompMult" "max" "memoryBarrier" + "memoryBarrierAtomicCounter" "memoryBarrierBuffer" + "memoryBarrierShared" "memoryBarrierImage" "memoryBarrier" + "min" "mix" "mod" "modf" "normalize" "not" "notEqual" "outerProduct" + "packDouble2x32" "packHalf2x16" "packSnorm2x16" "packSnorm4x8" + "packUnorm2x16" "packUnorm4x8" "pow" "radians" "reflect" "refract" + "round" "roundEven" "sign" "sin" "sinh" "smoothstep" "sqrt" "step" "tan" + "tanh" "texelFetch" "texelFetchOffset" "texture" "textureGather" + "textureGatherOffset" "textureGatherOffsets" "textureGrad" "textureSamples" + "textureGradOffset" "textureLod" "textureLodOffset" "textureOffset" + "textureProj" "textureProjGrad" "textureProjGradOffset" "textureProjLod" + "textureProjLodOffset" "textureProjOffset" "textureQueryLevels" "textureQueryLod" + "textureSize" "transpose" "trunc" "uaddCarry" "uintBitsToFloat" + "umulExtended" "unpackDouble2x32" "unpackHalf2x16" "unpackSnorm2x16" + "unpackSnorm4x8" "unpackUnorm2x16" "unpackUnorm4x8" "usubBorrow")) + + (defvar glsl-deprecated-builtin-list + '("noise1" "noise2" "noise3" "noise4" + "texture1D" "texture1DProj" "texture1DLod" "texture1DProjLod" + "texture2D" "texture2DProj" "texture2DLod" "texture2DProjLod" + "texture2DRect" "texture2DRectProj" + "texture3D" "texture3DProj" "texture3DLod" "texture3DProjLod" + "shadow1D" "shadow1DProj" "shadow1DLod" "shadow1DProjLod" + "shadow2D" "shadow2DProj" "shadow2DLod" "shadow2DProjLod" + "textureCube" "textureCubeLod")) + + (defvar glsl-deprecated-variables-list + '("gl_FragColor" "gl_FragData" "gl_MaxVarying" "gl_MaxVaryingFloats" + "gl_MaxVaryingComponents")) + + (defvar glsl-preprocessor-directive-list + '("define" "undef" "if" "ifdef" "ifndef" "else" "elif" "endif" + "error" "pragma" "extension" "version" "line")) + + (defvar glsl-preprocessor-expr-list + '("defined" "##")) + + (defvar glsl-preprocessor-builtin-list + '("__LINE__" "__FILE__" "__VERSION__")) + + ) ; eval-and-compile + +(eval-and-compile + (defun glsl-ppre (re) + (format "\\<\\(%s\\)\\>" (regexp-opt re)))) + +(defvar glsl-font-lock-keywords-1 + (append + (list + (cons (eval-when-compile + (format "^[ \t]*#[ \t]*\\<\\(%s\\)\\>" + (regexp-opt glsl-preprocessor-directive-list))) + glsl-preprocessor-face) + (cons (eval-when-compile + (glsl-ppre glsl-type-list)) + glsl-type-face) + (cons (eval-when-compile + (glsl-ppre glsl-deprecated-qualifier-list)) + glsl-deprecated-keyword-face) + (cons (eval-when-compile + (glsl-ppre glsl-reserved-list)) + glsl-reserved-keyword-face) + (cons (eval-when-compile + (glsl-ppre glsl-qualifier-list)) + glsl-qualifier-face) + (cons (eval-when-compile + (glsl-ppre glsl-keyword-list)) + glsl-keyword-face) + (cons (eval-when-compile + (glsl-ppre glsl-preprocessor-builtin-list)) + glsl-keyword-face) + (cons (eval-when-compile + (glsl-ppre glsl-deprecated-builtin-list)) + glsl-deprecated-builtin-face) + (cons (eval-when-compile + (glsl-ppre glsl-builtin-list)) + glsl-builtin-face) + (cons (eval-when-compile + (glsl-ppre glsl-deprecated-variables-list)) + glsl-deprecated-variable-name-face) + (cons "gl_[A-Z][A-Za-z_]+" glsl-variable-name-face) + ) + + (when glsl-additional-types + (list + (cons (glsl-ppre glsl-additional-types) glsl-type-face))) + (when glsl-additional-keywords + (list + (cons (glsl-ppre glsl-additional-keywords) glsl-keyword-face))) + (when glsl-additional-qualifiers + (list + (cons (glsl-ppre glsl-additional-qualifiers) glsl-qualifier-face))) + (when glsl-additional-built-ins + (list + (cons (glsl-ppre glsl-additional-built-ins) glsl-builtin-face))) + ) + "Highlighting expressions for GLSL mode.") + + +(defvar glsl-font-lock-keywords glsl-font-lock-keywords-1 + "Default highlighting expressions for GLSL mode.") + +(defvar glsl-mode-syntax-table + (let ((glsl-mode-syntax-table (make-syntax-table))) + (modify-syntax-entry ?/ ". 124b" glsl-mode-syntax-table) + (modify-syntax-entry ?* ". 23" glsl-mode-syntax-table) + (modify-syntax-entry ?\n "> b" glsl-mode-syntax-table) + (modify-syntax-entry ?_ "w" glsl-mode-syntax-table) + glsl-mode-syntax-table) + "Syntax table for glsl-mode.") + +(defvar glsl-other-file-alist + '(("\\.frag$" (".vert")) + ("\\.vert$" (".frag")) + ) + "Alist of extensions to find given the current file's extension.") + +(defun glsl-man-completion-list () + "Return list of all GLSL keywords." + (append glsl-builtin-list glsl-deprecated-builtin-list)) + +(defun glsl-find-man-page (thing) + "Collects and displays manual entry for GLSL built-in function THING." + (interactive + (let ((word (current-word nil t))) + (list + (completing-read + (concat "OpenGL.org GLSL man page: (" word "): ") + (glsl-man-completion-list) + nil nil nil nil word)))) + (save-excursion + (apply glsl-browse-url-function + (list (concat glsl-man-pages-base-url thing ".xhtml"))))) + +(easy-menu-define glsl-menu glsl-mode-map + "GLSL Menu" + `("GLSL" + ["Comment Out Region" comment-region + (c-fn-region-is-active-p)] + ["Uncomment Region" (comment-region (region-beginning) + (region-end) '(4)) + (c-fn-region-is-active-p)] + ["Indent Expression" c-indent-exp + (memq (char-after) '(?\( ?\[ ?\{))] + ["Indent Line or Region" c-indent-line-or-region t] + ["Fill Comment Paragraph" c-fill-paragraph t] + "----" + ["Backward Statement" c-beginning-of-statement t] + ["Forward Statement" c-end-of-statement t] + "----" + ["Up Conditional" c-up-conditional t] + ["Backward Conditional" c-backward-conditional t] + ["Forward Conditional" c-forward-conditional t] + "----" + ["Backslashify" c-backslash-region (c-fn-region-is-active-p)] + "----" + ["Find GLSL Man Page" glsl-find-man-page t] + )) + +;;;###autoload +(define-derived-mode glsl-mode prog-mode "GLSL" + "Major mode for editing GLSL shader files." + (c-initialize-cc-mode t) + (setq abbrev-mode t) + (c-init-language-vars-for 'c-mode) + (c-common-init 'c-mode) + (cc-imenu-init cc-imenu-c++-generic-expression) + (set (make-local-variable 'font-lock-defaults) '(glsl-font-lock-keywords)) + (set (make-local-variable 'ff-other-file-alist) 'glsl-other-file-alist) + (set (make-local-variable 'comment-start) "// ") + (set (make-local-variable 'comment-end) "") + (set (make-local-variable 'comment-padding) "") + (easy-menu-add glsl-menu) + (add-to-list 'align-c++-modes 'glsl-mode) + (c-run-mode-hooks 'c-mode-common-hook) + (run-mode-hooks 'glsl-mode-hook) + :after-hook (progn (c-make-noise-macro-regexps) + (c-make-macro-with-semi-re) + (c-update-modeline)) + ) + +;;; glsl-mode.el ends here diff --git a/emacs/.emacs.d/site-lisp/n3-mode.el b/emacs/.emacs.d/site-lisp/n3-mode.el deleted file mode 100644 index 8beced6..0000000 --- a/emacs/.emacs.d/site-lisp/n3-mode.el +++ /dev/null @@ -1,44 +0,0 @@ -;;; n3-mode.el --- mode for Notation 3 -; $Id: n3-mode.el 4084 2007-12-15 17:10:13Z hugoh $ - -;; Copyright (c) 2003-2007 Hugo Haas <hugo@larve.net> - -;; For documentation on Notation 3, see: -;; http://www.w3.org/DesignIssues/Notation3.html - -;;; Comentary: - -;; Goals: -;; - sytax highlighting -;; - completion -;; - indentation - -;; What it does now: -;; - Syntax highlighting - -;;; Code: - -(require 'generic) - -(define-generic-mode 'n3-mode - ;; comment char - (list "# ") - ;; keywords - (list "this" "a") - ;; additional font-lock'ing - '(("\\(@prefix\\)\\>" 1 font-lock-keyword-face t) - ("\\(\\S-*?:\\)" 1 font-lock-type-face t) - (":\\(\\S-+?\\)\\>" 1 font-lock-constant-face t) - ("\\(<.*?>\\)" 1 font-lock-function-name-face t) - ("\\(\\\".*?\\\"\\)" 1 font-lock-string-face t) -; Bug: some trailing characters are highlighted; restricting comments regexp -; ("\\(#.*\\)" 1 font-lock-comment-face t) - ("^\\s-*\\(#.*\\)" 1 font-lock-comment-face t) - ) - ;; auto-mode - (list "\\.n3$") - ;; additional setup - nil - ;; description - "Mode for Notation 3 documents." - ) diff --git a/emacs/.emacs.d/site-lisp/ppindent.el b/emacs/.emacs.d/site-lisp/ppindent.el deleted file mode 100644 index 84c9702..0000000 --- a/emacs/.emacs.d/site-lisp/ppindent.el +++ /dev/null @@ -1,138 +0,0 @@ -;;; ppindent.el --- Indents C preprocessor directives - -;; Copyright (C) 2007 Free Software Foundation, Inc. - -;; Author: Craig McDaniel <craigmcd@gmail.com> -;; Keywords: languages, c -;; Maintainer: Craig McDaniel <craigmcd@gmail.com> - -;; This file is free software; you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 2, or (at your option) -;; any later version. - -;; This file 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 General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to -;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. - -;;; Commentary: - -;; PPINDENT indents C-preprocessor statements depending on the current -;; #if..., #el.., #endif level. It only modifies lines with "#" as the -;; first non-blank character and therefore does not conflict with the -;; normal C indentation. Unlike a true indent, it inserts the -;; requisite number of spaces after, rather than before the "#" -;; character. This type of preprocesor indent is commonly used to -;; provide the most compatibility with different C-compilers. -;; -;; Example: - -;; #ifdef WOO -;; .... -;; #if defined(X) && !defined(Y) -;; #ifdef Q8 -;; ... -;; #else -;; ... -;; .... -;; #elif defined (Z) -;; .... -;; #endif -;; #endif -;; #endif - -;; After "M-x ppindent-c" becomes: - -;; #ifdef WOO -;; .... -;; # if defined(X) && !defined(Y) -;; # ifdef Q8 -;; ... -;; # else -;; ... -;; .... -;; # elif defined (Z) -;; .... -;; # endif -;; # endif -;; #endif - -;; Two functions are provided: PPINDENT-C indents as described -;; above. PPINDENT-H does not indent the first level, assuming that -;; .h/.hpp files use an #ifdef guard around the entire file. - -;; You can customize PPINDENT-INCREMENT if you want to use something -;; other than 2 spaces for the indent. - -;;; History: - -;; 2007-01-19 WCM Initial version - -;;; Code: - -(provide 'ppindent) - -(defgroup pp-indent nil - "Indent C preproccessor directives." - :group 'c) - -(defcustom ppindent-increment 2 - "Number of spaces per indention level. - -Used in C pre-processor indent functions ppindent-c and ppindent-h" - :type 'number - :group 'pp-indent) - -(defun starts-withp (str prefix) - "str starts with prefix" - (eql (compare-strings prefix nil nil str nil (length prefix)) t)) - -(defun my-make-string (length init) - "just like make-string, but makes an empty string if length is negative" - (when (minusp length) - (setf length 0)) - (make-string length init)) - -(defun ppindent-aux (start) - (let ((cnt start)) - (goto-char (point-min)) - (while (re-search-forward "^[ \t]*#[ \t]*\\(.*\\)" nil t) - (cond ((starts-withp (match-string-no-properties 1) "if") - (replace-match (concat "#" (my-make-string cnt ?\s) "\\1")) - (incf cnt ppindent-increment)) - ((starts-withp (match-string-no-properties 1) "el") - (when (< (- cnt ppindent-increment) start) - (throw 'err `(,(line-number-at-pos) "Unmatched #else or #elif"))) - (replace-match (concat "#" (my-make-string - (- cnt ppindent-increment) - ?\s) "\\1"))) - ((starts-withp (match-string-no-properties 1) "endif") - (when (< (- cnt ppindent-increment) start) - (throw 'err `(,(line-number-at-pos) "Unmatched #endif"))) - (decf cnt ppindent-increment) - (replace-match (concat "#" (my-make-string cnt ?\s) "\\1"))) - (t - (replace-match (concat "#" (my-make-string cnt ?\s) "\\1"))))))) - -(defun ppindent-buffer (start) - (let ((result (catch 'err (save-excursion (ppindent-aux start))))) - (when result - (goto-line (car result)) - (error "Error: %s" (cadr result))))) - -(defun ppindent-c () - "Indent all C pre-processor statements" - (interactive) - (ppindent-buffer 0)) - -(defun ppindent-h () - "Indent C pre-processor statements, keeping first level #ifdef unindented" - (interactive) - (ppindent-buffer (- ppindent-increment))) - diff --git a/emacs/.emacs.d/site-lisp/ttl-mode.el b/emacs/.emacs.d/site-lisp/ttl-mode.el deleted file mode 100644 index ee147de..0000000 --- a/emacs/.emacs.d/site-lisp/ttl-mode.el +++ /dev/null @@ -1,209 +0,0 @@ -;;; ttl-mode.el --- mode for Turtle(RDF) -;; Based on n3-mode.el --- mode for Notation 3, -;; at http://larve.net/people/hugo/2003/scratchpad/NotationThreeEmacsMode.html -;; Also draws on http://dishevelled.net/elisp/turtle-mode.el (which is for the _other_ turtle!) - -;; Copyright (c) 2003-2007 Hugo Haas <hugo@larve.net> -;; Extended 2011-2012, by Norman Gray <http://nxg.me.uk> -;; -;; See Hugo's commentary for original goals and further discussion. - -;; Project hosted at <https://bitbucket.org/nxg/ttl-mode>. See there for updates. - -;; To use: -;; -;; (autoload 'ttl-mode "ttl-mode" "Major mode for OWL or Turtle files" t) -;; (add-hook 'ttl-mode-hook ; Turn on font lock when in ttl mode -;; 'turn-on-font-lock) -;; (setq auto-mode-alist -;; (append -;; (list -;; '("\\.n3" . ttl-mode) -;; '("\\.ttl" . ttl-mode)) -;; auto-mode-alist)) - -;;; Code: - -(require 'generic) - -(define-generic-mode 'ttl - ;; comment char - (list "# ") - ;; keywords - (list "this" "a") - ;; additional font-lock'ing - '(("\\(@prefix\\)\\>" 1 font-lock-keyword-face t) ;keywords - ("\\^\\^[^,;.]+" 0 font-lock-preprocessor-face t) ;literal types - ("@[[:word:]_]+" 0 font-lock-preprocessor-face t) ;languages - ("\\(\\S-*?:\\)" 1 font-lock-type-face nil) ;prefix - (":\\([[:word:]_-]+\\)\\>" 1 font-lock-constant-face nil) ;suffix - ("\\(<.*?>\\)" 1 font-lock-function-name-face t) ;resources - ("\\(\\\".*?\\\"\\)" 1 font-lock-string-face t) ;strings - ("\\(\\\"\\\"\\\".*?\\\"\\\"\\\"\\)" 1 font-lock-string-face t) ;doesn't work over newlines? -; Bug: some trailing characters are highlighted; restricting comments regexp -; ("\\(#.*\\)" 1 font-lock-comment-face t) - ("^\\s-*\\(#.*\\)" 1 font-lock-comment-face t) ;comment - ) - ;; auto-mode - (list "\\.n3$" "\\.ttl") - ;; additional setup - nil - ;; description - "Mode for Turtle RDF documents." - ) - -(defun ttl-base () - (interactive) - (generic-mode "ttl")) - -(defun ttl-indent-line () - (interactive) - (indent-line-to - (or (ignore-errors (ttl-calculate-indentation)) - 0))) - -(defun ttl-calculate-indentation () - (save-excursion - (beginning-of-line) (skip-chars-forward "\t ") - (cond ((ttl-in-string-p) 8) - ((looking-at "$") - ;; empty line -- use same indentation as previous line - (save-excursion - (forward-line -1) - (skip-chars-forward "\t ") - (current-column))) - ((looking-at "@") 0) ;@prefix or @base - ((looking-at "#") 0) - ((looking-at "<");(looking-at "\\S-+\\s-*$") - ;;only a single expression on the line -- a subject - 0) - ((save-excursion - (forward-line -1) - (end-of-line) - (if (not (looking-back "\\[")) - nil - (beginning-of-line) - (skip-chars-forward "\t ") - (+ (current-column) 4)))) - (t 4)))) - -;; (defun turtle-indent-block () -;; (interactive) -;; (indent-region (point) -;; (save-excursion (forward-xxx) (point)))) - -(defvar ttl-mode-map (make-sparse-keymap)) -(define-derived-mode ttl-mode ttl-base - "Turtle RDF" - (setq indent-tabs-mode t) - (ttl-mode-variables) -; (define-key ttl-mode-map (kbd "C-M-q") -; 'turtle-indent-block) - (define-key ttl-mode-map (kbd "\;") 'ttl-electric-semi) - (define-key ttl-mode-map (kbd "\.") 'ttl-electric-dot) - (define-key ttl-mode-map (kbd "RET") 'newline-and-indent) - (define-key ttl-mode-map [backspace] 'ttl-hungry-delete-backwards) - (use-local-map ttl-mode-map)) - -(defcustom ttl-electric-semi-mode nil - "*If non-nil, `\;' will self insert, reindent the line, and do a newline. -If nil, just insert a `\;'. (To insert while t, do: \\[quoted-insert] \;)." - :group 'ttl - :type 'boolean) - -(defun beginning-of-stanza () - "Find the beginning of a stanza, indicated by non-whitespace at the beginning of a line." - (re-search-backward "^\\S-" (point-min) t)) - -(defun ttl-in-string-p () - "Is point inside a string or a long-string?" - (save-excursion - (let ((here (point)) - (in-p nil)) - (beginning-of-stanza) - (condition-case nil - (progn - (while (<= (point) here) - (if in-p - (progn - (search-forward in-p (point-max) nil) - (setq in-p nil)) - (re-search-forward "\"\\(\"\"\\)?" (point-max) nil) - (if (char-equal (char-before (- (point) 1)) ?\") - (setq in-p "\"\"\"") - (setq in-p "\"")))) - (not in-p)) - (search-failed ;reached EOF - (if in-p ;this indicates that we're inside a string - (message "Unbalanced quotes -- reached EOF inside string") - nil)))))) - -(defun *ttl-search-in-line-for-comment (limit) - "Search for a comment character from the current position, before point LIMIT; changes current position. Return location of comment, or nil if none can be found" - (let ((new-point (re-search-forward "[#<]" limit t))) - (cond ((not new-point) nil) - ((looking-back "#") new-point) ;found comment - (t ;looking-back "<" - (if (not (search-forward ">" limit t)) - nil ;starting point is within resource - (*ttl-search-in-line-for-comment limit)))))) ;recurse - -(defun ttl-in-comment-p () - "Is point inside a comment?" - (save-excursion - (let ((here (point))) - (beginning-of-line) - (*ttl-search-in-line-for-comment here)))) - -(defun ttl-in-resource-p () - "Is point within a resource, marked by <...>?" - (save-excursion - (and (re-search-backward "[<> ]" nil t) - (looking-at "<")))) - -(defun ttl-skip-ws-backwards () ;adapted from cc-mode - "Move backwards across whitespace." - (while (progn - (skip-chars-backward " \t\n\r\f\v") - (and (eolp) - (eq (char-before) ?\\))) - (backward-char))) - -(defun ttl-hungry-delete-backwards () - "Delete backwards, either all of the preceding whitespace, -or a single non-whitespace character if there is no whitespace before point." - (interactive) - (let ((here (point))) - (ttl-skip-ws-backwards) - (if (/= (point) here) - (delete-region (point) here) - (backward-delete-char-untabify 1)))) - -(defun ttl-insulate () - "Return true if this location should not be electrified" - (or (ttl-in-string-p) - (ttl-in-comment-p) - (ttl-in-resource-p))) - -(defun ttl-electric-semi () - "Insert a \;. -If variable `ttl-electric-semi-mode' is t, indent the current line, insert -a newline, and indent." - (interactive) - (insert "\;") - (if (and ttl-electric-semi-mode - (not (ttl-insulate))) - (reindent-then-newline-and-indent))) - -(defun ttl-electric-dot () - "Insert a \.. -If variable `ttl-electric-semi-mode' is t, indent the current line, insert -a newline, and indent." - (interactive) - (insert "\.") - (if (and ttl-electric-semi-mode - (not (ttl-insulate))) - (reindent-then-newline-and-indent))) - -(defun ttl-mode-variables () - (set (make-local-variable 'indent-line-function) 'ttl-indent-line)) diff --git a/emacs/.emacs.d/site-lisp/turtle-mode b/emacs/.emacs.d/site-lisp/turtle-mode new file mode 160000 +Subproject 8eb2ec3fee0a28f3716371c930b04be9cd63981 |