juicescript/legacy-code
juicescript/legacy-code
Archived
0
0
Fork 0
Code

🧑‍💻 parse optional parameters to min and max count

Browse Source
This commit is contained in:
DrMaxNix 2022-10-02 15:24:59 +02:00
parent 196f6e755c
commit 10eca29f76
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/parser.js
View File

@ -120,7 +120,7 @@ class Juicescript_parser {
// GET LIST OF PARAMETERS // // GET LIST OF PARAMETERS //
let parameter_list = this.parse_parameter_list(); let {list: parameter_list, count: parameter_count} = this.parse_parameter_list();
// CAN ONLY BE USED IN ROOT SCOPE // // CAN ONLY BE USED IN ROOT SCOPE //
@ -156,8 +156,9 @@ class Juicescript_parser {
// create empty scope from template // create empty scope from template
this.scope_tree = this.scope_tree_template(); this.scope_tree = this.scope_tree_template();
// store parameter list // store parameter list and count
this.scope_tree.parameter = parameter_list; this.scope_tree.parameter = parameter_list;
this.scope_tree.parameter_count = parameter_count;
} }
/* /*
@ -220,7 +221,7 @@ class Juicescript_parser {
*/ */
parse_global(){ parse_global(){
// GET LIST OF PARAMETERS // // GET LIST OF PARAMETERS //
let parameter_list = this.parse_parameter_list({strict: true}); let {list: parameter_list} = this.parse_parameter_list({strict: true});
// MAKE SURE WE ARE INSIDE OF A SCOPE // // MAKE SURE WE ARE INSIDE OF A SCOPE //
@ -350,6 +351,7 @@ class Juicescript_parser {
let parameter_list = []; let parameter_list = [];
let had_optional = false; let had_optional = false;
let first_optional = null;
while(!this.is_at_end()){ while(!this.is_at_end()){
// IS NEXT TOKEN A DELIMITER? // // IS NEXT TOKEN A DELIMITER? //
if(this.match_type(Juicescript.token_type.DELIMITER)){ if(this.match_type(Juicescript.token_type.DELIMITER)){
@ -406,6 +408,9 @@ class Juicescript_parser {
// if not allowed, ignore with error // if not allowed, ignore with error
if(options.strict) this.error_token("modifier not allowed:"); if(options.strict) this.error_token("modifier not allowed:");
// store number if this is the first optional parameter
if(!had_optional) first_optional = parameter_list.length;
// remember // remember
optional = true; optional = true;
had_optional = true; had_optional = true;
@ -431,7 +436,14 @@ class Juicescript_parser {
// RETURN // // RETURN //
return parameter_list; // determine count boundaries
let parameter_count = {
min: (first_optional ?? parameter_list.length),
max: parameter_list.length
};
// return object
return {list: parameter_list, count: parameter_count};
} }
/* /*