formatter 1.0

Author: drblallo

lib/dialect/include/rlc/dialect/Operations.hpp

@@ -220,7 +220,29 @@ namespace mlir::rlc
 {
 
 	void pruneUnrechableBlocks(mlir::Region& op, mlir::IRRewriter& rewriter);
-}
+
+	inline void setInlineComment(mlir::Operation* op, llvm::StringRef comment)
+	{
+		op->setAttr("comment", mlir::StringAttr::get(op->getContext(), comment));
+	}
+
+	inline void setInlineComment(mlir::Operation* op, mlir::rlc::Comment comment)
+	{
+		if (comment == nullptr or comment.getText().empty())
+			return;
+		op->setAttr("comment", comment.getTextAttr());
+		comment.erase();
+	}
+
+	inline llvm::StringRef getComment(mlir::Operation* op)
+	{
+		if (not op->hasAttr("comment"))
+		{
+			return "";
+		}
+		return mlir::cast<mlir::StringAttr>(op->getAttr("comment"));
+	}
+}	 // namespace mlir::rlc
 
 namespace rlc
 {

lib/dialect/src/EmitEnumEntitiesPass.cpp

@@ -16,6 +16,7 @@ limitations under the License.
 #include <set>
 
 #include "mlir/IR/IRMapping.h"
+#include "rlc/dialect/IRBuilder.hpp"
 #include "rlc/dialect/Operations.hpp"
 #include "rlc/dialect/Passes.hpp"
 
@@ -25,7 +26,7 @@ namespace mlir::rlc
 #include "rlc/dialect/Passes.inc"
 
 	static void emitFromIntFunction(
-			IRRewriter& rewriter, mlir::rlc::EnumDeclarationOp enumOp)
+			mlir::rlc::IRBuilder& rewriter, mlir::rlc::EnumDeclarationOp enumOp)
 	{
 		rewriter.setInsertionPoint(enumOp);
 		auto argType =
@@ -62,7 +63,7 @@ namespace mlir::rlc
 	}
 
 	static void emitAsIntFunction(
-			IRRewriter& rewriter, mlir::rlc::EnumDeclarationOp enumOp)
+			mlir::rlc::IRBuilder& rewriter, mlir::rlc::EnumDeclarationOp enumOp)
 	{
 		rewriter.setInsertionPoint(enumOp);
 		auto argType =
@@ -99,7 +100,7 @@ namespace mlir::rlc
 	}
 
 	static void emitMaxMemberFunction(
-			IRRewriter& rewriter, mlir::rlc::EnumDeclarationOp enumOp)
+			mlir::rlc::IRBuilder& rewriter, mlir::rlc::EnumDeclarationOp enumOp)
 	{
 		rewriter.setInsertionPoint(enumOp);
 		auto argType =
@@ -133,7 +134,7 @@ namespace mlir::rlc
 	}
 
 	static void emitIsEnumMemberFunction(
-			IRRewriter& rewriter, mlir::rlc::EnumDeclarationOp enumOp)
+			mlir::rlc::IRBuilder& rewriter, mlir::rlc::EnumDeclarationOp enumOp)
 	{
 		rewriter.setInsertionPoint(enumOp);
 		auto argType =
@@ -166,7 +167,7 @@ namespace mlir::rlc
 	}
 
 	static void emitAsStringLiteralFunction(
-			IRRewriter& rewriter, mlir::rlc::EnumDeclarationOp enumOp)
+			mlir::rlc::IRBuilder& rewriter, mlir::rlc::EnumDeclarationOp enumOp)
 	{
 		// Set initial insertion point
 		rewriter.setInsertionPoint(enumOp);
@@ -260,7 +261,7 @@ namespace mlir::rlc
 	}
 
 	static void emitImplicitEnumFunctions(
-			IRRewriter& rewriter, mlir::rlc::EnumDeclarationOp enumOp)
+			mlir::rlc::IRBuilder& rewriter, mlir::rlc::EnumDeclarationOp enumOp)
 	{
 		emitIsEnumMemberFunction(rewriter, enumOp);
 		emitMaxMemberFunction(rewriter, enumOp);
@@ -272,7 +273,7 @@ namespace mlir::rlc
 	static void moveAllFunctionDeclsToNewClass(
 			mlir::rlc::EnumDeclarationOp declaration,
 			mlir::rlc::ClassDeclaration classOp,
-			mlir::IRRewriter& rewriter)
+			mlir::rlc::IRBuilder& rewriter)
 	{
 		auto classBody = rewriter.createBlock(&classOp.getBody());
 		llvm::SmallVector<mlir::Operation*> toMoveOut;
@@ -313,7 +314,7 @@ namespace mlir::rlc
 	static mlir::LogicalResult moveAllMethodExpressionToNewClassFunctions(
 			mlir::rlc::EnumDeclarationOp declaration,
 			mlir::rlc::ClassDeclaration classOp,
-			mlir::IRRewriter& rewriter)
+			mlir::rlc::IRBuilder& rewriter)
 	{
 		llvm::StringMap<mlir::rlc::FunctionOp> funs;
 		if (declaration.getRegion()
@@ -444,7 +445,7 @@ namespace mlir::rlc
 
 		void runOnOperation() override
 		{
-			mlir::IRRewriter rewriter(getOperation().getContext());
+			mlir::rlc::IRBuilder rewriter(getOperation().getContext());
 			llvm::SmallVector<mlir::rlc::EnumDeclarationOp, 2> ops;
 			for (auto declaration :
 					 getOperation().getOps<mlir::rlc::EnumDeclarationOp>())
@@ -473,7 +474,6 @@ namespace mlir::rlc
 				auto op = rewriter.create<mlir::rlc::ClassDeclaration>(
 						declaration.getLoc(),
 						declaration.getNameAttr(),
-						fieldsDecl,
 						mlir::ArrayRef<mlir::Type>({}),
 						*declaration.getTypeLocation());
 
@@ -486,6 +486,12 @@ namespace mlir::rlc
 					signalPassFailure();
 					return;
 				}
+				rewriter.setInsertionPointToEnd(&op.getBody().front());
+				rewriter.createClassFieldDeclaration(
+						op.getLoc(),
+						mlir::rlc::ClassFieldDeclarationAttr::get(
+								declaration.getContext(), fields.back(), shugarType));
+				rewriter.setInsertionPointAfter(op);
 				enums[declaration.getName()] = declaration;
 			}
 
@@ -520,8 +526,13 @@ namespace mlir::rlc
 
 					auto type = mlir::rlc::ClassType::getIdentified(
 							getOperation().getContext(), use.getEnumName(), {});
-					rewriter.replaceOpWithNewOp<mlir::rlc::EnumUse>(
-							use, type, rewriter.getI64IntegerAttr(i), use.getEnumValueAttr());
+					auto newUse = rewriter.create<mlir::rlc::EnumUse>(
+							use.getLoc(),
+							type,
+							rewriter.getI64IntegerAttr(i),
+							use.getEnumValueAttr());
+					use.replaceAllUsesWith(newUse.getResult());
+					use.erase();
 					break;
 				}
 				if (failed)

lib/dialect/src/InstantiateTemplatesPass.cpp

@@ -15,6 +15,7 @@ limitations under the License.
 */
 #include "llvm/ADT/TypeSwitch.h"
 #include "mlir/IR/BuiltinDialect.h"
+#include "mlir/IR/IRMapping.h"
 #include "rlc/dialect/Operations.hpp"
 #include "rlc/dialect/Passes.hpp"
 #include "rlc/dialect/conversion/TypeConverter.h"
@@ -71,13 +72,14 @@ namespace mlir::rlc
 		assert(isTemplateType(originalDecl.getType()).succeeded());
 		mlir::IRRewriter rewriter(op.getContext());
 		rewriter.setInsertionPoint(originalDecl);
-		rewriter.create<mlir::rlc::ClassDeclaration>(
+		auto decl = rewriter.create<mlir::rlc::ClassDeclaration>(
 				originalDecl.getLoc(),
 				type,
 				originalDecl.getNameAttr(),
-				originalDecl.getMembers(),
 				rewriter.getArrayAttr({}),
 				nullptr);
+		mlir::IRMapping mapping;
+		originalDecl.getBody().cloneInto(&decl.getBody(), mapping);
 	}
 
 	static void declareInstantiatedStructs(

lib/dialect/src/Operations.cpp

@@ -250,8 +250,7 @@ static mlir::rlc::ActionFunction deduceActionType(mlir::rlc::ActionFunction fun)
 			generatedFunctions,
 			fun.getUnmangledName(),
 			fun.getInfo());
-	if (fun->hasAttr("emit_classes"))
-		newAction->setAttr("emit_classes", rewriter.getUnitAttr());
+	newAction->setDiscardableAttrs(fun->getDiscardableAttrDictionary());
 	newAction.getBody().takeBody(fun.getBody());
 	newAction.getPrecondition().takeBody(fun.getPrecondition());
 	fun.getResult().replaceAllUsesWith(newAction.getResult());
@@ -556,8 +555,6 @@ static mlir::Type declareActionStatementType(
 	name += snakeCaseToCamelCase(statement.getName());
 
 	llvm::SmallVector<mlir::rlc::ClassFieldAttr, 4> fields;
-	llvm::SmallVector<mlir::rlc::ClassFieldDeclarationAttr, 4> fieldsAttrs;
-
 	for (auto [name, result] :
 			 llvm::zip(statement.getDeclaredNames(), statement.getResults()))
 	{
@@ -568,19 +565,21 @@ static mlir::Type declareActionStatementType(
 			type = casted.getUnderlying();
 		auto field = mlir::rlc::ClassFieldAttr::get(name, type);
 		fields.push_back(field);
-		fieldsAttrs.push_back(mlir::rlc::ClassFieldDeclarationAttr::get(field));
 	}
 
 	auto type = mlir::rlc::ClassType::getNewIdentified(
 			function.getContext(), name, fields, {});
 
 	auto built = builder.getRewriter().create<mlir::rlc::ClassDeclaration>(
-			statement.getLoc(),
-			type,
-			name,
-			fieldsAttrs,
-			llvm::ArrayRef<mlir::Type>({}),
-			nullptr);
+			statement.getLoc(), type, name, llvm::ArrayRef<mlir::Type>({}), nullptr);
+	builder.getRewriter().createBlock(&built.getBody());
+
+	for (auto field : fields)
+	{
+		builder.getRewriter().create<mlir::rlc::ClassFieldDeclaration>(
+				built.getLoc(), mlir::rlc::ClassFieldDeclarationAttr::get(field));
+	}
+	builder.getRewriter().setInsertionPointAfter(built);
 	mlir::rlc::markSynthetic(built);
 	auto applyFunction =
 			defineApplyFunction(function, builder, action, statement, type);
@@ -1472,35 +1471,34 @@ mlir::LogicalResult mlir::rlc::ReturnStatement::typeCheck(
 	assert(yield);
 	const bool returnsValue = yield->getNumOperands() != 0;
 
-	auto newOne = rewriter.create<mlir::rlc::ReturnStatement>(
-			getLoc(),
-			returnsValue ? yield->getOpOperand(0).get().getType()
-									 : mlir::rlc::VoidType::get(getContext()));
-	newOne.getBody().takeBody(getBody());
-	rewriter.eraseOp(*this);
+	auto returnedType = returnsValue ? yield->getOpOperand(0).get().getType()
+																	 : mlir::rlc::VoidType::get(getContext());
 
-	if (newOne->getBlock()->getTerminator() != newOne)
+	setResult(returnedType);
+
+	if (getOperation()->getBlock()->getTerminator() != getOperation())
 	{
 		return mlir::rlc::logError(
-				newOne,
+				*this,
 				"Return statement should be the last statement of its code block.");
 	}
 
-	if (auto parentFunction = newOne->getParentOfType<mlir::rlc::FunctionOp>())
+	if (auto parentFunction =
+					getOperation()->getParentOfType<mlir::rlc::FunctionOp>())
 	{
 		mlir::Type returnType =
 				(parentFunction.getType().getNumResults() != 0
 						 ? parentFunction.getResultTypes()[0]
 						 : mlir::rlc::VoidType::get(getContext()));
 
-		if (not isReturnTypeCompatible(newOne.getResult(), returnType))
+		if (not isReturnTypeCompatible(getResult(), returnType))
 		{
 			auto _ = mlir::rlc::logError(
-					newOne,
+					*this,
 					"Return statement returns values incompatible with the function "
 					"signature");
 			_ = mlir::rlc::logRemark(
-					newOne, "Return value type is " + prettyType(newOne.getResult()));
+					*this, "Return value type is " + prettyType(getResult()));
 
 			return mlir::rlc::logRemark(
 					parentFunction,
@@ -2430,6 +2428,16 @@ mlir::LogicalResult mlir::rlc::FromByteArrayOp::typeCheck(
 			"are supported");
 }
 
+llvm::SmallVector<mlir::rlc::ShugarizedTypeAttr, 2>
+mlir::rlc::ClassFieldDeclaration::getShugarizedTypes()
+{
+	llvm::SmallVector<mlir::rlc::ShugarizedTypeAttr, 2> toReturn;
+
+	if (getDeclaration().getShugarizedType() != nullptr)
+		toReturn.push_back(getDeclaration().getShugarizedType());
+	return toReturn;
+}
+
 llvm::SmallVector<mlir::rlc::ShugarizedTypeAttr, 2>
 mlir::rlc::ConstantGlobalOp::getShugarizedTypes()
 {
@@ -2498,17 +2506,6 @@ mlir::rlc::IsOp::getShugarizedTypes()
 	return { *getShugarizedType() };
 }
 
-llvm::SmallVector<mlir::rlc::ShugarizedTypeAttr, 2>
-mlir::rlc::ClassDeclaration::getShugarizedTypes()
-{
-	llvm::SmallVector<mlir::rlc::ShugarizedTypeAttr, 2> toReturn;
-
-	for (auto parameter : getMemberFields())
-		if (parameter.getShugarizedType() != nullptr)
-			toReturn.push_back(parameter.getShugarizedType());
-	return toReturn;
-}
-
 llvm::SmallVector<mlir::rlc::ShugarizedTypeAttr, 2>
 mlir::rlc::TypeAliasOp::getShugarizedTypes()
 {
@@ -3440,3 +3437,19 @@ size_t mlir::rlc::EnumDeclarationOp::countFields()
 	auto range = getBody().front().getOps<mlir::rlc::EnumFieldDeclarationOp>();
 	return std::distance(range.begin(), range.end());
 }
+
+llvm::SmallVector<mlir::rlc::ClassFieldDeclarationAttr, 4>
+mlir::rlc::ClassDeclaration::getMemberFields()
+{
+	llvm::SmallVector<mlir::rlc::ClassFieldDeclarationAttr, 4> outs;
+	for (auto member : getBody().getOps<mlir::rlc::ClassFieldDeclaration>())
+		outs.push_back(member.getDeclaration());
+
+	return outs;
+}
+
+mlir::rlc::ClassFieldDeclarationAttr
+mlir::rlc::ClassDeclaration::getMemberField(size_t i)
+{
+	return getMemberFields()[i];
+}