From 97030639f19cee71db2997c38e175ba36d611451 Mon Sep 17 00:00:00 2001
From: Russell Joyce <russell.joyce@york.ac.uk>
Date: Thu, 18 Jun 2020 19:18:14 +0100
Subject: [PATCH] Fixed for loop initialisers with variable declarations

---
 c-tests/loop.c |  6 +++---
 expression.c   |  2 +-
 interpreter.h  |  2 +-
 parse.c        | 28 ++++++++++++++--------------
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/c-tests/loop.c b/c-tests/loop.c
index 5d57c76..9c8303b 100644
--- a/c-tests/loop.c
+++ b/c-tests/loop.c
@@ -1,10 +1,10 @@
 int main(void)
 {
-	int j = 0;
+	int j = 999;
 
 	for (int i = 0; i < 4; i++) {
-		j = i + 2;
+		j = i - 3;
 	}
 
-	return 0;
+	return j;
 }
diff --git a/expression.c b/expression.c
index 5c8419a..48afec6 100644
--- a/expression.c
+++ b/expression.c
@@ -1892,7 +1892,7 @@ void ExpressionParseFunctionCall(struct ParseState *Parser,
 
             Parser->ScopeID = OldScopeID;
 
-            if (ParseStatement(&FuncParser, true) != ParseResultOk)
+            if (ParseStatement(&FuncParser, true, false) != ParseResultOk)
                 ProgramFail(&FuncParser, "function body expected");
 
             if (RunIt) {
diff --git a/interpreter.h b/interpreter.h
index 3036d4f..08beaa3 100644
--- a/interpreter.h
+++ b/interpreter.h
@@ -551,7 +551,7 @@ extern void LexInteractiveStatementPrompt(Picoc *pc);
  * void PicocParseInteractive(); */
 extern void PicocParseInteractiveNoStartPrompt(Picoc *pc, int EnableDebugger);
 extern enum ParseResult ParseStatement(struct ParseState *Parser,
-    int CheckTrailingSemicolon);
+    int CheckTrailingSemicolon, int DoNotConsumeTrailingSemicolon);
 extern struct Value *ParseFunctionDefinition(struct ParseState *Parser,
     struct ValueType *ReturnType, char *Identifier);
 extern void ParseCleanup(Picoc *pc);
diff --git a/parse.c b/parse.c
index ca35830..decc26e 100644
--- a/parse.c
+++ b/parse.c
@@ -49,11 +49,11 @@ enum ParseResult ParseStatementMaybeRun(struct ParseState *Parser,
         enum RunMode OldMode = Parser->Mode;
         int Result;
         Parser->Mode = RunModeSkip;
-        Result = ParseStatement(Parser, CheckTrailingSemicolon);
+        Result = ParseStatement(Parser, CheckTrailingSemicolon, false);
         Parser->Mode = OldMode;
         return (enum ParseResult)Result;
     } else
-        return ParseStatement(Parser, CheckTrailingSemicolon);
+        return ParseStatement(Parser, CheckTrailingSemicolon, false);
 }
 
 /* count the number of parameters to a function or macro */
@@ -496,11 +496,11 @@ void ParseFor(struct ParseState *Parser)
         ProgramFail(Parser, "'(' expected");
 
     if (LexGetToken(Parser, NULL, false) != TokenSemicolon) {
-        if (ParseStatement(Parser, false) != ParseResultOk)
+        if (ParseStatement(Parser, false, true) != ParseResultOk)
             ProgramFail(Parser, "statement expected");
         while (LexGetToken(Parser, NULL, false) == TokenComma) {
             LexGetToken(Parser, NULL, true);
-            if (ParseStatement(Parser, false) != ParseResultOk)
+            if (ParseStatement(Parser, false, true) != ParseResultOk)
                 ProgramFail(Parser, "statement expected");
         }
     }
@@ -538,10 +538,10 @@ void ParseFor(struct ParseState *Parser)
 
     while (Condition && Parser->Mode == RunModeRun) {
         ParserCopyPos(Parser, &PreIncrement);
-        ParseStatement(Parser, false);
+        ParseStatement(Parser, false, false);
         while (LexGetToken(Parser, NULL, false) == TokenComma) {
             LexGetToken(Parser, NULL, true);
-            ParseStatement(Parser, false);
+            ParseStatement(Parser, false, false);
         }
 
         ParserCopyPos(Parser, &PreConditional);
@@ -552,7 +552,7 @@ void ParseFor(struct ParseState *Parser)
 
         if (Condition) {
             ParserCopyPos(Parser, &PreStatement);
-            ParseStatement(Parser, true);
+            ParseStatement(Parser, true, false);
 
             if (Parser->Mode == RunModeContinue)
                 Parser->Mode = RunModeRun;
@@ -581,12 +581,12 @@ enum RunMode ParseBlock(struct ParseState *Parser, int AbsorbOpenBrace,
         /* condition failed - skip this block instead */
         enum RunMode OldMode = Parser->Mode;
         Parser->Mode = RunModeSkip;
-        while (ParseStatement(Parser, true) == ParseResultOk) {
+        while (ParseStatement(Parser, true, false) == ParseResultOk) {
         }
         Parser->Mode = OldMode;
     } else {
         /* just run it in its current mode */
-        while (ParseStatement(Parser, true) == ParseResultOk) {
+        while (ParseStatement(Parser, true, false) == ParseResultOk) {
         }
     }
 
@@ -618,7 +618,7 @@ void ParseTypedef(struct ParseState *Parser)
 
 /* parse a statement */
 enum ParseResult ParseStatement(struct ParseState *Parser,
-    int CheckTrailingSemicolon)
+    int CheckTrailingSemicolon, int DoNotConsumeTrailingSemicolon)
 {
     int Condition;
     enum LexToken Token;
@@ -728,7 +728,7 @@ enum ParseResult ParseStatement(struct ParseState *Parser,
             ParserCopyPos(&PreStatement, Parser);
             do {
                 ParserCopyPos(Parser, &PreStatement);
-                if (ParseStatement(Parser, true) != ParseResultOk)
+                if (ParseStatement(Parser, true, false) != ParseResultOk)
                     ProgramFail(Parser, "statement expected");
                 if (Parser->Mode == RunModeContinue)
                     Parser->Mode = PreMode;
@@ -894,7 +894,7 @@ enum ParseResult ParseStatement(struct ParseState *Parser,
     }
 
     if (CheckTrailingSemicolon) {
-        if (LexGetToken(Parser, NULL, true) != TokenSemicolon)
+        if (LexGetToken(Parser, NULL, !DoNotConsumeTrailingSemicolon) != TokenSemicolon)
             ProgramFail(Parser, "';' expected");
     }
 
@@ -934,7 +934,7 @@ void PicocParse(Picoc *pc, const char *FileName, const char *Source,
         EnableDebugger);
 
     do {
-        Ok = ParseStatement(&Parser, true);
+        Ok = ParseStatement(&Parser, true, false);
     } while (Ok == ParseResultOk);
 
     if (Ok == ParseResultError)
@@ -957,7 +957,7 @@ void PicocParseInteractiveNoStartPrompt(Picoc *pc, int EnableDebugger)
 
     do {
         LexInteractiveStatementPrompt(pc);
-        Ok = ParseStatement(&Parser, true);
+        Ok = ParseStatement(&Parser, true, false);
         LexInteractiveCompleted(pc, &Parser);
 
     } while (Ok == ParseResultOk);