Merge branch 'master' of git://factorcode.org/git/factor
commit
57c2caa236
|
@ -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 definition drop f ;
|
||||
M: typedef-word declarations. drop ;
|
||||
M: c-type-word declarations. drop ;
|
||||
|
||||
GENERIC: pprint-c-type ( c-type -- )
|
||||
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 synopsis*
|
||||
\ TYPEDEF: pprint-word
|
||||
dup "c-type" word-prop pprint-c-type
|
||||
pprint-word ;
|
||||
{
|
||||
[ seeing-word ]
|
||||
[ definer. ]
|
||||
[ "c-type" word-prop pprint-c-type ]
|
||||
[ pprint-word ]
|
||||
} cleave ;
|
||||
|
||||
: pprint-function-arg ( type name -- )
|
||||
[ pprint-c-type ] [ text ] bi* ;
|
||||
|
@ -46,7 +49,10 @@ M: alien-function-word definer
|
|||
drop \ FUNCTION: \ ; ;
|
||||
M: alien-function-word definition drop f ;
|
||||
M: alien-function-word synopsis*
|
||||
\ FUNCTION: pprint-word
|
||||
[ def>> first pprint-c-type ]
|
||||
[ pprint-word ]
|
||||
[ <block "(" text pprint-function-args ")" text block> ] tri ;
|
||||
{
|
||||
[ seeing-word ]
|
||||
[ definer. ]
|
||||
[ def>> first pprint-c-type ]
|
||||
[ pprint-word ]
|
||||
[ <block "(" text pprint-function-args ")" text block> ]
|
||||
} cleave ;
|
||||
|
|
|
@ -1,13 +1,23 @@
|
|||
USING: assocs memoize locals kernel accessors init fonts math
|
||||
combinators windows.errors windows.types windows.gdi32 ;
|
||||
combinators system-info.windows windows.errors windows.types
|
||||
windows.gdi32 ;
|
||||
IN: windows.fonts
|
||||
|
||||
: windows-font-name ( string -- string' )
|
||||
MEMO: windows-fonts ( -- fonts )
|
||||
windows-major 6 >=
|
||||
H{
|
||||
{ "sans-serif" "Calibri" }
|
||||
{ "serif" "Cambria" }
|
||||
{ "monospace" "Consolas" }
|
||||
}
|
||||
H{
|
||||
{ "sans-serif" "Tahoma" }
|
||||
{ "serif" "Times New Roman" }
|
||||
{ "monospace" "Courier New" }
|
||||
} ?at drop ;
|
||||
} ? ;
|
||||
|
||||
: windows-font-name ( string -- string' )
|
||||
windows-fonts ?at drop ;
|
||||
|
||||
MEMO:: (cache-font) ( font -- HFONT )
|
||||
font size>> neg ! nHeight
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
nmap <silent> <Leader>fi :FactorVocabImpl<CR>
|
||||
nmap <silent> <Leader>fd :FactorVocabDocs<CR>
|
||||
nmap <silent> <Leader>ft :FactorVocabTests<CR>
|
||||
nmap <Leader>fv :FactorVocab<SPACE>
|
||||
nmap <Leader>fn :NewFactorVocab<SPACE>
|
||||
|
||||
if !exists("g:FactorRoot")
|
||||
let g:FactorRoot = "~/factor"
|
||||
|
|
Loading…
Reference in New Issue