fixup! Type inference draft.

Author: cameel

Diff for: libsolidity/experimental/codegen/IRGenerationContext.h

@@ -33,8 +33,12 @@ class Analysis;
 
 struct IRGenerationContext
 {
-	Analysis const& analysis;
-	TypeEnvironment const* env = nullptr;
+	struct QueuedFunction
+	{
+		FunctionDefinition const* function = nullptr;
+		Type type = std::monostate{};
+	};
+
 	void enqueueFunctionDefinition(FunctionDefinition const* _functionDefinition, Type _type)
 	{
 		QueuedFunction queue{_functionDefinition, env->resolve(_type)};
@@ -43,11 +47,9 @@ struct IRGenerationContext
 				return;
 		functionQueue.emplace_back(queue);
 	}
-	struct QueuedFunction
-	{
-		FunctionDefinition const* function = nullptr;
-		Type type = std::monostate{};
-	};
+
+	Analysis const& analysis;
+	TypeEnvironment const* env = nullptr;
 	std::list<QueuedFunction> functionQueue;
 	std::map<FunctionDefinition const*, std::vector<Type>> generatedFunctions;
 };

Diff for: libsolidity/experimental/codegen/IRGenerator.cpp

@@ -52,14 +52,13 @@ IRGenerator::IRGenerator(
 	DebugInfoSelection const&,
 	CharStreamProvider const*,
 	Analysis const& _analysis
-)
-:
-m_evmVersion(_evmVersion),
-m_eofVersion(_eofVersion),
-//		m_debugInfoSelection(_debugInfoSelection),
-//		m_soliditySourceProvider(_soliditySourceProvider),
-m_env(_analysis.typeSystem().env().clone()),
-m_context{_analysis, &m_env, {}, {}}
+):
+	m_evmVersion(_evmVersion),
+	m_eofVersion(_eofVersion),
+	//m_debugInfoSelection(_debugInfoSelection),
+	//m_soliditySourceProvider(_soliditySourceProvider),
+	m_env(_analysis.typeSystem().env().clone()),
+	m_context{_analysis, &m_env, {}, {}}
 {
 }
 
@@ -69,7 +68,6 @@ std::string IRGenerator::run(
 	std::map<ContractDefinition const*, std::string_view const> const& /*_otherYulSources*/
 )
 {
-
 	Whiskers t(R"(
 		object "<CreationObject>" {
 			code {

Diff for: libsolidity/experimental/codegen/IRGeneratorForStatements.cpp

@@ -56,7 +56,11 @@ struct CopyTranslate: public yul::ASTCopier
 		IRGenerationContext const& _context,
 		yul::Dialect const& _dialect,
 		std::map<yul::Identifier const*, InlineAssemblyAnnotation::ExternalIdentifierInfo> _references
-	): m_context(_context), m_dialect(_dialect), m_references(std::move(_references)) {}
+	):
+		m_context(_context),
+		m_dialect(_dialect),
+		m_references(std::move(_references))
+	{}
 
 	using ASTCopier::operator();
 

Diff for: libsolidity/experimental/codegen/IRGeneratorForStatements.h

@@ -34,7 +34,15 @@ class IRGeneratorForStatements: public ASTConstVisitor
 	IRGeneratorForStatements(IRGenerationContext& _context): m_context(_context) {}
 
 	std::string generate(ASTNode const& _node);
+
 private:
+	enum class Builtins
+	{
+		Identity,
+		FromBool,
+		ToBool
+	};
+
 	bool visit(ExpressionStatement const& _expressionStatement) override;
 	bool visit(Block const& _block) override;
 	bool visit(IfStatement const& _ifStatement) override;
@@ -54,18 +62,14 @@ class IRGeneratorForStatements: public ASTConstVisitor
 	void endVisit(Return const& _return) override;
 	/// Default visit will reject all AST nodes that are not explicitly supported.
 	bool visitNode(ASTNode const& _node) override;
-	IRGenerationContext& m_context;
-	std::stringstream m_code;
-	enum class Builtins
-	{
-		Identity,
-		FromBool,
-		ToBool
-	};
-	std::map<Expression const*, std::variant<Declaration const*, Builtins>> m_expressionDeclaration;
+
 	Type typeAnnotation(ASTNode const& _node) const;
 
 	FunctionDefinition const& resolveTypeClassFunction(TypeClass _class, std::string _name, Type _type);
+
+	IRGenerationContext& m_context;
+	std::stringstream m_code;
+	std::map<Expression const*, std::variant<Declaration const*, Builtins>> m_expressionDeclaration;
 };
 
 }