fix multi-line expressions

Author: chrisbeamable

FadeBasic/CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.0.46] - 2025-11-25
+
+### Fixed
+- expressions can be multiline
+
 ## [0.0.45] - 2025-06-19
 
 ### Fixed

FadeBasic/FadeBasic/Parser.cs

@@ -3071,12 +3071,36 @@ private IExpressionNode ParseWikiExpression(IExpressionNode lhs, int minPrec)
         {
 
             var lookAhead = _stream.Peek;
+            
+            while (lookAhead.type == LexemType.EndStatement)
+            {
+                var x = _stream.Save();
+                _stream.Advance();
+                lookAhead = _stream.Peek;
+                if (lookAhead.type != LexemType.EndStatement && !IsBinaryOp(lookAhead))
+                {
+                    _stream.Restore(x);
+                }
+            }
+            
             while (IsBinaryOp(lookAhead) && GetOperatorOrder(lookAhead) >= minPrec)
             {
                 var op = lookAhead;
                 _stream.Advance();
                 var rhs = ParseWikiTerm();
                 lookAhead = _stream.Peek;
+
+                while (lookAhead.type == LexemType.EndStatement)
+                {
+                    var x = _stream.Save();
+                    _stream.Advance();
+                    lookAhead = _stream.Peek;
+                    if (lookAhead.type != LexemType.EndStatement && !IsBinaryOp(lookAhead))
+                    {
+                        _stream.Restore(x);
+                    }
+                }
+                
                 // while lookahead is a binary operator whose precedence is greater
                 //     than op's, or a right-associative operator
                 //     whose precedence is equal to op's

FadeBasic/Tests/ExpressionTests.cs

@@ -44,6 +44,7 @@ public Parser BuildParser(string src, out List<Token> tokens)
     [TestCase("1+2", "(+ (1),(2))")]
     [TestCase("(2)", "(2)")]
     [TestCase("1+2+3", "(+ (1),(+ (2),(3)))")]
+    [TestCase("1+2\n+3", "(+ (1),(+ (2),(3)))")]
     [TestCase("1+2+3+4", "(+ (1),(+ (2),(+ (3),(4))))")]
     [TestCase("1+(2+3)+4", "(+ (1),(+ (+ (2),(3)),(4)))")]
     [TestCase("(1+2)+3", "(+ (+ (1),(2)),(3))")]
@@ -66,6 +67,7 @@ public Parser BuildParser(string src, out List<Token> tokens)
     [TestCase("-a", "(neg (ref a))")]
     [TestCase("b - -a", "(- (ref b),(neg (ref a)))")]
     [TestCase("3 AND 2", "(and (3),(2))")]
+    [TestCase("3 \nAND 2", "(and (3),(2))")]
     [TestCase("3 XOR 2", "(xor (3),(2))")]
     [TestCase("3 AND 2+1", "(and (3),(+ (2),(1)))")]
     [TestCase("(3 AND 2)+1", "(+ (and (3),(2)),(1))")]

FadeBasic/Tests/ParserTests_Erros.cs

@@ -1679,8 +1679,28 @@ function toast(x)
         Assert.That(errors[0].Display, Is.EqualTo($"[3:4] - {ErrorCodes.InvalidReference} | unknown symbol, x"));
     }
 
-    
-    
+    [Test]
+    public void Bug_Nov24_2025_MultiLineWhileClause()
+    {
+        /*
+         * This is a pretty major issue. Multi-line expressions should work, but
+         * they get stuck on EndOfStatement tokens.
+         *
+         * The rest of the parser is written to use the EndOfStatement, so re-writing it
+         * is not ideal.
+         *
+         * This test/note is here for me to deal with this later. Sad Sauce.
+         */
+        var input = $@"
+while (3 
+    or 5)
+endwhile
+";
+        var parser = MakeParser(input);
+        var prog = parser.ParseProgram();
+
+        prog.AssertNoParseErrors();
+    }
 
     [Test]
     public void ParseError_StructCastToForLoopVariable()