Escape quotes for python, cpp; Remove unused c/c++ option

Author: bergercookie

doc/debugstring.txt

@@ -42,11 +42,6 @@ To add a logging statement either use the default normal mode mapping
 
   * nmap <a-second-key-combination> <Plug>DumpDebugStringExpr
 
-                                            *g:debugstringAlwaysIncludeHeader*
-Set this to false if you want to print just the logging statement without any
-additional directive like '#include <stsdio.h' Applicable only in libraries
-that the logging directive is part of an external library
-
 
 ==============================================================================
 COMMANDS                                                *debugstring-commands*

ftplugin/c.vim

@@ -4,12 +4,6 @@ endif
 
 function! s:DebugStringFunBase(desc, var)
     let l:debug_str = "printf(\"" . a:desc . "%d\\n\", " . a:var . ");"
-
-    if g:debugstringAlwaysIncludeHeader
-        let l:incStr = '#include <stdio.h>; '
-        let l:debug_str = l:incStr . l:debug_str
-    endif
-
     return l:debug_str
 endfunc
 

ftplugin/cpp.vim

@@ -1,17 +1,18 @@
 let g:debugstring_loaded_cpp_vim = 1
 
 function! s:DebugStringFunBase(desc, var)
-    let l:debug_str = 'std::cout << "' . a:desc
+    " Escape quotes in description
+    let l:desc = a:desc
+    if stridx('"', l:desc)
+        let l:desc = substitute(l:desc, '"', '\\"', "g")
+    endif
+
+    let l:debug_str = 'std::cout << "' . l:desc
                 \ . '" << '
                 \ . a:var
                 \ . ' << '
                 \ . 'std::endl;'
 
-    if g:debugstringAlwaysIncludeHeader
-        let l:incStr = '#include <iostream>; '
-        let l:debug_str = l:incStr . l:debug_str
-    endif
-
     return l:debug_str
 endfunc
 

ftplugin/python.vim

@@ -1,5 +1,11 @@
 function! s:DebugStringFunBase(desc, var)
-    let l:debug_str = 'print("' . a:desc . '", ' . a:var . ')'
+    " Escape quotes in description
+    let l:desc = a:desc
+    if stridx('"', l:desc)
+        let l:desc = substitute(l:desc, '"', '\\"', "g")
+    endif
+
+    let l:debug_str = 'print("' . l:desc . '", ' . a:var . ')'
     return l:debug_str
 endfunc
 

plugin/debugstring.vim

@@ -138,14 +138,6 @@ if !hasmapto('<Plug>DumpDebugStringCexpr')
     nmap <unique> <Leader>DS  <Plug>DumpDebugStringCexpr
 endif
 
-""
-" Set this to false if you want to print just the logging statement without any
-" additional directive like '#include <stsdio.h'
-" Applicable only in libraries that the logging directive is part of an external
-" library
-"
-let g:debugstringAlwaysIncludeHeader = 0 " Include Header in place?
-
 ""
 " Wrapper around the low-level debug* methods.
 " It also takes care of incrementing the g:debugCounter

test/basic.vader

@@ -74,3 +74,5 @@ Execute (Lua):
   :set filetype=lua
 
 ================================================================================
+
+# vim: ft=vader