attempt to reuduce memory footprint during compilation

Nic30 · Dec 27, 2020 · 06fbd10 · 06fbd10
1 parent 1233e24
commit 06fbd10
Show file tree

Hide file tree

Showing 53 changed files with 128 additions and 142 deletions.
diff --git a/include/hdlConvertor/vhdlConvertor/generateStatementParser.h b/include/hdlConvertor/vhdlConvertor/generateStatementParser.h
@@ -15,7 +15,7 @@
 namespace hdlConvertor {
 namespace vhdl {
 
-class VhdlGenerateStatementParser : public BaseVhdlParser {
+class VhdlGenerateStatementParser: public BaseVhdlParser {
 public:
 	using BaseVhdlParser::BaseVhdlParser;
 	using vhdlParser = vhdl_antlr::vhdlParser;

diff --git a/src/hdlAst/hdlNamespace.cpp b/src/hdlAst/hdlNamespace.cpp
@@ -3,8 +3,6 @@
 namespace hdlConvertor {
 namespace hdlAst {
 
-using namespace std;
-
 HdlValueIdspace::HdlValueIdspace() :
 		WithNameAndDoc(), defs_only(false) {
 }

diff --git a/src/hdlAst/hdlOp.cpp b/src/hdlAst/hdlOp.cpp
@@ -1,11 +1,12 @@
 #include <hdlConvertor/hdlAst/hdlOp.h>
 #include <hdlConvertor/createObject.h>
 
-using namespace std;
 
 namespace hdlConvertor {
 namespace hdlAst {
 
+using namespace std;
+
 HdlOp::HdlOp() {
 	op = HdlOpType::ARROW;
 	operands.reserve(2);

diff --git a/src/hdlAst/hdlStmAssign.cpp b/src/hdlAst/hdlStmAssign.cpp
@@ -1,11 +1,12 @@
 #include <hdlConvertor/hdlAst/hdlStmAssign.h>
 #include <stdexcept>
 
-using namespace std;
 
 namespace hdlConvertor {
 namespace hdlAst {
 
+using namespace std;
+
 HdlStmAssign::HdlStmAssign(std::unique_ptr<iHdlExprItem> _dst,
 		std::unique_ptr<iHdlExprItem> _src, bool _is_blocking) :
 		HdlStmAssign(move(_dst), move(_src), nullptr, nullptr, _is_blocking) {

diff --git a/src/hdlAst/hdlStmProcess.cpp b/src/hdlAst/hdlStmProcess.cpp
@@ -3,11 +3,12 @@
 
 #include <hdlConvertor/createObject.h>
 
-using namespace std;
 
 namespace hdlConvertor {
 namespace hdlAst {
 
+using namespace std;
+
 HdlStmProcess::HdlStmProcess() :
 		iHdlStatement(), body(create_object<HdlStmBlock>(nullptr)) {
 }

diff --git a/src/hdlAst/hdlValue.cpp b/src/hdlAst/hdlValue.cpp
@@ -4,11 +4,12 @@
 #include <array>
 #include <assert.h>
 
-using namespace std;
 
 namespace hdlConvertor {
 namespace hdlAst {
 
+using namespace std;
+
 HdlValueArr::HdlValueArr(const HdlValueArr &other) :
 		iHdlExprItem() {
 	assert(other._arr);

diff --git a/src/hdlAst/iHdlExpr.cpp b/src/hdlAst/iHdlExpr.cpp
@@ -1,7 +1,5 @@
 #include <hdlConvertor/hdlAst/iHdlExpr.h>
 
-using namespace std;
-
 namespace hdlConvertor {
 namespace hdlAst {
 

diff --git a/src/hdlAst/iHdlStatement.cpp b/src/hdlAst/iHdlStatement.cpp
@@ -1,7 +1,5 @@
 #include <hdlConvertor/hdlAst/iHdlStatement.h>
 
-using namespace std;
-
 namespace hdlConvertor {
 namespace hdlAst {
 

diff --git a/src/hdlConvertor.cpp b/src/hdlConvertor.cpp
@@ -17,8 +17,6 @@
 namespace hdlConvertor {
 
 using namespace std;
-using namespace antlr4;
-using namespace antlr4::tree;
 using namespace hdlConvertor::hdlAst;
 
 bool HdlConvertor::debug = false;
@@ -58,7 +56,7 @@ class SVParserContainer: public iParserContainer<sv2017_antlr::sv2017Lexer,
 		string preprocessed_code = preprocess_res.str();
 		file_line_map = preprocess_res.file_line_map;
 
-		ANTLRInputStream input_for_parser(preprocessed_code);
+		antlr4::ANTLRInputStream input_for_parser(preprocessed_code);
 		input_for_parser.name = file_name.u8string();
 		this->_parse(input_for_parser, hierarchyOnly);
 	}
@@ -72,7 +70,7 @@ class SVParserContainer: public iParserContainer<sv2017_antlr::sv2017Lexer,
 		string preprocessed_code = preprocess_res.str();
 		file_line_map = preprocess_res.file_line_map;
 
-		ANTLRInputStream input_for_parser(preprocessed_code);
+		antlr4::ANTLRInputStream input_for_parser(preprocessed_code);
 		input_for_parser.name = STRING_FILENAME;
 		this->_parse(input_for_parser, hierarchyOnly);
 	}

diff --git a/src/svConvertor/attributeParser.cpp b/src/svConvertor/attributeParser.cpp
@@ -5,8 +5,6 @@
 namespace hdlConvertor {
 namespace sv {
 
-using namespace sv2017_antlr;
-
 void VerAttributeParser::visitAttribute_instance(
 		sv2017Parser::Attribute_instanceContext *ctx) {
 	// attribute_instance : '(' '*' attr_spec ( ',' attr_spec )* '*' ')' ;

diff --git a/src/svConvertor/baseSvParser.cpp b/src/svConvertor/baseSvParser.cpp
@@ -3,8 +3,6 @@
 namespace hdlConvertor {
 namespace sv {
 
-using namespace std;
-using sv2017Parser = sv2017_antlr::sv2017Parser;
 using namespace hdlConvertor::hdlAst;
 
 BaseSvParser::BaseSvParser(SVCommentParser &_commentParser,

diff --git a/src/svConvertor/declrParser.cpp b/src/svConvertor/declrParser.cpp
@@ -8,13 +8,14 @@
 
 #include <assert.h>
 
-using namespace std;
-using namespace sv2017_antlr;
-using namespace hdlConvertor::hdlAst;
 
 namespace hdlConvertor {
 namespace sv {
 
+using namespace std;
+using namespace hdlConvertor::hdlAst;
+
+
 void VerDeclrParser::visitData_declaration(
 		sv2017Parser::Data_declarationContext *ctx,
 		vector<unique_ptr<iHdlObj>> &res) {

diff --git a/src/svConvertor/delayParser.cpp b/src/svConvertor/delayParser.cpp
@@ -6,13 +6,12 @@
 #include <hdlConvertor/createObject.h>
 
 
-using namespace std;
-using sv2017Parser = sv2017_antlr::sv2017Parser;
-using namespace hdlConvertor::hdlAst;
 
 namespace hdlConvertor {
 namespace sv {
 
+using namespace std;
+
 VerDelayParser::HdlEventList VerDelayParser::visitEvent_control(
 		sv2017Parser::Event_controlContext *ctx) {
 	// event_control:

diff --git a/src/svConvertor/eventExprParser.cpp b/src/svConvertor/eventExprParser.cpp
@@ -5,14 +5,14 @@
 #include <hdlConvertor/svConvertor/exprParser.h>
 #include <hdlConvertor/notImplementedLogger.h>
 
-using namespace std;
-using sv2017Parser = sv2017_antlr::sv2017Parser;
-using namespace hdlConvertor::hdlAst;
-
 
 namespace hdlConvertor {
 namespace sv {
 
+using namespace std;
+using namespace hdlConvertor::hdlAst;
+
+
 void VerEventExprParser::visitEvent_expression(
 		sv2017Parser::Event_expressionContext *ctx,
 		std::vector<std::unique_ptr<iHdlExprItem>> &items) {

diff --git a/src/svConvertor/exprParser.cpp b/src/svConvertor/exprParser.cpp
@@ -10,13 +10,14 @@
 #include <hdlConvertor/svConvertor/exprPrimaryParser.h>
 #include <hdlConvertor/svConvertor/typeParser.h>
 
-using namespace std;
-using sv2017Parser = sv2017_antlr::sv2017Parser;
-using namespace hdlConvertor::hdlAst;
 
 namespace hdlConvertor {
 namespace sv {
 
+using namespace std;
+using namespace hdlConvertor::hdlAst;
+
+
 unique_ptr<iHdlExprItem> VerExprParser::visitConstant_expression(
 		sv2017Parser::Constant_expressionContext *ctx) {
 	// constant_expression : expression ;

diff --git a/src/svConvertor/exprPrimaryParser.cpp b/src/svConvertor/exprPrimaryParser.cpp
@@ -7,13 +7,14 @@
 #include <hdlConvertor/notImplementedLogger.h>
 #include <hdlConvertor/createObject.h>
 
-using namespace std;
-using sv2017Parser = sv2017_antlr::sv2017Parser;
-using namespace hdlConvertor::hdlAst;
 
 namespace hdlConvertor {
 namespace sv {
 
+using namespace std;
+using namespace hdlConvertor::hdlAst;
+
+
 unique_ptr<iHdlExprItem> VerExprPrimaryParser::visitPrimary(
 		sv2017Parser::PrimaryContext *ctx) {
 	// primary:

diff --git a/src/svConvertor/gateParser.cpp b/src/svConvertor/gateParser.cpp
@@ -7,13 +7,14 @@
 
 #include <assert.h>
 
-using namespace std;
-using namespace sv2017_antlr;
-using namespace hdlConvertor::hdlAst;
 
 namespace hdlConvertor {
 namespace sv {
 
+using namespace std;
+using namespace hdlConvertor::hdlAst;
+
+
 std::unique_ptr<iHdlExprItem> VerGateParser::visitEnable_terminal(
 		sv2017Parser::Enable_terminalContext *ctx) {
 	// enable_terminal: expression;

diff --git a/src/svConvertor/generateParser.cpp b/src/svConvertor/generateParser.cpp
@@ -22,7 +22,6 @@ namespace hdlConvertor {
 namespace sv {
 
 using namespace std;
-using sv2017Parser = sv2017_antlr::sv2017Parser;
 using namespace hdlConvertor::hdlAst;
 
 void VerGenerateParser::visitGenerate_region(

diff --git a/src/svConvertor/literalParser.cpp b/src/svConvertor/literalParser.cpp
@@ -6,13 +6,14 @@
 #include <hdlConvertor/notImplementedLogger.h>
 #include <hdlConvertor/createObject.h>
 
-using sv2017Parser = sv2017_antlr::sv2017Parser;
+
+namespace hdlConvertor {
+namespace sv {
+
 using namespace hdlConvertor::hdlAst;
 using TerminalNode = antlr4::tree::TerminalNode;
 using namespace std;
 
-namespace hdlConvertor {
-namespace sv {
 
 unique_ptr<iHdlExprItem> VerLiteralParser::visitIntegral_number(
 		sv2017Parser::Integral_numberContext *ctx) {

diff --git a/src/svConvertor/moduleInstanceParser.cpp b/src/svConvertor/moduleInstanceParser.cpp
@@ -10,7 +10,6 @@ namespace hdlConvertor {
 namespace sv {
 
 using namespace std;
-using sv2017Parser = sv2017_antlr::sv2017Parser;
 using namespace hdlConvertor::hdlAst;
 
 void VerModuleInstanceParser::visitModule_or_interface_or_program_or_udp_instantiation(

diff --git a/src/svConvertor/moduleParser.cpp b/src/svConvertor/moduleParser.cpp
@@ -23,7 +23,6 @@ namespace hdlConvertor {
 namespace sv {
 
 using namespace std;
-using namespace sv2017_antlr;
 using namespace hdlConvertor::hdlAst;
 
 void VerModuleParser::visitModule_header_common(

diff --git a/src/svConvertor/paramDefParser.cpp b/src/svConvertor/paramDefParser.cpp
@@ -8,13 +8,14 @@
 #include <hdlConvertor/svConvertor/typeParser.h>
 #include <hdlConvertor/svConvertor/exprParser.h>
 
-using namespace std;
-using sv2017Parser = sv2017_antlr::sv2017Parser;
-using namespace hdlConvertor::hdlAst;
 
 namespace hdlConvertor {
 namespace sv {
 
+using namespace std;
+using namespace hdlConvertor::hdlAst;
+
+
 void VerParamDefParser::visitParameter_port_list(
 		sv2017Parser::Parameter_port_listContext *ctx,
 		vector<unique_ptr<HdlIdDef>> &res) {

diff --git a/src/svConvertor/portParser.cpp b/src/svConvertor/portParser.cpp
@@ -17,7 +17,6 @@ namespace hdlConvertor {
 namespace sv {
 
 using namespace std;
-using sv2017Parser = sv2017_antlr::sv2017Parser;
 using namespace hdlAst;
 
 VerPortParser::VerPortParser(BaseSvParser *other,

diff --git a/src/svConvertor/programParser.cpp b/src/svConvertor/programParser.cpp
@@ -12,13 +12,14 @@
 #include <hdlConvertor/svConvertor/attributeParser.h>
 #include <hdlConvertor/createObject.h>
 
-using namespace std;
-using sv2017Parser = sv2017_antlr::sv2017Parser;
-using namespace hdlConvertor::hdlAst;
 
 namespace hdlConvertor {
 namespace sv {
 
+using namespace std;
+using namespace hdlConvertor::hdlAst;
+
+
 void VerProgramParser::visitTf_item_declaration(
 		sv2017Parser::Tf_item_declarationContext *ctx,
 		vector<unique_ptr<iHdlObj>> &objs,

diff --git a/src/svConvertor/source_textParser.cpp b/src/svConvertor/source_textParser.cpp
@@ -7,7 +7,6 @@
 namespace hdlConvertor {
 namespace sv {
 
-using sv2017Parser = sv2017_antlr::sv2017Parser;
 using namespace hdlConvertor::hdlAst;
 
 Source_textParser::Source_textParser(antlr4::TokenStream &tokens,

diff --git a/src/svConvertor/statementParser.cpp b/src/svConvertor/statementParser.cpp
@@ -19,13 +19,14 @@
 #include <hdlConvertor/svConvertor/paramDefParser.h>
 #include <hdlConvertor/svConvertor/literalParser.h>
 
-using namespace std;
-using sv2017Parser = sv2017_antlr::sv2017Parser;
-using namespace hdlConvertor::hdlAst;
 
 namespace hdlConvertor {
 namespace sv {
 
+using namespace std;
+using namespace hdlConvertor::hdlAst;
+
+
 void HdlStmIf_collapse_elifs(HdlStmIf &ifStm) {
 	if (ifStm.ifFalse) {
 		auto as_if = dynamic_cast<HdlStmIf*>(ifStm.ifFalse.get());
@@ -594,7 +595,7 @@ unique_ptr<HdlStmBlock> VerStatementParser::visitSeq_block(
 	return visit_block(ctx);
 }
 
-HdlStmBlockJoinType visitJoin_keyword(sv2017Parser::Join_keywordContext *ctx) {
+HdlStmBlockJoinType visitJoin_keyword(sv2017_antlr::sv2017Parser::Join_keywordContext *ctx) {
 	// join_keyword:
 	//     KW_JOIN
 	//     | KW_JOIN_ANY

diff --git a/src/svConvertor/typeParser.cpp b/src/svConvertor/typeParser.cpp
@@ -7,12 +7,14 @@
 #include <hdlConvertor/svConvertor/exprParser.h>
 #include <hdlConvertor/hdlAst/hdlOp.h>
 
-using namespace std;
-using namespace hdlConvertor::hdlAst;
 
 namespace hdlConvertor {
 namespace sv {
 
+using namespace std;
+using namespace hdlConvertor::hdlAst;
+
+
 unique_ptr<iHdlExprItem> VerTypeParser::visitType_reference(
 		sv2017Parser::Type_referenceContext *ctx) {
 	// type_reference:

diff --git a/src/svConvertor/utils.cpp b/src/svConvertor/utils.cpp
@@ -6,13 +6,14 @@
 
 #include <hdlConvertor/createObject.h>
 
-using sv2017Parser = sv2017_antlr::sv2017Parser;
-using namespace hdlConvertor::hdlAst;
-using namespace std;
 
 namespace hdlConvertor {
 namespace sv {
 
+using namespace hdlConvertor::hdlAst;
+using namespace std;
+
+
 unique_ptr<iHdlExprItem> Utils::mkStringT() {
 	return make_unique<HdlValueId>("__str__");
 }