Merge pull request #56 from Ted-Jin-Lab/development

More Operators to release.

Author: Ted-Jin-Lab

Directory.Build.props

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <Version>2025.11.19.2</Version>
+    <Version>2025.11.19.3</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>preview</LangVersion>

src/analyzers/TedToolkit.Quantities.Analyzer/QuantityStructGenerator.cs

@@ -51,8 +51,9 @@ public void GenerateCode(SourceProductionContext context)
 
                 if (attributeData.AttributeClass is not { TypeArguments.Length: > 1 } attributeClass) continue;
 
-                var otherType = attributeClass.TypeArguments[0].GetName();
-                var resultType = attributeClass.TypeArguments[1].GetName();
+                var leftType = attributeClass.TypeArguments[0].GetName();
+                var rightType = attributeClass.TypeArguments[1].GetName();
+                var resultType = attributeClass.TypeArguments[2].GetName();
 
                 operators.Add(
                     OperatorDeclaration(IdentifierName(resultType.FullName), Token(value switch
@@ -70,8 +71,8 @@ public void GenerateCode(SourceProductionContext context)
                         ])
                         .WithParameterList(ParameterList(
                         [
-                            Parameter(Identifier("left")).WithType(IdentifierName(quantity.Name)),
-                            Parameter(Identifier("right")).WithType(IdentifierName(otherType.FullName)),
+                            Parameter(Identifier("left")).WithType(IdentifierName(leftType.Name)),
+                            Parameter(Identifier("right")).WithType(IdentifierName(rightType.FullName)),
                         ]))
                         .WithExpressionBody(ArrowExpressionClause(CastExpression(IdentifierName(resultType.FullName),
                             ParenthesizedExpression(BinaryExpression(value switch
@@ -82,9 +83,11 @@ public void GenerateCode(SourceProductionContext context)
                                     3 => SyntaxKind.DivideExpression,
                                     _ => SyntaxKind.None,
                                 },
-                                MemberAccessExpression(SyntaxKind.SimpleMemberAccessExpression,
-                                    IdentifierName("left"), IdentifierName("Value")),
-                                otherType.FullName.Contains("TedToolkit.Quantities")
+                                leftType.FullName.Contains("TedToolkit.Quantities")
+                                    ? MemberAccessExpression(SyntaxKind.SimpleMemberAccessExpression,
+                                        IdentifierName("left"), IdentifierName("Value"))
+                                    : IdentifierName("left"),
+                                rightType.FullName.Contains("TedToolkit.Quantities")
                                     ? MemberAccessExpression(SyntaxKind.SimpleMemberAccessExpression,
                                         IdentifierName("right"), IdentifierName("Value"))
                                     : IdentifierName("right"))))))
@@ -200,18 +203,18 @@ public void GenerateCode(SourceProductionContext context)
                             .WithModifiers(TokenList(Token(SyntaxKind.PublicKeyword), Token(SyntaxKind.StaticKeyword)))
                             .WithAttributeLists([GeneratedCodeAttribute(typeof(QuantityStructGenerator))])
                             .WithExpressionBody(ArrowExpressionClause(CastExpression(
-                                        IdentifierName(quantity.Name),
-                                        LiteralExpression(SyntaxKind.NumericLiteralExpression, Literal(0)))))
+                                IdentifierName(quantity.Name),
+                                LiteralExpression(SyntaxKind.NumericLiteralExpression, Literal(0)))))
                             .WithSemicolonToken(Token(SyntaxKind.SemicolonToken)),
-                        
+
                         PropertyDeclaration(IdentifierName(quantity.Name), Identifier("One"))
                             .WithModifiers(TokenList(Token(SyntaxKind.PublicKeyword), Token(SyntaxKind.StaticKeyword)))
                             .WithAttributeLists([GeneratedCodeAttribute(typeof(QuantityStructGenerator))])
                             .WithExpressionBody(ArrowExpressionClause(CastExpression(
                                 IdentifierName(quantity.Name),
                                 LiteralExpression(SyntaxKind.NumericLiteralExpression, Literal(1)))))
                             .WithSemicolonToken(Token(SyntaxKind.SemicolonToken)),
-                        
+
                         FieldDeclaration(
                                 VariableDeclaration(IdentifierName(typeName.FullName))
                                     .WithVariables(
@@ -587,6 +590,19 @@ public void GenerateCode(SourceProductionContext context)
 
                         #region Operators
 
+                        OperatorDeclaration(IdentifierName(quantity.Name), Token(SyntaxKind.MinusToken))
+                            .WithModifiers(TokenList(Token(SyntaxKind.PublicKeyword), Token(SyntaxKind.StaticKeyword)))
+                            .WithAttributeLists([GeneratedCodeAttribute(typeof(QuantityStructGenerator))])
+                            .WithParameterList(ParameterList(
+                            [
+                                Parameter(Identifier("value")).WithType(IdentifierName(quantity.Name))
+                            ]))
+                            .WithExpressionBody(ArrowExpressionClause(CastExpression(IdentifierName(quantity.Name),
+                                        ParenthesizedExpression(PrefixUnaryExpression(SyntaxKind.UnaryMinusExpression,
+                                                MemberAccessExpression(SyntaxKind.SimpleMemberAccessExpression,
+                                                    IdentifierName("value"), IdentifierName("Value")))))))
+                            .WithSemicolonToken(Token(SyntaxKind.SemicolonToken)),
+
                         OperatorDeclaration(IdentifierName(quantity.Name), Token(SyntaxKind.PlusToken))
                             .WithModifiers(TokenList(Token(SyntaxKind.PublicKeyword), Token(SyntaxKind.StaticKeyword)))
                             .WithAttributeLists([GeneratedCodeAttribute(typeof(QuantityStructGenerator))])
@@ -606,7 +622,7 @@ public void GenerateCode(SourceProductionContext context)
                                         IdentifierName("right"),
                                         IdentifierName("Value")))))))
                             .WithSemicolonToken(Token(SyntaxKind.SemicolonToken)),
-                        
+
                         OperatorDeclaration(IdentifierName(quantity.Name), Token(SyntaxKind.PercentToken))
                             .WithModifiers(TokenList(Token(SyntaxKind.PublicKeyword), Token(SyntaxKind.StaticKeyword)))
                             .WithAttributeLists([GeneratedCodeAttribute(typeof(QuantityStructGenerator))])

src/libraries/TedToolkit.Quantities/QuantityOperatorAttribute.cs

@@ -11,10 +11,12 @@ namespace TedToolkit.Quantities;
 /// <param name="operator"></param>
 /// <typeparam name="TRight"></typeparam>
 /// <typeparam name="TResult"></typeparam>
+/// <typeparam name="TLeft"></typeparam>
 [Conditional("CODE_ANALYSIS")]
 [AttributeUsage(AttributeTargets.Struct, AllowMultiple = true)]
 [SuppressMessage("ReSharper", "UnusedTypeParameter")]
-public class QuantityOperatorAttribute<TRight, TResult>(Operator @operator) : Attribute
+public class QuantityOperatorAttribute<TLeft, TRight, TResult>(Operator @operator) : Attribute
+    where TLeft : struct
     where TRight : struct
     where TResult : struct;