ezrSquared prerelease-1.3.1.0.0

Uralstech · Feb 14, 2023 · 5f2c246 · 5f2c246
1 parent 6930b8c
commit 5f2c246
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/Constants.cs b/Constants.cs
@@ -4,8 +4,8 @@ namespace ezrSquared.Constants
 {
     public static class constants
     {
-        public const string VERSION = "prerelease-1.3.0.0.3";
-        public const string VERSION_DATE = "12.02.2023";
+        public const string VERSION = "prerelease-1.3.1.0.0";
+        public const string VERSION_DATE = "14.02.2023";
 
         public static readonly string[] KEYWORDS = { "item", "and", "or", "invert", "if", "else", "do", "count", "from", "as", "to", "step", "while", "function", "special", "with", "end", "return", "skip", "stop", "try", "error", "in", "object", "global", "include" };
         public static readonly string[] QEYWORDS = { "f", "l", "e", "c", "t", "n", "w", "fd", "sd", "od", "i", "s", "d", "g", "v" };

diff --git a/README.md b/README.md
@@ -15,11 +15,15 @@ Yeah! Check them out [here](https://github.com/Uralstech/ezrSquared/tree/master/
 I just need to finish the documentation! If you find any bugs, report them [here](https://github.com/Uralstech/ezrSquared/issues)
 
 ## Progress
-**For those confused by the versioning: 1st place -> Major; 2nd place -> Feature; 3rd place -> Function; 4th place -> Library; 5th place -> Patch**
+**For those confused by the versioning: 1st place -> Major; 2nd place -> Feature; 3rd place -> Quality of Life; 4th place -> Library; 5th place -> Patch**
 
 ### Released
 **Check the [GitHub Commits](https://github.com/Uralstech/ezrSquared/commits) for all changes in source code**
 
+* **prerelease-1.3.1.0.0** - [14-02-23]
+    * Fixed a count loop error message
+    * Better error message for else if statements
+
 * **prerelease-1.3.0.0.3** - [12-02-23]
     * Better `undefined` error message for special functions
 

diff --git a/ezr.cs b/ezr.cs
@@ -1229,7 +1229,11 @@ private parseResult ifExpression()
                             }
 
                             if (!currentToken.matchString(TOKENTYPE.KEY, "do"))
-                                return result.failure(new invalidGrammarError("Expected 'do'", currentToken.startPos, currentToken.endPos));
+                            {
+                                if (isElseIf)
+                                    return result.failure(new invalidGrammarError("Expected 'do'", currentToken.startPos, currentToken.endPos));
+                                return result.failure(new invalidGrammarError("Expected 'if' or 'do'", currentToken.startPos, currentToken.endPos));
+                            }
                             result.registerAdvance();
                             advance();
 
@@ -1281,7 +1285,11 @@ private parseResult ifExpression()
                     }
 
                     if (!currentToken.matchString(TOKENTYPE.KEY, "do"))
-                        return result.failure(new invalidGrammarError("Expected 'do'", currentToken.startPos, currentToken.endPos));
+                    {
+                        if (isElseIf)
+                            return result.failure(new invalidGrammarError("Expected 'do'", currentToken.startPos, currentToken.endPos));
+                        return result.failure(new invalidGrammarError("Expected 'if' or 'do'", currentToken.startPos, currentToken.endPos));
+                    }
                     result.registerAdvance();
                     advance();
 
@@ -1325,7 +1333,7 @@ private parseResult countExpression()
                 if (!currentToken.matchString(TOKENTYPE.KEY, "to"))
                 {
                     if (start != null)
-                        return result.failure(new invalidGrammarError("Expected 'from'", currentToken.startPos, currentToken.endPos));
+                        return result.failure(new invalidGrammarError("Expected 'to'", currentToken.startPos, currentToken.endPos));
                     return result.failure(new invalidGrammarError("Expected 'from' or 'to'", currentToken.startPos, currentToken.endPos));
                 }
                 result.registerAdvance();