#464 - Add string concatenation support (#465)

sys27 · Oct 17, 2021 · d99a754 · d99a754
1 parent a7e5b7b
commit d99a754
Show file tree

Hide file tree

Showing 18 changed files with 79 additions and 17 deletions.
diff --git a/xFunc.Maths/Analyzers/TypeAnalyzers/TypeAnalyzer.cs b/xFunc.Maths/Analyzers/TypeAnalyzers/TypeAnalyzer.cs
@@ -358,6 +358,10 @@ public virtual ResultTypes Analyze(Add exp)
                 (ResultTypes.Vector, ResultTypes.Vector) => ResultTypes.Vector,
                 (ResultTypes.Matrix, ResultTypes.Matrix) => ResultTypes.Matrix,
 
+                (ResultTypes.String, _) or
+                (_, ResultTypes.String)
+                    => ResultTypes.String,
+
                 (_, ResultTypes.Number) => ResultTypes.Number.ThrowForLeft(leftResult),
                 (ResultTypes.Number, _) => ResultTypes.Number.ThrowForRight(rightResult),
 

diff --git a/xFunc.Maths/Expressions/Add.cs b/xFunc.Maths/Expressions/Add.cs
@@ -74,6 +74,9 @@ public override object Execute(ExpressionParameters? parameters)
                 (Vector left, Vector right) => left.Add(right, parameters),
                 (Matrix left, Matrix right) => left.Add(right, parameters),
 
+                (string left, var right) => left + right,
+                (var left, string right) => left + right,
+
                 _ => throw new ResultIsNotSupportedException(this, leftResult, rightResult),
             };
         }

diff --git a/xFunc.Tests/Analyzers/TypeAnalyzerTests/AddTests.cs b/xFunc.Tests/Analyzers/TypeAnalyzerTests/AddTests.cs
@@ -18,7 +18,6 @@
 using xFunc.Maths.Expressions.ComplexNumbers;
 using xFunc.Maths.Expressions.LogicalAndBitwise;
 using xFunc.Maths.Expressions.Matrices;
-using xFunc.Maths.Expressions.Units;
 using xFunc.Maths.Expressions.Units.AngleUnits;
 using xFunc.Maths.Expressions.Units.PowerUnits;
 using Xunit;
@@ -346,5 +345,38 @@ public void TestAddPowerPower()
 
             Test(exp, ResultTypes.PowerNumber);
         }
+
+        [Fact]
+        public void TestAddStringToString()
+        {
+            var exp = new Add(
+                new StringExpression("a"),
+                new StringExpression("b")
+            );
+
+            Test(exp, ResultTypes.String);
+        }
+
+        [Fact]
+        public void TestAddStringToNumber()
+        {
+            var exp = new Add(
+                new StringExpression("a"),
+                Number.One
+            );
+
+            Test(exp, ResultTypes.String);
+        }
+
+        [Fact]
+        public void TestAddNumberToString()
+        {
+            var exp = new Add(
+                Number.One,
+                new StringExpression("a")
+            );
+
+            Test(exp, ResultTypes.String);
+        }
     }
 }
diff --git a/xFunc.Tests/Analyzers/TypeAnalyzerTests/DivTests.cs b/xFunc.Tests/Analyzers/TypeAnalyzerTests/DivTests.cs
@@ -17,7 +17,6 @@
 using xFunc.Maths.Expressions;
 using xFunc.Maths.Expressions.ComplexNumbers;
 using xFunc.Maths.Expressions.LogicalAndBitwise;
-using xFunc.Maths.Expressions.Units;
 using xFunc.Maths.Expressions.Units.AngleUnits;
 using xFunc.Maths.Expressions.Units.PowerUnits;
 using Xunit;

diff --git a/xFunc.Tests/Analyzers/TypeAnalyzerTests/MulTests.cs b/xFunc.Tests/Analyzers/TypeAnalyzerTests/MulTests.cs
@@ -18,7 +18,6 @@
 using xFunc.Maths.Expressions.ComplexNumbers;
 using xFunc.Maths.Expressions.LogicalAndBitwise;
 using xFunc.Maths.Expressions.Matrices;
-using xFunc.Maths.Expressions.Units;
 using xFunc.Maths.Expressions.Units.AngleUnits;
 using xFunc.Maths.Expressions.Units.PowerUnits;
 using Xunit;

diff --git a/xFunc.Tests/Analyzers/TypeAnalyzerTests/SubTests.cs b/xFunc.Tests/Analyzers/TypeAnalyzerTests/SubTests.cs
@@ -18,7 +18,6 @@
 using xFunc.Maths.Expressions.ComplexNumbers;
 using xFunc.Maths.Expressions.LogicalAndBitwise;
 using xFunc.Maths.Expressions.Matrices;
-using xFunc.Maths.Expressions.Units;
 using xFunc.Maths.Expressions.Units.AngleUnits;
 using xFunc.Maths.Expressions.Units.PowerUnits;
 using Xunit;

diff --git a/xFunc.Tests/Expressions/AddTest.cs b/xFunc.Tests/Expressions/AddTest.cs
@@ -16,10 +16,8 @@
 using System;
 using System.Numerics;
 using xFunc.Maths.Expressions;
-using xFunc.Maths.Expressions.Collections;
 using xFunc.Maths.Expressions.ComplexNumbers;
 using xFunc.Maths.Expressions.LogicalAndBitwise;
-using xFunc.Maths.Expressions.Units;
 using xFunc.Maths.Expressions.Units.AngleUnits;
 using xFunc.Maths.Expressions.Units.PowerUnits;
 using Xunit;
@@ -223,6 +221,45 @@ public void ExecutePowerAndPower()
             Assert.Equal(expected, actual);
         }
 
+        [Fact]
+        public void ExecuteStringAndString()
+        {
+            var exp = new Add(
+                new StringExpression("a"),
+                new StringExpression("b")
+            );
+            var actual = exp.Execute();
+            var expected = "ab";
+
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public void ExecuteStringAndNumber()
+        {
+            var exp = new Add(
+                new StringExpression("a"),
+                Number.One
+            );
+            var actual = exp.Execute();
+            var expected = "a1";
+
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public void ExecuteNumberAndString()
+        {
+            var exp = new Add(
+                Number.One,
+                new StringExpression("b")
+            );
+            var actual = exp.Execute();
+            var expected = "1b";
+
+            Assert.Equal(expected, actual);
+        }
+
         [Fact]
         public void ExecuteTestException()
             => TestNotSupported(new Add(Bool.False, Bool.False));

diff --git a/xFunc.Tests/Expressions/CeilTest.cs b/xFunc.Tests/Expressions/CeilTest.cs
@@ -15,7 +15,6 @@
 
 using xFunc.Maths.Expressions;
 using xFunc.Maths.Expressions.LogicalAndBitwise;
-using xFunc.Maths.Expressions.Units;
 using xFunc.Maths.Expressions.Units.AngleUnits;
 using xFunc.Maths.Expressions.Units.PowerUnits;
 using Xunit;

diff --git a/xFunc.Tests/Expressions/DivTest.cs b/xFunc.Tests/Expressions/DivTest.cs
@@ -18,7 +18,6 @@
 using xFunc.Maths.Expressions;
 using xFunc.Maths.Expressions.ComplexNumbers;
 using xFunc.Maths.Expressions.LogicalAndBitwise;
-using xFunc.Maths.Expressions.Units;
 using xFunc.Maths.Expressions.Units.AngleUnits;
 using xFunc.Maths.Expressions.Units.PowerUnits;
 using Xunit;

diff --git a/xFunc.Tests/Expressions/FloorTest.cs b/xFunc.Tests/Expressions/FloorTest.cs
@@ -15,7 +15,6 @@
 
 using xFunc.Maths.Expressions;
 using xFunc.Maths.Expressions.LogicalAndBitwise;
-using xFunc.Maths.Expressions.Units;
 using xFunc.Maths.Expressions.Units.AngleUnits;
 using xFunc.Maths.Expressions.Units.PowerUnits;
 using Xunit;

diff --git a/xFunc.Tests/Expressions/FracTest.cs b/xFunc.Tests/Expressions/FracTest.cs
@@ -15,7 +15,6 @@
 
 using xFunc.Maths.Expressions;
 using xFunc.Maths.Expressions.LogicalAndBitwise;
-using xFunc.Maths.Expressions.Units;
 using xFunc.Maths.Expressions.Units.AngleUnits;
 using xFunc.Maths.Expressions.Units.PowerUnits;
 using Xunit;

diff --git a/xFunc.Tests/Expressions/MulTest.cs b/xFunc.Tests/Expressions/MulTest.cs
@@ -18,7 +18,6 @@
 using xFunc.Maths.Expressions;
 using xFunc.Maths.Expressions.ComplexNumbers;
 using xFunc.Maths.Expressions.LogicalAndBitwise;
-using xFunc.Maths.Expressions.Units;
 using xFunc.Maths.Expressions.Units.AngleUnits;
 using xFunc.Maths.Expressions.Units.PowerUnits;
 using Xunit;

diff --git a/xFunc.Tests/Expressions/SignTest.cs b/xFunc.Tests/Expressions/SignTest.cs
@@ -15,7 +15,6 @@
 
 using xFunc.Maths.Expressions;
 using xFunc.Maths.Expressions.LogicalAndBitwise;
-using xFunc.Maths.Expressions.Units;
 using xFunc.Maths.Expressions.Units.AngleUnits;
 using xFunc.Maths.Expressions.Units.PowerUnits;
 using Xunit;

diff --git a/xFunc.Tests/Expressions/SubTest.cs b/xFunc.Tests/Expressions/SubTest.cs
@@ -18,7 +18,6 @@
 using xFunc.Maths.Expressions;
 using xFunc.Maths.Expressions.ComplexNumbers;
 using xFunc.Maths.Expressions.LogicalAndBitwise;
-using xFunc.Maths.Expressions.Units;
 using xFunc.Maths.Expressions.Units.AngleUnits;
 using xFunc.Maths.Expressions.Units.PowerUnits;
 using Xunit;

diff --git a/xFunc.Tests/Expressions/TruncTest.cs b/xFunc.Tests/Expressions/TruncTest.cs
@@ -15,7 +15,6 @@
 
 using xFunc.Maths.Expressions;
 using xFunc.Maths.Expressions.LogicalAndBitwise;
-using xFunc.Maths.Expressions.Units;
 using xFunc.Maths.Expressions.Units.AngleUnits;
 using xFunc.Maths.Expressions.Units.PowerUnits;
 using Xunit;

diff --git a/xFunc.Tests/Expressions/UnaryMinusTest.cs b/xFunc.Tests/Expressions/UnaryMinusTest.cs
@@ -18,7 +18,6 @@
 using xFunc.Maths.Expressions;
 using xFunc.Maths.Expressions.ComplexNumbers;
 using xFunc.Maths.Expressions.LogicalAndBitwise;
-using xFunc.Maths.Expressions.Units;
 using xFunc.Maths.Expressions.Units.AngleUnits;
 using xFunc.Maths.Expressions.Units.PowerUnits;
 using Xunit;

diff --git a/xFunc.Tests/ParserTests/AngleTests.cs b/xFunc.Tests/ParserTests/AngleTests.cs
@@ -13,7 +13,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using xFunc.Maths.Expressions;
 using xFunc.Maths.Expressions.Units;
 using xFunc.Maths.Expressions.Units.AngleUnits;
 using Xunit;

diff --git a/xFunc.Tests/ParserTests/PowerUnitTests.cs b/xFunc.Tests/ParserTests/PowerUnitTests.cs
@@ -13,7 +13,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using xFunc.Maths.Expressions;
 using xFunc.Maths.Expressions.Units.PowerUnits;
 using Xunit;