Cleanup

Author: StynH

README.md

@@ -22,7 +22,7 @@ Output (example):
 2025-10-04T14:23:00
 ```
 
-You can also parse expressions relative to a specific `DateTime` using `NaturalDateTime.From`.
+You can parse expressions relative to a specific `DateTime` using `NaturalDateTime.From`.
 
 ```csharp
 using STYME;
@@ -39,9 +39,29 @@ Output:
 2020-02-01T00:00:00
 ```
 
+### Add
+
+You can add time using the `add` keyword.
+
+```csharp
+using STYME;
+
+var baseTime = new DateTime(2020, 3, 1, 12, 0, 0);
+var parser = NaturalDateTime.From(baseTime);
+var result = parser.Parse("add 1 year");
+Console.WriteLine(result);
+```
+
+Output:
+
+```
+2021-03-01T00:00:00
+```
+
+
 ### Deduct / Subtract
 
-You can subtract time using the `deduct` (or `subtract`) keyword. The expression works the same as `add` but shifts the base time backwards.
+You can subtract time using the `deduct` (or `subtract`) keyword.
 
 ```csharp
 using STYME;
@@ -83,6 +103,13 @@ Console.WriteLine(parser.Parse("add 2 decades")); // 2020-01-01
 Console.WriteLine(parser.Parse("deduct 1 century")); // 1900-01-01
 ```
 
+### Todo
+
+[ ] Add month support (set DateTime to specific month)
+[ ] Add day support (i.e. "next friday")
+[ ] Add complex time support (i.e. "quarter past five")
+[ ] Add multiple complex operations (i.e. "add one year then next friday")
+
 ## Support
 
 * .NET 8.0 and later

src/STYME/Expressions/AddExpression.cs …essions/Implementations/AddExpression.cssrc/STYME/Expressions/AddExpression.cs renamed to src/STYME/Expressions/Implementations/AddExpression.cs src/STYME/Expressions/AddExpression.cs renamed to src/STYME/Expressions/Implementations/AddExpression.cs

@@ -1,7 +1,7 @@
 using STYME.Handling;
 using STYME.Values.TimeShifts;
 
-namespace STYME.Expressions;
+namespace STYME.Expressions.Implementations;
 
 internal sealed class AddExpression : IExpression
 {

src/STYME/Expressions/DeductExpression.cs …ions/Implementations/DeductExpression.cssrc/STYME/Expressions/DeductExpression.cs renamed to src/STYME/Expressions/Implementations/DeductExpression.cs src/STYME/Expressions/DeductExpression.cs renamed to src/STYME/Expressions/Implementations/DeductExpression.cs

@@ -1,7 +1,7 @@
 using STYME.Handling;
 using STYME.Values.TimeShifts;
 
-namespace STYME.Expressions;
+namespace STYME.Expressions.Implementations;
 
 internal sealed class DeductExpression : IExpression
 {

…STYME/Expressions/TimeShiftExpression.cs …s/Implementations/TimeShiftExpression.cssrc/STYME/Expressions/TimeShiftExpression.cs renamed to src/STYME/Expressions/Implementations/TimeShiftExpression.cs src/STYME/Expressions/TimeShiftExpression.cs renamed to src/STYME/Expressions/Implementations/TimeShiftExpression.cs

@@ -1,7 +1,7 @@
 using STYME.Handling;
 using STYME.Values.TimeShifts;
 
-namespace STYME.Expressions;
+namespace STYME.Expressions.Implementations;
 
 internal sealed class TimeShiftExpression : IExpression
 {

src/STYME/Locale/English/EnglishParserRules.cs

@@ -11,15 +11,6 @@ internal sealed class EnglishParserRules : ParserRules
     public EnglishParserRules()
     {
         _timeUnitMap = new(StringComparer.OrdinalIgnoreCase);
-        void AddTimeUnitAliases(Func<double, TimeSpan> converter, params string[] names)
-        {
-            foreach (var name in names)
-            {
-                if (string.IsNullOrWhiteSpace(name)) continue;
-                _timeUnitMap[name.Trim()] = converter;
-            }
-        }
-
         AddTimeUnitAliases(TimeSpan.FromSeconds, "second", "seconds");
         AddTimeUnitAliases(TimeSpan.FromMinutes, "minute", "minutes");
         AddTimeUnitAliases(TimeSpan.FromHours, "hour", "hours");
@@ -32,17 +23,33 @@ void AddTimeUnitAliases(Func<double, TimeSpan> converter, params string[] names)
         AddTimeUnitAliases(v => TimeSpan.FromDays(v * 365 * 1000), "millennium", "millennia", "millenium");
 
         _constructors = new(StringComparer.OrdinalIgnoreCase);
-        void AddConstructorAliases(IExpressionConstructor constructor, params string[] names)
+        AddConstructorAliases(new AddExpressionConstructor(), "add");
+        AddConstructorAliases(new DeductExpressionConstructor(), "deduct", "subtract");
+    }
+
+    private void AddConstructorAliases(IExpressionConstructor constructor, params string[] names)
+    {
+        foreach (var name in names)
         {
-            foreach (var name in names)
+            if (string.IsNullOrWhiteSpace(name))
             {
-                if (string.IsNullOrWhiteSpace(name)) continue;
-                _constructors[name.Trim()] = constructor;
+                continue;
             }
+
+            _constructors[name.Trim()] = constructor;
         }
+    }
+    private void AddTimeUnitAliases(Func<double, TimeSpan> converter, params string[] names)
+    {
+        foreach (var name in names)
+        {
+            if (string.IsNullOrWhiteSpace(name))
+            {
+                continue;
+            }
 
-        AddConstructorAliases(new AddExpressionConstructor(), "add");
-        AddConstructorAliases(new DeductExpressionConstructor(), "deduct", "subtract");
+            _timeUnitMap[name.Trim()] = converter;
+        }
     }
 
     public bool TryCreateTimeSpan(double amount, string unit, out TimeSpan value)

src/STYME/Parser/ExpressionParser.cs

@@ -1,4 +1,5 @@
 using STYME.Expressions;
+using STYME.Expressions.Implementations;
 using STYME.Locale.English;
 using STYME.Values.TimeShifts;
 

src/STYME/Parser/Expressions/Constructors/AddExpressionConstructor.cs

@@ -1,12 +1,13 @@
 using STYME.Expressions;
+using STYME.Expressions.Implementations;
 
 namespace STYME.Parser.Expressions.Constructors;
 
 internal sealed class AddExpressionConstructor : IExpressionConstructor
 {
     public IExpression Construct(string token, Queue<string> tokens, IExpressionParser parser)
     {
-        var right = parser.ParseExpressionTree(tokens) ?? throw new InvalidOperationException("Expected expression after keyword.");
+        var right = parser.ParseExpressionTree(tokens) ?? throw new InvalidOperationException($"Expected expression after keyword '{token}'.");
         return new AddExpression(right);
     }
 }

src/STYME/Parser/Expressions/Constructors/DeductExpressionConstructor.cs

@@ -1,12 +1,13 @@
 using STYME.Expressions;
+using STYME.Expressions.Implementations;
 
 namespace STYME.Parser.Expressions.Constructors;
 
 internal sealed class DeductExpressionConstructor : IExpressionConstructor
 {
     public IExpression Construct(string token, Queue<string> tokens, IExpressionParser parser)
     {
-        var right = parser.ParseExpressionTree(tokens) ?? throw new InvalidOperationException("Expected expression after keyword.");
+        var right = parser.ParseExpressionTree(tokens) ?? throw new InvalidOperationException($"Expected expression after keyword '{token}'.");
         return new DeductExpression(right);
     }
 }