Jellyfin.Plugin.SmartPlaylist/Api/LispPlaygroundController.cs

@@ -74,7 +74,7 @@ namespace Jellyfin.Plugin.SmartPlaylist.Api {
                 })));
                 return Lisp.Boolean.TRUE;
             };
-            executor.builtins["println"] = (x) => {
+                executor.builtins["print"] = (x) => {
                 sb.Append(string.Join(" ", x.Select((i) => {
                     if (i is Lisp.String i_s) {
                         return i_s.Value();

Jellyfin.Plugin.SmartPlaylist/Lisp/Compiler/Parser.cs

@@ -3,7 +3,7 @@ using Jellyfin.Plugin.SmartPlaylist.Lisp;
 
 namespace Jellyfin.Plugin.SmartPlaylist.Lisp.Compiler {
     public class Parser {
-        internal StringTokenStream _sts;
+        private StringTokenStream _sts;
         public Parser(StringTokenStream tokens) {
             _sts = tokens;
         }
@@ -29,18 +29,13 @@ namespace Jellyfin.Plugin.SmartPlaylist.Lisp.Compiler {
             Debug.Assert(start.value == end.value);
             Debug.Assert("\"".Contains(start.value));
             string r = "";
-            bool exit_ok = false;
             while (_sts.Available() > 0) {
                 Token<string> t = _sts.Get();
                 if (t.value == end.value) {
-                    exit_ok = true;
                     break;
                 }
                 r += t.value;
             }
-            if (!exit_ok) {
-                throw new ApplicationException($"Failed to parse string, are you missing the closing quotes? String is: {r}");
-            }
             _sts.Commit();
             return new String(r);
         }
@@ -74,16 +69,11 @@ namespace Jellyfin.Plugin.SmartPlaylist.Lisp.Compiler {
             if (";".Contains(start.value)) {
                 return parse_comment(start, end);
             }
-            if (end == null) {
-                throw new ApplicationException($"Don't know how to parse grouping starting with token '{start.value}'");
-            }
-
+            Debug.Assert(end != null);
             IList<Expression> expressions = new List<Expression>();
-            bool exit_ok = false;
             while (_sts.Available() > 0) {
                 Token<string> t = _sts.Get();
                 if (t.value == end.value) {
-                    exit_ok = true;
                     _sts.Commit();
                     break;
                 }
@@ -97,11 +87,7 @@ namespace Jellyfin.Plugin.SmartPlaylist.Lisp.Compiler {
                 _sts.Rewind(1);
                 expressions.Add(parse());
             }
-            var r = Cons.FromList(expressions);
-            if (!exit_ok) {
-                throw new ApplicationException($"Failed to parse grouping, are you missing some closing braces? Parsed expressions: {r}");
-            }
-            return r;
+            return Cons.FromList(expressions);
         }
 
         Expression parse_atom(AtomToken at) {

Jellyfin.Plugin.SmartPlaylist/Lisp/Interpreter.cs

@@ -601,11 +601,7 @@ namespace Jellyfin.Plugin.SmartPlaylist.Lisp {
             throw new ApplicationException($"Not handled case '{expression}'");
         }
         public Expression eval(Parser p) {
-            Expression r = eval(p.parse());
-            if (p._sts.Available() > 0) {
-                throw new ApplicationException($"Did not consume all tokens, remaining program is {string.Join(" ", p._sts.Remainder())}");
-            }
-            return r;
+            return eval(p.parse());
         }
         public Expression eval(StringTokenStream sts) {
             return eval(new Parser(sts));

Jellyfin.Plugin.SmartPlaylist/Util/Stream.cs

@@ -56,9 +56,6 @@ namespace Jellyfin.Plugin.SmartPlaylist.Util {
         public IStream<T> Copy() {
             return new Stream<T>(_items, _cursor, _ephemeralCursor);
         }
-        public IList<T> Remainder() {
-            return _items.Skip(_cursor).ToList();
-        }
     }
 }