FOR..NEXT linked by forindex, not line number

Author: nzeemin

generator.cpp

@@ -905,6 +905,8 @@ void Generator::GenerateFor(StatementModel& statement)
     ExpressionModel& expr1 = statement.args[0];
     assert(expr1.GetExpressionValueType() != ValueTypeString);
 
+    assert(statement.forindex != 0);
+
     assert(statement.ident.type == TokenTypeIdentifier);
     VariableExpressionModel var;
     var.name = statement.ident.text;
@@ -925,14 +927,14 @@ void Generator::GenerateFor(StatementModel& statement)
     {
         //TODO: register variable
         string svalue = expr2.GetVariableExpressionDecoratedName();
-        AddLine("\tMOV\t" + svalue + ", @#<R" + std::to_string(m_line->linenum) + "+2>");
+        AddLine("\tMOV\t" + svalue + ", @#<F" + std::to_string(statement.forindex) + "+2>");
     }
     else
     {
         GenerateExpression(expr2);
         if (expr2.GetExpressionValueType() == ValueTypeSingle)
             AddRuntimeCall(RuntimeFTOI, "to Integer");  // result in R0
-        AddLine("\tMOV\tR0, @#<R" + std::to_string(m_line->linenum) + "+2>");  //  Save "to" value
+        AddLine("\tMOV\tR0, @#<F" + std::to_string(statement.forindex) + "+2>");  //  Save "to" value
     }
 
     if (statement.args.size() > 2)  // has STEP expression
@@ -948,14 +950,13 @@ void Generator::GenerateFor(StatementModel& statement)
             if (expr3.GetExpressionValueType() == ValueTypeSingle)
                 AddRuntimeCall(RuntimeFTOI, "to Integer");  // result in R0
             // Save "step" value
-            AddLine("\tMOV\tR0, @#<S" + std::to_string(m_line->linenum) + "+2>");
+            AddLine("\tMOV\tR0, @#<S" + std::to_string(statement.forindex) + "+2>");
         }
     }
 
-    string nextlinelabel = m_source->GetNextLineLabel(m_line->linenum);
-    AddLine("R" + std::to_string(m_line->linenum) + ":\tCMP\t" + tovalue + ", " + deconame);
+    AddLine("F" + std::to_string(statement.forindex) + ":\tCMP\t" + tovalue + ", " + deconame);
     AddLine("\tBGE\t.+6\t; to loop body");
-    AddLine("\tJMP\tX" + std::to_string(m_line->linenum));  // label after NEXT
+    AddLine("\tJMP\tX" + std::to_string(statement.forindex));  // label after NEXT
 }
 
 // NEXT [<ПАРАМЕТР>[,< ПАРАМЕТР >...]]
@@ -968,11 +969,10 @@ void Generator::GenerateNext(StatementModel& statement)
         SourceLineModel* plinefor = variable.psourceline;
         assert(plinefor != nullptr);
         StatementModel& forstatement = plinefor->statement;
+        assert(forstatement.forindex != 0);
 
         string canoname = variable.GetVariableCanonicName();
         string deconame = DecorateVariableName(canoname);
-        int forlinenum = plinefor->linenum;
-        assert(forlinenum > 0);
         string comment = "NEXT " + canoname;
 
         // Increment FOR variable by 1 or by STEP value
@@ -991,14 +991,14 @@ void Generator::GenerateNext(StatementModel& statement)
             else
             {
                 //NOTE: "#1" here will be replaced at run-time with calculated STEP value
-                AddLine("S" + std::to_string(forlinenum) + ":\tADD\t#1, " + deconame + "\t; " + comment);
+                AddLine("S" + std::to_string(forstatement.forindex) + ":\tADD\t#1, " + deconame + "\t; " + comment);
             }
         }
 
         // JMP to continue loop
-        AddLine("\tJMP\tR" + std::to_string(forlinenum) + "\t; continue loop");
+        AddLine("\tJMP\tF" + std::to_string(forstatement.forindex) + "\t; continue loop");
         // Label after NEXT
-        AddLine("X" + std::to_string(forlinenum) + ":\t; FOR exit addr");
+        AddLine("X" + std::to_string(forstatement.forindex) + ":\t; FOR exit addr");
     }
 }
 

main.h

@@ -301,6 +301,7 @@ struct StatementModel
     bool    gotogosub;  // true for ON GOTO, false for ON GOSUB
     bool    deffnorusr; // true for DEF FN, false for DEF USR
     bool    nocrlf;     // PRINT flag indicating we don't need CR/LF at the end
+    int     forindex;   // Index used to tie FOR..NEXT parts together
     FileMode filemode;  // File mode for OPEN
     std::vector<ExpressionModel> args;  // Statement arguments
     std::vector<Token> params;  // Statement params like list of variables
@@ -339,7 +340,7 @@ struct SourceModel
     bool IsVariableRegistered(const string& varname) const;
     bool IsLineNumberExists(int linenumber) const;
     string GetNextLineLabel(int linenumber) const;
-    SourceLineModel& GetSourceLine(int linenumber);
+    SourceLineModel& GetSourceLine(int srclinenumber);
     void RegisterConstString(const string& str);
     int GetConstStringIndex(const string& str);
 };
@@ -494,7 +495,7 @@ struct ValidatorFuncSpec
 
 struct ValidatorForSpec
 {
-    int     linenum;  // FOR statement line number
+    int     srclinenum;  // FOR statement source line number
     string  varname;
 };
 
@@ -504,6 +505,7 @@ class Validator
     int             m_lineindex;
     SourceLineModel* m_line;  // Curent line being validated
     std::vector<ValidatorForSpec> m_fornextstack;
+    int             m_forcount;
 private:
     static const ValidatorKeywordSpec m_keywordspecs[];
     static const ValidatorOperSpec m_operspecs[];
@@ -512,6 +514,7 @@ class Validator
     Validator(SourceModel* source);
 public:
     bool ProcessLine();
+    void ProcessEnd();
 private:
     void ValidateStatement(StatementModel& statement);
     void Error(const string& message);

model.cpp

@@ -487,17 +487,17 @@ string SourceModel::GetNextLineLabel(int linenumber) const
     return "LEND";
 }
 
-SourceLineModel& SourceModel::GetSourceLine(int linenumber)
+SourceLineModel& SourceModel::GetSourceLine(int srclinenumber)
 {
-    assert(linenumber < MAX_LINE_NUMBER);
+    assert(srclinenumber > 0);
 
     for (auto it = std::begin(lines); it != std::end(lines); ++it)
     {
-        if (it->linenum == linenumber)
+        if (it->srclinenum == srclinenumber)
             return *it;
     }
 
-    assert(false);  // Line number not found
+    assert(false);  // Line not found
     exit(EXIT_FAILURE);
 }
 

runtime-BK0010.tmac

@@ -1348,7 +1348,6 @@ FADD$X = .
 	CLR	R1
 12$:	CLR	R3
 	BR	13$
-
 ;
 ; Ошибка: переполнение
 FADD$O:	MOV	FADD$X+2, R5	; откуда вызвали
@@ -1363,6 +1362,7 @@ FADD$O:	MOV	FADD$X+2, R5	; 
 ;           (SP+2)(SP+4) - плавающее число B (старшее, младшее слово)
 ;           (SP+6)(SP+10) - плавающее число A (старшее, младшее слово)
 ; Результат: (SP)(SP+2) - плавающее число (старшее слово, младшее слово)
+; Портит регистры: те же что FADD
 FSUB:
 	TST	2(SP)		; проверяем старше слово B
 	BEQ	1$		; ноль =>

tests/0067-for-next-validation.test

@@ -1,7 +1,8 @@
 -q
 ----------------------------------------------------------------------
+FOR J% = 1% TO 10%
 FOR I% = 1% TO 10%
-NEXT
+NEXT I%
 ----------------------------------------------------------------------
-ERROR at 1 - Line with FOR statement should have line number.
+ERROR at 1 - FOR statement has no corresponding NEXT.
 Validation ERRORS: 1

tests/0110-sin-cos.test

@@ -0,0 +1,6 @@
+-q
+----------------------------------------------------------------------
+10 FOR I% = -10 TO 10
+A = PI * I% / 4
+? A, SIN(A), COS(A)
+NEXT I%

validator.cpp

@@ -130,6 +130,8 @@ Validator::Validator(SourceModel* source)
 
     m_lineindex = -1;
     m_line = nullptr;
+
+    m_forcount = 0;
 }
 
 bool Validator::ProcessLine()
@@ -144,24 +146,30 @@ bool Validator::ProcessLine()
 
     if (m_lineindex >= (int)m_source->lines.size())
     {
-        //ProcessEnd();
+        ProcessEnd();
         m_lineindex = INT_MAX;
         return false;
     }
 
     m_line = &(m_source->lines[m_lineindex]);
 
-    // Spectial case: line with FOR statement should have line number
-    if (m_line->linenum == 0 && m_line->statement.token.keyword == KeywordFOR)
-    {
-        Error("Line with FOR statement should have line number.");
-    }
-
     ValidateStatement(m_line->statement);
 
     return true;
 }
 
+void Validator::ProcessEnd()
+{
+    if (!m_fornextstack.empty())
+    {
+        const ValidatorForSpec& forspec = m_fornextstack.back();
+
+        std::cerr << "ERROR at " << forspec.srclinenum << " - FOR statement has no corresponding NEXT." << std::endl;
+        m_line->error = true;
+        RegisterError();
+    }
+}
+
 void Validator::ValidateStatement(StatementModel& statement)
 {
     // Find validator implementation
@@ -527,11 +535,14 @@ void Validator::ValidateFor(StatementModel& statement)
     //TODO: check variable type
 
     // Add FOR variable to FOR/NEXT stack
+    m_forcount++;
     ValidatorForSpec forspec;
     forspec.varname = var.name;
-    forspec.linenum = m_line->linenum;
+    forspec.srclinenum = m_line->srclinenum;
     m_fornextstack.push_back(forspec);
 
+    statement.forindex = m_forcount;
+
     if (statement.args.size() < 2)
         MODEL_ERROR("Two parameters expected.");
 
@@ -554,6 +565,63 @@ void Validator::ValidateFor(StatementModel& statement)
     }
 }
 
+// NEXT [<ПАРАМЕТР>[,< ПАРАМЕТР >...]]
+void Validator::ValidateNext(StatementModel& statement)
+{
+    //NOTE: Filling statement.variables with list of NEXT variables plus link to FOR statement for each
+
+    if (statement.params.empty())  // NEXT without parameters
+    {
+        if (m_fornextstack.empty())
+            MODEL_ERROR("NEXT without FOR.");
+
+        ValidatorForSpec forspec = m_fornextstack.back();
+        m_fornextstack.pop_back();
+
+        Token tokenvar;
+        tokenvar.type = TokenTypeIdentifier;
+        tokenvar.text = forspec.varname;
+        statement.params.push_back(tokenvar);
+
+        // link FOR to the NEXT line number
+        SourceLineModel& linefor = m_source->GetSourceLine(forspec.srclinenum);
+        assert(linefor.statement.forindex != 0);
+
+        VariableModel variable;
+        variable.name = forspec.varname;
+        variable.psourceline = &linefor;
+        statement.variables.push_back(variable);
+
+        return;
+    }
+
+    for (auto it = std::begin(statement.params); it != std::end(statement.params); ++it)
+    {
+        if (m_fornextstack.empty())
+            MODEL_ERROR("NEXT without FOR.");
+
+        ValidatorForSpec forspec = m_fornextstack.back();
+
+        string varname = GetCanonicVariableName(it->text);
+        if (forspec.varname != varname)
+            MODEL_ERROR("NEXT variable expected: " + forspec.varname + ", found: " + varname + ".");
+        assert(m_source->IsVariableRegistered(varname));
+
+        //TODO: Check for numeric variable type?
+
+        m_fornextstack.pop_back();
+
+        // link FOR to the NEXT line number
+        SourceLineModel& linefor = m_source->GetSourceLine(forspec.srclinenum);
+        assert(linefor.statement.forindex != 0);
+
+        VariableModel variable;
+        variable.name = varname;
+        variable.psourceline = &linefor;
+        statement.variables.push_back(variable);
+    }
+}
+
 void Validator::ValidateGotoGosub(StatementModel& statement)
 {
     if (!m_source->IsLineNumberExists(statement.paramline))
@@ -884,63 +952,6 @@ void Validator::ValidatePsetPreset(StatementModel& statement)
         MODEL_ERROR("Too many parameters.");
 }
 
-// NEXT [<ПАРАМЕТР>[,< ПАРАМЕТР >...]]
-void Validator::ValidateNext(StatementModel& statement)
-{
-    //NOTE: Filling statement.variables with list of NEXT variables plus link to FOR statement for each
-
-    if (statement.params.empty())  // NEXT without parameters
-    {
-        if (m_fornextstack.empty())
-            MODEL_ERROR("NEXT without FOR.");
-
-        ValidatorForSpec forspec = m_fornextstack.back();
-        m_fornextstack.pop_back();
-
-        Token tokenvar;
-        tokenvar.type = TokenTypeIdentifier;
-        tokenvar.text = forspec.varname;
-        statement.params.push_back(tokenvar);
-
-        // link FOR to the NEXT line number
-        SourceLineModel& linefor = m_source->GetSourceLine(forspec.linenum);
-        linefor.statement.paramline = m_line->linenum;
-
-        VariableModel variable;
-        variable.name = forspec.varname;
-        variable.psourceline = &linefor;
-        statement.variables.push_back(variable);
-
-        return;
-    }
-
-    for (auto it = std::begin(statement.params); it != std::end(statement.params); ++it)
-    {
-        if (m_fornextstack.empty())
-            MODEL_ERROR("NEXT without FOR.");
-
-        ValidatorForSpec forspec = m_fornextstack.back();
-
-        string varname = GetCanonicVariableName(it->text);
-        if (forspec.varname != varname)
-            MODEL_ERROR("NEXT variable expected: " + forspec.varname + ", found: " + varname + ".");
-        assert(m_source->IsVariableRegistered(varname));
-
-        //TODO: Check for numeric variable type?
-
-        m_fornextstack.pop_back();
-
-        // link FOR to the NEXT line number
-        SourceLineModel& linefor = m_source->GetSourceLine(forspec.linenum);
-        linefor.statement.paramline = m_line->linenum;
-
-        VariableModel variable;
-        variable.name = varname;
-        variable.psourceline = &linefor;
-        statement.variables.push_back(variable);
-    }
-}
-
 // ON <ВЫРАЖЕНИЕ> GOTO <СПИСОК>
 // ON <ВЫРАЖЕНИЕ> GOSUB <СПИСОК>
 void Validator::ValidateOn(StatementModel& statement)