mirror of
				https://github.com/rm-dr/daisy
				synced 2025-11-03 15:04:25 -08:00 
			
		
		
		
	Fixed unit multiplication prettyprint
This commit is contained in:
		
							
								
								
									
										2
									
								
								Cargo.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										2
									
								
								Cargo.lock
									
									
									
										generated
									
									
									
								
							@ -22,7 +22,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 | 
			
		||||
 | 
			
		||||
[[package]]
 | 
			
		||||
name = "daisy"
 | 
			
		||||
version = "0.2.2"
 | 
			
		||||
version = "0.2.3"
 | 
			
		||||
dependencies = [
 | 
			
		||||
 "cfg-if",
 | 
			
		||||
 "rug",
 | 
			
		||||
 | 
			
		||||
@ -1,6 +1,6 @@
 | 
			
		||||
[package]
 | 
			
		||||
name = "daisy"
 | 
			
		||||
version = "0.2.2"
 | 
			
		||||
version = "0.2.3"
 | 
			
		||||
edition = "2021"
 | 
			
		||||
 | 
			
		||||
[profile.release]
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										1
									
								
								TODO.md
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								TODO.md
									
									
									
									
									
								
							@ -1,6 +1,5 @@
 | 
			
		||||
 - Prettyprint mi/h, mi/g
 | 
			
		||||
 - Better constant definitions
 | 
			
		||||
 - No times when number * unit
 | 
			
		||||
 - Fix unit conversion (km/s * mile)
 | 
			
		||||
 | 
			
		||||
## Pre-release
 | 
			
		||||
 | 
			
		||||
@ -264,7 +264,7 @@ impl Operator {
 | 
			
		||||
				let a = &args[0];
 | 
			
		||||
 | 
			
		||||
				let b; let sub;
 | 
			
		||||
				if let Token::Operator(o,ar) = &args[1] {
 | 
			
		||||
				if let Token::Operator(o, ar) = &args[1] {
 | 
			
		||||
					if let Operator::Negative = o {
 | 
			
		||||
						sub = true;
 | 
			
		||||
						b = &ar[0];
 | 
			
		||||
@ -290,18 +290,38 @@ impl Operator {
 | 
			
		||||
				let a = &args[0];
 | 
			
		||||
 | 
			
		||||
				let b; let div;
 | 
			
		||||
				if let Token::Operator(o,ar) = &args[1] {
 | 
			
		||||
				if let Token::Operator(o, ar) = &args[1] {
 | 
			
		||||
					if let Operator::Flip = o {
 | 
			
		||||
						div = true;
 | 
			
		||||
						b = &ar[0];
 | 
			
		||||
					} else { div = false; b = &args[1]; }
 | 
			
		||||
				} else { div = false; b = &args[1]; }
 | 
			
		||||
 | 
			
		||||
				// Division symbol case
 | 
			
		||||
				if div {
 | 
			
		||||
					return format!("{} ÷ {}",
 | 
			
		||||
						self.add_parens_to_arg_strict(a),
 | 
			
		||||
						self.add_parens_to_arg_strict(b)
 | 
			
		||||
					);
 | 
			
		||||
				}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
				// Omit times sign when we have a number
 | 
			
		||||
				// multiplied by a unit (like 10 m)
 | 
			
		||||
				// Times sign should stay in all other cases.
 | 
			
		||||
				let no_times = {
 | 
			
		||||
					if let Token::Quantity(p) = a {
 | 
			
		||||
						if let Token::Quantity(q) = b {
 | 
			
		||||
							p.unitless() && !q.unitless()
 | 
			
		||||
						} else {false}
 | 
			
		||||
					} else {false}
 | 
			
		||||
				};
 | 
			
		||||
 | 
			
		||||
				if no_times {
 | 
			
		||||
					return format!("{} {}",
 | 
			
		||||
						self.add_parens_to_arg_strict(a),
 | 
			
		||||
						self.add_parens_to_arg_strict(b)
 | 
			
		||||
					);
 | 
			
		||||
				} else {
 | 
			
		||||
					return format!("{} × {}",
 | 
			
		||||
						self.add_parens_to_arg_strict(a),
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user