From 14e415b5bad9aa9f252ffe5749b83b1dec20d9ae Mon Sep 17 00:00:00 2001 From: Stefan Huber Date: Tue, 11 Dec 2018 13:28:33 +0100 Subject: [PATCH] macros: Fix indentation --- macros.vim | 106 ++++++++++++++++++++++++++--------------------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/macros.vim b/macros.vim index 08f3d22..55335b1 100644 --- a/macros.vim +++ b/macros.vim @@ -1,19 +1,19 @@ " Tranlate umlauts to tex-syntax umlauts function TexTransUmlaute() - execute ':%s/ü/\\\"u/ge' - execute ':%s/Ü/\\\"U/&' - execute ':%s/ö/\\\"o/&' - execute ':%s/Ö/\\\"O/&' - execute ':%s/ä/\\\"a/&' - execute ':%s/Ä/\\\"A/&' - execute ':%s/ß/\\\"s/&' - execute ':%s/²/\^2/&' + execute ':%s/ü/\\\"u/ge' + execute ':%s/Ü/\\\"U/&' + execute ':%s/ö/\\\"o/&' + execute ':%s/Ö/\\\"O/&' + execute ':%s/ä/\\\"a/&' + execute ':%s/Ä/\\\"A/&' + execute ':%s/ß/\\\"s/&' + execute ':%s/²/\^2/&' endfunction "Open current file with a specific program function OpenIn(prog) - silent execute ":!" . a:prog . " % &" + silent execute ":!" . a:prog . " % &" endfunction @@ -21,68 +21,68 @@ endfunction "those in C/C++ comments. function PrependCppNamespaceToIdent(ns, id) - " To match Not to match - " - "|id |// id - "| id |// /* */ id - "|/* */ /* */ id |/* */ // id - "|id /* */ |/* id - "|*/ id | * id - " |/* id */ - " |::id - " |/**/ ::id - " |#include - " - " In order to not match '* id' it is assumed that multi-line comment lines - " in the middle begin with a star. - - " If #include and // and /* and ^* and :: is not prepend: - execute ':%s@\(\(#include\|\/\/\|\/\*\|^\s*\*[^/]\).*\|::\)\@@' . a:ns . '::' . a:id . '@ge' - " If #include and // and :: is not prepend, but */ is, and no further /* or // are found - execute ':%s@\(\(#include\|\/\/\).*\)\@@' . a:ns . '::' . a:id . '@ge' + " To match Not to match + " + "|id |// id + "| id |// /* */ id + "|/* */ /* */ id |/* */ // id + "|id /* */ |/* id + "|*/ id | * id + " |/* id */ + " |::id + " |/**/ ::id + " |#include + " + " In order to not match '* id' it is assumed that multi-line comment lines + " in the middle begin with a star. + + " If #include and // and /* and ^* and :: is not prepend: + execute ':%s@\(\(#include\|\/\/\|\/\*\|^\s*\*[^/]\).*\|::\)\@@' . a:ns . '::' . a:id . '@ge' + " If #include and // and :: is not prepend, but */ is, and no further /* or // are found + execute ':%s@\(\(#include\|\/\/\).*\)\@@' . a:ns . '::' . a:id . '@ge' endfunction "Prepend STL namespace 'std::' to several identifiers function PrependSTLNamespace() - " This list of identifier is not complete, but adding all of them is too - " much. We rather like to add identifieres that are 'typical' for C++. - " Others, like 'move' are likely to not be C++ specific. In this cases the - " user is asked to call PrependCppNamespaceToIdent by hand. - let id = [] - let id = id +['cin', 'cout', 'cerr', 'endl'] - let id = id +['swap', 'sort', 'max', 'min'] - let id = id +['vector', 'deque', 'list', 'map', 'multimap', 'set'] - let id = id +['queue', 'stack', 'priority_queue'] - let id = id +['ostream', 'istream', 'sstream'] - let id = id +['pair', 'string'] - - for i in id - call PrependCppNamespaceToIdent("std", i) - endfor + " This list of identifier is not complete, but adding all of them is too + " much. We rather like to add identifieres that are 'typical' for C++. + " Others, like 'move' are likely to not be C++ specific. In this cases the + " user is asked to call PrependCppNamespaceToIdent by hand. + let id = [] + let id = id +['cin', 'cout', 'cerr', 'endl'] + let id = id +['swap', 'sort', 'max', 'min'] + let id = id +['vector', 'deque', 'list', 'map', 'multimap', 'set'] + let id = id +['queue', 'stack', 'priority_queue'] + let id = id +['ostream', 'istream', 'sstream'] + let id = id +['pair', 'string'] + + for i in id + call PrependCppNamespaceToIdent("std", i) + endfor endfunction function EscapeHexToChar() - echo 'Call "x/Nxb addr" in GDB to print N bytes at addr' - execute '%s/^.*://' - execute '%s/\s*0x\(\x\x\)/\\x\1/g' - execute '%s/^\(.*\)$/"\1"/' + echo 'Call "x/Nxb addr" in GDB to print N bytes at addr' + execute '%s/^.*://' + execute '%s/\s*0x\(\x\x\)/\\x\1/g' + execute '%s/^\(.*\)$/"\1"/' endfunction function InsertIncludeGuardsWithoutEndif() - let gatename = substitute(expand("%:t"), "\\.", "_", "g") . '_' . strpart(system('pwgen -c 16 1'), 0, 16) - execute "normal! i#ifndef " . gatename - execute "normal! o#define " . gatename + let gatename = substitute(expand("%:t"), "\\.", "_", "g") . '_' . strpart(system('pwgen -c 16 1'), 0, 16) + execute "normal! i#ifndef " . gatename + execute "normal! o#define " . gatename endfunction function AddIncludeGuards() - execute "normal! Go#endif" - execute "normal! gg" - call InsertIncludeGuardsWithoutEndif() + execute "normal! Go#endif" + execute "normal! gg" + call InsertIncludeGuardsWithoutEndif() endfunction -- 2.30.2