From 36070dd429af69f1042f4ee56488a960c4d8e7ef Mon Sep 17 00:00:00 2001
From: Maxime Coste <frrrwww@gmail.com>
Date: Tue, 31 Jul 2012 14:22:57 +0200
Subject: CommandManager: rework command parser

a new type of strings is supported inspired by the ruby strings.
%<delimiter>content<delimiter>, if opening delimiter is one of
([{<, then closing delimiter is the matching )]}> and balanced
delimiters in the string needs not to be escaped, else the closing
delimiter is the same as the opening one.

shell expansion is available through %sh<delimiter>command<delimiter>
syntax.

Command flags have been removed, as these strings provide proper nesting
support, so now, you can for example do:

def command %{ echo %sh{ ls } }
---
 src/rc/cpp.kak | 45 +++++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 20 deletions(-)

(limited to 'src/rc/cpp.kak')

diff --git a/src/rc/cpp.kak b/src/rc/cpp.kak
index 82b9e9bf..f3e4dec9 100644
--- a/src/rc/cpp.kak
+++ b/src/rc/cpp.kak
@@ -1,29 +1,33 @@
-hook global BufCreate .*\.(c|cc|cpp|cxx|C|h|hh|hpp|hxx|H) \
+hook global BufCreate .*\.(c|cc|cpp|cxx|C|h|hh|hpp|hxx|H) %{
     setb filetype cpp
+}
 
-hook global WinSetOption filetype=cpp \
-    addhl group cpp-highlight; \
-    addhl -group cpp-highlight regex "\<(this|true|false|NULL|nullptr|)\>|\<-?\d+[fdiu]?|'((\\.)?|[^'\\])'" red default; \
-    addhl -group cpp-highlight regex "\<(void|int|char|unsigned|float|bool|size_t)\>" yellow default; \
-    addhl -group cpp-highlight regex "\<(while|for|if|else|do|switch|case|default|goto|break|continue|return|using|try|catch|throw|new|delete|and|or|not)\>" blue default; \
-    addhl -group cpp-highlight regex "\<(const|auto|namespace|inline|static|volatile|class|struct|enum|union|public|protected|private|template|typedef|virtual|friend|extern|typename)\>" green default; \
-    addhl -group cpp-highlight regex "(?<!')\"(\\\"|[^\"])*\"" magenta default; \
-    addhl -group cpp-highlight regex "(\`|(?<=\n))\h*#\h*[^\n]*" magenta default; \
-    addhl -group cpp-highlight regex "(//[^\n]*\n)|(/\*.*?(\*/|\'))" cyan default; \
-    addfilter group cpp-filters; \
-    addfilter -group cpp-filters preserve_indent; \
-    addfilter -group cpp-filters cleanup_whitespaces; \
-    hook window InsertEnd .* exec xs\h+(?=\n)<ret>d
+hook global WinSetOption filetype=cpp %{
+    addhl group cpp-highlight;
+    addhl -group cpp-highlight regex "\<(this|true|false|NULL|nullptr|)\>|\<-?\d+[fdiu]?|'((\\.)?|[^'\\])'" red default;
+    addhl -group cpp-highlight regex "\<(void|int|char|unsigned|float|bool|size_t)\>" yellow default;
+    addhl -group cpp-highlight regex "\<(while|for|if|else|do|switch|case|default|goto|break|continue|return|using|try|catch|throw|new|delete|and|or|not)\>" blue default;
+    addhl -group cpp-highlight regex "\<(const|auto|namespace|inline|static|volatile|class|struct|enum|union|public|protected|private|template|typedef|virtual|friend|extern|typename)\>" green default;
+    addhl -group cpp-highlight regex "(?<!')\"(\\\"|[^\"])*\"" magenta default;
+    addhl -group cpp-highlight regex "(\`|(?<=\n))\h*#\h*[^\n]*" magenta default;
+    addhl -group cpp-highlight regex "(//[^\n]*\n)|(/\*.*?(\*/|\'))" cyan default;
+    addfilter group cpp-filters;
+    addfilter -group cpp-filters preserve_indent;
+    addfilter -group cpp-filters cleanup_whitespaces;
+    hook window InsertEnd .* %{ exec xs\h+(?=\n)<ret>d }
+}
 
-hook global WinSetOption filetype=(?!cpp).* \
-    rmhl cpp-highlight; \
+hook global WinSetOption filetype=(?!cpp).* %{
+    rmhl cpp-highlight;
     rmfilter cpp-filters
+}
 
-hook global BufNew .*\.(h|hh|hpp|hxx|H) \
+hook global BufNew .*\.(h|hh|hpp|hxx|H) %{
     exec ggi<c-r>%<ret><esc>ggxs\.<ret>c_<esc><space>A_INCLUDED<esc>xyppI#ifndef<space><esc>jI#define<space><esc>jI#endif<space>//<space><esc>O<esc>
+}
 
-def alt edit \
-    `case ${kak_bufname} in
+def alt %{ edit %sh{
+    case ${kak_bufname} in
          *.c) echo ${kak_bufname/%c/h} ;;
          *.cc) echo ${kak_bufname/%cc/hh} ;;
          *.cpp) echo ${kak_bufname/%cpp/hpp} ;;
@@ -34,4 +38,5 @@ def alt edit \
          *.hpp) echo ${kak_bufname/%hpp/cpp} ;;
          *.hxx) echo ${kak_bufname/%hxx/cxx} ;;
          *.H) echo ${kak_bufname/%H/C} ;;
-    esac` 
\ No newline at end of file
+    esac
+}} 
\ No newline at end of file
-- 
cgit v1.2.3