steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://factorcode.org/git/factor

db4
Joe Groff 2009-09-20 23:35:18 -05:00
parent 6645b41fac 08d9d0ad28
commit 9d3d7f549a
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
basis/alien/prettyprint/prettyprint.factor
View File

@ -17,7 +17,7 @@ M: dll pprint* dll-path dup "DLL\" " "\"" pprint-string ;
M: c-type-word definer drop \ C-TYPE: f ; M: c-type-word definer drop \ C-TYPE: f ;
M: c-type-word definition drop f ; M: c-type-word definition drop f ;
M: typedef-word declarations. drop ; M: c-type-word declarations. drop ;
GENERIC: pprint-c-type ( c-type -- ) GENERIC: pprint-c-type ( c-type -- )
M: word pprint-c-type pprint-word ; M: word pprint-c-type pprint-word ;
@ -28,9 +28,12 @@ M: array pprint-c-type pprint* ;
M: typedef-word definer drop \ TYPEDEF: f ; M: typedef-word definer drop \ TYPEDEF: f ;
M: typedef-word synopsis* M: typedef-word synopsis*
\ TYPEDEF: pprint-word {
dup "c-type" word-prop pprint-c-type [ seeing-word ]
pprint-word ; [ definer. ]
[ "c-type" word-prop pprint-c-type ]
[ pprint-word ]
} cleave ;
: pprint-function-arg ( type name -- ) : pprint-function-arg ( type name -- )
[ pprint-c-type ] [ text ] bi* ; [ pprint-c-type ] [ text ] bi* ;
@ -46,7 +49,10 @@ M: alien-function-word definer
drop \ FUNCTION: \ ; ; drop \ FUNCTION: \ ; ;
M: alien-function-word definition drop f ; M: alien-function-word definition drop f ;
M: alien-function-word synopsis* M: alien-function-word synopsis*
\ FUNCTION: pprint-word {
[ def>> first pprint-c-type ] [ seeing-word ]
[ pprint-word ] [ definer. ]
[ <block "(" text pprint-function-args ")" text block> ] tri ; [ def>> first pprint-c-type ]
[ pprint-word ]
[ <block "(" text pprint-function-args ")" text block> ]
} cleave ;

2
misc/vim/plugin/factor.vim
View File

@ -1,6 +1,8 @@
nmap <silent> <Leader>fi :FactorVocabImpl<CR> nmap <silent> <Leader>fi :FactorVocabImpl<CR>
nmap <silent> <Leader>fd :FactorVocabDocs<CR> nmap <silent> <Leader>fd :FactorVocabDocs<CR>
nmap <silent> <Leader>ft :FactorVocabTests<CR> nmap <silent> <Leader>ft :FactorVocabTests<CR>
nmap <Leader>fv :FactorVocab<SPACE>
nmap <Leader>fn :NewFactorVocab<SPACE>
if !exists("g:FactorRoot") if !exists("g:FactorRoot")
let g:FactorRoot = "~/factor" let g:FactorRoot = "~/factor"