Index: src/CodeGen/CodeGenerator.cc
===================================================================
--- src/CodeGen/CodeGenerator.cc	(revision b99fd56cc71562efe6b8ef812e9867e080293add)
+++ src/CodeGen/CodeGenerator.cc	(revision 1931bb01089a99a839382b07c869b845128790a0)
@@ -9,7 +9,7 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Feb  2 20:30:30 2022
-// Update Count     : 541
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Jun 29 14:34:00 2022
+// Update Count     : 542
 //
 #include "CodeGenerator.h"
@@ -18,4 +18,5 @@
 #include <list>                      // for _List_iterator, list, list<>::it...
 
+#include "AST/Decl.hpp"              // for DeclWithType
 #include "Common/UniqueName.h"       // for UniqueName
 #include "Common/utility.h"          // for CodeLocation, toString
@@ -1238,4 +1239,13 @@
 		} // if
 	}
+
+std::string genName( ast::DeclWithType const * decl ) {
+	if ( const OperatorInfo * opInfo = operatorLookup( decl->name ) ) {
+		return opInfo->outputName;
+	} else {
+		return decl->name;
+	}
+}
+
 } // namespace CodeGen
 
Index: src/CodeGen/CodeGenerator.h
===================================================================
--- src/CodeGen/CodeGenerator.h	(revision b99fd56cc71562efe6b8ef812e9867e080293add)
+++ src/CodeGen/CodeGenerator.h	(revision 1931bb01089a99a839382b07c869b845128790a0)
@@ -9,7 +9,7 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb  1 09:23:21 2022
-// Update Count     : 64
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Jun 29 14:32:00 2022
+// Update Count     : 65
 //
 
@@ -26,4 +26,8 @@
 #include "SynTree/Visitor.h"      // for Visitor
 #include "SynTree/SynTree.h"      // for Visitor Nodes
+
+namespace ast {
+	class DeclWithType;
+}
 
 namespace CodeGen {
@@ -182,4 +186,5 @@
 	/// returns C-compatible name of declaration
 	std::string genName( DeclarationWithType * decl );
+	std::string genName( ast::DeclWithType const * decl );
 
 	inline std::ostream & operator<<( std::ostream & os, const CodeGenerator::LineEnder & endl ) {
Index: src/CodeGen/GenType.cc
===================================================================
--- src/CodeGen/GenType.cc	(revision b99fd56cc71562efe6b8ef812e9867e080293add)
+++ src/CodeGen/GenType.cc	(revision 1931bb01089a99a839382b07c869b845128790a0)
@@ -254,5 +254,5 @@
 
 	void GenType::postvisit( EnumInstType * enumInst ) {
-		if ( enumInst->baseEnum->base ) {
+		if ( enumInst->baseEnum && enumInst->baseEnum->base ) {
 			typeString = genType(enumInst->baseEnum->base, "", options) + typeString;
 		} else {