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 2020-07-15 02:15:38 -07:00 committed by GitHub
parent 6ba888e445
commit e2cefa124e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
version3.0/nasal.ebnf
View File

@ -17,7 +17,7 @@ hash ::=
'{' {hashmember ','} '}' '{' {hashmember ','} '}'
; ;
hashmember::= hashmember::=
id ':' calculation id|string ':' calculation
; ;
function::= function::=
func argument_list expressions func argument_list expressions

17
version3.0/nasal_parse.h
View File

@ -205,16 +205,20 @@ bool nasal_parse::check_special_call()
// special call means like this: // special call means like this:
// function_name(a:1,b:2,c:3); // function_name(a:1,b:2,c:3);
int check_ptr=ptr+1; int check_ptr=ptr+1;
int curve_cnt=1; int curve_cnt=1,bracket_cnt=0,brace_cnt=0;
bool ret=false; bool ret=false;
while(check_ptr<tok_list_size && curve_cnt) while(check_ptr<tok_list_size && curve_cnt)
{ {
switch(tok_list[check_ptr].type) switch(tok_list[check_ptr].type)
{ {
case tok_left_curve: ++curve_cnt; break; case tok_left_curve: ++curve_cnt; break;
case tok_left_bracket: ++bracket_cnt;break;
case tok_left_brace: ++brace_cnt; break;
case tok_right_curve: --curve_cnt; break; case tok_right_curve: --curve_cnt; break;
case tok_right_bracket:--bracket_cnt;break;
case tok_right_brace: --brace_cnt; break;
} }
if(curve_cnt==1 && tok_list[check_ptr].type==tok_colon) if(curve_cnt==1 && !bracket_cnt && !brace_cnt && tok_list[check_ptr].type==tok_colon)
{ {
ret=true; ret=true;
break; break;
@ -311,8 +315,9 @@ nasal_ast nasal_parse::hash_gen()
{ {
node.add_child(hash_member_gen()); node.add_child(hash_member_gen());
++ptr; ++ptr;
if(ptr<tok_list_size && tok_list[ptr].type==tok_comma) ++ptr; if(ptr>=tok_list_size) break;
else if(ptr<tok_list_size && tok_list[ptr].type!=tok_comma && tok_list[ptr].type!=tok_right_brace) if(tok_list[ptr].type==tok_comma) ++ptr;
else if(tok_list[ptr].type!=tok_comma && tok_list[ptr].type!=tok_right_brace)
{ {
error_info(error_line,lack_comma); error_info(error_line,lack_comma);
++error; ++error;
@ -329,14 +334,14 @@ nasal_ast nasal_parse::hash_gen()
nasal_ast nasal_parse::hash_member_gen() nasal_ast nasal_parse::hash_member_gen()
{ {
nasal_ast node; nasal_ast node;
if(ptr>=tok_list_size || tok_list[ptr].type!=tok_identifier) if(ptr>=tok_list_size || (tok_list[ptr].type!=tok_identifier && tok_list[ptr].type!=tok_string))
{ {
error_info(error_line,lack_identifier); error_info(error_line,lack_identifier);
return node; return node;
} }
node.set_line(tok_list[ptr].line); node.set_line(tok_list[ptr].line);
node.set_type(ast_hashmember); node.set_type(ast_hashmember);
node.add_child(id_gen()); node.add_child(tok_list[ptr].type==tok_identifier?id_gen():string_gen());
++ptr; ++ptr;
if(ptr>=tok_list_size || tok_list[ptr].type!=tok_colon) if(ptr>=tok_list_size || tok_list[ptr].type!=tok_colon)
{ {