From 10eca29f76873aba915f2012782179aae4ce9244 Mon Sep 17 00:00:00 2001
From: DrMaxNix <contact@drmaxnix.de>
Date: Sun, 2 Oct 2022 15:24:59 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20parse=20opt?=
 =?UTF-8?q?ional=20parameters=20to=20min=20and=20max=20count?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/parser.js | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/parser.js b/src/parser.js
index a9801c5..00f9137 100644
--- a/src/parser.js
+++ b/src/parser.js
@@ -120,7 +120,7 @@ class Juicescript_parser {
 		
 		
 		// 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 //
@@ -156,8 +156,9 @@ class Juicescript_parser {
 		// create empty scope from 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_count = parameter_count;
 	}
 	
 	/*
@@ -220,7 +221,7 @@ class Juicescript_parser {
 	*/
 	parse_global(){
 		// 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 //
@@ -350,6 +351,7 @@ class Juicescript_parser {
 		
 		let parameter_list = [];
 		let had_optional = false;
+		let first_optional = null;
 		while(!this.is_at_end()){
 			// IS NEXT TOKEN A DELIMITER? //
 			if(this.match_type(Juicescript.token_type.DELIMITER)){
@@ -406,6 +408,9 @@ class Juicescript_parser {
 				// if not allowed, ignore with error
 				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
 				optional = true;
 				had_optional = true;
@@ -431,7 +436,14 @@ class Juicescript_parser {
 		
 		
 		// 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};
 	}
 	
 	/*