diff --git a/version0.11/nasal_parser.h b/version0.11/nasal_parser.h index dc77ec1..a9558c0 100644 --- a/version0.11/nasal_parser.h +++ b/version0.11/nasal_parser.h @@ -67,22 +67,30 @@ cmp_seq par[]= {{__elsif_choose,__if_choose}, __choose}, {{__if_choose}, __choose},// ? + {{__statement,__right_curve,__id,__semi,__id,__left_curve,__forindex}, __loop}, + {{__right_brace,__statement,__left_brace,__right_curve,__id,__semi,__id,__left_curve,__forindex}, __loop}, + {{__right_brace,__statements,__left_brace,__right_curve,__id,__semi,__id,__left_curve,__forindex},__loop}, + + {{__statement,__right_curve,__id,__semi,__id,__left_curve,__foreach}, __loop}, + {{__right_brace,__statement,__left_brace,__right_curve,__id,__semi,__id,__left_curve,__foreach}, __loop}, + {{__right_brace,__statements,__left_brace,__right_curve,__id,__semi,__id,__left_curve,__foreach}, __loop}, + {{__statement,__right_curve,__calculation,__if_head}, __if_choose}, - {{__right_curve,__statement,__left_curve,__right_curve,__calculation,__if_head}, __if_choose}, - {{__right_curve,__statements,__left_curve,__right_curve,__calculation,__if_head}, __if_choose}, - {{__right_curve,__left_curve,__right_curve,__calculation,__if_head}, __if_choose}, + {{__right_brace,__statement,__left_brace,__right_curve,__calculation,__if_head}, __if_choose}, + {{__right_brace,__statements,__left_brace,__right_curve,__calculation,__if_head}, __if_choose}, + {{__right_brace,__left_brace,__right_curve,__calculation,__if_head}, __if_choose}, {{__statement,__right_curve,__calculation,__elsif_head}, __elsif_choose}, - {{__right_curve,__statement,__left_curve,__right_curve,__calculation,__elsif_head}, __elsif_choose}, - {{__right_curve,__statements,__left_curve,__right_curve,__calculation,__elsif_head}, __elsif_choose}, - {{__right_curve,__left_curve,__right_curve,__calculation,__elsif_head}, __elsif_choose}, + {{__right_brace,__statement,__left_brace,__right_curve,__calculation,__elsif_head}, __elsif_choose}, + {{__right_brace,__statements,__left_brace,__right_curve,__calculation,__elsif_head}, __elsif_choose}, + {{__right_brace,__left_brace,__right_curve,__calculation,__elsif_head}, __elsif_choose}, {{__statement,__right_curve,__calculation,__if_head,__else}, __elsif_choose}, - {{__right_curve,__statement,__left_curve,__right_curve,__calculation,__if_head,__else}, __elsif_choose}, - {{__right_curve,__statements,__left_curve,__right_curve,__calculation,__if_head,__else}, __elsif_choose}, - {{__right_curve,__left_curve,__right_curve,__calculation,__if_head,__else}, __elsif_choose}, + {{__right_brace,__statement,__left_brace,__right_curve,__calculation,__if_head,__else}, __elsif_choose}, + {{__right_brace,__statements,__left_brace,__right_curve,__calculation,__if_head,__else}, __elsif_choose}, + {{__right_brace,__left_brace,__right_curve,__calculation,__if_head,__else}, __elsif_choose}, {{__statement,__else}, __else_choose}, - {{__right_curve,__statement,__left_curve,__else}, __else_choose}, - {{__right_curve,__statements,__left_curve,__else}, __else_choose}, - {{__right_curve,__left_curve,__else}, __else_choose}, + {{__right_brace,__statement,__left_brace,__else}, __else_choose}, + {{__right_brace,__statements,__left_brace,__else}, __else_choose}, + {{__right_brace,__left_brace,__else}, __else_choose}, {{__semi,__semi}, __semi}, @@ -246,6 +254,9 @@ cmp_seq par[]= {{__definition}, __statement}, {{__assignment}, __statement}, {{__choose}, __statement}, + {{__semi,__continue}, __statement}, + {{__semi,__break}, __statement}, + {{__semi,__id,__return}, __statement}, {{__loop}, __statement}, {{__statement,__statement}, __statements}, {{__statements,__statement}, __statements}