Mark/daisy
1
1
Fork 0
mirror of https://github.com/rm-dr/daisy synced 2025-11-03 15:04:25 -08:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: Mark:v1.1.4
Branches Tags
Mark:master Mark:dev Mark:newfloat
Mark:v1.1.7 Mark:v1.1.6 Mark:v1.1.5 Mark:v1.1.4 Mark:v1.1.3 Mark:v1.1.1 Mark:v1.1.0 Mark:v1.0.1 Mark:v1.0.0
...
compare: Mark:a75f6197cd89e7c31f0115a9ca9e36bd09885af4
Branches Tags
Mark:master Mark:dev Mark:newfloat
Mark:v1.1.7 Mark:v1.1.6 Mark:v1.1.5 Mark:v1.1.4 Mark:v1.1.3 Mark:v1.1.1 Mark:v1.1.0 Mark:v1.0.1 Mark:v1.0.0

11 Commits
v1.1.4 ... a75f6197cd

Author SHA1 Message Date
Mark
a75f6197cd Merge pull request #11 from rm-dr/dev 
Version bump to v1.1.5
 2023-09-28 13:38:21 -07:00
Mark
2f2c005c86 Version bump 2023-09-28 13:32:34 -07:00
Mark
ffebcf2e15 Merge branch 'master' into dev 2023-09-28 13:30:08 -07:00
Mark
4e1df2399b Merge pull request #10 from bojohnson5/testing 
fix electron mass
 2023-09-28 13:29:23 -07:00
Johnson, Bo
5a921cfc7b fix electron mass 2023-09-28 14:35:16 -04:00
Mark
2531524ffd Updated makefile 2023-09-22 11:22:36 -07:00
Mark
e5525adcca Updated todo 2023-09-22 11:05:58 -07:00
Mark
a61cbf29e5 Makefile edits 2023-09-22 11:05:30 -07:00
Mark
39ab47530e Merge pull request #9 from rm-dr/dev 
Merge v1.1.4
 2023-09-22 11:01:55 -07:00
Mark
be28669416 Sync with master 2023-09-22 11:00:28 -07:00
Mark
63d4a01095 Merge pull request #8 from rm-dr/dev 
Merge v1.1.3
 2023-09-22 10:48:59 -07:00
5 changed files with 7 additions and 7 deletions
Expand all files Collapse all files

2
Cargo.lock generated
View File

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

2
Cargo.toml
View File

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

5
Makefile
View File

@ -14,5 +14,6 @@ publish:
cargo test cargo test
cargo publish 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

1
TODO.md
View File

@ -12,7 +12,6 @@
## 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?

4
buildscript/constants.toml
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.1093837015-31 kg" value = "9.1093837015e-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"