sample script

42sh/Makefile

@@ -6,14 +6,14 @@
 #    By: wescande <wescande@student.42.fr>          +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2016/08/29 21:32:58 by wescande          #+#    #+#              #
-#    Updated: 2017/03/27 15:09:22 by ariard           ###   ########.fr        #
+#    Updated: 2017/03/27 15:12:02 by ariard           ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
 NAME		=	42sh
 
 CC			=	gcc
-FLAGS		=	-Wall -Wextra -Werror -fsanitize=address
+FLAGS		=	-Wall -Wextra -Werror #-fsanitize=address
 D_FLAGS		=	-g
 
 DELTA		=	$$(echo "$$(tput cols)-47"|bc)

42sh/another_file

@@ -0,0 +1,248 @@
+hello$$
+hello$$
+bonjour$$
+salut$$
+comment$$
+src/builtin/bt_env_opt.c$$
+src/builtin/bt_read_get.c$$
+src/builtin/bt_read_term.c$$
+src/builtin/builtin_cd.c$$
+src/builtin/builtin_echo.c$$
+src/builtin/builtin_env.c$$
+src/builtin/builtin_exit.c$$
+src/builtin/builtin_export.c$$
+src/builtin/builtin_func.c$$
+src/builtin/builtin_hash.c$$
+src/builtin/builtin_history.c$$
+src/builtin/builtin_math.c$$
+src/builtin/builtin_read.c$$
+src/builtin/builtin_setenv.c$$
+src/builtin/builtin_unset.c$$
+src/builtin/builtin_unsetenv.c$$
+src/builtin/is_builtin.c$$
+src/completion/c_arrow.c$$
+src/completion/c_clear.c$$
+src/completion/c_find_abspath.c$$
+src/completion/c_find_binary.c$$
+src/completion/c_find_env.c$$
+src/completion/c_find_files.c$$
+src/completion/c_init.c$$
+src/completion/c_match.c$$
+src/completion/c_match_glob.c$$
+src/completion/c_match_update.c$$
+src/completion/c_misc.c$$
+src/completion/c_output.c$$
+src/completion/c_parser.c$$
+src/completion/c_pathsolver.c$$
+src/completion/c_printer.c$$
+src/completion/c_sizing.c$$
+src/completion/c_terminal.c$$
+src/completion/completion.c$$
+src/exec/ast_free.c$$
+src/exec/bad_fd.c$$
+src/exec/exec_ampersand.c$$
+src/exec/exec_and_if.c$$
+src/exec/exec_bang.c$$
+src/exec/exec_case_branch.c$$
+src/exec/exec_destroy.c$$
+src/exec/exec_elif.c$$
+src/exec/exec_else.c$$
+src/exec/exec_func.c$$
+src/exec/exec_init.c$$
+src/exec/exec_leaf.c$$
+src/exec/exec_or_if.c$$
+src/exec/exec_pipe.c$$
+src/exec/exec_popfds.c$$
+src/exec/exec_pushfds.c$$
+src/exec/exec_semi.c$$
+src/exec/exec_var.c$$
+src/exec/fd_is_valid.c$$
+src/exec/ft_exec.c$$
+src/exec/ft_findexec.c$$
+src/exec/is_function.c$$
+src/exec/mark_process_status.c$$
+src/exec/node_copy.c$$
+src/exec/pfree_cmd.c$$
+src/exec/pfree_cond.c$$
+src/exec/pfree_func.c$$
+src/exec/pfree_list.c$$
+src/exec/pfree_subshell.c$$
+src/exec/plaunch_brace.c$$
+src/exec/plaunch_builtin.c$$
+src/exec/plaunch_case.c$$
+src/exec/plaunch_empty.c$$
+src/exec/plaunch_file.c$$
+src/exec/plaunch_for.c$$
+src/exec/plaunch_function.c$$
+src/exec/plaunch_if.c$$
+src/exec/plaunch_subshell.c$$
+src/exec/plaunch_until.c$$
+src/exec/plaunch_while.c$$
+src/exec/process_launch.c$$
+src/exec/process_redirect.c$$
+src/exec/process_set.c$$
+src/exec/process_setgroup.c$$
+src/exec/process_setsig.c$$
+src/exec/pset_brace.c$$
+src/exec/pset_case.c$$
+src/exec/pset_cmd.c$$
+src/exec/pset_for.c$$
+src/exec/pset_if.c$$
+src/exec/pset_subshell.c$$
+src/exec/pset_until.c$$
+src/exec/pset_while.c$$
+src/exec/redir_copy.c$$
+src/exec/redir_free.c$$
+src/exec/redirect_dgreat.c$$
+src/exec/redirect_dless.c$$
+src/exec/redirect_great.c$$
+src/exec/redirect_greatand.c$$
+src/exec/redirect_less.c$$
+src/exec/redirect_lessand.c$$
+src/exec/set_exitstatus.c$$
+src/exec/token_to_argv.c$$
+src/glob/command_getoutput.c$$
+src/glob/dir_glob.c$$
+src/glob/esc_print.c$$
+src/glob/expand_bquote.c$$
+src/glob/expand_brace.c$$
+src/glob/expand_esc.c$$
+src/glob/expand_home.c$$
+src/glob/expand_var.c$$
+src/glob/ft_strsplit_esc.c$$
+src/glob/ft_strsplit_spe.c$$
+src/glob/gen_tab_esc.c$$
+src/glob/glob.c$$
+src/glob/is_char_esc.c$$
+src/glob/match_pattern.c$$
+src/glob/tab_esc_copy.c$$
+src/glob/word_is_assignment.c$$
+src/hash_table/ft_add_hash.c$$
+src/hash_table/hash.c$$
+src/hash_table/hash_free.c$$
+src/hash_table/hash_str.c$$
+src/hash_table/is_hash.c$$
+src/history/add_str_in_history.c$$
+src/history/history.c$$
+src/history/history_parsing.c$$
+src/history/history_parsing_toolz.c$$
+src/history/history_parsing_toolz_2.c$$
+src/history/list_toolz.c$$
+src/history/surch_in_history.c$$
+src/job_control/builtin_bg.c$$
+src/job_control/builtin_fg.c$$
+src/job_control/builtin_jobs.c$$
+src/job_control/do_job_notification.c$$
+src/job_control/has_running_job.c$$
+src/job_control/has_stopped_job.c$$
+src/job_control/job_addprocess.c$$
+src/job_control/job_cmp_id.c$$
+src/job_control/job_format.c$$
+src/job_control/job_format_head.c$$
+src/job_control/job_free.c$$
+src/job_control/job_getprocess.c$$
+src/job_control/job_getrank.c$$
+src/job_control/job_hup_all.c$$
+src/job_control/job_is_completed.c$$
+src/job_control/job_is_stopped.c$$
+src/job_control/job_notify_change.c$$
+src/job_control/job_notify_new.c$$
+src/job_control/job_remove.c$$
+src/job_control/job_run.c$$
+src/job_control/job_update_id.c$$
+src/job_control/job_update_status.c$$
+src/job_control/job_wait.c$$
+src/job_control/jobc_destroy.c$$
+src/job_control/mark_job_as_running.c$$
+src/job_control/pprint_brace.c$$
+src/job_control/pprint_case.c$$
+src/job_control/pprint_cmd.c$$
+src/job_control/pprint_for.c$$
+src/job_control/pprint_function.c$$
+src/job_control/pprint_if.c$$
+src/job_control/pprint_subshell.c$$
+src/job_control/pprint_until.c$$
+src/job_control/pprint_while.c$$
+src/job_control/process_cmp_pid.c$$
+src/job_control/process_format.c$$
+src/job_control/process_free.c$$
+src/job_control/put_job_in_background.c$$
+src/job_control/put_job_in_foreground.c$$
+src/job_control/sigchld_handler.c$$
+src/job_control/sigint_handler.c$$
+src/job_control/sigtstp_handler.c$$
+src/job_control/sigttin_handler.c$$
+src/job_control/sigttou_handler.c$$
+src/lexer/do_lexer_routine.c$$
+src/lexer/get_lexer_stack.c$$
+src/lexer/get_lexer_stack2.c$$
+src/lexer/get_reserved_words.c$$
+src/lexer/get_state_global.c$$
+src/lexer/get_state_redir.c$$
+src/lexer/insert_newline.c$$
+src/lexer/isrw_delim.c$$
+src/lexer/keep_last_type.c$$
+src/lexer/lexer_backslash.c$$
+src/lexer/lexer_bquote.c$$
+src/lexer/lexer_curly_braces.c$$
+src/lexer/lexer_default.c$$
+src/lexer/lexer_delim.c$$
+src/lexer/lexer_destroy.c$$
+src/lexer/lexer_dquote.c$$
+src/lexer/lexer_end.c$$
+src/lexer/lexer_great.c$$
+src/lexer/lexer_heredoc.c$$
+src/lexer/lexer_init.c$$
+src/lexer/lexer_less.c$$
+src/lexer/lexer_lex.c$$
+src/lexer/lexer_newline.c$$
+src/lexer/lexer_number.c$$
+src/lexer/lexer_paren.c$$
+src/lexer/lexer_quote.c$$
+src/lexer/lexer_sep.c$$
+src/lexer/lexer_word.c$$
+src/lexer/token_append.c$$
+src/lexer/token_cmp_type.c$$
+src/lexer/token_free.c$$
+src/lexer/token_init.c$$
+src/lexer/token_print.c$$
+src/line_editing/control_features.c$$
+src/line_editing/ft_prompt.c$$
+src/line_editing/get_key.c$$
+src/line_editing/readline.c$$
+src/line_editing/resize.c$$
+src/main/data_exit.c$$
+src/main/data_init.c$$
+src/main/data_singleton.c$$
+src/main/ft_putast.c$$
+src/main/main.c$$
+src/main/shell_init.c$$
+src/main/shell_reset.c$$
+src/parser/add_bang.c$$
+src/parser/add_case.c$$
+src/parser/add_cmd.c$$
+src/parser/add_condition.c$$
+src/parser/add_func.c$$
+src/parser/add_loop.c$$
+src/parser/add_number.c$$
+src/parser/add_redir.c$$
+src/parser/add_sep.c$$
+src/parser/add_subshell.c$$
+src/parser/aggregate_sym.c$$
+src/parser/build_tree.c$$
+src/parser/do_parser_routine.c$$
+src/parser/error_syntax.c$$
+src/parser/eval_sym.c$$
+src/parser/ft_parse.c$$
+src/parser/heredoc_parser.c$$
+src/parser/parser_destroy.c$$
+src/parser/parser_init.c$$
+src/parser/pop_stack.c$$
+src/parser/produce_sym.c$$
+src/parser/push_stack.c$$
+src/parser/read_stack.c$$
+src/parser/redir_init.c$$
+src/parser/stack_init.c$$
+src/parser/sym_free.c$$
+src/parser/tree_func_free.c$$
+src/parser/tree_wrapper.c$$

42sh/file

@@ -0,0 +1,20 @@
+/Users/ariard/Projects/42sh
+/Users/ariard/Projects/42sh
+42ShellTester
+42sh
+Makefile
+README.md
+STDBUG
+another_file
+auteur
+donovan_segaults_06-02
+file
+includes
+libft
+objs
+pdf
+sample
+scriptheader.sh
+src
+test
+update_makefile.sh

42sh/sample/again.sh

@@ -0,0 +1,2 @@
+echo "echo hello" >> sample/again.sh
+echo hello

42sh/sample/andor.sh

@@ -0,0 +1,8 @@
+pwd > file && pwd >> file || ls | cat && ls | cat >> file || ls
+cat -e file
+
+sleep 2
+echo "My sample :"
+echo
+cat sample/andor.sh
+

42sh/sample/brace

@@ -1 +0,0 @@
-{ ls | cat }

42sh/sample/brace.sh

@@ -0,0 +1,9 @@
+{ ls ;  pwd } > file
+cat -e file
+
+sleep 2
+echo
+echo "My sample :"
+sleep 2
+echo
+cat sample/brace.sh

42sh/sample/case.sh

@@ -1,8 +1,16 @@
-case van in
+case toto in
-	( "bus" ) echo Hello world ;;
+	( tutu ) echo PERDU ;;
-	( "velo" ) echo Comment va  ;;
+	( titi ) echo PERDU  ;;
-	( "van" ) case tutu in
+	( toto ) case lala in
-					( toto ) pwd ;;
+					( lolo ) echo PERDU ;;
-					( tutu ) ls ;;
+					( lala ) echo GAGNE ;;
 				esac ;;
-esac
+esac > file
+cat -e file
+
+sleep 2
+echo
+echo "My sample :"
+sleep 2
+echo
+cat sample/case.sh

42sh/sample/comment.sh

@@ -1,2 +1,9 @@
 ls # Da comment
 pwd
+
+sleep 2
+echo
+echo "My sample :"
+sleep 2
+echo
+cat sample/comment.sh

42sh/sample/eof.sh

@@ -0,0 +1,3 @@
+while [ 1 ]
+do
+	ls

42sh/sample/for.sh

@@ -1,4 +1,13 @@
-for i in hello bonjour salut comment
+for i in src/*/*.c
 do
-	echo $i | cat -e
+	echo $i | cat -e > file
+	cat -e file >> another_file
+	cat -e another_file
 done
+
+sleep 2
+echo
+echo "My sample :"
+sleep 2
+echo
+cat sample/for.sh

42sh/sample/func.sh

@@ -1,5 +1,14 @@
 hello() (
-	echo HELLO
+	hello() (
+	echo hello ; hello )
+	hello
 )
 
 hello
+
+sleep 2
+echo
+echo "My sample :"
+sleep 2
+echo
+cat sample/func.sh

42sh/sample/if.sh

@@ -1,9 +1,25 @@
-if cat wef4eeef
+if false
 then
-	echo Conditon 1
+	echo PERDU
-elif cat yulu
+elif false
 then
-	echo Condition 2
+	echo PERDU
+elif true
+then
+	if false
+	then
+		echo PERDU
+	elif
+		echo GAGNE
+	fi > file
 else
-	echo Condition 3
+	echo PERDU
 fi
+cat -e file
+
+sleep 2
+echo
+echo "My sample :"
+sleep 2
+echo
+cat sample/if.sh

42sh/sample/if/02_if_elif.sh

@@ -1,10 +0,0 @@
-if ls ;
-then
-	pwd
-elif ls
-then
-	pwd
-elif ls
-then
-	pwd
-fi

42sh/sample/if/03_if_else.sh

@@ -1,5 +0,0 @@
-if cat yolo ;
-then
-	pwd
-else ls 
-fi

42sh/sample/if/04_if_elseelsif.sh

@@ -1,11 +0,0 @@
-if cat yolo ;
-then
-	pwd
-elif ls
-then
-	pwd
-elif pwd
-then
-	ls
-else ls 
-fi

42sh/sample/infinite.sh

@@ -1,2 +0,0 @@
-echo "echo hello" >> sample/infinite.sh
-echo hello

42sh/sample/ls

@@ -1 +0,0 @@
-ls

42sh/sample/mix.sh

@@ -0,0 +1,30 @@
+VAR=10
+if true
+then
+    echo "Salut" ; echo "Correcteur"
+	while [ $VAR -gt 0 ]
+	do
+		until true
+		do
+			echo KO SI JE M AFFICHE
+		done
+		if true
+		then
+			echo OK SI JE M AFFICHE
+		elif [ -f Makefile ]
+		then
+			echo KO SI JE M AFFICHE
+		else
+			echo KO SI JE M AFFICHE
+		fi
+		echo "Encore un tour"
+		math VAR - 1
+	done
+fi
+
+sleep 2
+echo
+echo "My sample :"
+sleep 3
+echo
+cat sample/mix/mix.sh

42sh/sample/mix/mix.sh

@@ -1,21 +0,0 @@
-if ls
-then
-    pwd ; echo "Salut"
-	while ls
-	do
-		until pwd
-		do
-			echo KO SI JE M AFFICHE
-		done
-		if cat faux
-		then
-			echo BONJOUR MAKEFILE
-		elif [ -f Makefile ]
-		then
-			echo BONJOUR MAKEFILE
-		else
-			echo KO SI JE M M AFFICHE
-		fi
-		echo "Encore une"
-	done
-fi

42sh/sample/muchloop.sh

@@ -0,0 +1,31 @@
+while [ 1 ]
+do
+	while [ 1 ]
+	do
+		while [ 1 ]
+		do
+			while [ 1 ]
+			do
+				while [ 1 ]
+				do
+					while [ 1 ]
+					do
+						while [ 1 ]
+						do
+							while [ 1 ]
+							do
+								while [ 1 ]
+								do
+									while [ 1 ]
+									do
+										echo "SO MUCH LOOOOP"
+									done
+								done
+							done
+						done
+					done
+				done
+			done
+		done
+	done
+done

42sh/sample/multiredir

@@ -1,3 +0,0 @@
-cat < file1 < file2 > file3 > file4
-
-

42sh/sample/redir/redir.sh

@@ -1 +0,0 @@
-

42sh/sample/script.sh

@@ -0,0 +1,16 @@
+clear
+YES=y
+NO=n
+echo "Welcome in 42Zash, new corrector, what is your login ?"
+
+until [ $REP == $YES ]
+do
+	read -p "> " LOGIN
+	echo
+	read -p "Ok, fine, your login is $LOGIN, right ?(y/n) " REP
+	if [ $REP = $NO ]
+	then
+		echo
+		echo "Don't worry let's do it again"
+	fi	
+done

42sh/sample/stack.sh

@@ -1,3 +0,0 @@
-cat && ls || ls | cat && ls | cat || ls
-
-

42sh/sample/subshell.sh

@@ -8,3 +8,10 @@ echo aaa \
 	| (echo bbb 7; cat -e ;echo ccc 7) \
 	| (echo bbb 8; cat -e ;echo ccc 8) \
 	| (echo bbb 9; cat -e ;echo ccc 9)
+
+
+sleep 2
+echo "My sample :"
+echo
+sleep 2
+cat sample/subshell.sh

42sh/sample/subshell/subshell01.sh

@@ -1,2 +0,0 @@
-(ls | cat
-pwd ;  ls)

42sh/sample/toomuchdone.sh

@@ -0,0 +1,4 @@
+while [ 1 ]
+do
+	ls
+done done

42sh/sample/until.sh

@@ -1,8 +1,30 @@
-until [ 1 ]
+VAR1=0
+until [ $VAR1 -gt 10 ]
 do
-	echo LOOP1 
+	VAR2=0
-	until [ 1 ]
+	until [ $VAR2 -gt 10 ]
 	do
-		echo hello
+		VAR3=0
+		until [ $VAR3 -gt 10 ]
+		do
+			math VAR3 + 1
+			echo "3rd is $VAR3"
 		done
-done > file1
+		math VAR2 + 1
+		echo "2nd is $VAR2"
+	done
+	math VAR1 + 1
+	echo "1st is $VAR1"
+	sleep 1
+done
+echo
+echo "VAR1: $VAR1"
+echo "VAR2: $VAR2"
+echo "VAR3: $VAR3"
+
+sleep 2
+echo
+echo "My sample :"
+sleep 2
+echo
+cat sample/until.sh

42sh/sample/until/01_until.sh

@@ -1,11 +0,0 @@
-until cat wefwef
-do
-	until ls
-	do
-		pwd ; ls
-	done
-	until cat eqwfewf
-	do
-		ls | cat
-	done
-done

42sh/sample/until2.sh

@@ -1,11 +0,0 @@
-ONE=0
-while [ $ONE -le 10 ] 
-do
-	TWO=0
-	while [ $TWO -le 10 ]
-	do
-		echo world 
-		math TWO + 1;
-	done
-	math ONE + 1;
-done > file1

42sh/sample/var.sh

@@ -0,0 +1,11 @@
+HELLO=WORLD HELLO=SALUT HELLO="BUENOS DIAS"
+echo $HELLO
+SALUT=$HELLO
+echo $SALUT
+
+sleep 2
+echo
+echo "My sample :"
+sleep 2
+echo
+cat sample/var.sh

42sh/sample/var_01.sh

@@ -1 +0,0 @@
-HELLO=WORLD

42sh/sample/while.sh

@@ -1,12 +1,24 @@
+VAR=10
 while 
-	while
+	   while [ $VAR -gt 0 ]  
-	   while ls | cat
 	   do
-			ls
+			echo "Inside inner loop" | cat -e
+			math VAR - 1
 		done
+		if [ $VAR -eq -42 ]
+		then
+			false
+		else
+			true
+		fi
 do 
-		ls | cat
+	echo "I'm the execution block"
-	done
+	VAR=-42
-do 
-	pwd
 done 
+
+sleep 2
+echo
+echo "My sample :"
+sleep 3
+echo
+cat sample/while.sh

42sh/sample/while/while01.sh

@@ -1,11 +0,0 @@
-while ls
-do
-	while cat rwgwghe
-	do
-		echo Hello World
-	done
-	while pwd
-	do
-		echo Bonjour ca va
-	done
-done

42sh/sample/while/while02.sh

@@ -1,5 +0,0 @@
-ls
-while [ 1 ] ;
-do
-	ls | cat
-done

42sh/sample/while/while03.sh

@@ -1,5 +0,0 @@
-ls
-for HELLLO in yolo ;
-do
-	ls
-done > file1

42sh/sample/while2.sh

@@ -1,16 +0,0 @@
-ONE=11
-while [ $ONE -gt 1 ] 
-do
-	TWO=11
-	while [ $TWO -gt 1 ]
-	do
-		THREE=11
-		while [ $THREE -gt 1 ]
-		do
-			echo hello
-			((THREE--))
-		done
-		((TWO--))
-	done
-	((ONE--))
-done > file1

42sh/sample/while_error.sh

@@ -1,6 +0,0 @@
-echo hello
-while ||
-do
-	pwd ;
-done
-ls | cat

42sh/sample/yale/yale0.ex

@@ -1 +0,0 @@
-< A B | ( C 2> D & E < F ) > G ; H=I J K

42sh/sample/yale/yale1.ex

@@ -1 +0,0 @@
-< A B | C | D | E > F 

42sh/sample/yale/yale2.ex

@@ -1 +0,0 @@
- A && B || C && D

42sh/sample/yale/yale3.ex

@@ -1 +0,0 @@
-A ; B & C ; D || E

42sh/sample/yale/yale5.ex

@@ -1 +0,0 @@
-(A ; B &) | (C || D) && E

42sh/sample/yale1.sh

@@ -1 +0,0 @@
-

42sh/src/main/main.c

@@ -6,7 +6,7 @@
 /*   By: gwojda <gwojda@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/03/20 14:45:40 by gwojda            #+#    #+#             */
-/*   Updated: 2017/03/26 21:57:37 by jhalford         ###   ########.fr       */
+/*   Updated: 2017/03/27 15:18:20 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -46,6 +46,7 @@ static int		handle_instruction(t_list **token, t_btree **ast)
 			return (ret);
 		if (do_lexer_routine(token, stream) > 0)
 			continue ;
+		token_print(*token);
 		if ((ret = do_parser_routine(token, ast)) == 1
 				&& SH_NO_INTERACTIVE(data->opts))
 			return (ret);

42sh/src/parser/aggregate_sym.c

@@ -6,7 +6,7 @@
 /*   By: ariard <ariard@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/03/11 15:58:38 by ariard            #+#    #+#             */
-/*   Updated: 2017/03/24 23:26:22 by ariard           ###   ########.fr       */
+/*   Updated: 2017/03/27 17:23:36 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -89,6 +89,7 @@ static t_aggrematch		g_aggrematch[] =
 	{NEWLINE_LIST, TK_ELIF, TK_ELIF, TK_ELIF},
 	{NEWLINE_LIST, TK_ELSE, TK_ELSE, TK_ELSE},
 	{NEWLINE_LIST, TK_WHILE, TK_WHILE, TK_WHILE},
+	{NEWLINE_LIST, LOOP, LOOP, LOOP},
 	{NEWLINE_LIST, TK_LBRACE, TK_LBRACE, TK_LBRACE},
 	{NEWLINE_LIST, TK_UNTIL, TK_UNTIL, TK_UNTIL},
 	{NEWLINE_LIST, CASE_LIST_NS, CASE_LIST_NS, CASE_LIST_NS},
@@ -148,6 +149,7 @@ static t_aggrematch		g_aggrematch[] =
 	{CMD_SUFFIX, CMD_WORD, SIMPLE_COMMAND, CMD_PREFIX},
 	{CMD_SUFFIX, CMD_NAME, SIMPLE_COMMAND, CMD_NAME},
 	{CMD_SUFFIX, CMD_SUPERIOR, CMD_SUPERIOR, CMD_SUPERIOR},
+	{CMD_SUFFIX, COMPOUND_LIST, COMPOUND_LIST, COMPOUND_LIST},
 	{CMD_SUFFIX, PIPE_SEMI_SEQUENCE, PIPE_SEMI_SEQUENCE, PIPE_SEMI_SEQUENCE},
 	{CMD_SUFFIX, PIPE_CLOSE_SEQUENCE, PIPE_CLOSE_SEQUENCE, PIPE_CLOSE_SEQUENCE},
 	{CMD_PREFIX, LINEBREAK, SIMPLE_COMMAND, 0},

42sh/src/parser/eval_sym.c

@@ -6,7 +6,7 @@
 /*   By: ariard <ariard@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/03/11 16:11:21 by ariard            #+#    #+#             */
-/*   Updated: 2017/03/24 23:26:06 by ariard           ###   ########.fr       */
+/*   Updated: 2017/03/27 17:29:01 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -605,6 +605,7 @@ static t_stackmatch		g_stackmatch[] =
 	{NEWLINE_LIST, FOR_WORDLIST},
 	{NEWLINE_LIST, TK_IN},
 	{NEWLINE_LIST, TK_WHILE},
+	{NEWLINE_LIST, LOOP},
 	{NEWLINE_LIST, FUNC_NAME},
 	{NEWLINE_LIST, TK_UNTIL},
 	{NEWLINE_LIST, TK_IF},

42sh/src/parser/produce_sym.c

@@ -6,7 +6,7 @@
 /*   By: ariard <ariard@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/02/09 17:58:34 by ariard            #+#    #+#             */
-/*   Updated: 2017/03/23 16:47:59 by ariard           ###   ########.fr       */
+/*   Updated: 2017/03/27 17:22:10 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -71,7 +71,7 @@ static t_prodmatch			g_prodmatch[] =
 	{TK_ASSIGNMENT_WORD, NEWLINE_LIST, CMD_PREFIX},
 	{TK_ASSIGNMENT_WORD, CMD_NAME, CMD_SUFFIX},
 	{TK_ASSIGNMENT_WORD, CMD_SUPERIOR, CMD_SUFFIX},
-	{TK_ASSIGNMENT_WORD, COMPOUND_LIST, CMD_SUFFIX},
+	{TK_ASSIGNMENT_WORD, COMPOUND_LIST, CMD_PREFIX},
 	{TK_ASSIGNMENT_WORD, COMPLETE_CONDITION, CMD_PREFIX},
 	{TK_ASSIGNMENT_WORD, CONDITION, CMD_PREFIX},
 	{TK_ASSIGNMENT_WORD, AND_OR, CMD_PREFIX},
@@ -94,6 +94,7 @@ static t_prodmatch			g_prodmatch[] =
 	{TK_NEWLINE, TK_RBRACE, CMD_NAME},
 	{TK_NEWLINE, TK_IN, NEWLINE_LIST},
 	{TK_NEWLINE, TK_WHILE, NEWLINE_LIST},
+	{TK_NEWLINE, LOOP, NEWLINE_LIST},
 	{TK_NEWLINE, TK_UNTIL, NEWLINE_LIST},
 	{TK_NEWLINE, TK_FOR, NEWLINE_LIST},
 	{TK_NEWLINE, TK_IF, NEWLINE_LIST},