Add expression support for C/C++

Author: bergercookie

README.md

@@ -51,8 +51,8 @@ std::cout << "[a.c:4] a_variable: " << a_variable << std::endl;
 
 Lang       | Debug String       | Debug Variable
 ---        | ---                | ---
-C          | :heavy_check_mark: | :x:
-C++        | :heavy_check_mark: | :x:
+C          | :heavy_check_mark: | :heavy_check_mark:
+C++        | :heavy_check_mark: | :heavy_check_mark:
 CMake      | :heavy_check_mark: | :heavy_check_mark:
 Fortran    | :heavy_check_mark: | :x:
 Haskell    | :heavy_check_mark: | :heavy_check_mark:
@@ -152,6 +152,6 @@ vim.org](https://vim.sourceforge.io/scripts/script.php?script_id=5634)
 - [ ] Use travis for CI
 - [x] Bug with changing the filename of the current file
 - [x] Make vim-repeat dependency optional
-- [ ] Turn supported languages into a table - what do we support in which
-    language?
+- [x] Turn supported languages into a table - what do we support in which
+    language
 - [x] Make vim-repeat dependency optional

ftplugin/c.vim

@@ -2,11 +2,18 @@ if exists('g:debugstring_loaded_cpp_vim')
   finish
 endif
 
-let g:path = fnamemodify(resolve(expand('<sfile>:p')), ':h')
-execute 'source ' . g:path . '/common/c_like.vim'
+function! s:DebugStringFunBase(desc, var)
+    let l:debug_str = "printf(\"" . a:desc . "%d\\n\", " . a:var . ");"
 
-function! s:DebugStringFun()
-    return DebugStringFunC()
+    if g:debugstringAlwaysIncludeHeader
+        let l:incStr = '#include <stdio.h>; '
+        let l:debug_str = l:incStr . l:debug_str
+    endif
+
+    return l:debug_str
 endfunc
 
-command! -buffer -nargs=0 AddDebugString put=s:DebugStringFun()
+command! -buffer -nargs=0 AddDebugString
+            \ put=s:DebugStringFunBase(g:DebugstringPrefixStr(), g:debugStringCounter)
+command! -buffer -nargs=1 AddDebugStringExpr
+            \ put=s:DebugStringFunBase(<args> . ': ', <args>)

ftplugin/common/c_like.vim

@@ -1,16 +1,9 @@
 let g:debugstring_loaded_cpp_vim = 1
 
-let g:path = fnamemodify(resolve(expand('<sfile>:p')), ':h')
-execute 'source ' . g:path . '/common/c_like.vim'
-
-function! s:DebugStringFun()
-    return DebugStringFunC()
-endfunc
-
-function! s:DebugStringFunExpr(expr)
-    let l:debug_str = 'std::cout << "' . g:DebugstringPrefixStr()
-                \ . a:expr . '"' . ' << '
-                \ . a:expr
+function! s:DebugStringFunBase(desc, var)
+    let l:debug_str = 'std::cout << "' . a:desc
+                \ . '" << '
+                \ . a:var
                 \ . ' << '
                 \ . 'std::endl;'
 
@@ -22,6 +15,7 @@ function! s:DebugStringFunExpr(expr)
     return l:debug_str
 endfunc
 
-command! -buffer -nargs=0 AddDebugString :put=s:DebugStringFun()
-command! -buffer -nargs=1 AddDebugStringExpr :put=s:DebugStringFunExpr(<args>)
-
+command! -buffer -nargs=0 AddDebugString
+            \ put=s:DebugStringFunBase(g:DebugstringPrefixStr(), g:debugStringCounter)
+command! -buffer -nargs=1 AddDebugStringExpr
+            \ put=s:DebugStringFunBase(<args> . ': ', <args>)

ftplugin/cpp.vim

@@ -4,6 +4,7 @@
 
 
 
+" TODO: Rewrite these instructions
 ""
 " @section Introduction, intro
 "
@@ -80,7 +81,8 @@ let s:modes = {
 let g:debugStringCounter = 0
 let g:debugStringCounterStep = 1
 
-" By default debugging lines should be of the form <directive_to_print> " <prefix_string><debug_number>
+" By default debugging lines should be of the form
+" <directive_to_print> <prefix_string><debug_number>
 function! g:DebugstringPrefixStr()
   let l:debug_str = '[' . fnamemodify(bufname('%'), ':t') . ':'
   if getline('.') =~# '^$' " Empty line