Merge pull request #8 from rm-dr/dev

Merge v1.1.3

Cargo.lock

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

Cargo.toml

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

Makefile

@@ -0,0 +1,18 @@
+release:
+	cargo build --release
+
+test:
+	cargo test
+
+run:
+	cargo run
+
+wasm:
+	wasm-pack build --release --target web --out-dir server/pkg
+
+publish:
+	cargo test
+	cargo publish
+
+docker:
+	docker build ./server -t git.betalupi.com/mark/daisy

README.md

@@ -1,4 +1,4 @@
-![](./site/misc/readme-banner.png)
+![](./server/site/resources/readme-banner.png)
 
 A high-precision scientific calculator with support for units, derivatives, and more.
 

TODO.md

@@ -1,5 +1,4 @@
 ## Version Bump checklist
- - TODO: build and publish script
  - update Cargo.toml
  - run cargo test
  - commit
@@ -7,12 +6,9 @@
  - merge
  - git tag -a v1.0.0 -m "Version 1.0.0" on merge commit
  - cargo publish
- - Update packages
  - Build wasm & push changes
- - Squash merge
  - Update AUR package
 
-
 ## Pre-release
  - Tuple operations
  - we don't need vectors as arguments to operators
@@ -22,25 +18,18 @@
  - Should functions be operators?
  - Binary, hex, octal numbers
 
-
 ## General
  - Better tests (assignment, many expressions in one context)
  - Optional config file
  - Optional history file
- - evaluate straight from command line
  - Package for debian, nix
-
-
-## Internals
  - Non-recursive treeify
  - Faster factorial function. Maybe use gamma instead?
- - Arbitrary precision float (rug doesn't offer arbitrary exponents)
+ - Arbitrary precision floats
 
 ## Math Features
  - Mean, Median, Min
  - Arbitrary base logarithm
- - Derivatives
- - CAS features (trig, roots and powers)
  - Complex numbers
  - acot/acoth functions
  - Sums and products with functional arguments
@@ -50,8 +39,7 @@
  - Fix terminal color detection
  - Live syntax/output (like firefox js terminal)
  - Syntax highlighting
- - fish-style tab completion
+ - Numbered history recall
- - Numbered expressions, history recall
  - Enable/disable unit sets (defaults?)
  - Consistent unit ordering
 

server/.gitignore

@@ -0,0 +1,2 @@
+/site/node_modules
+/pkg

server/docker-compose.yml

@@ -7,7 +7,7 @@ networks:
 
 services:
   daisy:
-    build: ./.
+    build: .
     container_name: daisy
     restart: unless-stopped
 

server/site/index.html

@@ -100,6 +100,11 @@
 			<a href="https://aur.archlinux.org/packages/daisy" target="_blank" rel="noopener noreferrer">AUR</a>
 		</div>
 
+		<script>
+			var mobile = (/iphone|ipad|ipod|android|blackberry|mini|windows\sce|palm/i.test(navigator.userAgent.toLowerCase()));
+			if (mobile) { alert("This site may not work on mobile."); }
+		</script>
+
 		<script type="module">
 			// See wasm-pack docs
 			// Build with `wasm-pack build --release --target web --out-dir pkg`

server/site/package-lock.json

@@ -0,0 +1,17 @@
+{
+  "name": "site",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "dependencies": {
+        "xterm": "^5.3.0"
+      }
+    },
+    "node_modules/xterm": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/xterm/-/xterm-5.3.0.tgz",
+      "integrity": "sha512-8QqjlekLUFTrU6x7xck1MsPzPA571K5zNqWm0M0oroYEWVOptZ0+ubQSkQ3uxIEhcIHRujJy6emDWX4A7qyFzg=="
+    }
+  }
+}

shell.nix

@@ -1,11 +1,22 @@
+{ nixpkgs ? import <nixpkgs> { }}:
 let
- pkgs = import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/f155f0cf4ea43c4e3c8918d2d327d44777b6cad4.tar.gz") {};
+  # If you set hash to an empty string, you'll get
+  # an error with the correct hash.
+  pinnedPkgs = nixpkgs.fetchFromGitHub {
+    owner  = "NixOS";
+    repo   = "nixpkgs";
+    rev    = "4ecab3273592f27479a583fb6d975d4aba3486fe";
+    sha256 = "btHN1czJ6rzteeCuE/PNrdssqYD2nIA4w48miQAFloM=";
+  };
+  pkgs = import pinnedPkgs {};
+
 in pkgs.mkShell {
   buildInputs = with pkgs; [
     cargo
     rustc
     rustfmt
-    m4
+    rust-analyzer
+    wasm-pack
    ];
 }
 

site/.gitignore

@@ -1,3 +0,0 @@
-/node_modules
-/package-lock.json
-/pkg

src/lib.rs

@@ -68,9 +68,7 @@ cfg_if::cfg_if! {
 						return format!("\r\n{}", daisy_prompt(state));
 					}
 
-					if in_str.trim() == "quit" {
+
-						return "[quit]".to_string();
-					} else {
 					let r = crate::do_string( unsafe { &mut (*state).context }, &in_str);
 
 					match r {
@@ -78,7 +76,6 @@ cfg_if::cfg_if! {
 							out += t;
 						}
 					}
-					}
 				},
 
 				"\x7F" => { unsafe { (*state).promptbuffer.backspace(); } },
@@ -91,7 +88,20 @@ cfg_if::cfg_if! {
 				//'\x04' | '\x03'
 				//=> { break 'outer; },
 
-				_ => { unsafe { (*state).promptbuffer.add_char(s.chars().next().unwrap()); } },
+				// Only process sane characters
+
+				_ => {
+					let c = s.chars().next().unwrap();
+					match c {
+						'a'..='z' | 'A'..='Z' | '0'..='9'
+						|'!'|'@'|'#'|'$'|'%'|'^'|'&'|'*'|'('|')'
+						|'?'|'~'|','|'.'|'['|']'|' '
+						|'<'|'>'|'/'|'_'|'-'|':'|'|'|'='|'+'|';'
+						=> { unsafe { (*state).promptbuffer.add_char(c); } },
+
+						_ => {}
+					}
+				},
 			};
 			
 			let t = unsafe { (*state).promptbuffer.write_prompt(&mut (*state).context) };

src/main.rs

@@ -120,7 +120,7 @@ pub fn main() -> Result<(), std::io::Error> {
 					// Only process sane characters
 					'a'..='z' | 'A'..='Z' | '0'..='9'
 					|'!'|'@'|'#'|'$'|'%'|'^'|'&'|'*'|'('|')'
-					|'?'|'~'|','|'.'|'['|']'
+					|'?'|'~'|','|'.'|'['|']'|' '
 					|'<'|'>'|'/'|'_'|'-'|':'|'|'|'='|'+'|';'
 					=> { pb.add_char(*q); },