This commit is contained in:
Valk Richard Li 2019-09-03 06:05:15 -05:00 committed by GitHub
parent 0b0d55bb15
commit b90dadc3c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 544 additions and 309 deletions

View File

@ -9,7 +9,7 @@ int main()
nasal_lexer lex; nasal_lexer lex;
nasal_parser pas; nasal_parser pas;
std::string command; std::string command;
std::cout<<">> nasal script interpreter by ValKmjolnir"<<std::endl; std::cout<<">> Nasal interpreter by ValKmjolnir"<<std::endl;
std::cout<<">> input \"help\" to find help."<<std::endl; std::cout<<">> input \"help\" to find help."<<std::endl;
std::cout<<">> Be careful: this interpreter uses strict methods to check if there's an error."<<std::endl; std::cout<<">> Be careful: this interpreter uses strict methods to check if there's an error."<<std::endl;
std::cout<<" Always add \";\" after each statement (except loop and if-else)."<<std::endl; std::cout<<" Always add \";\" after each statement (except loop and if-else)."<<std::endl;

View File

@ -43,14 +43,14 @@ enum token_type
__call_list, __call_list,
__call_hash, __call_hash,
__definition, __definition,
__assignment, __assignment,__pre_assignment,
__calculation, __calculation,
__loop, __loop,
__choose,__if_choose,__elsif_choose,__else_choose, __choose,__if_choose,__elsif_choose,__else_choose,
__program __program
}; };
const int max_len=10; const int max_len=15;
struct cmp_seq struct cmp_seq
{ {
int tokens[max_len]; int tokens[max_len];
@ -78,7 +78,7 @@ cmp_seq par[]=
{{__statement,__right_curve,__id,__semi,__id,__left_curve,__forindex}, __loop}, {{__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,__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}, {{__right_brace,__statements,__left_brace,__right_curve,__id,__semi,__id,__left_curve,__forindex}, __loop},
{{__statement,__right_curve,__id,__semi,__id,__left_curve,__foreach}, __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,__statement,__left_brace,__right_curve,__id,__semi,__id,__left_curve,__foreach}, __loop},
@ -126,6 +126,13 @@ cmp_seq par[]=
{{__right_curve,__data_list,__call_func_head}, __call_function}, {{__right_curve,__data_list,__call_func_head}, __call_function},
{{__right_curve,__scalar_list,__call_func_head}, __call_function}, {{__right_curve,__scalar_list,__call_func_head}, __call_function},
{{__right_curve,__id,__call_func_head}, __call_function}, {{__right_curve,__id,__call_func_head}, __call_function},
{{__right_curve,__call_hash,__call_func_head}, __call_function},
{{__right_curve,__call_list,__call_func_head}, __call_function},
{{__right_curve,__number,__call_func_head}, __call_function},
{{__right_curve,__function,__call_func_head}, __call_function},
{{__right_curve,__string,__call_func_head}, __call_function},
{{__right_curve,__char,__call_func_head}, __call_function},
{{__right_curve,__calculation,__call_func_head}, __call_function},
{{__right_curve,__call_func_head}, __call_function}, {{__right_curve,__call_func_head}, __call_function},
{{__right_brace,__left_brace,__right_curve,__data_list,__func_head}, __function}, {{__right_brace,__left_brace,__right_curve,__data_list,__func_head}, __function},
@ -156,21 +163,78 @@ cmp_seq par[]=
{{__number,__comma,__string}, __scalar_list}, {{__number,__comma,__string}, __scalar_list},
{{__number,__comma,__char}, __scalar_list}, {{__number,__comma,__char}, __scalar_list},
{{__number,__comma,__id}, __scalar_list}, {{__number,__comma,__id}, __scalar_list},
{{__number,__comma,__call_list}, __scalar_list},
{{__number,__comma,__call_hash}, __scalar_list},
{{__number,__comma,__function}, __scalar_list},
{{__number,__comma,__calculation}, __scalar_list},
{{__string,__comma,__number}, __scalar_list}, {{__string,__comma,__number}, __scalar_list},
{{__string,__comma,__string}, __scalar_list}, {{__string,__comma,__string}, __scalar_list},
{{__string,__comma,__char}, __scalar_list}, {{__string,__comma,__char}, __scalar_list},
{{__string,__comma,__id}, __scalar_list}, {{__string,__comma,__id}, __scalar_list},
{{__string,__comma,__call_list}, __scalar_list},
{{__string,__comma,__call_hash}, __scalar_list},
{{__string,__comma,__function}, __scalar_list},
{{__string,__comma,__calculation}, __scalar_list},
{{__char,__comma,__number}, __scalar_list}, {{__char,__comma,__number}, __scalar_list},
{{__char,__comma,__string}, __scalar_list}, {{__char,__comma,__string}, __scalar_list},
{{__char,__comma,__char}, __scalar_list}, {{__char,__comma,__char}, __scalar_list},
{{__char,__comma,__id}, __scalar_list}, {{__char,__comma,__id}, __scalar_list},
{{__char,__comma,__call_list}, __scalar_list},
{{__char,__comma,__call_hash}, __scalar_list},
{{__char,__comma,__function}, __scalar_list},
{{__char,__comma,__calculation}, __scalar_list},
{{__call_list,__comma,__number}, __scalar_list},
{{__call_list,__comma,__string}, __scalar_list},
{{__call_list,__comma,__char}, __scalar_list},
{{__call_list,__comma,__id}, __scalar_list},
{{__call_list,__comma,__call_list}, __scalar_list},
{{__call_list,__comma,__call_hash}, __scalar_list},
{{__call_list,__comma,__function}, __scalar_list},
{{__call_list,__comma,__calculation}, __scalar_list},
{{__call_hash,__comma,__number}, __scalar_list},
{{__call_hash,__comma,__string}, __scalar_list},
{{__call_hash,__comma,__char}, __scalar_list},
{{__call_hash,__comma,__id}, __scalar_list},
{{__call_hash,__comma,__call_list}, __scalar_list},
{{__call_hash,__comma,__call_hash}, __scalar_list},
{{__call_hash,__comma,__function}, __scalar_list},
{{__call_hash,__comma,__calculation}, __scalar_list},
{{__function,__comma,__number}, __scalar_list},
{{__function,__comma,__string}, __scalar_list},
{{__function,__comma,__char}, __scalar_list},
{{__function,__comma,__id}, __scalar_list},
{{__function,__comma,__call_list}, __scalar_list},
{{__function,__comma,__call_hash}, __scalar_list},
{{__function,__comma,__function}, __scalar_list},
{{__function,__comma,__calculation}, __scalar_list},
{{__calculation,__comma,__number}, __scalar_list},
{{__calculation,__comma,__string}, __scalar_list},
{{__calculation,__comma,__char}, __scalar_list},
{{__calculation,__comma,__id}, __scalar_list},
{{__calculation,__comma,__call_list}, __scalar_list},
{{__calculation,__comma,__call_hash}, __scalar_list},
{{__calculation,__comma,__function}, __scalar_list},
{{__calculation,__comma,__calculation}, __scalar_list},
{{__scalar_list,__comma,__number}, __scalar_list}, {{__scalar_list,__comma,__number}, __scalar_list},
{{__scalar_list,__comma,__string}, __scalar_list}, {{__scalar_list,__comma,__string}, __scalar_list},
{{__scalar_list,__comma,__char}, __scalar_list}, {{__scalar_list,__comma,__char}, __scalar_list},
{{__scalar_list,__comma,__id}, __scalar_list}, {{__scalar_list,__comma,__id}, __scalar_list},
{{__scalar_list,__comma,__call_list}, __scalar_list},
{{__scalar_list,__comma,__call_hash}, __scalar_list},
{{__scalar_list,__comma,__function}, __scalar_list},
{{__scalar_list,__comma,__calculation}, __scalar_list},
{{__data_list,__comma,__number}, __scalar_list}, {{__data_list,__comma,__number}, __scalar_list},
{{__data_list,__comma,__string}, __scalar_list}, {{__data_list,__comma,__string}, __scalar_list},
{{__data_list,__comma,__char}, __scalar_list}, {{__data_list,__comma,__char}, __scalar_list},
{{__data_list,__comma,__call_list}, __scalar_list},
{{__data_list,__comma,__call_hash}, __scalar_list},
{{__data_list,__comma,__function}, __scalar_list},
{{__data_list,__comma,__calculation}, __scalar_list},
{{__right_bracket,__scalar_list,__left_bracket}, __list}, {{__right_bracket,__scalar_list,__left_bracket}, __list},
{{__right_bracket,__number,__left_bracket}, __list}, {{__right_bracket,__number,__left_bracket}, __list},
@ -333,6 +397,162 @@ cmp_seq par[]=
{{__number,__or_operator,__id}, __calculation}, {{__number,__or_operator,__id}, __calculation},
{{__id,__or_operator,__number}, __calculation}, {{__id,__or_operator,__number}, __calculation},
{{__calculation,__add_operator,__call_hash}, __calculation},
{{__call_hash,__add_operator,__calculation}, __calculation},
{{__call_hash,__add_operator,__call_hash}, __calculation},
{{__call_hash,__add_operator,__id}, __calculation},
{{__id,__add_operator,__call_hash}, __calculation},
{{__calculation,__sub_operator,__call_hash}, __calculation},
{{__call_hash,__sub_operator,__calculation}, __calculation},
{{__call_hash,__sub_operator,__call_hash}, __calculation},
{{__call_hash,__sub_operator,__id}, __calculation},
{{__id,__sub_operator,__call_hash}, __calculation},
{{__calculation,__mul_operator,__call_hash}, __calculation},
{{__call_hash,__mul_operator,__calculation}, __calculation},
{{__call_hash,__mul_operator,__call_hash}, __calculation},
{{__call_hash,__mul_operator,__id}, __calculation},
{{__id,__mul_operator,__call_hash}, __calculation},
{{__calculation,__div_operator,__call_hash}, __calculation},
{{__call_hash,__div_operator,__calculation}, __calculation},
{{__call_hash,__div_operator,__call_hash}, __calculation},
{{__call_hash,__div_operator,__id}, __calculation},
{{__id,__div_operator,__call_hash}, __calculation},
{{__calculation,__link_operator,__call_hash}, __calculation},
{{__call_hash,__link_operator,__calculation}, __calculation},
{{__call_hash,__link_operator,__call_hash}, __calculation},
{{__call_hash,__link_operator,__id}, __calculation},
{{__id,__link_operator,__call_hash}, __calculation},
{{__calculation,__cmp_equal,__call_hash}, __calculation},
{{__call_hash,__cmp_equal,__calculation}, __calculation},
{{__call_hash,__cmp_equal,__call_hash}, __calculation},
{{__call_hash,__cmp_equal,__id}, __calculation},
{{__id,__cmp_equal,__call_hash}, __calculation},
{{__calculation,__cmp_not_equal,__call_hash}, __calculation},
{{__call_hash,__cmp_not_equal,__calculation}, __calculation},
{{__call_hash,__cmp_not_equal,__call_hash}, __calculation},
{{__call_hash,__cmp_not_equal,__id}, __calculation},
{{__id,__cmp_not_equal,__call_hash}, __calculation},
{{__calculation,__cmp_less,__call_hash}, __calculation},
{{__call_hash,__cmp_less,__calculation}, __calculation},
{{__call_hash,__cmp_less,__call_hash}, __calculation},
{{__call_hash,__cmp_less,__id}, __calculation},
{{__id,__cmp_less,__call_hash}, __calculation},
{{__calculation,__cmp_less_or_equal,__call_hash}, __calculation},
{{__call_hash,__cmp_less_or_equal,__calculation}, __calculation},
{{__call_hash,__cmp_less_or_equal,__call_hash}, __calculation},
{{__call_hash,__cmp_less_or_equal,__id}, __calculation},
{{__id,__cmp_less_or_equal,__call_hash}, __calculation},
{{__calculation,__cmp_more,__call_hash}, __calculation},
{{__call_hash,__cmp_more,__calculation}, __calculation},
{{__call_hash,__cmp_more,__call_hash}, __calculation},
{{__call_hash,__cmp_more,__id}, __calculation},
{{__id,__cmp_more,__call_hash}, __calculation},
{{__calculation,__cmp_more_or_equal,__call_hash}, __calculation},
{{__call_hash,__cmp_more_or_equal,__calculation}, __calculation},
{{__call_hash,__cmp_more_or_equal,__call_hash}, __calculation},
{{__call_hash,__cmp_more_or_equal,__id}, __calculation},
{{__id,__cmp_more_or_equal,__call_hash}, __calculation},
{{__calculation,__and_operator,__call_hash}, __calculation},
{{__call_hash,__and_operator,__calculation}, __calculation},
{{__call_hash,__and_operator,__call_hash}, __calculation},
{{__call_hash,__and_operator,__id}, __calculation},
{{__id,__and_operator,__call_hash}, __calculation},
{{__calculation,__or_operator,__call_hash}, __calculation},
{{__call_hash,__or_operator,__calculation}, __calculation},
{{__call_hash,__or_operator,__call_hash}, __calculation},
{{__call_hash,__or_operator,__id}, __calculation},
{{__id,__or_operator,__call_hash}, __calculation},
{{__calculation,__add_operator,__call_list}, __calculation},
{{__call_list,__add_operator,__calculation}, __calculation},
{{__call_list,__add_operator,__call_list}, __calculation},
{{__call_list,__add_operator,__id}, __calculation},
{{__id,__add_operator,__call_list}, __calculation},
{{__calculation,__sub_operator,__call_list}, __calculation},
{{__call_list,__sub_operator,__calculation}, __calculation},
{{__call_list,__sub_operator,__call_list}, __calculation},
{{__call_list,__sub_operator,__id}, __calculation},
{{__id,__sub_operator,__call_list}, __calculation},
{{__calculation,__mul_operator,__call_list}, __calculation},
{{__call_list,__mul_operator,__calculation}, __calculation},
{{__call_list,__mul_operator,__call_list}, __calculation},
{{__call_list,__mul_operator,__id}, __calculation},
{{__id,__mul_operator,__call_list}, __calculation},
{{__calculation,__div_operator,__call_list}, __calculation},
{{__call_list,__div_operator,__calculation}, __calculation},
{{__call_list,__div_operator,__call_list}, __calculation},
{{__call_list,__div_operator,__id}, __calculation},
{{__id,__div_operator,__call_list}, __calculation},
{{__calculation,__link_operator,__call_list}, __calculation},
{{__call_list,__link_operator,__calculation}, __calculation},
{{__call_list,__link_operator,__call_list}, __calculation},
{{__call_list,__link_operator,__id}, __calculation},
{{__id,__link_operator,__call_list}, __calculation},
{{__calculation,__cmp_equal,__call_list}, __calculation},
{{__call_list,__cmp_equal,__calculation}, __calculation},
{{__call_list,__cmp_equal,__call_list}, __calculation},
{{__call_list,__cmp_equal,__id}, __calculation},
{{__id,__cmp_equal,__call_list}, __calculation},
{{__calculation,__cmp_not_equal,__call_list}, __calculation},
{{__call_list,__cmp_not_equal,__calculation}, __calculation},
{{__call_list,__cmp_not_equal,__call_list}, __calculation},
{{__call_list,__cmp_not_equal,__id}, __calculation},
{{__id,__cmp_not_equal,__call_list}, __calculation},
{{__calculation,__cmp_less,__call_list}, __calculation},
{{__call_list,__cmp_less,__calculation}, __calculation},
{{__call_list,__cmp_less,__call_list}, __calculation},
{{__call_list,__cmp_less,__id}, __calculation},
{{__id,__cmp_less,__call_list}, __calculation},
{{__calculation,__cmp_less_or_equal,__call_list}, __calculation},
{{__call_list,__cmp_less_or_equal,__calculation}, __calculation},
{{__call_list,__cmp_less_or_equal,__call_list}, __calculation},
{{__call_list,__cmp_less_or_equal,__id}, __calculation},
{{__id,__cmp_less_or_equal,__call_list}, __calculation},
{{__calculation,__cmp_more,__call_list}, __calculation},
{{__call_list,__cmp_more,__calculation}, __calculation},
{{__call_list,__cmp_more,__call_list}, __calculation},
{{__call_list,__cmp_more,__id}, __calculation},
{{__id,__cmp_more,__call_list}, __calculation},
{{__calculation,__cmp_more_or_equal,__call_list}, __calculation},
{{__call_list,__cmp_more_or_equal,__calculation}, __calculation},
{{__call_list,__cmp_more_or_equal,__call_list}, __calculation},
{{__call_list,__cmp_more_or_equal,__id}, __calculation},
{{__id,__cmp_more_or_equal,__call_list}, __calculation},
{{__calculation,__and_operator,__call_list}, __calculation},
{{__call_list,__and_operator,__calculation}, __calculation},
{{__call_list,__and_operator,__call_list}, __calculation},
{{__call_list,__and_operator,__id}, __calculation},
{{__id,__and_operator,__call_list}, __calculation},
{{__calculation,__or_operator,__call_list}, __calculation},
{{__call_list,__or_operator,__calculation}, __calculation},
{{__call_list,__or_operator,__call_list}, __calculation},
{{__call_list,__or_operator,__id}, __calculation},
{{__id,__or_operator,__call_list}, __calculation},
{{__right_curve,__number,__left_curve}, __calculation}, {{__right_curve,__number,__left_curve}, __calculation},
{{__number,__nor_operator}, __calculation}, {{__number,__nor_operator}, __calculation},
@ -351,65 +571,67 @@ cmp_seq par[]=
{{__semi,__list,__equal,__id,__var}, __definition}, {{__semi,__list,__equal,__id,__var}, __definition},
{{__semi,__hash,__equal,__id,__var}, __definition}, {{__semi,__hash,__equal,__id,__var}, __definition},
{{__semi,__calculation,__equal,__id}, __assignment}, {{__calculation,__equal,__id}, __pre_assignment},
{{__semi,__number,__equal,__id}, __assignment}, {{__number,__equal,__id}, __pre_assignment},
{{__semi,__string,__equal,__id}, __assignment}, {{__string,__equal,__id}, __pre_assignment},
{{__semi,__id,__equal,__id}, __assignment}, {{__id,__equal,__id}, __pre_assignment},
{{__semi,__char,__equal,__id}, __assignment}, {{__char,__equal,__id}, __pre_assignment},
{{__semi,__right_brace,__left_brace,__equal,__id}, __assignment}, {{__right_brace,__left_brace,__equal,__id}, __pre_assignment},
{{__semi,__right_bracket,__left_bracket,__equal,__id}, __assignment}, {{__right_bracket,__left_bracket,__equal,__id}, __pre_assignment},
{{__semi,__call_function,__equal,__id}, __assignment}, {{__call_function,__equal,__id}, __pre_assignment},
{{__semi,__call_list,__equal,__id}, __assignment}, {{__call_list,__equal,__id}, __pre_assignment},
{{__function,__equal,__id}, __assignment}, {{__function,__equal,__id}, __pre_assignment},
{{__semi,__function,__equal,__id}, __assignment}, {{__function,__equal,__id}, __pre_assignment},
{{__semi,__call_hash,__equal,__id}, __assignment}, {{__call_hash,__equal,__id}, __pre_assignment},
{{__semi,__list,__equal,__id}, __assignment}, {{__list,__equal,__id}, __pre_assignment},
{{__semi,__hash,__equal,__id}, __assignment}, {{__hash,__equal,__id}, __pre_assignment},
{{__semi,__calculation,__add_equal,__id}, __assignment}, {{__calculation,__add_equal,__id}, __pre_assignment},
{{__semi,__number,__add_equal,__id}, __assignment}, {{__number,__add_equal,__id}, __pre_assignment},
{{__semi,__string,__add_equal,__id}, __assignment}, {{__string,__add_equal,__id}, __pre_assignment},
{{__semi,__id,__add_equal,__id}, __assignment}, {{__id,__add_equal,__id}, __pre_assignment},
{{__semi,__char,__add_equal,__id}, __assignment}, {{__char,__add_equal,__id}, __pre_assignment},
{{__semi,__call_function,__add_equal,__id}, __assignment}, {{__call_function,__add_equal,__id}, __pre_assignment},
{{__semi,__call_list,__add_equal,__id}, __assignment}, {{__call_list,__add_equal,__id}, __pre_assignment},
{{__semi,__call_hash,__add_equal,__id}, __assignment}, {{__call_hash,__add_equal,__id}, __pre_assignment},
{{__semi,__calculation,__sub_equal,__id}, __assignment}, {{__calculation,__sub_equal,__id}, __pre_assignment},
{{__semi,__number,__sub_equal,__id}, __assignment}, {{__number,__sub_equal,__id}, __pre_assignment},
{{__semi,__string,__sub_equal,__id}, __assignment}, {{__string,__sub_equal,__id}, __pre_assignment},
{{__semi,__id,__sub_equal,__id}, __assignment}, {{__id,__sub_equal,__id}, __pre_assignment},
{{__semi,__char,__sub_equal,__id}, __assignment}, {{__char,__sub_equal,__id}, __pre_assignment},
{{__semi,__call_function,__sub_equal,__id}, __assignment}, {{__call_function,__sub_equal,__id}, __pre_assignment},
{{__semi,__call_list,__sub_equal,__id}, __assignment}, {{__call_list,__sub_equal,__id}, __pre_assignment},
{{__semi,__call_hash,__sub_equal,__id}, __assignment}, {{__call_hash,__sub_equal,__id}, __pre_assignment},
{{__semi,__calculation,__mul_equal,__id}, __assignment}, {{__calculation,__mul_equal,__id}, __pre_assignment},
{{__semi,__number,__mul_equal,__id}, __assignment}, {{__number,__mul_equal,__id}, __pre_assignment},
{{__semi,__string,__mul_equal,__id}, __assignment}, {{__string,__mul_equal,__id}, __pre_assignment},
{{__semi,__id,__mul_equal,__id}, __assignment}, {{__id,__mul_equal,__id}, __pre_assignment},
{{__semi,__char,__mul_equal,__id}, __assignment}, {{__char,__mul_equal,__id}, __pre_assignment},
{{__semi,__call_function,__mul_equal,__id}, __assignment}, {{__call_function,__mul_equal,__id}, __pre_assignment},
{{__semi,__call_list,__mul_equal,__id}, __assignment}, {{__call_list,__mul_equal,__id}, __pre_assignment},
{{__semi,__call_hash,__mul_equal,__id}, __assignment}, {{__call_hash,__mul_equal,__id}, __pre_assignment},
{{__semi,__calculation,__div_equal,__id}, __assignment}, {{__calculation,__div_equal,__id}, __pre_assignment},
{{__semi,__number,__div_equal,__id}, __assignment}, {{__number,__div_equal,__id}, __pre_assignment},
{{__semi,__string,__div_equal,__id}, __assignment}, {{__string,__div_equal,__id}, __pre_assignment},
{{__semi,__id,__div_equal,__id}, __assignment}, {{__id,__div_equal,__id}, __pre_assignment},
{{__semi,__char,__div_equal,__id}, __assignment}, {{__char,__div_equal,__id}, __pre_assignment},
{{__semi,__call_function,__div_equal,__id}, __assignment}, {{__call_function,__div_equal,__id}, __pre_assignment},
{{__semi,__call_list,__div_equal,__id}, __assignment}, {{__call_list,__div_equal,__id}, __pre_assignment},
{{__semi,__call_hash,__div_equal,__id}, __assignment}, {{__call_hash,__div_equal,__id}, __pre_assignment},
{{__semi,__calculation,__link_equal,__id}, __assignment}, {{__calculation,__link_equal,__id}, __pre_assignment},
{{__semi,__number,__link_equal,__id}, __assignment}, {{__number,__link_equal,__id}, __pre_assignment},
{{__semi,__string,__link_equal,__id}, __assignment}, {{__string,__link_equal,__id}, __pre_assignment},
{{__semi,__id,__link_equal,__id}, __assignment}, {{__id,__link_equal,__id}, __pre_assignment},
{{__semi,__char,__link_equal,__id}, __assignment}, {{__char,__link_equal,__id}, __pre_assignment},
{{__semi,__call_function,__link_equal,__id}, __assignment}, {{__call_function,__link_equal,__id}, __pre_assignment},
{{__semi,__call_list,__link_equal,__id}, __assignment}, {{__call_list,__link_equal,__id}, __pre_assignment},
{{__semi,__call_hash,__link_equal,__id}, __assignment}, {{__call_hash,__link_equal,__id}, __pre_assignment},
{{__semi,__pre_assignment}, __assignment},
{{__definition}, __statement}, {{__definition}, __statement},
{{__assignment}, __statement}, {{__assignment}, __statement},
@ -662,6 +884,9 @@ void print_token(int type)
case __hash_member_list: case __hash_member_list:
context="hash_members"; context="hash_members";
break; break;
case __pre_assignment:
context="pre_assignment";
break;
default: default:
context="unknown_type"; context="unknown_type";
break; break;
@ -782,7 +1007,17 @@ class PDA
{ {
comp_stack.push(main_stack.top()); comp_stack.push(main_stack.top());
main_stack.pop(); main_stack.pop();
if((comp_stack.top()==__id) && (!main_stack.empty()) && (main_stack.top()==__var)) // special LR(1) for definition & assignment if((comp_stack.top()==__id) && (!main_stack.empty()) && ((main_stack.top()==__var) || (main_stack.top()==__dot))) // special LR(1) for definition & assignment
{
comp_stack.push(main_stack.top());
main_stack.pop();
}
if((comp_stack.top()==__left_curve) && (!main_stack.empty()) && ((main_stack.top()==__id) || (main_stack.top()==__if) || (main_stack.top()==__elsif) || (main_stack.top()==__while) || (main_stack.top()==__func)))
{
comp_stack.push(main_stack.top());
main_stack.pop();
}
if((comp_stack.top()==__left_bracket) && (!main_stack.empty()) && (main_stack.top()==__id))
{ {
comp_stack.push(main_stack.top()); comp_stack.push(main_stack.top());
main_stack.pop(); main_stack.pop();