Gaze/SpaceVim
1
0
Fork 0
mirror of https://github.com/SpaceVim/SpaceVim.git synced 2025-03-13 02:05:40 +08:00
Code Issues Projects Releases Wiki Activity

Improve c stdin support

Browse Source
This commit is contained in:
Shidong Wang 2019-02-11 10:24:44 +08:00 committed by Wang Shidong
parent 0c8be4f18e
commit 71524080d4
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
autoload/SpaceVim/layers/lang/c.vim
View File

@ -93,7 +93,13 @@ function! SpaceVim#layers#lang#c#config() abort
call SpaceVim#mapping#gd#add('cpp', call SpaceVim#mapping#gd#add('cpp',
\ function('s:go_to_def')) \ function('s:go_to_def'))
" TODO: add stdin suport flex -t lexer.l | gcc -o lexer.o -xc - " TODO: add stdin suport flex -t lexer.l | gcc -o lexer.o -xc -
call SpaceVim#plugins#runner#reg_runner('c', ['gcc -o #TEMP# %s', '#TEMP#']) let runner1 = {
\ 'exe' : 'gcc',
\ 'targetopt' : '-o',
\ 'opt' : ['-xc', '-'],
\ 'usestdin' : 1,
\ }
call SpaceVim#plugins#runner#reg_runner('c', [runner1, '#TEMP#'])
call SpaceVim#mapping#space#regesit_lang_mappings('c', function('s:language_specified_mappings')) call SpaceVim#mapping#space#regesit_lang_mappings('c', function('s:language_specified_mappings'))
call SpaceVim#plugins#runner#reg_runner('cpp', ['g++ -o #TEMP# %s', '#TEMP#']) call SpaceVim#plugins#runner#reg_runner('cpp', ['g++ -o #TEMP# %s', '#TEMP#'])
call SpaceVim#mapping#space#regesit_lang_mappings('cpp', funcref('s:language_specified_mappings')) call SpaceVim#mapping#space#regesit_lang_mappings('cpp', funcref('s:language_specified_mappings'))

22
autoload/SpaceVim/plugins/runner.vim
View File

@ -61,9 +61,24 @@ function! s:async_run(runner) abort
" the runner is a list " the runner is a list
" the first item is compile cmd, and the second one is running cmd. " the first item is compile cmd, and the second one is running cmd.
let s:target = s:FILE.unify_path(tempname(), ':p') let s:target = s:FILE.unify_path(tempname(), ':p')
if type(a:runner[0]) == type({})
if type(a:runner[0].exe) == 2
let exe = call(a:runner[0].exe, [])
elseif type(a:runner[0].exe) ==# type('')
let exe = [a:runner[0].exe]
endif
let usestdin = get(a:runner[0], 'usestdin', 0)
let compile_cmd = exe + [get(a:runner[0], 'targetopt', '')] + [s:target]
if usestdin
let compile_cmd = compile_cmd + a:runner[0].opt
else
let compile_cmd = compile_cmd + a:runner[0].opt + [get(s:, 'selected_file', bufname('%'))]
endif
else
let compile_cmd = substitute(printf(a:runner[0], bufname('%')), '#TEMP#', s:target, 'g') let compile_cmd = substitute(printf(a:runner[0], bufname('%')), '#TEMP#', s:target, 'g')
endif
call s:BUFFER.buf_set_lines(s:bufnr, s:lines , s:lines + 3, 0, [ call s:BUFFER.buf_set_lines(s:bufnr, s:lines , s:lines + 3, 0, [
\ '[Compile] ' . compile_cmd, \ '[Compile] ' . join(compile_cmd) . (usestdin ? ' STDIN' : ''),
\ '[Running] ' . s:target, \ '[Running] ' . s:target,
\ '', \ '',
\ repeat('-', 20)]) \ repeat('-', 20)])
@ -74,6 +89,11 @@ function! s:async_run(runner) abort
\ 'on_stderr' : function('s:on_stderr'), \ 'on_stderr' : function('s:on_stderr'),
\ 'on_exit' : function('s:on_compile_exit'), \ 'on_exit' : function('s:on_compile_exit'),
\ }) \ })
if usestdin
let range = get(a:runner[0], 'range', [1, '$'])
call s:JOB.send(s:job_id, call('getline', range))
call s:JOB.chanclose(s:job_id, 'stdin')
endif
elseif type(a:runner) == type({}) elseif type(a:runner) == type({})
" the runner is a dict " the runner is a dict
" keys: " keys: