Skip to content

Commit bcc28e4

Browse files
authored
Simplify the canonicalizer (#898)
Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>
1 parent 425a26a commit bcc28e4

133 files changed

Lines changed: 1482 additions & 2201 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

config.cmake.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,6 @@ foreach(component ${BLAZE_COMPONENTS})
7575
elseif(component STREQUAL "canonicalizer")
7676
include("${CMAKE_CURRENT_LIST_DIR}/sourcemeta_blaze_foundation.cmake")
7777
include("${CMAKE_CURRENT_LIST_DIR}/sourcemeta_blaze_frame.cmake")
78-
include("${CMAKE_CURRENT_LIST_DIR}/sourcemeta_blaze_evaluator.cmake")
79-
include("${CMAKE_CURRENT_LIST_DIR}/sourcemeta_blaze_compiler.cmake")
80-
include("${CMAKE_CURRENT_LIST_DIR}/sourcemeta_blaze_output.cmake")
8178
include("${CMAKE_CURRENT_LIST_DIR}/sourcemeta_blaze_canonicalizer.cmake")
8279
elseif(component STREQUAL "editor")
8380
include("${CMAKE_CURRENT_LIST_DIR}/sourcemeta_blaze_foundation.cmake")

src/canonicalizer/CMakeLists.txt

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
sourcemeta_library(NAMESPACE sourcemeta PROJECT blaze NAME canonicalizer
22
FOLDER "Blaze/Canonicalizer"
3-
SOURCES canonicalize.cc transformer.cc
4-
canonicalizer_transformer.h
5-
canonicalizer_error.h
3+
SOURCES canonicalize.cc
4+
rule.h
5+
helpers.h
66

77
# Rules
88
rules/additional_items_implicit.h
@@ -140,13 +140,5 @@ target_link_libraries(sourcemeta_blaze_canonicalizer PUBLIC
140140
sourcemeta::blaze::foundation)
141141
target_link_libraries(sourcemeta_blaze_canonicalizer PUBLIC
142142
sourcemeta::blaze::frame)
143-
target_link_libraries(sourcemeta_blaze_canonicalizer PUBLIC
144-
sourcemeta::blaze::compiler)
145-
target_link_libraries(sourcemeta_blaze_canonicalizer PRIVATE
146-
sourcemeta::blaze::evaluator)
147-
target_link_libraries(sourcemeta_blaze_canonicalizer PRIVATE
148-
sourcemeta::blaze::output)
149-
target_link_libraries(sourcemeta_blaze_canonicalizer PRIVATE
150-
sourcemeta::core::regex)
151143
target_link_libraries(sourcemeta_blaze_canonicalizer PRIVATE
152144
sourcemeta::core::uri)

0 commit comments

Comments
 (0)