support for parsing '{' and '}' symbol, and nested scopes within func…

…tions

compiler_lib/node.cpp

@@ -90,6 +90,11 @@ int node::getStackSize()
 		}
 	}
 
+	else if (m_node_type == NODE_TYPE_BODY)
+	{
+		return m_body_size;
+	}
+
 	return 0;
 }
 

compiler_lib/node.h

@@ -68,6 +68,7 @@ class node
 	std::shared_ptr < node > getValueNode() { return m_value_node; }
 	void setBodyNode(std::shared_ptr < node > body_node) { m_body_node = body_node; }
 	std::shared_ptr < node > getBodyNode() { return m_body_node; }
+	int getBodySize() { return m_body_size; }
 
 	void setDatatype(std::shared_ptr < datatype > dtype) { m_datatype = dtype; }
 	std::shared_ptr < datatype > getDatatype() {return m_datatype; }

compiler_lib/parser.cpp

@@ -294,12 +294,27 @@ void parser::parseStatement()
 		return;
 	}
 
-	parseExpression();
+	parseExpression(); //if symbol, no tokens are popped
 
-	//parse symbol ('{' new scope or ':' label)
-	//no other token types is expected as the first token in the statement
+	token = peekToken();
+
+	if (token->isTokenTypeSymbol() && token->getCharValue() == '{')
+	{
+		parseSymbol();
+		nextToken(); //pop off '}'
+		/*
+		* Nested scope, return because ';' is not expected
+		* 
+		* {
+		*		{
+		*		}
+		* }
+		*/
+		return;
+	}
 
 	token = nextToken();
+
 	if ((!token->isTokenTypeSymbol()) || token->getCharValue() != ';')
 	{
 		cerror("expected ';' at ending of statement");
@@ -309,7 +324,11 @@ void parser::parseStatement()
 void parser::parseSymbol()
 {
 	//parse '{' new scope
-
+	std::shared_ptr<token> token = peekToken();
+	if (token->isTokenTypeSymbol() && token->getCharValue() == '{')
+	{
+		parseBody();
+	}
 	//parse ':' label
 }
 

unit_test/test.cpp

@@ -635,7 +635,7 @@ TEST(parser, function) {
 	/*
 	* File Content
 	*
-	*  a = 50 * 30 + 20
+	*  int main(){	int var_val; var_val + 50;}
 	*/
 	const int num_of_tokens = 5;
 
@@ -644,7 +644,48 @@ TEST(parser, function) {
 	process.startCompiler();
 
 	std::list < std::shared_ptr < node > > ast = process.getAbstractSyntaxTree();
+	std::shared_ptr < node > _node = ast.front();
+
+	EXPECT_EQ(_node->getStringValue(), "main");
+	EXPECT_EQ(_node->getBodyNode()->getBodySize(), 4 );
+	std::list < std::shared_ptr < node > > statements = _node->getBodyNode()->getStatements();
+	EXPECT_EQ(statements.size(), 2 );
+	statements.pop_back();
+	EXPECT_EQ(statements.back()->getStackSize(), 4); //int var_val;
+
+}
+
+
+
+TEST(parser, functionWithSecondScope) {
+
+	std::string file_name = "test_parser_function_2.c";
+	/*
+	* File Content
+	*
+	*  int main() { int var_a; { int var_val; var_val + 50; int var_b;  } }
+	*/
+	const int num_of_tokens = 5;
+
+	compileProcess process;
+	process.initialize(file_path + file_name);
+	process.startCompiler();
+
+	std::list < std::shared_ptr < node > > ast = process.getAbstractSyntaxTree();
+	std::shared_ptr < node > _node = ast.front();
+
+	EXPECT_EQ(_node->getStringValue(), "main");
+	EXPECT_EQ(_node->getBodyNode()->getBodySize(), 12);
+	std::list < std::shared_ptr < node > > statements = _node->getBodyNode()->getStatements();
+	EXPECT_EQ(statements.size(), 2);
+
+	std::shared_ptr < node > nested_body_node = statements.back(); // { int var_val; var_val + 50; int var_b;  }
+	statements.pop_back();
+	EXPECT_EQ(statements.back()->getStackSize(), 4); //int var_val;
 
+	EXPECT_EQ(nested_body_node->getBodySize(), 8);
+	std::list < std::shared_ptr < node > > nested_statements = nested_body_node->getStatements();
+	EXPECT_EQ(nested_statements.size(), 3);
 
 }
 

unit_test/test_files/test_parser_function_2.c

@@ -0,0 +1 @@
+int main() { int var_a; { int var_val; var_val + 50; int var_b;  } }