Merge pull request #139 from Rustfahrtagentur/pat/units

Add density to Units

Author: fightling

lang/eval/call/call_method.rs

@@ -68,6 +68,7 @@ impl CallMethod for Value {
             Value::Volume(_) => todo!(),
             Value::Angle(_) => todo!(),
             Value::Weight(_) => todo!(),
+            Value::Density(_) => todo!(),
             Value::Bool(_) => todo!(),
             Value::String(_) => todo!(),
             Value::Color(_) => todo!(),

lang/syntax/literal/units.rs

@@ -92,6 +92,9 @@ pub enum Unit {
     Milliliter,
     /// Microliter
     Microliter,
+
+    /// Density
+    KilogramPerMeter2,
 }
 
 impl std::fmt::Display for Unit {
@@ -145,6 +148,9 @@ impl std::fmt::Display for Unit {
             Self::Centiliter => write!(f, "cl"),
             Self::Liter => write!(f, "l"),
             Self::Microliter => write!(f, "µl"),
+
+            // Density
+            Self::KilogramPerMeter2 => write!(f, "kg/m2"),
         }
     }
 }
@@ -181,6 +187,7 @@ impl Unit {
             | Self::Centiliter
             | Self::Milliliter
             | Self::Microliter => Type::Volume,
+            Self::KilogramPerMeter2 => Type::Density,
         }
     }
     /// Normalize value to mm, rad or gram
@@ -232,6 +239,9 @@ impl Unit {
             Self::Centiliter => x * 10_000.0_f64,
             Self::Milliliter => x * 1_000.0_f64,
             Self::Microliter => x * 1_000_000.0_f64,
+
+            // Densities
+            Self::KilogramPerMeter2 => 1_f64,
         }
     }
 }

lang/ty/type.rs

@@ -28,6 +28,8 @@ pub enum Type {
     Angle,
     /// A physical weight, e.g. 4.0kg
     Weight,
+    /// A physical density, e.g. 1.0kg/m³
+    Density,
     /// A boolean: true, false
     Bool,
     /// A list of elements of the same type: `[scalar]`
@@ -82,6 +84,7 @@ impl std::fmt::Display for Type {
             Self::Volume => write!(f, "Volume"),
             Self::Angle => write!(f, "Angle"),
             Self::Weight => write!(f, "Weight"),
+            Self::Density => write!(f, "Density"),
             Self::Bool => write!(f, "Bool"),
             Self::List(t) => write!(f, "{}", t),
             Self::Map(t) => write!(f, "{}", t),

lang/value/mod.rs

@@ -49,6 +49,8 @@ pub enum Value {
     Area(Scalar),
     /// Volume in mm³.
     Volume(Scalar),
+    /// Density in g/mm³
+    Density(Scalar),
     /// An angle in radians.
     Angle(Scalar),
     /// Weight of a specific volume of material.
@@ -222,6 +224,7 @@ impl crate::ty::Ty for Value {
             Value::Volume(_) => Type::Volume,
             Value::Angle(_) => Type::Angle,
             Value::Weight(_) => Type::Weight,
+            Value::Density(_) => Type::Density,
             Value::Bool(_) => Type::Bool,
             Value::String(_) => Type::String,
             Value::Color(_) => Type::Color,
@@ -418,7 +421,8 @@ impl std::fmt::Display for Value {
             | Value::Angle(n)
             | Value::Area(n)
             | Value::Volume(n)
-            | Value::Weight(n) => {
+            | Value::Weight(n)
+            | Value::Density(n) => {
                 write!(f, "{n}{}", self.ty().default_unit())
             }
             Value::Bool(b) => write!(f, "{b}"),
@@ -444,6 +448,7 @@ impl std::fmt::Debug for Value {
             Self::Volume(arg0) => write!(f, "Volume: {arg0}"),
             Self::Angle(arg0) => write!(f, "Angle: {arg0}"),
             Self::Weight(arg0) => write!(f, "Weight: {arg0}"),
+            Self::Density(arg0) => write!(f, "Density: {arg0}"),
             Self::Bool(arg0) => write!(f, "Bool: {arg0}"),
             Self::String(arg0) => write!(f, "String: {arg0}"),
             Self::Color(arg0) => write!(f, "Color: {arg0}"),