Add cell, tablecols, tablerows functions

#1551

OneMore/Commands/Tables/AddFormulaCommand.cs

@@ -86,17 +86,11 @@ public override async Task Execute(params object[] args)
 			if (cells.Count == 1)
 			{
 				dialog.SetCellNames(cells[0].Coordinates);
-				dialog.SetResultRow(cells[0].RowNum);
 			}
 			else
 			{
 				dialog.SetCellNames(
 					$"{cells[0].Coordinates} - {cells[cells.Count - 1].Coordinates}");
-
-				if (range == TableSelectionRange.Rows)
-				{
-					dialog.SetResultRow(cells[cells.Count - 1].RowNum);
-				}
 			}
 
 			var cell = cells[0];
@@ -162,7 +156,7 @@ private void StoreFormula(
 				return;
 			}
 
-			var regex = new Regex(Processor.OffsetPattern);
+			var regex = new Regex(Processor.AddressPattern);
 
 			int offset = 0;
 			foreach (var cell in cells)

OneMore/Commands/Tables/FormulaDialog.cs

@@ -14,7 +14,6 @@ internal partial class FormulaDialog : UI.MoreForm
 	{
 		private readonly int helpHeight;
 		private readonly Calculator calculator;
-		private int resultRow;
 
 
 		public FormulaDialog()
@@ -49,7 +48,7 @@ public FormulaDialog()
 
 			formatBox.SelectedIndex = 0;
 
-			calculator = new Calculator();
+			calculator = new Calculator(null);
 			calculator.ProcessSymbol += ResolveSymbol;
 		}
 
@@ -81,12 +80,6 @@ public void SetCellNames(string names)
 		}
 
 
-		public void SetResultRow(int row)
-		{
-			resultRow = row;
-		}
-
-
 		public bool Tagged
 		{
 			get => tagBox.Checked;
@@ -102,36 +95,41 @@ private void ChangedFormula(object sender, EventArgs e)
 			{
 				try
 				{
-					calculator.Execute(formula, indexOffset: resultRow);
+					calculator.Execute(formula, 0, 0);
 					validStatusLabel.ForeColor = manager.GetColor("ControlText");
 					validStatusLabel.Text = Resx.word_OK;
+					tooltip.SetToolTip(validStatusLabel, string.Empty);
 					okButton.Enabled = true;
 				}
-				catch
+				catch (Exception exc)
 				{
 					validStatusLabel.ForeColor = manager.GetColor("ErrorText");
 					validStatusLabel.Text = Resx.FormulaDialog_status_Invalid;
+					tooltip.SetToolTip(validStatusLabel, exc.Message);
 					okButton.Enabled = false;
 				}
 			}
 			else
 			{
 				validStatusLabel.ForeColor = manager.GetColor("ControlText");
 				validStatusLabel.Text = Resx.FormulaDialog_status_Empty;
+				tooltip.SetToolTip(validStatusLabel, string.Empty);
 				okButton.Enabled = false;
 			}
 		}
 
 
 		private void ResolveSymbol(object sender, SymbolEventArgs e)
 		{
-			if (Regex.Match(e.Name, Processor.OffsetPattern).Success)
+			if (Regex.Match(e.Name, Processor.AddressPattern).Success)
 			{
+				logger.Verbose($"ResolveSymbol({e.Name}) OK");
 				e.SetResult(1.0);
 				e.Status = SymbolStatus.OK;
 			}
 			else
 			{
+				logger.Verbose($"ResolveSymbol({e.Name}) undefined");
 				e.Status = SymbolStatus.UndefinedSymbol;
 			}
 		}

OneMore/Commands/Tables/FormulaDialog.resx

@@ -128,6 +128,9 @@ Cell reference: A1, A2, ... ZZZ999
 Cell range: A1:A22
 Relative range in a column: A1:A-1</value>
   </data>
+  <metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

OneMore/Commands/Tables/Formulas/Calculator.cs

@@ -61,14 +61,16 @@ private enum State
 		// to signify a unary negative; 0x80 follows DEL/0x7F just out of ASCII range
 		private const string UnaryMinus = "\x80";
 
-		private int indexOffset;
+		private Models.Table table;
+		private Coordinates coordinates;
 
 
 		/// <summary>
 		/// Initialize a new instance
 		/// </summary>
-		public Calculator()
+		public Calculator(Models.Table table)
 		{
+			this.table = table;
 		}
 
 
@@ -82,9 +84,9 @@ public Calculator()
 		/// accomodate a dynamically growing table of rows without having to update the formula.
 		/// </param>
 		/// <returns></returns>
-		public double Execute(string expression, int indexOffset)
+		public double Execute(string expression, int colNumber, int rowNumber)
 		{
-			this.indexOffset = indexOffset;
+			coordinates = new Coordinates(colNumber, rowNumber);
 
 			var result = ExecuteInternal(expression);
 			if (result.Type == FormulaValueType.Double)
@@ -311,8 +313,7 @@ private string ParseSymbolToken(TextParser parser)
 		{
 			int start = parser.Position;
 			var c = parser.Peek();
-			while (char.IsLetterOrDigit(c) || c == '<' || c == '>' || c == '!' || c == '_' ||
-				(c == '-' && indexOffset > 0))
+			while (char.IsLetterOrDigit(c) || c == '<' || c == '>' || c == '!' || c == '_')
 			{
 				parser.MoveAhead();
 				c = parser.Peek();
@@ -335,10 +336,17 @@ private FormulaValue EvaluateFunction(TextParser parser, string name, int pos)
 			// parse function parameters
 			var parameters = ParseParameters(parser);
 
-			var Fn = MathFunctions.Find(name);
-			if (Fn != null)
+			var function = MathFunctions.Find(name);
+			if (function != null)
 			{
-				return new FormulaValue(Fn(parameters));
+				if (function.Spacial)
+				{
+					parameters.Add(new FormulaValue(table));
+					parameters.Add(coordinates.ColNumber);
+					parameters.Add(coordinates.RowNumber);
+				}
+
+				return new FormulaValue(function.Fn(parameters));
 			}
 
 			double result = default;
@@ -475,31 +483,15 @@ private FormulaValues EvaluateCellReferences(string cell1, string cell2, int p1,
 			if (!match.Success)
 				throw new FormulaException(string.Format(ErrUndefinedSymbol, cell1), p1);
 
-			if (int.Parse(match.Groups["r"].Value) == 0)
-			{
-				// do not include result cell (or off-table) in calculations
-				throw new FormulaException("row offset cannot be zero");
-			}
-
-			var col1 = match.Groups["c"].Value;
-			var row1 = match.Groups["r"].Value;
-
-			// cell2...
+			var col1 = match.Groups[1].Value;
+			var row1 = match.Groups[2].Value;
 
-			match = Regex.Match(cell2, Processor.OffsetPattern);
+			match = Regex.Match(cell2, Processor.AddressPattern);
 			if (!match.Success)
 				throw new FormulaException(string.Format(ErrUndefinedSymbol, cell2), p2);
 
-			if (int.Parse(match.Groups["r"].Value) == 0)
-			{
-				// do not include result cell (or off-table) in calculations
-				throw new FormulaException("row offset cannot be zero");
-			}
-
-			var col2 = match.Groups["c"].Value;
-			var row2 = match.Groups["o"].Success && indexOffset > 0
-				? $"{indexOffset - int.Parse(match.Groups["r"].Value)}"
-				: match.Groups["r"].Value;
+			var col2 = match.Groups[1].Value;
+			var row2 = match.Groups[2].Value;
 
 			// validate...
 
@@ -612,7 +604,7 @@ private FormulaValue EvaluateSymbol(string name, int pos)
 			// ask consumer to resolve symbol reference
 			if (ProcessSymbol != null)
 			{
-				var args = new SymbolEventArgs(name, indexOffset);
+				var args = new SymbolEventArgs(name, coordinates);
 
 				ProcessSymbol(this, args);
 				if (args.Status == SymbolStatus.OK)

OneMore/Commands/Tables/Formulas/Coordinates.cs

@@ -0,0 +1,22 @@
+//************************************************************************************************
+// Copyright © 2024 Steven M Cohn. All rights reserved.
+//************************************************************************************************
+
+namespace River.OneMoreAddIn.Commands.Tables.Formulas
+{
+
+	internal class Coordinates
+	{
+		public Coordinates(int col, int row)
+		{
+			ColNumber = col;
+			RowNumber = row;
+		}
+
+
+		public int ColNumber { get; private set; }
+
+
+		public int RowNumber { get; private set; }
+	}
+}

OneMore/Commands/Tables/Formulas/FormulaValues.cs

@@ -15,28 +15,17 @@ internal enum FormulaValueType
 		Boolean,
 		Double,
 		String,
+		Table,
 		Unknown
 	}
 
 
-	/// <summary>
-	/// Allowed operators in first character of a countif comparison
-	/// </summary>
-	internal enum CountIfOperator
-	{
-		GreaterThan,
-		LessThan,
-		NotEqual
-	}
-
-
 	/// <summary>
 	/// Boxy formula value representing a double, string, or boolean value.
 	/// </summary>
 	internal class FormulaValue
 	{
 		public FormulaValueType Type { get; private set; }
-		public CountIfOperator Operator { get; private set; }
 		public object Value { get; private set; }
 		public double DoubleValue { get => (double)Value; }
 
@@ -60,6 +49,11 @@ public FormulaValue(string value)
 			Value = value;
 			Type = FormulaValueType.String;
 		}
+		public FormulaValue(Models.Table value)
+		{
+			Value = value;
+			Type = FormulaValueType.Table;
+		}
 
 		public int CompareTo(FormulaValue template)
 		{