SIFOSC の不具合を修正

Author: Takym

FastChatProtocolInterface/SimpleFormulaScript/SifoscObject.cs

@@ -5,13 +5,30 @@
  * distributed under the MIT License.
 ****/
 
+using System;
+using System.Text;
+
 namespace FastChatProtocolInterface.SimpleFormulaScript
 {
 	public record SifoscObject { }
 
 	public sealed record SifoscArray : SifoscObject
 	{
-		public SifoscObject?[]? Values { get; set; }
+		public ReadOnlyMemory<SifoscObject?> Values { get; set; }
+
+		protected override bool PrintMembers(StringBuilder builder)
+		{
+			// 参考：https://qiita.com/muniel/items/fd843abc55a5626e5c45
+
+			var s = this.Values.Span;
+			for (int i = 0; i < s.Length; ++i) {
+				if (i != 0) {
+					builder.Append(", ");
+				}
+				builder.Append(s[i]);
+			}
+			return s.Length > 0;
+		}
 	}
 
 	public sealed record SifoscNull : SifoscObject

FastChatProtocolInterface/SimpleFormulaScript/SifoscParser.cs

@@ -52,7 +52,7 @@ public static bool TryParseArray(this SourceCode sc, [NotNullWhen(true)][MaybeNu
 
 				sc.SkipSpaces();
 				if (sc.AdvanceIf(']')) {
-					result = new() { Values = [ ..list ] };
+					result = new() { Values = list.ToArray() };
 					return true;
 				}
 			}

FastChatProtocolInterface/SimpleFormulaScript/SifoscServer.cs

@@ -25,12 +25,17 @@ protected override string ReceiveMessageCore(FachpiCommunicationFlow flow)
 
 		public static string RunScriptLine(string s)
 		{
+			// SIFOSC の例：[ null, newobj, 123, +456, -789, [ ] ]
+
 			var sc = new SourceCode(s);
 			if (sc.TryParseValue(out var result)) {
-				return result.ToString();
-			} else {
-				return "（有効な SIFOSC ではありませんでした。）" + sc.Text;
+				sc.SkipSpaces();
+				if (sc.Index >= sc.Length) {
+					return result.ToString();
+				}
 			}
+
+			return "（有効な SIFOSC ではありませんでした。）" + sc.Text;
 		}
 	}
 }

FastChatProtocolInterface/SimpleFormulaScript/SourceCode.cs

@@ -73,7 +73,7 @@ public bool TryReadChar(out char result)
 		public bool TryPeekChar(out char result)
 		{
 			if (_idx < _src.Length) {
-				result = _src[_idx++];
+				result = _src[_idx];
 				return true;
 			} else {
 				result = '\0';