Minor edits

CONTRIBUTING.MD

@@ -29,8 +29,4 @@ What to do
  - `cargo publish`
  - Update web demo & pull server (`make docker`)
  - Update aur package
-
-Test `default.nix` with
-``sh
-nix-build -E 'let pkgs = import <nixpkgs> { }; in pkgs.callPackage ./default.nix {}'
-``
+ - Update `default.nix` (test with `make nix`)

Cargo.lock

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

Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "daisycalc"
-version = "1.1.6"
+version = "1.1.7"
 edition = "2021"
 build = "buildscript/main.rs"
 license = "GPL-3.0-only"
-description = "A high-precision terminal scientific calculator."
+description = "A pretty TUI scientific calculator."
 repository = "https://git.betalupi.com/Mark/daisy"
 homepage = "https://git.betalupi.com/Mark/daisy"
 readme = "README.md"

Makefile

@@ -1,6 +1,9 @@
 release:
 	cargo build --release
 
+nix:
+	nix-build -E 'let pkgs = import <nixpkgs> { }; in pkgs.callPackage ./default.nix {}'
+
 test:
 	cargo test
 

README.md

@@ -1,6 +1,6 @@
 ![](./server/site/resources/readme-banner.png)
 
-A high-precision scientific calculator with support for units, derivatives, and more.
+A pretty, general-purpose scientific calculator with support for units, derivatives, and more.
 
 Many features are missing, this is still under development.
 
@@ -33,9 +33,7 @@ in
 
 # 🛠️ Features
  - Open-source
- - Extremely high precision
-	 - Uses a rational datatype when possible, and a high-precision float when not.
- - Pretty printing in prompt (with special substitutions)
+ - Carefully designed and easy-to-read prompt
  - Supports many physical units, with metric and binary prefixes
  - Supports exponential notation
  - Clear syntax, parsed input is always re-printed as a sanity check.
@@ -77,6 +75,10 @@ Daisy instead provides four functions (`fromCelsius`, `toCelsius`, `fromFahrenhe
  - "from" functions take a scalar and return a value in Kelvin: `fromCelsius(0) = 273.15K`
  - "to" functions take a value in Kelvin and return a scalar: `toCelsius(273.15 K) = 0`
 
+Functions `FtoC` and `CtoF` are also provided:
+ - `FtoC(x) = toCelsius(fromFahrenheit(x))`
+ - `CtoF(x) = toFahrenheit(fromCelsius(x))`
+
 
 ## Multiplication Order
 

default.nix

@@ -1,17 +1,17 @@
 { lib, fetchgit, rustPlatform }:
 rustPlatform.buildRustPackage rec {
 	pname = "daisy";
-	version = "1.1.6";
+	version = "1.1.7";
 	cargoLock.lockFile = src + /Cargo.lock;
 
-	src = fetchgit {
+	src = builtins.fetchGit {
 		url = "https://github.com/rm-dr/daisy.git";
-		rev = "v${version}";
-		sha256 = "";
+		ref = "refs/tags/v${version}";
+		#rev = ""; Ideally, we'd have a hash here, but that would make git history messy.
 	};
 
 	meta = with lib; {
-		description = "A pretty command-line scientific calculator";
+		description = "A general-purpose scientific calculator";
 		homepage = "https://github.com/rm-dr/daisy";
 		#license = licenses.GPL;
 		maintainers = [ maintainers.tailhook ];

server/site/index.html

@@ -86,7 +86,7 @@
 
 		<div id="header">
 			<img id="banner" src = "resources/daisy-light.svg" alt="Daisy Banner"/>
-			<p>A high-precision, general-purpose scientific calculator</p>
+			<p>A pretty, general-purpose scientific calculator</p>
 		</div>
 		
 		<div id="terminal"></div>

src/command/mod.rs

@@ -57,8 +57,8 @@ pub fn do_command(
 
 			t.push(
 				concat!(
-					"Daisy is a high-precision, general-purpose\n",
-					"scientific calculator.\n",
+					"Daisy is a pretty, general-purpose\n",
+					"TUI scientific calculator.\n",
 					"\n",
 					" - Use Up/Down arrows to navigate history.\n",
 					" - Use Ctrl-C or Ctrl-D to quit.\n",
@@ -152,6 +152,9 @@ pub fn do_command(
 					"  Fahrenheit to Kelvin     [c]fromF, fromFahrenheit[n]\n",
 					"  Kelvin to Fahrenheit     [c]toF,   toFahrenheit[n]\n",
 					"\n",
+					"  Celsius to Fahrenheit    [c]CtoF[n]\n",
+					"  Fahrenheit to Celsius    [c]FtoC[n]\n",
+					"\n",
 					"  convert to base unit     [c]tobase[n]\n",
 					"  remove units             [c]nounit[n]\n",
 					"\n\n"

src/evaluate/function.rs

@@ -1,3 +1,5 @@
+use std::collections::VecDeque;
+
 use crate::parser::Expression;
 use crate::parser::Function;
 use crate::parser::Operator;
@@ -9,6 +11,7 @@ use crate::quantity::Quantity;
 use crate::quantity::Scalar;
 use crate::errors::DaisyError;
 use crate::context::Context;
+use super::evaluate;
 
 // If unitless, do nothing
 // If compatible with radians, convert to radians and return unitless
@@ -151,6 +154,33 @@ pub fn eval_function(context: &mut Context, g: &Expression) -> Result<Option<Exp
 		},
 
 
+		Function::CtoF => {
+			return Ok(evaluate(context,
+				&Expression::Operator(
+					*l + *loc,
+					Operator::Function(Function::ToFahrenheit),
+					VecDeque::from(vec![Expression::Operator(
+						*l + *loc,
+						Operator::Function(Function::FromCelsius),
+						VecDeque::from(vec![Expression::Quantity(*l, q.clone())])
+					)])
+				)
+			).ok());
+		},
+
+		Function::FtoC => {
+			return Ok(evaluate(context,
+				&Expression::Operator(
+					*l + *loc,
+					Operator::Function(Function::ToCelsius),
+					VecDeque::from(vec![Expression::Operator(
+						*l + *loc,
+						Operator::Function(Function::FromFahrenheit),
+						VecDeque::from(vec![Expression::Quantity(*l, q.clone())])
+					)])
+				)
+			).ok());
+		},
 
 		Function::ToCelsius => {
 			let mut k = Quantity::new_rational(1f64).unwrap();

src/parser/expression/function.rs

@@ -37,7 +37,9 @@ pub enum Function {
 	FromCelsius,
 	ToCelsius,
 	FromFahrenheit,
-	ToFahrenheit
+	ToFahrenheit,
+	CtoF,
+	FtoC,
 }
 
 
@@ -74,6 +76,8 @@ impl ToString for Function {
 			Function::ToCelsius => {String::from("tocelsius") },
 			Function::FromFahrenheit => { String::from("fromfahrenheit") },
 			Function::ToFahrenheit => { String::from("tofahrenheit") },
+			Function::FtoC => { String::from("FtoC") },
+			Function::CtoF => { String::from("CtoF") },
 		}
 	}
 
@@ -126,6 +130,11 @@ impl Function {
 			"fromF"          => {Some(Function::FromFahrenheit)},
 			"fromfahrenheit" => {Some(Function::FromFahrenheit)},
 			"fromFahrenheit" => {Some(Function::FromFahrenheit)},
+
+			"FtoC" => {Some(Function::FtoC)},
+			"ftoc" => {Some(Function::FtoC)},
+			"ctof" => {Some(Function::CtoF)},
+			"CtoF" => {Some(Function::CtoF)},
 			_ => None
 		}
 	}

src/tests.rs

@@ -232,5 +232,11 @@ fn functions() {
 
 	good_expr("2", "nounit(2 mm)");
 	good_expr("2", "nounit(2 meter * second)");
+
+	good_expr("37.778", "FtoC(100)");
+	good_expr("73.399", "CtoF(23)");
+	good_expr("-17.778", "FtoC(0)");
+	good_expr("31.999", "CtoF(0)");
+
 	//good_expr("5000 m²·g/(s²·A²)", "tobase(5H)");
 }