Commit graph

701 commits

Author SHA1 Message Date
Antoine Riard
4d13a2e6e6 end merge 2017-03-08 23:44:03 +01:00
Antoine Riard
a8881bfed3 end 2017-03-08 23:20:28 +01:00
Antoine Riard
791b99e469 last commit 2017-03-08 23:18:55 +01:00
wescande
4a22ddc0e1 rectif du fork git prompt 2017-03-08 21:27:37 +01:00
Jack Halford
c2952d577c hanged jobs printing and some other stuff 2017-03-08 20:58:34 +01:00
Jack Halford
0c938e8963 compiles now 2017-03-08 17:53:02 +01:00
Jack Halford
1de7494d3d merged 2017-03-08 17:47:11 +01:00
Jack Halford
0d162c50f5 started rapiring jobc and heredoc lexer now OK' 2017-03-08 17:46:38 +01:00
wescande
029e1a1bbe Merge branch 'pda' of github.com:jzck/42sh into pda 2017-03-08 16:24:33 +01:00
wescande
86a733ffe5 ajout affichage du job control 2017-03-08 16:24:25 +01:00
Antoine Riard
6fa5153df2 end pull 2017-03-08 16:11:36 +01:00
gwojda
8cad57fc8e fixe #49 2017-03-08 16:07:12 +01:00
Antoine Riard
2bcf456967 before pull heredoc 2017-03-08 16:06:15 +01:00
Antoine Riard
fa82326823 before pull heredoc 2017-03-08 16:06:04 +01:00
Jack Halford
67bbc22fd7 fixed 2017-03-08 15:55:56 +01:00
Jack Halford
794a3f9936 heredoc changes to lexer done 2017-03-08 15:53:10 +01:00
wescande
145c116e18 ajout de reinitialisation du des exec dans les forks + correctif d'un segv sur free du subshell 2017-03-08 15:19:10 +01:00
wescande
ec531721ea Merge branch 'pda' of github.com:jzck/42sh into pda 2017-03-08 14:53:20 +01:00
wescande
e2a254863c rectif du glob sur l'affichage du pattern quand pas de match, et ajout du / quand match avec un dossier 2017-03-08 14:53:11 +01:00
Jack Halford
95be4e209c stuff 2017-03-08 14:52:44 +01:00
Jack Halford
4ee0f24632 compils now 2017-03-08 14:28:34 +01:00
Jack Halford
8528951041 heredoc changes first step 2017-03-08 13:48:58 +01:00
gwojda
301ec53259 j'avais fait des betises 2017-03-08 13:48:37 +01:00
gwojda
4d805a1c74 completion a partir de la racine ok (sauf si jai fait des betises) 2017-03-08 13:39:41 +01:00
Jack Halford
e711ffc927 issue #50 done 2017-03-08 13:07:46 +01:00
Jack Halford
8a46d9fe2a issue #48 first step 2017-03-08 12:44:09 +01:00
Jack Halford
8cba9bc113 issue #52: rewrote lexer_sep entirely 2017-03-08 12:21:13 +01:00
Jack Halford
91a8e81c45 minor libft interface changes 2017-03-08 12:04:05 +01:00
gwojda
6f0daec1cb oups, c'etait pas dans le bon dossier 2017-03-08 11:51:21 +01:00
gwojda
ff13c21d37 oups, c'etait pas dans le bon dossier 2017-03-08 11:50:57 +01:00
wescande
9f8f9bb729 normalement les fonctions sont fonctionnelles. necessitent plus de test. 2017-03-08 04:49:50 +01:00
wescande
b3e03c71c7 Merge branch 'pda' of github.com:jzck/42sh into pda 2017-03-08 03:10:50 +01:00
wescande
be78dfbdf8 commit pour recup lib & node_copy 2017-03-08 03:10:46 +01:00
Antoine Riard
cc5ba1dc75 pull done 2017-03-08 03:07:16 +01:00
Antoine Riard
bce509e19c wefwef 2017-03-08 03:05:01 +01:00
wescande
157519224d ajout des free en fonction du process 2017-03-08 02:40:58 +01:00
Antoine Riard
37970c7274 ft_lstdup 2017-03-08 01:47:40 +01:00
wescande
3a186407b1 working but no subshell 2017-03-08 01:45:29 +01:00
wescande
26222441cc ajout execution des while, if, for, case, until 2017-03-07 22:45:48 +01:00
wescande
bac6e9d6d8 permet de compiler 2017-03-07 21:25:40 +01:00
wescande
8c2103fa1b merge of the work 2017-03-07 21:01:33 +01:00
wescande
ad5bea849e working on job_control, need to catch Jack work's 2017-03-07 20:53:11 +01:00
Antoine Riard
69732b44fe conflcit resolved 2017-03-07 19:43:59 +01:00
Antoine Riard
dc994484af grammmar tk_bang + brace_group 2017-03-07 19:42:00 +01:00
Antoine Riard
02286b88bf moar grammmar 2017-03-07 19:41:25 +01:00
Jack Halford
6ef7a1289a compilation error 2017-03-07 18:38:20 +01:00
Jack Halford
764c62cc45 changed header layout 2017-03-07 18:37:13 +01:00
gwojda
b4e7d8ab5e mise a la norme edition de ligne 2017-03-07 17:37:32 +01:00
gwojda
f70722a5ae fix bug 2017-03-07 17:15:41 +01:00
wescande
48dc3d7c70 recup merge + modif 2017-03-07 16:56:20 +01:00
wescande
29aff9ebb7 exec en cours 2017-03-07 16:43:32 +01:00
Jack Halford
c8793578d6 merge 2017-03-07 16:41:10 +01:00
Jack Halford
2a215a6506 launch_file and launch_builtin 2017-03-07 16:40:09 +01:00
Antoine Riard
86fcb41c2f end pull 2017-03-07 15:54:51 +01:00
Antoine Riard
74b9f83779 renforcement stack + correction erreur syntax 2017-03-07 15:52:54 +01:00
wescande
7195207116 merging 2017-03-07 15:35:36 +01:00
Jack Halford
8de235e719 new libft commit 2017-03-07 15:35:26 +01:00
Jack Halford
7018cfc326 no more atexit, we call builtin_exit at end of main or at ctrl D 2017-03-07 15:25:28 +01:00
wescande
b2af159f64 pour merge 2017-03-07 15:12:20 +01:00
Jack Halford
eb9a697ef4 merged bt_jobs 2017-03-07 15:10:13 +01:00
Jack Halford
a5f186eb59 new process logic 2017-03-07 15:05:04 +01:00
Antoine Riard
d30519ced2 with math 2017-03-07 14:40:44 +01:00
Antoine Riard
5118a00f28 math ok, parsing io number tjr problemes 2017-03-07 13:35:40 +01:00
Antoine Riard
14be331b4e expr math doing 2017-03-07 12:22:05 +01:00
wescande
7ae114fd55 permet la compilation en commentant exec_var 2017-03-07 12:19:10 +01:00
wescande
6c2dbb0a57 expansion des variables locales au shell. 2017-03-07 12:11:13 +01:00
gwojda
1c41155c50 on a retrouvé le builtin history 2017-03-07 11:24:20 +01:00
gwojda
dea350d925 fixe bug history 2017-03-07 11:21:21 +01:00
AntoHesse
6c8c3ea792 parsing math ok 2017-03-07 02:09:33 +01:00
AntoHesse
bc1c16a45b parsing func stable, todo parsing brace_group 2017-03-07 01:17:58 +01:00
AntoHesse
f70f8bd3b5 exec var 2017-03-06 23:51:26 +01:00
Antoine Riard
4be3a84471 expansion case yeaaah 2017-03-06 19:46:09 +01:00
Antoine Riard
1dbc4653fd expansion for + cleanage code get_reserved_word 2017-03-06 19:05:43 +01:00
Antoine Riard
9f87126762 pull ok 2017-03-06 17:59:07 +01:00
Antoine Riard
8873f31f79 protection stack symbolique 2017-03-06 17:57:51 +01:00
Jack Halford
e9633119e5 >& and <& check if fd is open for reading/writing specifically 2017-03-06 16:58:47 +01:00
wescande
c42357efa3 merge of stuff 2017-03-06 16:22:01 +01:00
wescande
d3821b9ac7 some correctif 2017-03-06 16:20:06 +01:00
Antoine Riard
e675eceb87 redirection ok, further test needed 2017-03-06 15:58:30 +01:00
Antoine Riard
21245cac3b merge 2017-03-06 14:55:48 +01:00
Antoine Riard
65930ddf07 Merge branch 'pda' of https://github.com/jzck/42sh into pda
"recup work last night"
2017-03-06 14:51:32 +01:00
AntoHesse
2b5b23e981 execution case without extension 2017-03-06 02:11:03 +01:00
AntoHesse
4849c899e4 execution for without expansion 2017-03-06 01:10:54 +01:00
Jack Halford
40aebb29b2 redirect greatand / lessand execution done (parsing not functional yet) 2017-03-05 19:48:56 +01:00
gwojda
21a2aca244 ajout control L 2017-03-05 19:41:13 +01:00
Jack Halford
23cdcb2dbb merged new reidrection layout from pda 2017-03-05 19:30:27 +01:00
Antoine Riard
b23c28bf2f subshell doing 2017-03-05 19:21:00 +01:00
Antoine Riard
314daa62a6 clean subshell 2017-03-05 19:19:45 +01:00
william
a0086265e4 merge correctif > < >& <&
3
2017-03-05 18:43:06 +01:00
william
08f437a573 scission apres les TOKEN_GREAT / LESS / GREATAND / LESSAND 2017-03-05 18:42:00 +01:00
Antoine Riard
cba548d0ae redir io number seems good 2017-03-05 18:17:51 +01:00
Jack Halford
25a8e2f65e getoutput temporary fix 2017-03-05 18:15:09 +01:00
Jack Halford
510a0c303a Merge branch 'pda_execution' of https://github.com/jzck/minishell into pda_execution 2017-03-05 17:30:38 +01:00
Jack Halford
b998f45e49 comments with # 2017-03-05 17:30:32 +01:00
Antoine Riard
1086d95d89 merge resolved 2017-03-05 17:23:02 +01:00
Antoine Riard
b6c0355904 redir without IO_NUMBER good 2017-03-05 17:20:43 +01:00
william
0d5408b114 qMerge branch 'pda_execution' of github.com:jzck/42sh into pda_execution 2017-03-05 17:18:57 +01:00
william
9bd9130ca6 rectif lexer number multi token 2017-03-05 17:18:37 +01:00
Antoine Riard
9e0c2bd906 merged done 2017-03-05 16:50:27 +01:00
Jack Halford
e645db2f0f changed libft preprocessor apple/linux dichotomy 2017-03-05 16:49:21 +01:00
Antoine Riard
5035122523 merge 2017-03-05 16:46:05 +01:00
Antoine Riard
2b456eac9c rectification cleanage code 2017-03-05 16:40:22 +01:00
Jack Halford
77ed38038a merged 2017-03-05 16:33:11 +01:00
Jack Halford
ee883b38a9 parens and curly braces lexing OK 2017-03-05 16:30:48 +01:00
william
0e85867fd8 IO_NUMBER sur plusieurs digits 2017-03-05 16:09:49 +01:00
william
eb6e104812 compilation sous linux possible, mise en commentaire des variables set but not used 2017-03-05 15:44:12 +01:00
Jack Halford
9a038e9290 && || seem to work now 2017-03-05 15:19:18 +01:00
Jack Halford
566cd522ae builtins no longer remain in job control 2017-03-05 15:07:43 +01:00
Antoine Riard
56b106ee0f gen ast cleand 2017-03-04 22:08:31 +01:00
Antoine Riard
7d660fec7c execution if/elif/else + while ok 2017-03-04 18:02:38 +01:00
Antoine Riard
3dc47431ba gestion error ok + moar grammar pipe 2017-03-04 16:51:38 +01:00
AntoHesse
0f684e6189 clean instruction (token, parser, error) whatever succes or error, still issue lexing after syntax error 2017-03-04 02:51:52 +01:00
AntoHesse
dc423db858 stack is now a beautiful linked list 2017-03-04 02:17:06 +01:00
AntoHesse
af311380f4 further streamile grammar around pipe 2017-03-04 01:26:20 +01:00
wescande
6ce2a1ec14 rectif free on expand_var 2017-03-03 20:45:36 +01:00
wescande
ec945bb5a5 Merge branch 'pda' of github.com:jzck/42sh into pda 2017-03-03 20:14:01 +01:00
wescande
ed0c3803b0 rectif builtin cd : ajout du -- pour stopper les args, ajout des messages d'erreurs pour trops d'arguments ou home not set 2017-03-03 20:13:55 +01:00
Antoine Riard
b4fdc05f64 ast free 2017-03-03 20:12:57 +01:00
Antoine Riard
29692ef8fa ast free 2017-03-03 20:02:53 +01:00
Jack Halford
b1b0cbdd92 builtins segfault patch 2017-03-03 19:53:59 +01:00
Jack Halford
f62ef4d9c0 reading from files now works 2017-03-03 19:47:06 +01:00
Jack Halford
8b88d41ed9 trying to make files work 2017-03-03 19:05:42 +01:00
Jack Halford
eac301aa16 merged pda stuff 2017-03-03 18:52:20 +01:00
Jack Halford
20e96b751f pipes work 2017-03-03 18:50:13 +01:00
wescande
4c44407b65 correctif on some stuff + ajout framework for test 2017-03-03 18:49:39 +01:00
Jack Halford
bc40339015 merged more stuff 2017-03-03 18:06:04 +01:00
Jack Halford
783cd963e4 merged things 2017-03-03 18:05:17 +01:00
Jack Halford
03c62f69a6 stuff 2017-03-03 18:03:17 +01:00
wescande
d146126135 rectif makefile 2017-03-03 18:01:25 +01:00
wescande
e9d0324189 merge correcitf segv 2017-03-03 18:00:43 +01:00
wescande
6775120264 protection de segv au lancement du shell (redirection entrante & nom de fichier non valid) 2017-03-03 17:59:39 +01:00
Jack Halford
2ad34631e3 parentheses dont trigger more input after lexing 2017-03-03 17:58:08 +01:00
Jack Halford
2926a9d00d merged pda_execution 2017-03-03 17:33:36 +01:00
Antoine Riard
a78416ae40 Merge branch 'pda' of https://github.com/jzck/42sh into pda
"syhcnrho witg wescnde"
2017-03-03 17:19:49 +01:00
Antoine Riard
d0b821c483 pipe fix grammar + assignement word parsing 2017-03-03 17:19:39 +01:00
Jack Halford
5159c30b67 new libft for pop 2017-03-03 16:59:21 +01:00
Jack Halford
418859e9e8 it compiles ! much more testing for simple commands to work 2017-03-03 16:51:18 +01:00
wescande
df7ed59b03 ajout du bool dans l'appel a glob pour demander un matching complet ou juste une expnsion de var +bquote (cas de l'assignation de variables) 2017-03-03 16:30:06 +01:00
wescande
d0c9baeeb8 modif assignment word 2017-03-03 16:11:42 +01:00
Antoine Riard
b90a17f2fa googd redir 2017-03-03 14:37:22 +01:00
wescande
7a72910a97 ajout de l'expansion du ~ + mise a la norme de command_get_output et correctif appliqué en cas de read invalid 2017-03-03 14:35:30 +01:00
Jack Halford
975a271bc9 Merge branch 'pda' of https://github.com/jzck/minishell into pda 2017-03-03 14:24:24 +01:00
Antoine Riard
a4d0093144 good state 2017-03-03 14:20:26 +01:00
AntoHesse
37d815cb57 fuck it 2017-03-03 02:36:25 +01:00
AntoHesse
b9d8b949be perdu entre les 2 libs de lst :( to-do tomorroz 2017-03-03 02:00:15 +01:00
AntoHesse
7f82901608 Merge branch 'pda' of https://github.com/jzck/minishell into pda
"need"
2017-03-03 00:05:41 +01:00
AntoHesse
75f1da13f2 before pull 2017-03-03 00:05:37 +01:00
Antoine Riard
37d9898f59 doing pipe + lst cmds 2017-03-02 22:02:53 +01:00
Jack Halford
3857b06785 execution much simpler with new parser, thx ariard! 2017-03-02 21:17:16 +01:00
Jack Halford
62d3ef01d2 merged pda 2017-03-02 12:37:15 +01:00
ariard@student.42.fr
722a290aee yale sauf subshell 2017-03-01 23:01:43 +01:00
ariard@student.42.fr
aa9097575d rewef 2017-03-01 18:04:29 +01:00
ariard@student.42.fr
9f9d799bbe merge fixed 2017-03-01 16:28:44 +01:00
ariard@student.42.fr
f5fafb4c19 before pull 2017-03-01 16:25:53 +01:00
Jack Halford
03152a9e2b conflicts resolved 2017-02-28 21:40:22 +01:00
ariard@student.42.fr
871b4da000 test 2017-02-28 19:28:01 +01:00
Jack Halford
ca1e060463 fixed problem with redirection lexing 2017-02-28 18:53:58 +01:00
gwojda
703f8a4cd4 issue #39 2017-02-28 11:12:31 +01:00
gwojda
949d0b2c62 issue #44 2017-02-28 10:45:36 +01:00
Jack Halford
9a29a9dcb3 issue #46 2017-02-27 16:59:28 +01:00
M600
c1b3704cab Include rebase 2017-02-27 13:25:15 +01:00
M600
2265938254 Rebase 2017-02-27 13:17:42 +01:00
Emeline Saley
f8753ccae1 Rebase current 2017-02-27 13:09:53 +01:00
AntoHesse
9c0984658e exec flow control 2017-02-26 01:13:47 +01:00
AntoHesse
a154aa85b6 eof syntax good 2017-02-25 22:34:38 +01:00
ariard@student.42.fr
8c8ee2152e parsing heredoc doing 2017-02-25 20:36:27 +01:00
ariard@student.42.fr
eeb0887081 commit from un cluster qui marche aka new redir 2017-02-25 19:31:02 +01:00
ariard@student.42.fr
7b1d505a5b gen func ok, todo: multi branch declaration, probleme lexer sur brackets 2017-02-25 00:31:51 +01:00
ariard@student.42.fr
a8a06305bb parsing brace_clause + func def ok 2017-02-24 23:18:00 +01:00
ariard@student.42.fr
102196bff4 parsing brace_clause + func def ok 2017-02-24 23:17:29 +01:00
ariard@student.42.fr
f703185a3a assignement word lexing parsing 2017-02-24 21:00:38 +01:00
ariard@student.42.fr
a3c750494f good code 2017-02-24 19:32:45 +01:00
ariard@student.42.fr
0461285d95 subshell et case ok 2017-02-24 19:30:20 +01:00
ariard@student.42.fr
d50a0d1b13 parsing for ok 2017-02-24 16:29:51 +01:00
ariard@student.42.fr
5f596310e1 nesting case ok 2017-02-24 15:32:56 +01:00
ariard@student.42.fr
d251474db9 erase error 2017-02-24 14:52:04 +01:00
ariard@student.42.fr
ecc058dd11 still case 2017-02-23 22:55:17 +01:00
AntoHesse
79bceb05a9 trop fatigue pour debug les case nesting, fuck it, todo tomorrow 2017-02-23 01:55:09 +01:00
AntoHesse
03238b2042 fucking case grammar done 2017-02-22 22:04:45 +01:00
AntoHesse
50da96bbd6 on a retrpuve la compagnie TK_PAREN 2017-02-22 20:25:51 +01:00
AntoHesse
2fbea4837d gramamr for 2017-02-22 19:50:29 +01:00
AntoHesse
7a849b360a syntax error + coordination parser etat 2017-02-22 18:36:42 +01:00
AntoHesse
268c5fb46e syntax error + coordination parser etat 2017-02-22 18:36:32 +01:00
AntoHesse
5976d0d281 grammar case part 1 motherfucker 2017-02-22 01:43:25 +01:00
ariard@student.42.fr
49b79603b3 insert newline add 2017-02-21 22:45:59 +01:00
Jack Halford
8084ffb6a1 pipes done 2017-02-21 22:42:13 +01:00
ariard@student.42.fr
04c4978c35 Merge branch 'pda' of https://github.com/jzck/42sh into pda
"conflict resolved"
2017-02-21 20:33:12 +01:00
ariard@student.42.fr
fffb8c74a5 before pull main clean 2017-02-21 20:29:46 +01:00
Jack Halford
ec79b05131 new instruction handler looks good 2017-02-21 20:21:52 +01:00
ariard@student.42.fr
7856564ecb main clean 2017-02-21 18:34:31 +01:00
ariard@student.42.fr
07c2101df4 EOF error add 2017-02-21 18:15:21 +01:00
ariard@student.42.fr
d05cec4962 include + parser state 2017-02-21 16:46:13 +01:00
Jack Halford
71e8d28263 libft change 2017-02-21 15:25:37 +01:00
ariard@student.42.fr
58473871ca ok 2017-02-21 15:22:11 +01:00
ariard@student.42.fr
62a8832823 before pull 2017-02-21 14:36:32 +01:00
Jack Halford
661cb0eb8b get_fd 2017-02-21 14:35:14 +01:00
Jack Halford
c04006a471 fixed some merging problems : it compiles now 2017-02-20 22:41:02 +01:00
ariard@student.42.fr
8d23821d69 after mege 2017-02-20 21:05:12 +01:00
ariard@student.42.fr
ca56489f13 before merge master 2017-02-20 19:52:38 +01:00
wescande
4ea6fb5801 Merge remote-tracking branch 'origin/glob_bquote' 2017-02-20 19:18:23 +01:00