From 7930b048b8ccf35b081175ed80c4832281d82a67 Mon Sep 17 00:00:00 2001
From: "Samuel D. Crow" <samuraileumas@yahoo.com>
Date: Thu, 4 Aug 2022 21:18:26 -0500
Subject: [PATCH] wrote on n sub unit test and made necessary fixes

---
 runtime/Makefile      |  6 ++---
 tester.cpp            | 53 +++++++++++++++++++++++++++++++++++++++++++
 yab2cpp.h             |  4 +++-
 yabCodeStructures.cpp | 47 ++++++++++++++++++--------------------
 yabFunctions.cpp      | 14 ++++++------
 5 files changed, 88 insertions(+), 36 deletions(-)

diff --git a/runtime/Makefile b/runtime/Makefile
index 0892928..84b048c 100644
--- a/runtime/Makefile
+++ b/runtime/Makefile
@@ -1,9 +1,9 @@
 CC := g++
 CFLAGS := -Wall
 CFLAGS += -std=c++11
-#CFLAGS += -fno-rtti
-#CFLAGS += -fno-exceptions
-#CFLAGS += -Os
+CFLAGS += -fno-rtti
+CFLAGS += -fno-exceptions
+CFLAGS += -Os
 LFLAGS := 
 
 .PHONY: all
diff --git a/tester.cpp b/tester.cpp
index dbb5f34..974a0b4 100644
--- a/tester.cpp
+++ b/tester.cpp
@@ -410,6 +410,58 @@ void testForLoop()
 	logger("testForLoop cleared");
 }
 
+void testOnNCall()
+{
+	logger("testOnNCall entered");
+	string s1 = string("func1");
+	fn *f1=fn::declare(s1, T_UNKNOWNFUNC);
+	print=new printSegment(new expression(new constOp(string("one"), T_STRING)));
+	print->generate();
+	delete print;
+	f1->close();
+	logger("func1 declared");
+	string s2=string("func2");
+	fn *f2=fn::declare(s2, T_UNKNOWNFUNC);
+	print=new printSegment(new expression(new constOp(string("two"), T_STRING)));
+	print->generate();
+	delete print;
+	f2->close();
+	logger("func2 declared");
+	string s3=string("func3");
+	fn *f3=fn::declare(s3, T_UNKNOWNFUNC);
+	print=new printSegment(new expression(new constOp(string("three"), T_STRING)));
+	print->generate();
+	delete print;
+	f3->close();
+	logger("func3 declared");
+	string s=string("countdown");
+	variableType *q=variableType::getOrCreateVar(s, T_INTVAR);
+	logger("countdown var declared");
+	forLoop *f=new forLoop(q,
+		new expression(new constOp("3",T_INT)),
+		new expression(new constOp("0",T_INT)),
+		new expression(new constOp("-1",T_INT))
+	);
+	logger("forloop declared");
+	list<label *> l;
+	l.push_back(f1->getStart());
+	l.push_back(f2->getStart());
+	l.push_back(f3->getStart());
+	logger("list allocated");
+	unsigned int x = label::generateOnNSkip(l);
+	fn::generateOnNSub(new expression(q), x);
+	logger("on countdown gosub declared");
+	print=new printSegment(new expression(new constOp("fallthrough condition test",T_STRING)));
+	print->generate();
+	delete print;
+	logger("fallthrough condition declared");
+	f->close();
+	v->dispose();
+	l.clear();
+	delete f;
+	logger("testOnNCall cleared");
+}
+
 /* open files and compile */
 void compile()
 {
@@ -420,6 +472,7 @@ void compile()
 	testFunc();
 	testIf();
 	testForLoop();
+	testOnNCall();
 	logger("generating end");
 	label::generateEnd();
 	/*check for nesting error */
diff --git a/yab2cpp.h b/yab2cpp.h
index 25f29a6..a389426 100644
--- a/yab2cpp.h
+++ b/yab2cpp.h
@@ -277,7 +277,7 @@ public:
 	void generateJumpTo();
 	/* pass generateOnNSkip as second paramater
 		to generateOnNTo or generateOnNSub */
-	unsigned int generateOnNSkip(list<label *>&dest);
+	static unsigned int generateOnNSkip(list<label *>&dest);
 	static void generateOnNTo(expression *e, unsigned int skip);
 	void generateCondJump(expression *e);
 	void generate();
@@ -420,9 +420,11 @@ public:
 	/* must be called after label::generateOnNSkip */
 	static void generateOnNSub(expression *e, unsigned int skip);
 
+	label *getStart() const {return startAddr;}
 	enum CODES getType() const {return this->type;}
 	unsigned int getID() const {return this->id;}
 	size_t getNumParams() const {return this->params.size();}
+	/* can return nullptr if not found */
 	variableType *getLocalVar(string &name);
 	void addParameter(string &name, enum TYPES t);
 
diff --git a/yabCodeStructures.cpp b/yabCodeStructures.cpp
index a7bac17..b9d4aa4 100644
--- a/yabCodeStructures.cpp
+++ b/yabCodeStructures.cpp
@@ -60,52 +60,49 @@ void label::generateEnd()
 
 void label::generateJumpTo()
 {
-	output_cpp << "state=" << this->getID() << ";\nbreak;\n";
+	output_cpp << "{state=" << this->getID() << ";break;}\n";
 }
 
 /* pass this as second parameter to generateOnNTo or generateOnNSub */
 unsigned int label::generateOnNSkip(list<label *>&dest)
 {
+	unsigned int ret=++nextID;
 	if (dest.size()<2)error(E_BAD_SYNTAX);
 	auto iter=dest.begin();
-	consts_h << "j" << this->getID() << "[]={" << *iter;
+	consts_h << "const unsigned int j" << ret << "[]={\n" << (*iter)->getID();
 	++iter;
 	while(iter!=dest.end())
 	{
-		consts_h << ", " << *iter;
+		consts_h << ",\n" << (*iter)->getID();
 		++iter;
 	}
-	consts_h << "}\njs" << this->getID()<< "=" << dest.size() << ";\n";
-	return this->getID();
+	consts_h << "\n};\nconst int js" << ret << "=" << dest.size() << ";\n";
+	return ret;
 }
 
 void label::generateOnNTo(expression *e, unsigned int skip)
 {
-	operands *o=e->evaluate();
-	if (o->getType()==T_INT||o->getType()==T_INTVAR)
-	{
-		output_cpp<< "if(" << o->boxName() << ">=0 && "
-		    << o->boxName() << "<js" << skip << ")state=j["
-		    << o->boxName() << "];\nbreak;\n";
-		o->dispose();
-		delete e;
-		return;
-	}
-	error(E_TYPE_MISMATCH);
+	// indexed by one instead of zero so we subtract one
+	expression *e2=new expression(e, O_MINUS,
+		new expression(new constOp("1", T_INT)));
+	operands *o=e2->evaluate();
+	output_cpp << "if(" << o->boxName() << ">=0 && "
+	    << o->boxName() << "<js" << skip 
+		<< "){state=j" << skip << "["
+	    << o->boxName() << "];break;}\n";
+	o->dispose();
+	delete e2;
+	return;
 }
 
 void label::generateCondJump(expression *e)
 {
 	operands *o=e->evaluate();
-	if (o->getType()==T_INT||o->getType()==T_INTVAR)
-	{
-		output_cpp<< "if(" << o->boxName() 
-            << "!=0){state=" << this->getID() << ";break;}\n";
-		o->dispose();
-		delete e;
-		return;
-	}
-	error(E_TYPE_MISMATCH);
+	if (o->getSimpleVarType()!=T_INTVAR)error(E_TYPE_MISMATCH);
+	output_cpp<< "if(" << o->boxName() 
+		<< "!=0){state=" << this->getID() << ";break;}\n";
+	o->dispose();
+	delete e;
 }
 
 void label::generate()
diff --git a/yabFunctions.cpp b/yabFunctions.cpp
index edb0327..6ecad2f 100644
--- a/yabFunctions.cpp
+++ b/yabFunctions.cpp
@@ -33,18 +33,18 @@ void fn::dumpFunctionIDs()
 
 void fn::generateOnNSub(expression *e, unsigned int skip)
 {
-	label *r=new label();
-	output_cpp << "callStack=new subroutine(" << r->getID() << ");\n";
+	label *retLabel=new label();
+	output_cpp << "callStack=new subroutine(" << retLabel->getID() << ");\n";
 	label::generateOnNTo(e, skip);
-	r->generate();
+	retLabel->generate();
 }
 
 void fn::generateGosub(label *sub)
 {
-	label *r=new label();
-	output_cpp << "callStack=new subroutine(" << r->getID() << ");\n";
+	label *retLabel=new label();
+	output_cpp << "callStack=new subroutine(" << retLabel->getID() << ");\n";
 	sub->generateJumpTo();
-	r->generate();
+	retLabel->generate();
 }
 
 fn *fn::getSub(string &name)
@@ -285,7 +285,7 @@ fn::fn(enum CODES t, operands *returnCode)
 	{
 		funcs_h << "struct f" << this->id <<":public subroutine\n{\nf"
 			<< this->id << "(unsigned int x):subroutine(x)\n{}\n"
-			<< "virtual ~f" << this->id <<"()\n{}\n\n";
+			<< "virtual ~f" << this->id <<"()\n{}\n";
 	}
 	/*keep track of where the return code will be sent to*/
 	this->rc=returnCode;