jack/42-archive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

token

Browse source
This commit is contained in:
Jack Halford 2016-11-11 14:28:59 +01:00
parent 27e26a6211
commit c5b837a8e6
3 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
42sh/Session.vim
View file

@ -176,11 +176,11 @@ setlocal fml=1
setlocal fdn=20 setlocal fdn=20
setlocal fen setlocal fen
silent! normal! zE silent! normal! zE
let s:l = 19 - ((18 * winheight(0) + 20) / 40) let s:l = 29 - ((27 * winheight(0) + 20) / 40)
if s:l < 1 | let s:l = 1 | endif if s:l < 1 | let s:l = 1 | endif
exe s:l exe s:l
normal! zt normal! zt
19 29
normal! 029| normal! 029|
wincmd w wincmd w
argglobal argglobal
@ -194,13 +194,14 @@ setlocal fml=1
setlocal fdn=20 setlocal fdn=20
setlocal fen setlocal fen
silent! normal! zE silent! normal! zE
let s:l = 28 - ((11 * winheight(0) + 20) / 40) let s:l = 36 - ((19 * winheight(0) + 20) / 40)
if s:l < 1 | let s:l = 1 | endif if s:l < 1 | let s:l = 1 | endif
exe s:l exe s:l
normal! zt normal! zt
28 36
normal! 08| normal! 028|
wincmd w wincmd w
2wincmd w
exe 'vert 1resize ' . ((&columns * 89 + 89) / 178) exe 'vert 1resize ' . ((&columns * 89 + 89) / 178)
exe 'vert 2resize ' . ((&columns * 88 + 89) / 178) exe 'vert 2resize ' . ((&columns * 88 + 89) / 178)
tabedit src/token/token_init.c tabedit src/token/token_init.c

5
42sh/src/token/ft_tokenize.c
View file

@ -23,7 +23,7 @@ int ft_tokenize(t_list **alst, char *str)
token = (*alst)->content; token = (*alst)->content;
if (!*str) if (!*str)
return (0); return (0);
else if ((token->type & TOKEN_OPERATOR) && !quoted) else if ((token->type >= TK_OP_MIN) && !quoted)
{ {
if (can_be_used_in_op) if (can_be_used_in_op)
token_append(token, *str); token_append(token, *str);
@ -35,7 +35,6 @@ int ft_tokenize(t_list **alst, char *str)
(*alst)->next = ft_lstnew(token_init(), sizeof(t_token)); (*alst)->next = ft_lstnew(token_init(), sizeof(t_token));
(*alst) = (*alst)->next; (*alst) = (*alst)->next;
token = (*alst)->content; token = (*alst)->content;
token->type = TOKEN_UNKNOWN;
} }
else if (*str == '\n' && !quoted) else if (*str == '\n' && !quoted)
ft_tokenize(&(*alst)->next, str + 1); ft_tokenize(&(*alst)->next, str + 1);
@ -50,7 +49,7 @@ int ft_tokenize(t_list **alst, char *str)
ft_tokenize(alst, str); ft_tokenize(alst, str);
} }
(*alst)->next = ft_lstnew(token_init(), sizeof(t_token)); (*alst)->next = ft_lstnew(token_init(), sizeof(t_token));
token->type = TOKEN_WORD; token->type = TK_WORD;
token_append(token, *str); token_append(token, *str);
ft_tokenize(&(*alst)->next, str + 1); ft_tokenize(&(*alst)->next, str + 1);
} }

24
42sh/src/token/includes/token.h
View file

@ -13,16 +13,20 @@
#ifndef TOKEN_H #ifndef TOKEN_H
# define TOKEN_H # define TOKEN_H
# define TK_WORD 0x001 # define TK_WORD 0x0001
# define TK_NEWLINE 0x002 # define TK_NEWLINE 0x0002
# define TK_IOHERE 0b00000100 # define TK_IOHERE 0x0004
# define TK_DLESS 0b00001000
# define TK_DGREAT 0b00010000 # define TK_LESS 0x0010
# define TK_LESS 0b00100000 # define TK_GREAT 0x0020
# define TK_GREAT 0b00100000 # define TK_DLESS 0x0048
# define TK_LESSAND 0b00100000 # define TK_DGREAT 0x0080
# define TK_GREATAND 0b01000000 # define TK_LESSAND 0x0100
# define TK_OPERATOR 0b01111100 # define TK_GREATAND 0x0200
# define TK_SCOLON 0x0400
# define TK_PIPE 0x0800
# define TK_OP_MIN TK_LESS
typedef struct s_token t_token; typedef struct s_token t_token;