rename YulASTComparator -> yuldiff

clonker · clonker · commit de86faa8342e · 2026-04-02T11:25:54.000+02:00
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -210,9 +210,9 @@ set(yul_phaser_sources
 detect_stray_source_files("${yul_phaser_sources}" "yulPhaser/")
 
 set(yul_ast_comparator_sources
-    yulASTComparator/ASTComparator.cpp
+    yuldiff/ASTComparator.cpp
 )
-detect_stray_source_files("${yul_ast_comparator_sources}" "yulASTComparator/")
+detect_stray_source_files("${yul_ast_comparator_sources}" "yuldiff/")
 
 add_executable(soltest ${sources}
     ${contracts_sources}
@@ -226,7 +226,7 @@ add_executable(soltest ${sources}
     ${yul_phaser_sources}
     ${yul_ast_comparator_sources}
 )
-target_link_libraries(soltest PRIVATE solcli libsolc yul solidity smtutil solutil phaser libYulASTComparator Boost::boost yulInterpreter evmasm Boost::filesystem Boost::program_options Boost::unit_test_framework evmc)
+target_link_libraries(soltest PRIVATE solcli libsolc yul solidity smtutil solutil phaser libyuldiff Boost::boost yulInterpreter evmasm Boost::filesystem Boost::program_options Boost::unit_test_framework evmc)
 
 
 # Special compilation flag for Visual Studio (version 2019 at least affected)
diff --git a/test/yuldiff/ASTComparator.cpp b/test/yuldiff/ASTComparator.cpp
@@ -16,7 +16,7 @@
 */
 // SPDX-License-Identifier: GPL-3.0
 
-#include <tools/yulASTComparator/ASTComparator.h>
+#include <tools/yuldiff/ASTComparator.h>
 
 #include <libyul/AST.h>
 #include <libyul/AsmAnalysis.h>
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
@@ -36,4 +36,4 @@ target_link_libraries(yul-phaser PRIVATE phaser)
 
 install(TARGETS yul-phaser DESTINATION "${CMAKE_INSTALL_BINDIR}")
 
-add_subdirectory(yulASTComparator)
+add_subdirectory(yuldiff)
diff --git a/tools/yulASTComparator/CMakeLists.txt b/tools/yulASTComparator/CMakeLists.txt
diff --git a/tools/yuldiff/ASTComparator.cpp b/tools/yuldiff/ASTComparator.cpp
@@ -16,7 +16,7 @@
 */
 // SPDX-License-Identifier: GPL-3.0
 
-#include <tools/yulASTComparator/ASTComparator.h>
+#include <tools/yuldiff/ASTComparator.h>
 
 #include <libyul/AST.h>
 
diff --git a/tools/yuldiff/ASTComparator.h b/tools/yuldiff/ASTComparator.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <tools/yulASTComparator/ScopeBimap.h>
+#include <tools/yuldiff/ScopeBimap.h>
 
 #include <libyul/Dialect.h>
 #include <libyul/Object.h>
diff --git a/tools/yuldiff/CMakeLists.txt b/tools/yuldiff/CMakeLists.txt
@@ -0,0 +1,9 @@
+add_library(libyuldiff
+	ASTComparator.cpp
+	ASTComparator.h
+	ScopeBimap.h
+)
+target_link_libraries(libyuldiff PUBLIC solidity)
+
+add_executable(yuldiff main.cpp)
+target_link_libraries(yuldiff PRIVATE libyuldiff)
diff --git a/tools/yuldiff/ScopeBimap.h b/tools/yuldiff/ScopeBimap.h
diff --git a/tools/yuldiff/main.cpp b/tools/yuldiff/main.cpp
@@ -19,12 +19,12 @@
 /// Compares two Yul object trees structurally, treating variable and user-defined function names as equivalent
 /// if they correspond 1:1 (tracked via a scoped bidirectional map). Prints a diff at the first point of divergence.
 
-#include <tools/yulASTComparator/ASTComparator.h>
+#include <tools/yuldiff/ASTComparator.h>
 
 #include <libyul/AST.h>
+#include <libyul/Dialect.h>
 #include <libyul/Object.h>
 #include <libyul/ObjectParser.h>
-#include <libyul/Dialect.h>
 #include <libyul/backends/evm/EVMDialect.h>
 
 #include <libsolutil/CommonIO.h>

Original file line number	Diff line number	Diff line change
`@@ -36,4 +36,4 @@ target_link_libraries(yul-phaser PRIVATE phaser)`
`36`	`36`
`37`	`37`	`install(TARGETS yul-phaser DESTINATION "${CMAKE_INSTALL_BINDIR}")`
`38`	`38`
`39`		`-add_subdirectory(yulASTComparator)`
	`39`	`+add_subdirectory(yuldiff)`