From e9d392b80b114f835bb8a1f38e19d140a21b2a27 Mon Sep 17 00:00:00 2001
From: Mark <mark@betalupi.com>
Date: Fri, 22 Sep 2023 10:58:51 -0700
Subject: [PATCH 1/2] Fixed linelocation inside user functions

---
 src/evaluate/operator.rs | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/evaluate/operator.rs b/src/evaluate/operator.rs
index 0851212..22c61cd 100644
--- a/src/evaluate/operator.rs
+++ b/src/evaluate/operator.rs
@@ -19,6 +19,7 @@ pub fn eval_operator(context: &mut Context, g: &Expression) -> Result<Option<Exp
 
 			if args.len() != 1 {panic!()};
 			let a = &args[0];
+			let mut args_ll = op_loc.clone();
 
 			if sh_vars.len() == 1 {
 				if let Expression::Tuple(l, v) = a {
@@ -28,6 +29,7 @@ pub fn eval_operator(context: &mut Context, g: &Expression) -> Result<Option<Exp
 					))
 				};
 
+				args_ll += a.get_linelocation();
 				context.add_shadow(sh_vars[0].clone(), Some(a.clone()));
 			} else {
 				let Expression::Tuple(l, v) = a else {
@@ -46,16 +48,26 @@ pub fn eval_operator(context: &mut Context, g: &Expression) -> Result<Option<Exp
 
 				let mut i = 0;
 				while i < sh_vars.len() {
+					args_ll += v[i].get_linelocation();
 					context.add_shadow(sh_vars[i].clone(), Some(v[i].clone()));
 					i += 1;
 				}
 			}
 
 
-			let r = evaluate(context, &exp)?;
+			let r = evaluate(context, &exp);
 			context.clear_shadow();
 
-			return Ok(Some(r));
+			match r {
+				Ok(mut r) => {
+					r.set_linelocation(&args_ll);
+					return Ok(Some(r));
+				},
+
+				Err( (_, err) ) => {
+					return Err((args_ll, err));
+				}
+			}
 		},
 
 		Operator::Negative => {

From 7658ff76ef2d2fab540dc8b8d4ee24077daebd01 Mon Sep 17 00:00:00 2001
From: Mark <mark@betalupi.com>
Date: Fri, 22 Sep 2023 10:59:35 -0700
Subject: [PATCH 2/2] Version bump

---
 Cargo.lock | 2 +-
 Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 855ef27..6ba14d1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -28,7 +28,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "daisycalc"
-version = "1.1.3"
+version = "1.1.4"
 dependencies = [
  "cfg-if",
  "num",
diff --git a/Cargo.toml b/Cargo.toml
index 3dc7b41..cbe1259 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "daisycalc"
-version = "1.1.3"
+version = "1.1.4"
 edition = "2021"
 build = "buildscript/main.rs"
 license = "GPL-3.0-only"