mirror of
https://github.com/urbit/shrub.git
synced 2024-11-30 22:15:47 +03:00
Merge branch 'test' of https://github.com/urbit/urbit into test
This commit is contained in:
C. Guy Yarvin
commit
d1e64e60da
1
Makefile
1
Makefile
@ -256,7 +256,6 @@ OUT_OFILES=\
|
||||
|
||||
V_OFILES=\
|
||||
v/ames.o \
|
||||
v/batz.o \
|
||||
v/cttp.o \
|
||||
v/http.o \
|
||||
v/loop.o \
|
||||
|
||||
@ -1,15 +1,44 @@
|
||||
"hoon.vim: Hoon syntax file
|
||||
"Credit goes to Fode
|
||||
"
|
||||
" With contributions from Philip C Monk
|
||||
|
||||
" Eric Fode, Philip C Monk
|
||||
|
||||
if exists("b:current_syntax")
|
||||
finish
|
||||
endif
|
||||
|
||||
syn case match
|
||||
set autoindent
|
||||
map g/ /++
|
||||
nmap gs :let varname = '\<<C-R><C-W>\>'<CR>?++ <C-R>=varname<CR><CR>
|
||||
set tabstop=2
|
||||
" nmap gc :let &colorcolumn=join(range(81,999),",")<CR>
|
||||
" nmap gC :let &colorcolumn=join(range(999,999),",")<CR>
|
||||
" nmap ge :vertical resize 85<CR>
|
||||
|
||||
" Because symobls are used much more than numbers, some
|
||||
" developers swap the number and symbol keys in insert
|
||||
" mode. This is disabled by default. Uncomment the
|
||||
" following lines to enable.
|
||||
" inoremap 1 !
|
||||
" inoremap 2 @
|
||||
" inoremap 3 #
|
||||
" inoremap 4 $
|
||||
" inoremap 5 %
|
||||
" inoremap 6 ^
|
||||
" inoremap 7 &
|
||||
" inoremap 8 *
|
||||
" inoremap 9 (
|
||||
" inoremap 0 )
|
||||
" inoremap ! 1
|
||||
" inoremap @ 2
|
||||
" inoremap # 3
|
||||
" inoremap $ 4
|
||||
" inoremap % 5
|
||||
" inoremap ^ 6
|
||||
" inoremap & 7
|
||||
" inoremap * 8
|
||||
" inoremap ( 9
|
||||
" inoremap ) 0
|
||||
|
||||
syn case match
|
||||
|
||||
" Declarations
|
||||
hi def link hoonDeclaration Define
|
||||
@ -19,17 +48,17 @@ hi def link hoonRune Operator
|
||||
hi def link hoonIdentifier Identifier
|
||||
hi def link hoonBranch Conditional
|
||||
hi def link hoonType Type
|
||||
hi def link hoonName Constant
|
||||
" hi def link hoonName Constant
|
||||
hi def link hoonNumber Number
|
||||
hi def link hoonComment Comment
|
||||
hi def link hoonTodo Todo
|
||||
hi def link hoonString String
|
||||
|
||||
syn match hoonDeclaration "++" nextgroup=hoonSymbolDec skipwhite
|
||||
syn match hoonSymbol /%\%(\%(\%(\w\|-\)\+\)\|[|&$]\)/
|
||||
syn match hoonAtom /@\w*/
|
||||
syn match hoonDeclaration "+[+-]" nextgroup=hoonSymbolDec skipwhite
|
||||
syn match hoonSymbol /%\%(\%(\%(\w\|-\)\+\)\|[|&$]\|\%(\.n\)\|\%(\.y\)\)/
|
||||
syn match hoonAtom /\%(@\w*\)\|\^/
|
||||
syn match hoonName "\w*" contained
|
||||
syn match hoonSymbolDec "\w*" contained contains=hoonName
|
||||
syn match hoonSymbolDec "\w\w\+" contained contains=hoonName
|
||||
|
||||
" numbers
|
||||
" Numbers are in decimal, binary, hex, base32, or base64, and they must
|
||||
@ -50,6 +79,7 @@ syn keyword hoonTodo contained XX XXX TODO FIXME
|
||||
" strings
|
||||
|
||||
syn region hoonString start=+'+ skip=+\\[\\']+ end=+'+ contains=@spell
|
||||
syn region hoonBlock start=+'''+ end=+'''+
|
||||
syn region hoonString start=+"+ skip=+\\[\\"]+ end=+"+ contains=@spell
|
||||
|
||||
|
||||
@ -66,6 +96,7 @@ syn match hoonRune "|+"
|
||||
syn match hoonRune "|\*"
|
||||
syn match hoonRune "|="
|
||||
syn match hoonRune "|?"
|
||||
syn match hoonRune "|\/"
|
||||
syn match hoonRune "%_"
|
||||
syn match hoonRune "%:"
|
||||
syn match hoonRune "%\."
|
||||
@ -82,6 +113,8 @@ syn match hoonRune "\$%"
|
||||
syn match hoonRune "\$,"
|
||||
syn match hoonRune "\$&"
|
||||
syn match hoonRune "\$?"
|
||||
syn match hoonRune "\$+"
|
||||
syn match hoonRune "\$="
|
||||
syn match hoonRune ":_"
|
||||
syn match hoonRune ":\~"
|
||||
syn match hoonRune ":/"
|
||||
@ -117,6 +150,7 @@ syn match hoonRune "\~\^"
|
||||
syn match hoonRune "\~+"
|
||||
syn match hoonRune "\~&"
|
||||
syn match hoonRune "\~="
|
||||
syn match hoonRune "\~?"
|
||||
syn match hoonRune "\~!"
|
||||
syn match hoonRune ";_"
|
||||
syn match hoonRune ";,"
|
||||
@ -141,6 +175,7 @@ syn match hoonRune "\%([^a-zA-Z]\|^\)\zs=<"
|
||||
syn match hoonRune "\%([^a-zA-Z]\|^\)\zs=>"
|
||||
syn match hoonRune "\%([^a-zA-Z]\|^\)\zs=-"
|
||||
syn match hoonRune "\%([^a-zA-Z]\|^\)\zs=+"
|
||||
syn match hoonRune "\%([^a-zA-Z]\|^\)\zs=\*"
|
||||
syn match hoonRune "\%([^a-zA-Z]\|^\)\zs=\~"
|
||||
syn match hoonRune "?|"
|
||||
syn match hoonRune "?:"
|
||||
|
||||
@ -41,7 +41,6 @@
|
||||
# define c3__base c3_s4('b','a','s','e')
|
||||
# define c3__bask c3_s4('b','a','s','k')
|
||||
# define c3__basp c3_s4('b','a','s','p')
|
||||
# define c3__batz c3_s4('b','a','t','z')
|
||||
# define c3__bel c3_s3('b','e','l')
|
||||
# define c3__bbye c3_s4('b','b','y','e')
|
||||
# define c3__bcbn c3_s4('b','c','b','n')
|
||||
|
||||
27
i/v/vere.h
27
i/v/vere.h
@ -363,14 +363,6 @@
|
||||
#endif
|
||||
} u3_unix;
|
||||
|
||||
/* u3_batz: just a timer for now
|
||||
*/
|
||||
typedef struct _u3_batz {
|
||||
uv_timer_t tim_u; // batz timer
|
||||
c3_w run_w; // run of consecutive alarms
|
||||
c3_o alm; // alarm
|
||||
} u3_batz;
|
||||
|
||||
/* u3_temp: just a timer for ever
|
||||
*/
|
||||
typedef struct _u3_temp {
|
||||
@ -557,7 +549,6 @@
|
||||
u3_save sav_u; // autosave
|
||||
u3_opts ops_u; // commandline options
|
||||
u3_unix unx_u; // sync and clay
|
||||
u3_batz beh_u; // batz timer
|
||||
u3_temp teh_u; // temp timer
|
||||
c3_o liv; // if u3_no, shut down
|
||||
c3_i xit_i; // exit code for shutdown
|
||||
@ -963,24 +954,6 @@
|
||||
u3_unix_io_poll(void);
|
||||
|
||||
|
||||
/** Behn, just a timer.
|
||||
**/
|
||||
/* u3_batz_io_init(): initialize batz timer.
|
||||
*/
|
||||
void
|
||||
u3_batz_io_init(void);
|
||||
|
||||
/* u3_batz_io_exit(): terminate timer.
|
||||
*/
|
||||
void
|
||||
u3_batz_io_exit(void);
|
||||
|
||||
/* u3_batz_io_poll(): update batz IO state.
|
||||
*/
|
||||
void
|
||||
u3_batz_io_poll(void);
|
||||
|
||||
|
||||
/** Temp, just a timer.
|
||||
**/
|
||||
/* u2_temp_io_init(): initialize temp timer.
|
||||
|
||||
4
v/loop.c
4
v/loop.c
@ -173,7 +173,6 @@ _lo_init()
|
||||
u3_http_io_init();
|
||||
u3_cttp_io_init();
|
||||
u3_save_io_init();
|
||||
u3_batz_io_init();
|
||||
u3_temp_io_init();
|
||||
}
|
||||
|
||||
@ -199,7 +198,6 @@ u3_lo_exit(void)
|
||||
u3_http_io_exit();
|
||||
u3_cttp_io_exit();
|
||||
u3_save_io_exit();
|
||||
u3_batz_io_exit();
|
||||
u3_temp_io_exit();
|
||||
}
|
||||
|
||||
@ -213,7 +211,6 @@ _lo_poll(void)
|
||||
u3_term_io_poll();
|
||||
u3_save_io_poll();
|
||||
u3_unix_io_poll();
|
||||
u3_batz_io_poll();
|
||||
u3_temp_io_poll();
|
||||
}
|
||||
|
||||
@ -227,7 +224,6 @@ _lo_how(u3_noun how)
|
||||
default: c3_assert(0); break;
|
||||
|
||||
case c3__ames: return "ames";
|
||||
case c3__batz: return "batz";
|
||||
case c3__temp: return "temp";
|
||||
case c3__term: return "cons";
|
||||
case c3__htcn: return "http-conn";
|
||||
|
||||
4
v/raft.c
4
v/raft.c
@ -1553,15 +1553,13 @@ _raft_punk(u3_noun ovo)
|
||||
|
||||
// XX this is wrong - the timer should be on the original hose.
|
||||
//
|
||||
if ( (c3__term == u3h(u3t(u3h(ovo)))) ||
|
||||
(c3__batz == u3h(u3t(u3h(ovo)))) ) {
|
||||
if (c3__term == u3h(u3t(u3h(ovo)))) {
|
||||
sec_w = 0;
|
||||
} else sec_w = 600;
|
||||
|
||||
// Control alarm loops.
|
||||
//
|
||||
if ( c3__wake != u3h(u3t(ovo)) ) {
|
||||
u3_Host.beh_u.run_w = 0;
|
||||
u3_Host.teh_u.run_w = 0;
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user