xxq250
/
Nasal-Interpreter
mirror of https://github.com/ValKmjolnir/Nasal-Interpreter.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Update

This commit is contained in:
Valk Richard Li 2019-09-20 06:23:02 -05:00 committed by GitHub
parent 9b3a5c1639
commit d4e32b80bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
version1.0/nasal_parser.h
View File

@ -331,13 +331,14 @@ void nasal_parser::call_function_expr()
break; break;
} }
get_token(); get_token();
if(this_token.type!=__comma) if(this_token.type!=__comma && this_token.type!=__right_curve && this_token.type!=__semi)
{ {
++error; ++error;
std::cout<<">>[Error] line "<<this_token.line<<": expect a \',\'."<<std::endl; std::cout<<">>[Error] line "<<this_token.line<<": expect a \',\'."<<std::endl;
return; return;
} }
get_token(); else if(this_token.type!=__right_curve)
get_token();
} }
if(this_token.type==__semi) if(this_token.type==__semi)
{ {
@ -361,6 +362,10 @@ void nasal_parser::identifier_begin_expr()
case __left_curve:call_function_expr();break; case __left_curve:call_function_expr();break;
case __left_bracket:list_search_expr();break; case __left_bracket:list_search_expr();break;
case __dot:hash_search_expr();break; case __dot:hash_search_expr();break;
case __comma:
case __right_curve:
case __right_bracket:
case __right_brace:
case __semi:parse.push(this_token);break; case __semi:parse.push(this_token);break;
default: default:
++error; ++error;
@ -381,6 +386,10 @@ void nasal_parser::number_begin_expr()
case __mul_operator: case __mul_operator:
case __div_operator:mul_div_expr();break; case __div_operator:mul_div_expr();break;
case __link_operator:link_expr();break; case __link_operator:link_expr();break;
case __comma:
case __right_curve:
case __right_bracket:
case __right_brace:
case __semi:parse.push(this_token);break; case __semi:parse.push(this_token);break;
default: default:
++error; ++error;
@ -401,6 +410,10 @@ void nasal_parser::string_begin_expr()
case __mul_operator: case __mul_operator:
case __div_operator:mul_div_expr();break; case __div_operator:mul_div_expr();break;
case __link_operator:link_expr();break; case __link_operator:link_expr();break;
case __comma:
case __right_curve:
case __right_bracket:
case __right_brace:
case __semi:parse.push(this_token);break; case __semi:parse.push(this_token);break;
default: default:
++error; ++error;

5
version1.0/test.txt
View File

@ -1,3 +1,8 @@
1*1/1+1; 1*1/1+1;
2*3*4/1-2+3; 2*3*4/1-2+3;
1-1+20-2*10; 1-1+20-2*10;
id(id);
id("str",1,1);
var e=1;
var x=10*2-20;
var id;