Compare commits

..

No commits in common. "a75f6197cd89e7c31f0115a9ca9e36bd09885af4" and "39ab47530e5889766b8d0dd2de6cc0ca001a9e29" have entirely different histories.

5 changed files with 7 additions and 7 deletions

2
Cargo.lock generated
View File

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

View File

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

View File

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

View File

@ -12,6 +12,7 @@
## Pre-release ## Pre-release
- Tuple operations - Tuple operations
- we don't need vectors as arguments to operators - we don't need vectors as arguments to operators
- Fix linelocation when evaluating functions
## Parser ## Parser
- Should functions be operators? - Should functions be operators?

View File

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