checkpoint on adding new AST elements

mballance · mballance · commit 62c9ce284164 · 2020-10-16T21:58:15.000-04:00
Signed-off-by: Matthew Ballance &lt;matt.ballance@gmail.com&gt;
diff --git a/ast/datatypes.json b/ast/datatypes.json
@@ -0,0 +1,97 @@
+{
+	"classes": [
+		{
+			"name": "Scope",
+			"super": "ScopeChild",
+			"data": {
+				"children": "list<UP<ScopeChild>>",
+				"symtab": {
+					"type": "map<string,P<NamedScopeChild>>",
+					"is_ctor": false
+				}
+			}
+		},
+		{
+			"name": "ScopeChild",
+			"data": {
+				"parent": {
+					"type": "P<Scope>",
+					"is_ctor": false,
+					"init": 0
+				}
+			}
+		},
+		{
+			"name": "GlobalScope",
+			"super": "Scope"
+		},
+		{
+			"name": "NamedScope",
+			"super": "Scope",
+			"data": {
+				"name" : "UP<ExprId>"
+			}
+		},
+		{
+			"name": "NamedScopeChild",
+			"super": "ScopeChild",
+			"data": {
+				"name": "UP<ExprId>"
+			}
+		},
+		{
+			"name": "PackageScope",
+			"super": "NamedScope",
+			"data": {
+				"sibling": {
+					"type": "P<PackageScope>",
+					"is_ctor": false,
+					"init": 0
+				}
+			}
+		},
+		{
+			"name": "TypeScope",
+			"super": "NamedScope",
+			"data": {
+				"super_t" : "UP<TypeIdentifier>"
+			}
+		},
+		{
+			"name": "Action",
+			"super": "TypeScope"
+		},
+		{
+			"name": "Component",
+			"super": "TypeScope"
+		},
+		{
+			"name": "Struct",
+			"super": "TypeScope"
+		},
+		{
+			"name": "Buffer",
+			"super": "Struct"
+		},
+		{
+			"name": "Resource",
+			"super": "Struct"
+		},
+		{
+			"name": "State",
+			"super": "Struct"
+		},
+		{
+			"name": "Stream",
+			"super": "Struct"
+		}
+	],
+"flags": [
+		{
+			"name": "FieldAttr",
+			"values": [
+				"FieldAttr_Builtin"
+			]
+		}
+	]
+}
diff --git a/src/AstBuilder.cpp b/src/AstBuilder.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "AstBuilder.h"
+
 #include "AstBuilderInt.h"
 
 namespace pssp {
@@ -21,8 +22,9 @@ AstBuilder::~AstBuilder() {
 }
 
 void AstBuilder::build(
-			std::istream		*in) {
-	m_builder_int->build(in);
+		GlobalScope			*global,
+		std::istream		*in) {
+	m_builder_int->build(global, in);
 }
 
 } /* namespace pssp */
diff --git a/src/AstBuilder.h b/src/AstBuilder.h
@@ -8,6 +8,7 @@
 #pragma once
 #include <memory>
 #include <iostream>
+#include "GlobalScope.h"
 #include "IMarkerListener.h"
 
 namespace pssp {
@@ -22,6 +23,7 @@ class AstBuilder {
 	virtual ~AstBuilder();
 
 	void build(
+			GlobalScope			*global,
 			std::istream		*in);
 
 private:
diff --git a/src/AstBuilderInt.cpp b/src/AstBuilderInt.cpp
diff --git a/src/AstBuilderInt.h b/src/AstBuilderInt.h
@@ -11,6 +11,8 @@
 #include "IMarkerListener.h"
 #include "PSSBaseVisitor.h"
 #include "BaseErrorListener.h"
+#include "GlobalScope.h"
+#include "Scope.h"
 
 using namespace antlr4;
 
@@ -24,16 +26,12 @@ class AstBuilderInt :
 
 	virtual ~AstBuilderInt();
 
-	void build(std::istream *in);
-
-    virtual antlrcpp::Any visitCompilation_unit(PSSParser::Compilation_unitContext *context) override;
-
-    virtual antlrcpp::Any visitPortable_stimulus_description(PSSParser::Portable_stimulus_descriptionContext *context) override;
+	void build(
+			GlobalScope		*global,
+			std::istream 	*in);
 
     virtual antlrcpp::Any visitPackage_declaration(PSSParser::Package_declarationContext *context) override;
 
-    virtual antlrcpp::Any visitPackage_body_item(PSSParser::Package_body_itemContext *context) override;
-
     virtual antlrcpp::Any visitImport_stmt(PSSParser::Import_stmtContext *context) override;
 
     virtual antlrcpp::Any visitPackage_import_pattern(PSSParser::Package_import_patternContext *context) override;
@@ -556,8 +554,16 @@ class AstBuilderInt :
 			const std::string &msg,
 			std::exception_ptr e) override;
 
+private:
+    Scope *scope() const { return m_scopes.back(); }
+
+    void push_scope(Scope *s) { m_scopes.push_back(s); }
+
+    void pop_scope() { m_scopes.pop_back(); }
+
 private:
     IMarkerListener						*m_marker_l;
+    std::vector<Scope *>				m_scopes;
 
 };
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -32,6 +32,8 @@ file(GLOB pssparser_SRC
 add_library(pssparser
 	${pssparser_SRC}
 	${ANTLR_PSS_OUTPUTS})
+
+add_dependencies(pssparser pss_ast libantlr4)
 	
 add_library(formatter
 	${parser_SRC}
@@ -46,7 +48,7 @@ target_link_libraries(pssformat
 	
 	
 add_dependencies(pssformat
-	LIBANTLR4)
+	libantlr4)
   
 #add_dependencies(parser gen_pss_parser)
 		
diff --git a/src/Formatter.cpp b/src/Formatter.cpp
@@ -5,12 +5,15 @@
  *      Author: ballance
  */
 
+#include <stdio.h>
 #include "Formatter.h"
 #include "PSSLexer.h"
 #include "PSSParser.h"
 
 using namespace antlr4;
 
+namespace pss {
+
 Formatter::Formatter() {
 	// TODO Auto-generated constructor stub
 
@@ -34,12 +37,35 @@ void Formatter::format(
     parser.compilation_unit();
 }
 
+void Formatter::enterAction_declaration(PSSParser::Action_declarationContext *ctx) {
+	fprintf(stdout, "enterAction_declaration %p %s\n",
+			ctx->start,
+			ctx->start->getText().c_str());
+}
+
+void Formatter::exitAction_declaration(PSSParser::Action_declarationContext *ctx) {
+	fprintf(stdout, "exitAction_declaration %s\n", ctx->start->getText().c_str());
+}
+
+void Formatter::enterComponent_declaration(PSSParser::Component_declarationContext *ctx) {
+	fprintf(stdout, "enterComponent_declaration %p %s\n",
+			ctx->start,
+			ctx->start->getText().c_str());
+}
+
+void Formatter::exitComponent_declaration(PSSParser::Component_declarationContext *ctx) {
+	fprintf(stdout, "exitComponent_declaration %s\n", ctx->start->getText().c_str());
+}
+
 void Formatter::visitTerminal(antlr4::tree::TerminalNode *node) {
-	fprintf(stdout, "visitTerminal: %s\n", node->getText().c_str());
+	fprintf(stdout, "visitTerminal: %p %s\n",
+			node->getSymbol(),
+			node->getText().c_str());
 
 }
 
 void Formatter::visitErrorNode(antlr4::tree::ErrorNode *node) {
 	fprintf(stdout, "visitErrorNode: %s\n", node->getText().c_str());
 }
 
+}
diff --git a/src/Formatter.h b/src/Formatter.h
@@ -9,6 +9,8 @@
 #include "PSSBaseListener.h"
 #include <iostream>
 
+namespace pss {
+
 class Formatter : public PSSBaseListener {
 public:
 	Formatter();
@@ -19,9 +21,16 @@ class Formatter : public PSSBaseListener {
 			std::istream	*in,
 			std::ostream	*out);
 
+	virtual void enterAction_declaration(PSSParser::Action_declarationContext *ctx) override;
+	virtual void exitAction_declaration(PSSParser::Action_declarationContext *ctx) override;
+
+	virtual void enterComponent_declaration(PSSParser::Component_declarationContext *ctx) override;
+	virtual void exitComponent_declaration(PSSParser::Component_declarationContext *ctx) override;
+
 	virtual void visitTerminal(antlr4::tree::TerminalNode *node) override;
 
 	virtual void visitErrorNode(antlr4::tree::ErrorNode *node) override;
 
 };
 
+}
diff --git a/src/IMarkerListener.h b/src/IMarkerListener.h
@@ -7,6 +7,7 @@
 
 #pragma once
 #include "Marker.h"
+#include "MarkerSeverityE.h"
 
 namespace pssp {
 
@@ -16,6 +17,8 @@ class IMarkerListener {
 
 	virtual void marker(const Marker &m) = 0;
 
+	virtual bool hasSeverity(MarkerSeverityE s) = 0;
+
 };
 
 }
diff --git a/src/Location.cpp b/src/Location.cpp
diff --git a/src/Location.h b/src/Location.h
diff --git a/src/Marker.cpp b/src/Marker.cpp
diff --git a/src/Marker.h b/src/Marker.h
diff --git a/src/MarkerCollector.cpp b/src/MarkerCollector.cpp
@@ -10,12 +10,22 @@
 namespace pssp {
 
 MarkerCollector::MarkerCollector() {
-	// TODO Auto-generated constructor stub
-
+	for (uint32_t i=0; i<Severity_NumLevels; i++) {
+		m_count[i] = 0;
+	}
 }
 
 MarkerCollector::~MarkerCollector() {
 	// TODO Auto-generated destructor stub
 }
 
+void MarkerCollector::marker(const Marker &m) {
+	m_markers.push_back(m);
+	m_count[m.severity()]++;
+}
+
+bool MarkerCollector::hasSeverity(MarkerSeverityE s) {
+	return m_count[s];
+}
+
 } /* namespace pssp */
diff --git a/src/MarkerCollector.h b/src/MarkerCollector.h
@@ -6,6 +6,7 @@
  */
 
 #pragma once
+#include <vector>
 #include "IMarkerListener.h"
 
 namespace pssp {
@@ -16,6 +17,14 @@ class MarkerCollector : public virtual IMarkerListener {
 
 	virtual ~MarkerCollector();
 
+	virtual void marker(const Marker &m) override;
+
+	virtual bool hasSeverity(MarkerSeverityE s) override;
+
+private:
+	uint32_t					m_count[Severity_NumLevels];
+	std::vector<Marker>			m_markers;
+
 
 };
 
diff --git a/src/MarkerSeverityE.h b/src/MarkerSeverityE.h
@@ -5,13 +5,16 @@
  *      Author: ballance
  */
 
+#pragma once
+
 namespace pssp {
 
 enum MarkerSeverityE {
 	Severity_Error,
 	Severity_Warn,
 	Severity_Info,
-	Severity_Hint
+	Severity_Hint,
+	Severity_NumLevels
 };
 
 }
diff --git a/src/apps/pssformat_main.cpp b/src/apps/pssformat_main.cpp
@@ -20,7 +20,7 @@ int main(int argc, char **argv) {
 		exit(1);
 	}
 
-	Formatter f;
+	pss::Formatter f;
 
 
 

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ int main(int argc, char **argv) {`
`20`	`20`	`exit(1);`
`21`	`21`	`}`
`22`	`22`
`23`		`- Formatter f;`
	`23`	`+ pss::Formatter f;`
`24`	`24`
`25`	`25`
`26`	`26`