Commit graph

382 commits

Author SHA1 Message Date
gwojda
71f13249b8 recollage de l'historique + control R + point d'exclamation. quelques fixes pour le prompt 2017-02-14 15:45:17 +01:00
Jack Halford
75c11ff4a6 first batch of fixes on lexer and bquote expansion 2017-02-14 14:54:01 +01:00
Jack Halford
665c593f5d merged new lexer/line-edit architecture 2017-02-14 01:16:54 +01:00
Jack Halford
be6be17f2a bquotes expansion refactoring for future norm checks; still need to preventh field splitting for dquoted bquotes; also need to fuse bquote expansion into the globbing module 2017-02-14 00:42:41 +01:00
ariard@student.42.fr
fd951302a3 combinaison pipe et simple ok 2017-02-13 23:00:05 +01:00
Jack Halford
4840051dbd backquote expansion checks for splitting 2017-02-13 17:46:56 +01:00
Jack Halford
2e0b6102ce bquotes expand correctly but segfault afterwards... 2017-02-13 15:31:21 +01:00
ariard@student.42.fr
582087186f a lot of grammar 2017-02-12 21:09:23 +01:00
ariard@student.42.fr
2a70b3f702 moar moar moar grammar 2017-02-12 19:19:16 +01:00
ariard@student.42.fr
f16b0b923f moaaar grammar 2017-02-12 18:49:30 +01:00
ariard@student.42.fr
a07ed6eea7 moaaaar grammar 2017-02-12 18:47:16 +01:00
Jack Halford
742a99440e backslash should work, also keep NL when they are quoted 2017-02-12 18:11:59 +01:00
ariard@student.42.fr
80a5a8b1e2 Merge branch 'pda' of https://github.com/jzck/minishell into pda
grammar neeeded
2017-02-12 17:30:47 +01:00
ariard@student.42.fr
775d995772 grammar 2017-02-12 17:30:36 +01:00
AntoHesse
6601e2111f moar moar grammar 2017-02-12 04:09:36 +01:00
AntoHesse
516e1dade5 enforcement grammar part 1 2017-02-12 02:40:34 +01:00
ariard@student.42.fr
30494f2df2 moar grammar 2017-02-10 20:08:46 +01:00
gwojda
ab66992500 prompt zsh style : quelques petits trucs a revoir 2017-02-10 18:22:50 +01:00
ariard@student.42.fr
53ce7d5c1c grammar 2017-02-10 17:00:52 +01:00
Jack Halford
f7ed0a6bdd bq->dq seems to function 2017-02-10 13:50:46 +01:00
Jack Halford
a144239a56 pull resolved 2017-02-10 13:39:34 +01:00
Jack Halford
0a1fd7e518 dquotes->bquotes 2017-02-10 13:38:49 +01:00
gwojda
b25e6b186a fixe termcaps 2017-02-10 12:19:51 +01:00
Jack Halford
1167a23ca3 some refactoring of readline.c 2017-02-10 05:30:17 +01:00
Jack Halford
6ec9f9295e initial implementation looks ok, parenthesis needs fix 2017-02-10 05:19:26 +01:00
ariard@student.42.fr
1358c367e6 jack a raison: les enums ca marche.. 2017-02-10 01:43:20 +01:00
Jack Halford
e8cd4f45b0 started to work on lexer_stack 2017-02-10 00:38:45 +01:00
ariard@student.42.fr
87b7d65d71 archi ok, test struct de grammaire 2017-02-09 20:34:09 +01:00
ariard@student.42.fr
e7a7fc04df proto parser en cours 2017-02-09 18:10:28 +01:00
wescande
74713d84b0 rectif memrealloc 2017-02-09 17:02:35 +01:00
ariard@student.42.fr
ebc57c0da8 parser as a pushdown automata, test 2017-02-09 16:06:05 +01:00
ariard@student.42.fr
5dc789ebda before test pushdown automata 2017-02-08 23:29:13 +01:00
ariard@student.42.fr
5ec1e4c29f before test pushdown automata 2017-02-08 23:28:18 +01:00
Jack Halford
c5263b51d0 Merge branch 'random_fixes' 2017-02-08 22:49:01 +01:00
Jack Halford
5a033a8789 fcntl for saving fds, new option to distinguish interactive shell or not 2017-02-08 22:48:37 +01:00
wescande
6c8ea86a24 ajout memrealloc et modif token_append sur les char esc et esc2 2017-02-08 18:46:16 +01:00
Jack Halford
a99ef894e7 maakefile switch echo to printf 2017-02-07 22:42:02 +01:00
Jack Halford
bb666ba0c6 escaped codes in makefile are now \e 2017-02-07 20:16:53 +01:00
wescande
87e5d1eed0 mise norme 2017-02-07 19:58:32 +01:00
wescande
c2d979012a rectif du ./ dans le glob + optim du nb de result dans le cas de recherche cross-dir 2017-02-07 19:53:12 +01:00
wescande
90611cf046 Merge branch 'master' of github.com:jzck/minishell
rectif read
2017-02-07 19:00:51 +01:00
wescande
afd57a576c rectif invalid read on glob.c because of len instead of (len >> 3) + 1 2017-02-07 19:00:39 +01:00
Jack Halford
28acb3b814 removed lexer_var and prototype 2017-02-07 18:14:57 +01:00
Jack Halford
b613f9fb89 conflicts resolved 2017-02-07 18:06:30 +01:00
Jack Halford
a01b7b76ab redirection now works with builtins! 2017-02-07 17:57:52 +01:00
wescande
8539dc9ddf libft with new makfile 2017-02-07 17:43:22 +01:00
wescande
6648487f4a mergeing of branch var expansion 2017-02-07 17:40:10 +01:00
wescande
7610136d18 expansion des variables ok, fait a l'execution et plus dans le lexer (laissé en commentaire dans le lexer) 2017-02-07 17:22:39 +01:00
gwojda
4dea36519b correction ptit bug touche suppr 2017-02-07 15:28:35 +01:00
Jack Halford
060800769b lexer_comment done 2017-02-07 12:57:46 +01:00
Jack Halford
c56f9dac85 lexer_comment back onto master 2017-02-07 12:38:04 +01:00
Jack Halford
8ae6910122 redirection of identical fds does nothing 2017-02-07 12:03:22 +01:00
Jack Halford
d7f5116eb0 looks promising 2017-02-07 02:07:47 +01:00
Jack Halford
bb52d35f4d starting to fix redirects 2017-02-06 23:49:58 +01:00
ariard@student.42.fr
46ccf47755 loop read again if script modifierd 2017-02-06 22:04:21 +01:00
ariard@student.42.fr
c0977b20ff until exec ok 2017-02-06 21:02:37 +01:00
ariard@student.42.fr
490f81ee23 exec if + elif + else ok to-do:syntax error 2017-02-06 19:48:17 +01:00
ariard@student.42.fr
a211bfd1b0 parsing if/elsif stable 2017-02-06 17:59:48 +01:00
Jack Halford
5cac33e7cf Merge branch 'master' of https://github.com/jzck/minishell 2017-02-06 17:01:23 +01:00
Jack Halford
156e1cb29c file redirections repaired 2017-02-06 16:51:34 +01:00
wescande
80cbac03a2 rectif du glob pour ne pas chercher les fichiers/dossiers cachés 2017-02-06 16:04:03 +01:00
wescande
43a4fffc58 erreur de parenthese + remise a la norme 2017-02-06 15:51:49 +01:00
wescande
fe57e9e520 rectif du segv sur {} + modification de la gestion des {} (ordre + qd chaine unique) + ajout de fonction pours les chars esc (set_char_esc | set_char_no_esc | set_char_esc_mode 2017-02-06 15:38:10 +01:00
Jack Halford
a919dc53b9 added parsing error when words follow a subshell 2017-02-06 14:42:21 +01:00
Jack Halford
1649b6a294 read works with escape sequences 2017-02-06 14:05:44 +01:00
ariard@student.42.fr
9bb45abb3d currently parsing if, to-do:syntax error, clean code& interactive shell 2017-02-06 00:05:32 +01:00
ariard@student.42.fr
ffb0542c42 parsing loop stable 2017-02-05 21:13:55 +01:00
ariard@student.42.fr
63b25532b3 parsing loop presque 2017-02-05 19:38:46 +01:00
gwojda
f63737a90c changement des couleurs du prompt - correction leger bug sur le backslash 2017-02-05 17:45:17 +01:00
gwojda
1afdd9528b correction des heredocs + corrections de quelques bugs mineurs sur l'edition de ligne (le gain de ligne a peut-etre entrainé des bugs que j'ai raté) 2017-02-05 17:13:26 +01:00
ariard@student.42.fr
65b6658978 parse newline 2017-02-05 00:41:00 +01:00
ariard@student.42.fr
cd2019c0fd fucking newline to parse 2017-02-05 00:15:12 +01:00
gwojda
c77af3da9f mise a jour des parentheses/accolades 2017-02-04 18:28:05 +01:00
gwojda
288acbb378 mise a la norme edition de ligne - heredoc mal géré 2017-02-04 16:29:28 +01:00
ariard@student.42.fr
9bbd6d7403 do as a sep + multiple newline 2017-02-04 15:52:07 +01:00
ariard@student.42.fr
0a5143bd69 multi loop ok, to-do : do as a separator(lexing), in case of multisep after do delete all (parsing), before while inspect after done (parsing) 2017-02-03 20:03:54 +01:00
gwojda
08710f9e6b merge 2017-02-03 18:40:27 +01:00
gwojda
86fc221cb4 heredoc - historique avec point d'exclamation - sortie plus propre avec control D - historique ne prend plus en compte deux commandes consecutives egales 2017-02-03 18:38:22 +01:00
Jack Halford
065aacaadd removed debug messages from completion 2017-02-03 17:36:07 +01:00
Jack Halford
12d069d26b fix des problemes de compilations post-merge 2017-02-03 16:28:47 +01:00
Jack Halford
593258dff2 merged lexer-hotfix 2017-02-03 16:23:54 +01:00
Jack Halford
2f647b820f no more skipping delims before lexing, removed superfluous headers from lib, readded do_job_notifications before prompt 2017-02-03 16:15:55 +01:00
gwojda
2d6b314a68 completion semble fonctionnelle : plus de tests a faire ! :) 2017-02-03 16:13:36 +01:00
m600x
6ab0634d4c Reworked autocompletion multichoice 2017-02-03 15:49:03 +01:00
ariard@student.42.fr
fcea6dda9b scripting stable before new lexing and parsing(merged with master) 2017-02-03 15:41:14 +01:00
gwojda
045b3c0226 completion en cas d'unique possibilité : OK ! :D 2017-02-03 15:41:06 +01:00
m600x
c9dc8a5bd2 Merged with completion 2017-02-03 15:21:13 +01:00
Jack Halford
585d469324 lexer skips delims before starting to tokenize 2017-02-03 15:15:38 +01:00
m600x
cb9fe01c3e Merging 2017-02-03 15:14:02 +01:00
m600x
fff7a872e6 Pre-Merge 2017-02-03 15:08:32 +01:00
gwojda
3e2f3eae76 quoting + backslash + backquotes + parentheses + accolades revu : normalement ca marche. On va tenter d'ajouter la completion 2017-02-03 15:05:28 +01:00
gwojda
c0918e8e6b quoting + backslash + backquotes + parentheses + accolades revu : normalement ca marche. On va tenter d'ajouter la completion 2017-02-03 15:04:54 +01:00
Jack Halford
f4efbdd313 hotfix, forget to check compilation 2017-02-03 14:56:30 +01:00
ariard@student.42.fr
e708ce1e16 merge resolved 2017-02-03 14:44:35 +01:00
Jack Halford
da66e7bd79 Merge branch 'redirection-fix' 2017-02-03 14:42:41 +01:00
Jack Halford
09cb6f7843 seems to pass initial testing for chained redirections, havent tried very far 2017-02-03 14:41:28 +01:00
m600x
9f15e9b4c7 Content of data->line.input and data->line.pos updated 2017-02-03 14:15:46 +01:00
Jack Halford
62be4bc470 new architecture for redirection inside of fork(), chained redirects dont work properly yet 2017-02-03 14:11:34 +01:00
Jack Halford
985745f881 starting to fixi redirections 2017-02-03 13:21:06 +01:00
m600x
f43f11cd14 Rebase init 2017-02-03 12:36:25 +01:00
gwojda
7fb9aa2da5 changement du squelette (passage a un tableau de pointeur sur fonction) - pas encore tout resté 2017-02-02 19:07:32 +01:00
ariard@student.42.fr
36dcd432a4 before rebase 2017-02-02 17:56:40 +01:00
Jack Halford
7265a6c340 cleaner main, added ft_lexer to encapsulate all phases of tokenization 2017-02-02 15:45:55 +01:00
Jack Halford
b08b727779 orphan backquotes and orpan parens generate parse errors 2017-02-02 15:28:18 +01:00
Jack Halford
073ef322e4 fixed backquotes 2017-02-02 14:57:30 +01:00
gwojda
97ac417f81 ajout d'un fichier pour garder l'historique des utilisations precedentes (.42sh_history dans le dossier du 42sh) + gestion du resize de fenetre 2017-02-02 13:40:20 +01:00
gwojda
f03692e762 correction de bugs sur les termcaps - normalement tu peux spammer wesande ! :p 2017-02-02 11:47:58 +01:00
gwojda
12e92eec1a correction de leaks 2017-02-02 11:15:08 +01:00
gwojda
1a724c6d6d correction de leaks 2017-02-02 11:15:02 +01:00
Gautier WOJDA
b576eddd03 correction de leaks 2017-02-02 11:13:02 +01:00
Jack Halford
d5c830d347 Merge branch 'job-control-fix' 2017-02-02 01:21:16 +01:00
Jack Halford
da592565e0 cleaned up debug macros before merge 2017-02-02 01:20:51 +01:00
Jack Halford
0d8610ca65 exit statuses behave correctly now (like bash) 2017-02-02 00:56:16 +01:00
Jack Halford
6ad4ca1848 some nices fixes, works nicely 2017-02-01 21:27:16 +01:00
wescande
59bbf8ab10 libft update 2017-02-01 19:55:39 +01:00
wescande
cd7b4cde7c merge de la suppression de leaks 2017-02-01 19:52:36 +01:00
wescande
9641ed9dbb suppression d'un malheureux leaks + opti recursivite 2017-02-01 19:50:32 +01:00
Jack Halford
62cdc4ca84 back to looking like the GNU tutorial 2017-02-01 17:30:45 +01:00
Gautier WOJDA
feac290fee Comportement de control C/D mise a jour (avec le bruit d'erreur pour control D) -- mise a jour de l'edition de lignes, quelques bugs resolus (merci wescande :p) 2017-02-01 16:54:15 +01:00
ariard@student.42.fr
f33d2be526 lexing if ok 2017-02-01 00:00:27 +01:00
wescande
43f1295324 finition sur le globbing (expansion des accolades, gestion des characteres echappe) => normalement aucun bug + mise a la norme 2017-01-31 23:25:41 +01:00
ariard@student.42.fr
b0dececf1f loop_del 2017-01-31 22:52:36 +01:00
ariard@student.42.fr
73b4cc3060 resolution empty tree + nested loop + while error lexing 2017-01-31 22:12:49 +01:00
wescande
3c8c143143 merge de extend_glob. Ajout de la barre de progression dans le makefile 2017-01-31 19:52:04 +01:00
wescande
ad7d814c74 extension du globbing implemente SUPER MAKEFILE QUI DECHIRE TA M*RE 2017-01-31 19:36:29 +01:00
Jack Halford
9e3640aed1 maj libft 2017-01-31 16:43:46 +01:00
Jack Halford
e7e93fa533 correction de la norme sur tout le moude job-control 2017-01-31 15:11:26 +01:00
Jack Halford
e2e18d83bc removed debug macros in job_control 2017-01-31 13:52:21 +01:00
ariard@student.42.fr
0dc029406f exec while ok nxt: resoudre bug empty tree 2017-01-30 23:47:05 +01:00
ariard@student.42.fr
000ae4116a generation subtree test_commands + consequent_commands 2017-01-30 19:31:34 +01:00
ariard@student.42.fr
2212c927f8 ast with while ok next:execution while 2017-01-30 17:23:55 +01:00
wescande
3c46e10736 integration du retour de glob dans les tokens 2017-01-30 17:19:09 +01:00
wescande
95e1f03401 upgrade Makefile with all .c 2017-01-30 16:43:41 +01:00
wescande
77b94ee8ce merge de globbing on master 2017-01-30 13:09:41 +01:00
wescande
7cfa1a4837 finalisation norme 2017-01-30 12:23:13 +01:00
ariard@student.42.fr
42bd66af42 generation liste chainee d'ast de multi commande ok, to-do : ast de while 2017-01-28 23:39:59 +01:00
Jack Halford
4b6a8e6563 removed some DG macros 2017-01-28 20:24:54 +01:00
Jack Halford
7dd0f2d11e forgot to add new file job_run.c 2017-01-28 20:24:54 +01:00
Jack Halford
90bd6820c3 some function shrinking for norme 2017-01-28 20:24:54 +01:00
Jack Halford
279509a651 merged and fixed conflicts 2017-01-28 19:25:25 +01:00
Jack Halford
076d3c3d5b remise a la norme avant de merge 2017-01-28 14:44:00 +01:00
wescande
4f5c65b9a2 finalisation du lexer avec les char echappé -> 1 unsigned char pour 8 char du token (1 bit pour 1 char). Module glob en place en tenant compte des echappé. fonction is_char_esc en place pour une utilisation plus globale 2017-01-28 01:19:03 +01:00
wescande
45bc317f97 working on esc character in token 2017-01-27 20:13:13 +01:00
Jack Halford
f236e8e734 refactoring for clarity of bt_read* family 2017-01-27 20:08:56 +01:00
Jack Halford
cc2fadf41c variables assigning passes initial testing, needs more testing 2017-01-27 19:40:36 +01:00
Gautier WOJDA
d6c6103bc4 avant de merge 2017-01-27 17:42:46 +01:00
Jack Halford
e66999c24f -t works fine, gonna do the IFS split next 2017-01-27 17:11:11 +01:00
ariard@student.42.fr
47a2fdd683 doing, parsing newline et generation liste chaine d arbre binaire 2017-01-26 22:43:47 +01:00
Jack Halford
7d57b47f5e end of day, still doesnt work properly 2017-01-26 20:32:39 +01:00
Jack Halford
26625dd1b1 commit pour cleanup la merde de wescande sur git........ 2017-01-26 19:39:39 +01:00