Merge branch 'dev'

Version bump to v1.1.5

.gitignore

@@ -1,3 +1,4 @@
 /target
 /src/target
-/pkg
+/pkg
+/result

CONTRIBUTING.MD

@@ -0,0 +1,31 @@
+# Contribution guidelines for Daisy
+
+
+## Pull requests
+All PRs should merge to `dev`. See "branching" below.
+
+
+## Versioning
+Daisy uses [semantic versioning](https://semver.org/), which looks like `maj.min.patch`. In short:
+ - `maj`: Incremented on large, incompatible changes
+ - `min`: Incremented on new features
+ - `patch`: Incremented on bugfixes
+
+Whenever one of the above fields is incremented, all sub-fields are reset to zero. When `min` is incremented, `patch` is set to zero.
+
+
+## Branching
+Daisy uses a branch model much like the one described [here](https://nvie.com/posts/a-successful-git-branching-model).
+ - `master`: 1 commit = 1 release. This is always a merge comit from `dev`, and is always tagged with a version.
+ - `dev`: main development branch. Never deleted. Most work happens here.
+ - `features`: temporary branches pulled from `dev` and merged to `dev` for larger features.
+ - Always merge with git's `--no-ff` option for a more detailed history.
+
+
+## Releases
+What to do 
+ - Merge into `master` (`git merge --no-ff dev`)
+ - Tag merge commit on `master` (`git tag -a v1.0.0 -m "Version 1.0.0"`)
+ - `cargo publish`
+ - Update web demo & pull server (`make docker`)
+ - Update aur package

Cargo.lock

@@ -28,7 +28,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "daisycalc"
-version = "1.1.3"
+version = "1.1.5"
 dependencies = [
  "cfg-if",
  "num",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "daisycalc"
-version = "1.1.3"
+version = "1.1.5"
 edition = "2021"
 build = "buildscript/main.rs"
 license = "GPL-3.0-only"

Makefile

@@ -14,5 +14,6 @@ publish:
 	cargo test
 	cargo publish
 
-docker:
+docker: wasm
-	docker build ./server -t git.betalupi.com/mark/daisy
+	docker build ./server -t git.betalupi.com/mark/daisy --no-cache
+	docker push git.betalupi.com/mark/daisy

TODO.md

@@ -1,19 +1,3 @@
-## Version Bump checklist
- - update Cargo.toml
- - run cargo test
- - commit
- - push
- - merge
- - git tag -a v1.0.0 -m "Version 1.0.0" on merge commit
- - cargo publish
- - Build wasm & push changes
- - Update AUR package
-
-## Pre-release
- - Tuple operations
- - we don't need vectors as arguments to operators
- - Fix linelocation when evaluating functions
-
 ## Parser
  - Should functions be operators?
  - Binary, hex, octal numbers
@@ -26,6 +10,7 @@
  - Non-recursive treeify
  - Faster factorial function. Maybe use gamma instead?
  - Arbitrary precision floats
+ - we don't need vectors as arguments to operators
 
 ## Math Features
  - Mean, Median, Min
@@ -34,6 +19,7 @@
  - acot/acoth functions
  - Sums and products with functional arguments
  - Add functions: gcd, inverse mod, dice
+ - Tuple operations
 
 ## Prompt
  - Fix terminal color detection
@@ -47,5 +33,5 @@
  - long prefixes (megatonne, etc)
  - HMS for degrees
  - Exact radians, using pi constant?
- - Weird units: flops, lumen, lux, bel
+ - Odd units: flops, lumen, lux, bel
  - Command to list units

buildscript/constants.toml

@@ -49,7 +49,7 @@ value = "1.602176634e-19 C"
 enum_name = "ElectronMass"
 pretty_name = "Electron mass"
 strings = ["electronmass"]
-value = "9.1093837015-31 kg"
+value = "9.1093837015e-31 kg"
 
 [[constant]]
 enum_name = "ProtonMass"
@@ -205,4 +205,4 @@ value = "TW * hour"
 [[constant]]
 enum_name = "PWH"
 strings = "PWh"
-value = "PW * hour"
+value = "PW * hour"

default.nix

@@ -0,0 +1,19 @@
+{ lib, fetchgit, rustPlatform }:
+rustPlatform.buildRustPackage rec {
+	pname = "daisy";
+	version = "1.1.4";
+	cargoLock.lockFile = src + /Cargo.lock;
+
+	src = fetchgit {
+		url = "https://github.com/rm-dr/daisy.git";
+		rev = "v${version}";
+		sha256 = "sha256-aENuKtE1+tBRN0HZzRr8Gk+dVEYTiP6FNRz817Sk88o=";
+	};
+
+	meta = with lib; {
+		description = "A pretty command-line scientific calculator";
+		homepage = "https://github.com/rm-dr/daisy";
+		#license = licenses.GPL;
+		maintainers = [ maintainers.tailhook ];
+	};
+}

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 => {