From f594b8c922647461dd0c9e534c8267b11b4f6897 Mon Sep 17 00:00:00 2001 From: Diego Jesus Date: Tue, 28 Apr 2020 18:57:57 +0100 Subject: [PATCH 01/14] Adds a CHANGELOG.md file and makes some changes in preparation for the release. --- CHANGELOG.md | 34 +++++++++++++++++++ CMakeLists.txt | 4 ++- cmake/Selector.cmake | 24 +++++++------ source/CMakeLists.txt | 7 +--- source/common/CMakeLists.txt | 7 +--- source/dynamic_value/CMakeLists.txt | 7 +--- source/geometry_core/CMakeLists.txt | 7 +--- source/geometry_operations/CMakeLists.txt | 7 +--- source/math_lib/CMakeLists.txt | 7 +--- source/parameter/CMakeLists.txt | 7 +--- source/procedural_graph/CMakeLists.txt | 7 +--- source/procedural_graph/reader/CMakeLists.txt | 7 +--- source/procedural_objects/CMakeLists.txt | 7 +--- source/selscript/CMakeLists.txt | 7 +--- source/selscript/intermediate/CMakeLists.txt | 7 +--- source/selscript/interpreter/CMakeLists.txt | 7 +--- source/selscript/parser/CMakeLists.txt | 7 +--- source/selscript/value/CMakeLists.txt | 7 +--- tests/regression_tests/CMakeLists.txt | 7 +--- tests/selscript/CMakeLists.txt | 7 +--- tests/unit_tests/CMakeLists.txt | 7 +--- tools/CMakeLists.txt | 7 +--- 22 files changed, 69 insertions(+), 126 deletions(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..f6b943be --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,34 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [0.1.0] - 2020-04-28 + +### Added + +- Procedural graph description file format. +- Operation Node. +- Input Interface Node. +- Output Interface Node. +- Parameter Node. +- Router Node. +- Create Rect Geometry operation. +- Create Sphere Geometry operation. +- Create Box Geometry operation. +- Export Geometry operation. +- Extract Scope operation. +- Extrude Geometry operation. +- Face Offset operation. +- Triangulate Geometry operation. +- Clip Geometry operation. +- Repeat Split operation. +- Extract Faces operation. +- Translate operation. +- Split operation. +- Scale operation. +- Rotate operation. +- Selscript scripting language. +- Geometry implementation with Split Point topology. diff --git a/CMakeLists.txt b/CMakeLists.txt index 43085141..80ae55c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,6 @@ -project("Selector" LANGUAGES CXX) +cmake_policy(SET CMP0048 NEW) + +project("Selector" LANGUAGES CXX VERSION 0.1.0) cmake_minimum_required(VERSION 3.11.0 FATAL_ERROR) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") diff --git a/cmake/Selector.cmake b/cmake/Selector.cmake index 30d45c70..d0c27fb1 100644 --- a/cmake/Selector.cmake +++ b/cmake/Selector.cmake @@ -1,14 +1,3 @@ -# Default Selector version, build number and date -if (NOT DEFINED SELECTOR_VERSION) - set(SELECTOR_VERSION "developer-version") -endif() - -if (NOT DEFINED SELECTOR_BUILD_NUMBER) - set(SELECTOR_BUILD_NUMBER "") -endif() - -string(TIMESTAMP SELECTOR_BUILD_DATE "%d/%m/%Y %H:%M:%S") - execute_process( COMMAND git rev-parse --abbrev-ref HEAD WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} @@ -40,6 +29,17 @@ execute_process( OUTPUT_STRIP_TRAILING_WHITESPACE ) +# Default Selector version, build number and date +if (NOT DEFINED SELECTOR_VERSION) + set(SELECTOR_VERSION "${CMAKE_PROJECT_VERSION}") +endif() + +if (NOT DEFINED SELECTOR_BUILD_NUMBER) + set(SELECTOR_BUILD_NUMBER "0") +endif() + +string(TIMESTAMP SELECTOR_BUILD_DATE "%d/%m/%Y %H:%M:%S") + if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release") option(SELECTOR_PROFILER_ACTIVE "Enable or disable built in profiling" OFF) option(SELECTOR_ENABLE_ASSERTIONS "Enable or disable assertions" OFF) @@ -57,6 +57,8 @@ set(GIT_COMMIT_AUTHOR "\"${GIT_COMMIT_AUTHOR}\"") set(SELECTOR_INCLUDE_GIT_INFO 0) if ("${GIT_BRANCH}" STREQUAL "master") option(SELECTOR_GIT_INFO "Include git information in the version information" OFF) +elseif("${GIT_BRANCH}" MATCHES "^release-.+") + option(SELECTOR_GIT_INFO "Include git information in the version information" OFF) else() option(SELECTOR_GIT_INFO "Include git information in the version information" ON) endif() diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 65956b27..a1cdcfa7 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -33,12 +33,6 @@ add_library(selector STATIC "${SELECTOR_SOURCES}" $ ) -set_target_properties( - selector - PROPERTIES - COMPILE_FLAGS ${COMPILE_FLAGS} "-Wno-gnu-zero-variadic-macro-arguments" -) - target_include_directories( selector PRIVATE @@ -61,6 +55,7 @@ target_compile_options( PRIVATE -Wall -Werror + $<$:-Wno-gnu-zero-variadic-macro-arguments> ) target_compile_definitions( diff --git a/source/common/CMakeLists.txt b/source/common/CMakeLists.txt index 14c48fd4..2b1bd1f7 100644 --- a/source/common/CMakeLists.txt +++ b/source/common/CMakeLists.txt @@ -52,12 +52,6 @@ target_include_directories( ${SELSCRIPT_INCLUDE_DIR} ) -set_target_properties( - common - PROPERTIES - COMPILE_FLAGS ${COMPILE_FLAGS} "-Wno-gnu-zero-variadic-macro-arguments" -) - target_compile_features( common PRIVATE @@ -72,6 +66,7 @@ target_compile_options( PRIVATE -Wall -Werror + $<$:-Wno-gnu-zero-variadic-macro-arguments> ) target_compile_definitions( diff --git a/source/dynamic_value/CMakeLists.txt b/source/dynamic_value/CMakeLists.txt index 141c3aec..a1ecb0ab 100644 --- a/source/dynamic_value/CMakeLists.txt +++ b/source/dynamic_value/CMakeLists.txt @@ -77,12 +77,6 @@ target_include_directories( ${SELSCRIPT_INCLUDE_DIR} ) -set_target_properties( - dynamic_value - PROPERTIES - COMPILE_FLAGS ${COMPILE_FLAGS} "-Wno-gnu-zero-variadic-macro-arguments" -) - target_compile_features( dynamic_value PRIVATE @@ -97,6 +91,7 @@ target_compile_options( PRIVATE -Wall -Werror + $<$:-Wno-gnu-zero-variadic-macro-arguments> ) target_compile_definitions( diff --git a/source/geometry_core/CMakeLists.txt b/source/geometry_core/CMakeLists.txt index e702e9c6..8dca2cff 100644 --- a/source/geometry_core/CMakeLists.txt +++ b/source/geometry_core/CMakeLists.txt @@ -33,12 +33,6 @@ target_include_directories( ${SELSCRIPT_INCLUDE_DIR} ) -set_target_properties( - geometry_core - PROPERTIES - COMPILE_FLAGS ${COMPILE_FLAGS} "-Wno-gnu-zero-variadic-macro-arguments" -) - target_compile_features( geometry_core PRIVATE @@ -53,6 +47,7 @@ target_compile_options( PRIVATE -Wall -Werror + $<$:-Wno-gnu-zero-variadic-macro-arguments> ) target_compile_definitions( diff --git a/source/geometry_operations/CMakeLists.txt b/source/geometry_operations/CMakeLists.txt index 5e6ed6ac..92276c15 100644 --- a/source/geometry_operations/CMakeLists.txt +++ b/source/geometry_operations/CMakeLists.txt @@ -35,12 +35,6 @@ target_include_directories( ${SELSCRIPT_INCLUDE_DIR} ) -set_target_properties( - geometry_operations - PROPERTIES - COMPILE_FLAGS ${COMPILE_FLAGS} "-Wno-gnu-zero-variadic-macro-arguments" -) - target_compile_features( geometry_operations PRIVATE @@ -55,6 +49,7 @@ target_compile_options( PRIVATE -Wall -Werror + $<$:-Wno-gnu-zero-variadic-macro-arguments> ) target_compile_definitions( diff --git a/source/math_lib/CMakeLists.txt b/source/math_lib/CMakeLists.txt index f9dd1ce2..b128f2cd 100644 --- a/source/math_lib/CMakeLists.txt +++ b/source/math_lib/CMakeLists.txt @@ -45,12 +45,6 @@ target_include_directories( ${SELSCRIPT_INCLUDE_DIR} ) -set_target_properties( - math_lib - PROPERTIES - COMPILE_FLAGS ${COMPILE_FLAGS} "-Wno-gnu-zero-variadic-macro-arguments" -) - target_compile_features( math_lib PRIVATE @@ -65,6 +59,7 @@ target_compile_options( PRIVATE -Wall -Werror + $<$:-Wno-gnu-zero-variadic-macro-arguments> ) target_compile_definitions( diff --git a/source/parameter/CMakeLists.txt b/source/parameter/CMakeLists.txt index 881c3dc4..582b316d 100644 --- a/source/parameter/CMakeLists.txt +++ b/source/parameter/CMakeLists.txt @@ -20,12 +20,6 @@ target_include_directories( ${Boost_INCLUDE_DIRS} ) -set_target_properties( - parameter - PROPERTIES - COMPILE_FLAGS ${COMPILE_FLAGS} "-Wno-gnu-zero-variadic-macro-arguments" -) - target_compile_features( parameter PRIVATE @@ -40,6 +34,7 @@ target_compile_options( PRIVATE -Wall -Werror + $<$:-Wno-gnu-zero-variadic-macro-arguments> ) target_compile_definitions( diff --git a/source/procedural_graph/CMakeLists.txt b/source/procedural_graph/CMakeLists.txt index d19ab25e..5a55844e 100644 --- a/source/procedural_graph/CMakeLists.txt +++ b/source/procedural_graph/CMakeLists.txt @@ -75,12 +75,6 @@ target_include_directories( ${SELSCRIPT_INCLUDE_DIR} ) -set_target_properties( - procedural_graph - PROPERTIES - COMPILE_FLAGS ${COMPILE_FLAGS} "-Wno-gnu-zero-variadic-macro-arguments" -) - target_compile_features( procedural_graph PRIVATE @@ -95,6 +89,7 @@ target_compile_options( PRIVATE -Wall -Werror + $<$:-Wno-gnu-zero-variadic-macro-arguments> ) target_compile_definitions( diff --git a/source/procedural_graph/reader/CMakeLists.txt b/source/procedural_graph/reader/CMakeLists.txt index 9196f5ed..53ff55d3 100644 --- a/source/procedural_graph/reader/CMakeLists.txt +++ b/source/procedural_graph/reader/CMakeLists.txt @@ -42,12 +42,6 @@ target_include_directories( ${SELSCRIPT_INCLUDE_DIR} ) -set_target_properties( - procedural_graph_reader - PROPERTIES - COMPILE_FLAGS ${COMPILE_FLAGS} "-Wno-gnu-zero-variadic-macro-arguments" -) - target_compile_features( procedural_graph_reader PRIVATE @@ -62,6 +56,7 @@ target_compile_options( PRIVATE -Wall -Werror + $<$:-Wno-gnu-zero-variadic-macro-arguments> ) target_compile_definitions( diff --git a/source/procedural_objects/CMakeLists.txt b/source/procedural_objects/CMakeLists.txt index 535a894c..99be4b8c 100644 --- a/source/procedural_objects/CMakeLists.txt +++ b/source/procedural_objects/CMakeLists.txt @@ -109,12 +109,6 @@ target_include_directories( ${SELSCRIPT_INCLUDE_DIR} ) -set_target_properties( - procedural_objects - PROPERTIES - COMPILE_FLAGS ${COMPILE_FLAGS} "-Wno-gnu-zero-variadic-macro-arguments" -) - target_compile_features( procedural_objects PRIVATE @@ -129,6 +123,7 @@ target_compile_options( PRIVATE -Wall -Werror + $<$:-Wno-gnu-zero-variadic-macro-arguments> ) target_compile_definitions( diff --git a/source/selscript/CMakeLists.txt b/source/selscript/CMakeLists.txt index c5463765..7dd925e5 100644 --- a/source/selscript/CMakeLists.txt +++ b/source/selscript/CMakeLists.txt @@ -29,6 +29,7 @@ target_compile_options( PRIVATE -Wall -Werror + $<$:-Wno-gnu-zero-variadic-macro-arguments> ) target_link_libraries( @@ -37,12 +38,6 @@ target_link_libraries( common ) -set_target_properties( - selscript - PROPERTIES - COMPILE_FLAGS ${COMPILE_FLAGS} "-Wno-gnu-zero-variadic-macro-arguments" -) - include(GNUInstallDirs) install(TARGETS selscript EXPORT selscript-export diff --git a/source/selscript/intermediate/CMakeLists.txt b/source/selscript/intermediate/CMakeLists.txt index 35177ec6..235c973e 100644 --- a/source/selscript/intermediate/CMakeLists.txt +++ b/source/selscript/intermediate/CMakeLists.txt @@ -42,12 +42,7 @@ target_compile_options( PRIVATE -Wall -Werror -) - -set_target_properties( - selscript_intermediate - PROPERTIES - COMPILE_FLAGS ${COMPILE_FLAGS} "-Wno-gnu-zero-variadic-macro-arguments" + $<$:-Wno-gnu-zero-variadic-macro-arguments> ) target_link_libraries( diff --git a/source/selscript/interpreter/CMakeLists.txt b/source/selscript/interpreter/CMakeLists.txt index cfba1f13..88b5f6d2 100644 --- a/source/selscript/interpreter/CMakeLists.txt +++ b/source/selscript/interpreter/CMakeLists.txt @@ -29,6 +29,7 @@ target_compile_options( PRIVATE -Wall -Werror + $<$:-Wno-gnu-zero-variadic-macro-arguments> ) target_link_libraries( @@ -37,12 +38,6 @@ target_link_libraries( common ) -set_target_properties( - selscript_interpreter - PROPERTIES - COMPILE_FLAGS ${COMPILE_FLAGS} "-Wno-gnu-zero-variadic-macro-arguments" -) - include(GNUInstallDirs) install(TARGETS selscript_interpreter EXPORT selscript_interpreter-export diff --git a/source/selscript/parser/CMakeLists.txt b/source/selscript/parser/CMakeLists.txt index 424a9a54..d93fb5ea 100644 --- a/source/selscript/parser/CMakeLists.txt +++ b/source/selscript/parser/CMakeLists.txt @@ -31,6 +31,7 @@ target_compile_options( PRIVATE -Wall -Werror + $<$:-Wno-gnu-zero-variadic-macro-arguments> ) target_link_libraries( @@ -39,12 +40,6 @@ target_link_libraries( common ) -set_target_properties( - selscript_parser - PROPERTIES - COMPILE_FLAGS ${COMPILE_FLAGS} "-Wno-gnu-zero-variadic-macro-arguments" -) - include(GNUInstallDirs) install(TARGETS selscript_parser EXPORT selscript_parser-export diff --git a/source/selscript/value/CMakeLists.txt b/source/selscript/value/CMakeLists.txt index b3a3c58f..b22881d2 100644 --- a/source/selscript/value/CMakeLists.txt +++ b/source/selscript/value/CMakeLists.txt @@ -31,12 +31,7 @@ target_compile_options( PRIVATE -Wall -Werror -) - -set_target_properties( - selscript_value - PROPERTIES - COMPILE_FLAGS ${COMPILE_FLAGS} "-Wno-gnu-zero-variadic-macro-arguments" + $<$:-Wno-gnu-zero-variadic-macro-arguments> ) target_link_libraries( diff --git a/tests/regression_tests/CMakeLists.txt b/tests/regression_tests/CMakeLists.txt index dc3df8b7..6b0ec3f1 100644 --- a/tests/regression_tests/CMakeLists.txt +++ b/tests/regression_tests/CMakeLists.txt @@ -9,12 +9,6 @@ set(test_srcs add_executable(regression_tests ${test_srcs}) -set_target_properties( - regression_tests - PROPERTIES - COMPILE_FLAGS ${COMPILE_FLAGS} "-Wno-gnu-zero-variadic-macro-arguments" -) - target_compile_features( regression_tests PRIVATE @@ -26,6 +20,7 @@ target_compile_features( target_compile_options( regression_tests PRIVATE + $<$:-Wno-gnu-zero-variadic-macro-arguments> -Wall -Werror ) diff --git a/tests/selscript/CMakeLists.txt b/tests/selscript/CMakeLists.txt index 2274b02f..2d2a6ceb 100644 --- a/tests/selscript/CMakeLists.txt +++ b/tests/selscript/CMakeLists.txt @@ -4,12 +4,6 @@ set(test_srcs add_executable(selscript_tests ${test_srcs}) -set_target_properties( - selscript_tests - PROPERTIES - COMPILE_FLAGS ${COMPILE_FLAGS} "-Wno-gnu-zero-variadic-macro-arguments" -) - target_compile_features( selscript_tests PRIVATE @@ -23,6 +17,7 @@ target_compile_options( PRIVATE -Wall -Werror + $<$:-Wno-gnu-zero-variadic-macro-arguments> ) target_include_directories( diff --git a/tests/unit_tests/CMakeLists.txt b/tests/unit_tests/CMakeLists.txt index 9035d09d..ccbf23f4 100644 --- a/tests/unit_tests/CMakeLists.txt +++ b/tests/unit_tests/CMakeLists.txt @@ -55,12 +55,6 @@ set(test_srcs add_executable(unit_tests ${test_srcs}) -set_target_properties( - unit_tests - PROPERTIES - COMPILE_FLAGS ${COMPILE_FLAGS} "-Wno-gnu-zero-variadic-macro-arguments" -) - target_compile_features( unit_tests PRIVATE @@ -74,6 +68,7 @@ target_compile_options( PRIVATE -Wall -Werror + $<$:-Wno-gnu-zero-variadic-macro-arguments> ) target_include_directories( diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 7fc4bd85..267697eb 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -15,6 +15,7 @@ target_compile_options( PRIVATE -Wall -Werror + $<$:-Wno-gnu-zero-variadic-macro-arguments> ) target_include_directories( @@ -28,12 +29,6 @@ target_include_directories( ${SELSCRIPT_INCLUDE_DIR} ) -set_target_properties( - sel - PROPERTIES - COMPILE_FLAGS ${COMPILE_FLAGS} "-Wno-gnu-zero-variadic-macro-arguments" -) - target_compile_definitions( sel PRIVATE From a6008aa2abbaaebb2fe780237f3799a2f5c99805 Mon Sep 17 00:00:00 2001 From: Diego Jesus Date: Tue, 28 Apr 2020 19:07:50 +0100 Subject: [PATCH 02/14] Don't use -Werror on MSVCC --- source/CMakeLists.txt | 2 +- source/common/CMakeLists.txt | 2 +- source/dynamic_value/CMakeLists.txt | 2 +- source/geometry_core/CMakeLists.txt | 2 +- source/geometry_operations/CMakeLists.txt | 2 +- source/math_lib/CMakeLists.txt | 2 +- source/parameter/CMakeLists.txt | 2 +- source/procedural_graph/CMakeLists.txt | 2 +- source/procedural_graph/reader/CMakeLists.txt | 2 +- source/procedural_objects/CMakeLists.txt | 2 +- source/selscript/CMakeLists.txt | 2 +- source/selscript/intermediate/CMakeLists.txt | 2 +- source/selscript/interpreter/CMakeLists.txt | 2 +- source/selscript/parser/CMakeLists.txt | 2 +- source/selscript/value/CMakeLists.txt | 2 +- tests/regression_tests/CMakeLists.txt | 2 +- tests/selscript/CMakeLists.txt | 2 +- tests/unit_tests/CMakeLists.txt | 2 +- tools/CMakeLists.txt | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index a1cdcfa7..84b3c51b 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -54,7 +54,7 @@ target_compile_options( selector PRIVATE -Wall - -Werror + $<$:-Werror> $<$:-Wno-gnu-zero-variadic-macro-arguments> ) diff --git a/source/common/CMakeLists.txt b/source/common/CMakeLists.txt index 2b1bd1f7..a2c5655b 100644 --- a/source/common/CMakeLists.txt +++ b/source/common/CMakeLists.txt @@ -65,7 +65,7 @@ target_compile_options( common PRIVATE -Wall - -Werror + $<$:-Werror> $<$:-Wno-gnu-zero-variadic-macro-arguments> ) diff --git a/source/dynamic_value/CMakeLists.txt b/source/dynamic_value/CMakeLists.txt index a1ecb0ab..8716c7de 100644 --- a/source/dynamic_value/CMakeLists.txt +++ b/source/dynamic_value/CMakeLists.txt @@ -90,7 +90,7 @@ target_compile_options( dynamic_value PRIVATE -Wall - -Werror + $<$:-Werror> $<$:-Wno-gnu-zero-variadic-macro-arguments> ) diff --git a/source/geometry_core/CMakeLists.txt b/source/geometry_core/CMakeLists.txt index 8dca2cff..ac267bca 100644 --- a/source/geometry_core/CMakeLists.txt +++ b/source/geometry_core/CMakeLists.txt @@ -46,7 +46,7 @@ target_compile_options( geometry_core PRIVATE -Wall - -Werror + $<$:-Werror> $<$:-Wno-gnu-zero-variadic-macro-arguments> ) diff --git a/source/geometry_operations/CMakeLists.txt b/source/geometry_operations/CMakeLists.txt index 92276c15..cb8fbe01 100644 --- a/source/geometry_operations/CMakeLists.txt +++ b/source/geometry_operations/CMakeLists.txt @@ -48,7 +48,7 @@ target_compile_options( geometry_operations PRIVATE -Wall - -Werror + $<$:-Werror> $<$:-Wno-gnu-zero-variadic-macro-arguments> ) diff --git a/source/math_lib/CMakeLists.txt b/source/math_lib/CMakeLists.txt index b128f2cd..6a5eeda4 100644 --- a/source/math_lib/CMakeLists.txt +++ b/source/math_lib/CMakeLists.txt @@ -58,7 +58,7 @@ target_compile_options( math_lib PRIVATE -Wall - -Werror + $<$:-Werror> $<$:-Wno-gnu-zero-variadic-macro-arguments> ) diff --git a/source/parameter/CMakeLists.txt b/source/parameter/CMakeLists.txt index 582b316d..02ef11e9 100644 --- a/source/parameter/CMakeLists.txt +++ b/source/parameter/CMakeLists.txt @@ -33,7 +33,7 @@ target_compile_options( parameter PRIVATE -Wall - -Werror + $<$:-Werror> $<$:-Wno-gnu-zero-variadic-macro-arguments> ) diff --git a/source/procedural_graph/CMakeLists.txt b/source/procedural_graph/CMakeLists.txt index 5a55844e..0501bd94 100644 --- a/source/procedural_graph/CMakeLists.txt +++ b/source/procedural_graph/CMakeLists.txt @@ -88,7 +88,7 @@ target_compile_options( procedural_graph PRIVATE -Wall - -Werror + $<$:-Werror> $<$:-Wno-gnu-zero-variadic-macro-arguments> ) diff --git a/source/procedural_graph/reader/CMakeLists.txt b/source/procedural_graph/reader/CMakeLists.txt index 53ff55d3..ed8541f1 100644 --- a/source/procedural_graph/reader/CMakeLists.txt +++ b/source/procedural_graph/reader/CMakeLists.txt @@ -55,7 +55,7 @@ target_compile_options( procedural_graph_reader PRIVATE -Wall - -Werror + $<$:-Werror> $<$:-Wno-gnu-zero-variadic-macro-arguments> ) diff --git a/source/procedural_objects/CMakeLists.txt b/source/procedural_objects/CMakeLists.txt index 99be4b8c..ceb32965 100644 --- a/source/procedural_objects/CMakeLists.txt +++ b/source/procedural_objects/CMakeLists.txt @@ -122,7 +122,7 @@ target_compile_options( procedural_objects PRIVATE -Wall - -Werror + $<$:-Werror> $<$:-Wno-gnu-zero-variadic-macro-arguments> ) diff --git a/source/selscript/CMakeLists.txt b/source/selscript/CMakeLists.txt index 7dd925e5..b4b44ef9 100644 --- a/source/selscript/CMakeLists.txt +++ b/source/selscript/CMakeLists.txt @@ -28,7 +28,7 @@ target_compile_options( selscript PRIVATE -Wall - -Werror + $<$:-Werror> $<$:-Wno-gnu-zero-variadic-macro-arguments> ) diff --git a/source/selscript/intermediate/CMakeLists.txt b/source/selscript/intermediate/CMakeLists.txt index 235c973e..60fa519e 100644 --- a/source/selscript/intermediate/CMakeLists.txt +++ b/source/selscript/intermediate/CMakeLists.txt @@ -41,7 +41,7 @@ target_compile_options( selscript_intermediate PRIVATE -Wall - -Werror + $<$:-Werror> $<$:-Wno-gnu-zero-variadic-macro-arguments> ) diff --git a/source/selscript/interpreter/CMakeLists.txt b/source/selscript/interpreter/CMakeLists.txt index 88b5f6d2..ba0fce37 100644 --- a/source/selscript/interpreter/CMakeLists.txt +++ b/source/selscript/interpreter/CMakeLists.txt @@ -28,7 +28,7 @@ target_compile_options( selscript_interpreter PRIVATE -Wall - -Werror + $<$:-Werror> $<$:-Wno-gnu-zero-variadic-macro-arguments> ) diff --git a/source/selscript/parser/CMakeLists.txt b/source/selscript/parser/CMakeLists.txt index d93fb5ea..b63156cf 100644 --- a/source/selscript/parser/CMakeLists.txt +++ b/source/selscript/parser/CMakeLists.txt @@ -30,7 +30,7 @@ target_compile_options( selscript_parser PRIVATE -Wall - -Werror + $<$:-Werror> $<$:-Wno-gnu-zero-variadic-macro-arguments> ) diff --git a/source/selscript/value/CMakeLists.txt b/source/selscript/value/CMakeLists.txt index b22881d2..22e6057d 100644 --- a/source/selscript/value/CMakeLists.txt +++ b/source/selscript/value/CMakeLists.txt @@ -30,7 +30,7 @@ target_compile_options( selscript_value PRIVATE -Wall - -Werror + $<$:-Werror> $<$:-Wno-gnu-zero-variadic-macro-arguments> ) diff --git a/tests/regression_tests/CMakeLists.txt b/tests/regression_tests/CMakeLists.txt index 6b0ec3f1..d233d0e9 100644 --- a/tests/regression_tests/CMakeLists.txt +++ b/tests/regression_tests/CMakeLists.txt @@ -22,7 +22,7 @@ target_compile_options( PRIVATE $<$:-Wno-gnu-zero-variadic-macro-arguments> -Wall - -Werror + $<$:-Werror> ) target_include_directories( diff --git a/tests/selscript/CMakeLists.txt b/tests/selscript/CMakeLists.txt index 2d2a6ceb..ce5a140d 100644 --- a/tests/selscript/CMakeLists.txt +++ b/tests/selscript/CMakeLists.txt @@ -16,7 +16,7 @@ target_compile_options( selscript_tests PRIVATE -Wall - -Werror + $<$:-Werror> $<$:-Wno-gnu-zero-variadic-macro-arguments> ) diff --git a/tests/unit_tests/CMakeLists.txt b/tests/unit_tests/CMakeLists.txt index ccbf23f4..a282f77e 100644 --- a/tests/unit_tests/CMakeLists.txt +++ b/tests/unit_tests/CMakeLists.txt @@ -67,7 +67,7 @@ target_compile_options( unit_tests PRIVATE -Wall - -Werror + $<$:-Werror> $<$:-Wno-gnu-zero-variadic-macro-arguments> ) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 267697eb..cb155bcd 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -14,7 +14,7 @@ target_compile_options( sel PRIVATE -Wall - -Werror + $<$:-Werror> $<$:-Wno-gnu-zero-variadic-macro-arguments> ) From 5d77d48cf95725169a83c003a9880cef7669e7df Mon Sep 17 00:00:00 2001 From: Diego Jesus Date: Tue, 28 Apr 2020 21:30:15 +0100 Subject: [PATCH 03/14] Link statically to boost libraries. --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 80ae55c5..017a0df8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") include("Selector") include("gtest") +set(Boost_USE_STATIC_LIBS ON) find_package(Boost COMPONENTS chrono system program_options filesystem) # Export compile comands From f14eb38aee44abff570e3de56a00402f94f80d40 Mon Sep 17 00:00:00 2001 From: Diego Jesus Date: Tue, 28 Apr 2020 23:10:59 +0100 Subject: [PATCH 04/14] Link statically to boost libraries. --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 017a0df8..c4907173 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,4 +18,3 @@ add_subdirectory(tools) enable_testing() add_subdirectory(tests) - From 52d068a0a1dcad3e5d063cb160d3779a8e2d0068 Mon Sep 17 00:00:00 2001 From: Diego Jesus Date: Wed, 29 Apr 2020 13:41:18 +0100 Subject: [PATCH 05/14] Only install the sel executable --- source/CMakeLists.txt | 58 ------------------- source/common/CMakeLists.txt | 17 ------ source/dynamic_value/CMakeLists.txt | 18 ------ source/geometry_core/CMakeLists.txt | 19 ------ source/geometry_operations/CMakeLists.txt | 19 ------ source/math_lib/CMakeLists.txt | 19 ------ source/parameter/CMakeLists.txt | 19 ------ source/procedural_graph/CMakeLists.txt | 19 ------ source/procedural_graph/reader/CMakeLists.txt | 19 ------ source/procedural_objects/CMakeLists.txt | 19 ------ source/selscript/CMakeLists.txt | 16 ----- source/selscript/intermediate/CMakeLists.txt | 17 ------ source/selscript/interpreter/CMakeLists.txt | 17 ------ source/selscript/parser/CMakeLists.txt | 17 ------ source/selscript/value/CMakeLists.txt | 17 ------ 15 files changed, 310 deletions(-) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 84b3c51b..259262e2 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -63,61 +63,3 @@ target_compile_definitions( PRIVATE "$<$:DEBUG>" ) - -include(GNUInstallDirs) -install(TARGETS selector - EXPORT selector-export - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/selector/ - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/selector/ -) - -install(FILES - ${SELECTOR_COMMON_PUBLIC_HEADERS} - DESTINATION - "${CMAKE_INSTALL_INCLUDEDIR}/selector/common/" -) - -install(FILES - ${SELECTOR_MATH_LIB_PUBLIC_HEADERS} - DESTINATION - "${CMAKE_INSTALL_INCLUDEDIR}/selector/math_lib/" -) - -install(FILES - ${SELECTOR_GEOMCORE_PUBLIC_HEADERS} - DESTINATION - "${CMAKE_INSTALL_INCLUDEDIR}/selector/geometry_core/" -) - -install(FILES - ${SELECTOR_GEOMETRY_OPERATION_PUBLIC_HEADERS} - DESTINATION - "${CMAKE_INSTALL_INCLUDEDIR}/selector/geometry_operations/" -) - -install(FILES - ${SELECTOR_PARAMETER_PUBLIC_HEADERS} - DESTINATION - "${CMAKE_INSTALL_INCLUDEDIR}/selector/parameter/" -) - -install(FILES - ${SELECTOR_PROCEDURAL_OBJECTS_PUBLIC_HEADERS} - DESTINATION - "${CMAKE_INSTALL_INCLUDEDIR}/selector/procedural_objects/" -) - -install(FILES - ${SELECTOR_PROCEDURAL_GRAPH_HEADERS} - DESTINATION - "${CMAKE_INSTALL_INCLUDEDIR}/selector/procedural_graph/" -) - -install(EXPORT selector-export - FILE - SelectorTargets.cmake - NAMESPACE - Selector:: - DESTINATION - ${CMAKE_INSTALL_LIBDIR}/selector/cmake/ -) diff --git a/source/common/CMakeLists.txt b/source/common/CMakeLists.txt index a2c5655b..3aaf04fb 100644 --- a/source/common/CMakeLists.txt +++ b/source/common/CMakeLists.txt @@ -96,20 +96,3 @@ target_link_libraries( Boost::filesystem ) -include(GNUInstallDirs) -install(TARGETS common - EXPORT common-export - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/selector/common - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/selector/common -) -install(FILES ${VALUE_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/selector/common) - -install(EXPORT common-export - FILE - BindingTargets.cmake - NAMESPACE - Selector:: - DESTINATION - ${CMAKE_INSTALL_LIBDIR}/selector/cmake/ -) - diff --git a/source/dynamic_value/CMakeLists.txt b/source/dynamic_value/CMakeLists.txt index 8716c7de..45bb4138 100644 --- a/source/dynamic_value/CMakeLists.txt +++ b/source/dynamic_value/CMakeLists.txt @@ -106,21 +106,3 @@ target_link_libraries( common ) -include(GNUInstallDirs) -install(TARGETS dynamic_value - EXPORT dynamic_value-export - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/selector/dynamic_value - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/selector/dynamic_value -) -install(FILES ${VALUE_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/selector/dynamic_value) - -install(EXPORT dynamic_value-export - FILE - BindingTargets.cmake - NAMESPACE - Selector:: - DESTINATION - ${CMAKE_INSTALL_LIBDIR}/selector/cmake/ -) - - diff --git a/source/geometry_core/CMakeLists.txt b/source/geometry_core/CMakeLists.txt index ac267bca..cf0af5a1 100644 --- a/source/geometry_core/CMakeLists.txt +++ b/source/geometry_core/CMakeLists.txt @@ -61,22 +61,3 @@ target_link_libraries( PRIVATE common ) - -include(GNUInstallDirs) -install(TARGETS geometry_core - EXPORT geometry_core-export - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/selector/geometry_core - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/selector/geometry_core -) -install(FILES ${VALUE_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/selector/geometry_core) - -install(EXPORT geometry_core-export - FILE - BindingTargets.cmake - NAMESPACE - Selector:: - DESTINATION - ${CMAKE_INSTALL_LIBDIR}/selector/cmake/ -) - - diff --git a/source/geometry_operations/CMakeLists.txt b/source/geometry_operations/CMakeLists.txt index cb8fbe01..b304f2ed 100644 --- a/source/geometry_operations/CMakeLists.txt +++ b/source/geometry_operations/CMakeLists.txt @@ -63,22 +63,3 @@ target_link_libraries( PRIVATE common ) - -include(GNUInstallDirs) -install(TARGETS geometry_operations - EXPORT geometry_operations-export - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/selector/geometry_operations - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/selector/geometry_operations -) -install(FILES ${VALUE_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/selector/geometry_operations) - -install(EXPORT geometry_operations-export - FILE - BindingTargets.cmake - NAMESPACE - Selector:: - DESTINATION - ${CMAKE_INSTALL_LIBDIR}/selector/cmake/ -) - - diff --git a/source/math_lib/CMakeLists.txt b/source/math_lib/CMakeLists.txt index 6a5eeda4..264c5179 100644 --- a/source/math_lib/CMakeLists.txt +++ b/source/math_lib/CMakeLists.txt @@ -73,22 +73,3 @@ target_link_libraries( PRIVATE common ) - -include(GNUInstallDirs) -install(TARGETS math_lib - EXPORT math_lib-export - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/selector/math_lib - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/selector/math_lib -) -install(FILES ${VALUE_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/selector/math_lib) - -install(EXPORT math_lib-export - FILE - BindingTargets.cmake - NAMESPACE - Selector:: - DESTINATION - ${CMAKE_INSTALL_LIBDIR}/selector/cmake/ -) - - diff --git a/source/parameter/CMakeLists.txt b/source/parameter/CMakeLists.txt index 02ef11e9..194143c3 100644 --- a/source/parameter/CMakeLists.txt +++ b/source/parameter/CMakeLists.txt @@ -48,22 +48,3 @@ target_link_libraries( PRIVATE common ) - -include(GNUInstallDirs) -install(TARGETS parameter - EXPORT parameter-export - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/selector/parameter - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/selector/parameter -) -install(FILES ${VALUE_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/selector/parameter) - -install(EXPORT parameter-export - FILE - BindingTargets.cmake - NAMESPACE - Selector:: - DESTINATION - ${CMAKE_INSTALL_LIBDIR}/selector/cmake/ -) - - diff --git a/source/procedural_graph/CMakeLists.txt b/source/procedural_graph/CMakeLists.txt index 0501bd94..dd4fd74b 100644 --- a/source/procedural_graph/CMakeLists.txt +++ b/source/procedural_graph/CMakeLists.txt @@ -103,22 +103,3 @@ target_link_libraries( PRIVATE common ) - -include(GNUInstallDirs) -install(TARGETS procedural_graph - EXPORT procedural_graph-export - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/selector/procedural_graph - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/selector/procedural_graph -) -install(FILES ${VALUE_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/selector/procedural_graph) - -install(EXPORT procedural_graph-export - FILE - BindingTargets.cmake - NAMESPACE - Selector:: - DESTINATION - ${CMAKE_INSTALL_LIBDIR}/selector/cmake/ -) - - diff --git a/source/procedural_graph/reader/CMakeLists.txt b/source/procedural_graph/reader/CMakeLists.txt index ed8541f1..9d291efa 100644 --- a/source/procedural_graph/reader/CMakeLists.txt +++ b/source/procedural_graph/reader/CMakeLists.txt @@ -70,22 +70,3 @@ target_link_libraries( PRIVATE common ) - -include(GNUInstallDirs) -install(TARGETS procedural_graph_reader - EXPORT procedural_graph_reader-export - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/selector/reader/ - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/selector/reader -) -install(FILES ${VALUE_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/selector/reader) - -install(EXPORT procedural_graph_reader-export - FILE - BindingTargets.cmake - NAMESPACE - Selector:: - DESTINATION - ${CMAKE_INSTALL_LIBDIR}/selector/cmake/ -) - - diff --git a/source/procedural_objects/CMakeLists.txt b/source/procedural_objects/CMakeLists.txt index ceb32965..79ab16ac 100644 --- a/source/procedural_objects/CMakeLists.txt +++ b/source/procedural_objects/CMakeLists.txt @@ -137,22 +137,3 @@ target_link_libraries( PRIVATE common ) - -include(GNUInstallDirs) -install(TARGETS procedural_objects - EXPORT procedural_objects-export - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/selector/procedural_objects - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/selector/procedural_objects -) -install(FILES ${VALUE_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/selector/procedural_objects) - -install(EXPORT procedural_objects-export - FILE - BindingTargets.cmake - NAMESPACE - Selector:: - DESTINATION - ${CMAKE_INSTALL_LIBDIR}/selector/cmake/ -) - - diff --git a/source/selscript/CMakeLists.txt b/source/selscript/CMakeLists.txt index b4b44ef9..33d8542a 100644 --- a/source/selscript/CMakeLists.txt +++ b/source/selscript/CMakeLists.txt @@ -37,19 +37,3 @@ target_link_libraries( PRIVATE common ) - -include(GNUInstallDirs) -install(TARGETS selscript - EXPORT selscript-export - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/selector/selscript/ - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/selector/selscript/ -) - -install(EXPORT selscript-export - FILE - SelScriptTargets.cmake - NAMESPACE - Selector:: - DESTINATION - ${CMAKE_INSTALL_LIBDIR}/selector/selscript/cmake/ -) diff --git a/source/selscript/intermediate/CMakeLists.txt b/source/selscript/intermediate/CMakeLists.txt index 60fa519e..7292e0ef 100644 --- a/source/selscript/intermediate/CMakeLists.txt +++ b/source/selscript/intermediate/CMakeLists.txt @@ -50,20 +50,3 @@ target_link_libraries( PRIVATE common ) - -include(GNUInstallDirs) -install(TARGETS selscript_intermediate - EXPORT selscript_intermediate-export - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/selector/selscript/selscript_intermediate - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/selector/selscript/selscript_intermediate -) -install(FILES ${INTERMEDIATE_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/selector/selscript/selscript_intermediate) - -install(EXPORT selscript_intermediate-export - FILE - IntermediateTargets.cmake - NAMESPACE - Selector:: - DESTINATION - ${CMAKE_INSTALL_LIBDIR}/selector/selscript/cmake/ -) diff --git a/source/selscript/interpreter/CMakeLists.txt b/source/selscript/interpreter/CMakeLists.txt index ba0fce37..fb68ca82 100644 --- a/source/selscript/interpreter/CMakeLists.txt +++ b/source/selscript/interpreter/CMakeLists.txt @@ -37,20 +37,3 @@ target_link_libraries( PRIVATE common ) - -include(GNUInstallDirs) -install(TARGETS selscript_interpreter - EXPORT selscript_interpreter-export - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/selector/selscript/selscript_interpreter - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/selector/selscript/selscript_interpreter -) -install(FILES ${INTERPRETER_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/selector/selscript/selscript_interpreter) - -install(EXPORT selscript_interpreter-export - FILE - InterpreterTargets.cmake - NAMESPACE - Selector:: - DESTINATION - ${CMAKE_INSTALL_LIBDIR}/selector/selscript/cmake/ -) diff --git a/source/selscript/parser/CMakeLists.txt b/source/selscript/parser/CMakeLists.txt index b63156cf..3970b564 100644 --- a/source/selscript/parser/CMakeLists.txt +++ b/source/selscript/parser/CMakeLists.txt @@ -39,20 +39,3 @@ target_link_libraries( PRIVATE common ) - -include(GNUInstallDirs) -install(TARGETS selscript_parser - EXPORT selscript_parser-export - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/selector/selscript/selscript_parser - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/selector/selscript/selscript_parser -) -install(FILES ${PARSER_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/selector/selscript/selscript_parser) - -install(EXPORT selscript_parser-export - FILE - ParserTargets.cmake - NAMESPACE - Selector:: - DESTINATION - ${CMAKE_INSTALL_LIBDIR}/selector/selscript/cmake/ -) diff --git a/source/selscript/value/CMakeLists.txt b/source/selscript/value/CMakeLists.txt index 22e6057d..25f12ff2 100644 --- a/source/selscript/value/CMakeLists.txt +++ b/source/selscript/value/CMakeLists.txt @@ -39,20 +39,3 @@ target_link_libraries( PRIVATE common ) - -include(GNUInstallDirs) -install(TARGETS selscript_value - EXPORT selscript_value-export - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/selector/selscript/selscript_value - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/selector/selscript/selscript_value -) -install(FILES ${VALUE_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/selector/selscript/selscript_value) - -install(EXPORT selscript_value-export - FILE - ValueTargets.cmake - NAMESPACE - Selector:: - DESTINATION - ${CMAKE_INSTALL_LIBDIR}/selector/selscript/cmake/ -) From b3d5e8508fc42b80e4561a7a6432a7add4e9a79f Mon Sep 17 00:00:00 2001 From: Diego Jesus Date: Thu, 30 Apr 2020 08:07:45 +0100 Subject: [PATCH 06/14] Change license to MIT --- LICENSE | 186 +++++++------------------------------------------------- 1 file changed, 21 insertions(+), 165 deletions(-) diff --git a/LICENSE b/LICENSE index 0a041280..f9f6e66f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,165 +1,21 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. +MIT License + +Copyright (c) 2020 Diego Jesus + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From 9716792aa8c60d5939b760285176f5576135ce7e Mon Sep 17 00:00:00 2001 From: Diego Jesus Date: Thu, 30 Apr 2020 16:56:19 +0100 Subject: [PATCH 07/14] Adds a "side" predicate and fixes a bug in extract faces. --- CHANGELOG.md | 1 + docs/docs/graph/Router.md | 17 +++++++++-------- source/procedural_objects/extract_faces.cpp | 17 ++++++++++++++++- source/procedural_objects/face_offset.cpp | 2 +- source/selector.cpp | 2 ++ 5 files changed, 29 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f6b943be..2acec5e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Output Interface Node. - Parameter Node. - Router Node. +- Predicates for procedural objects facing a given direction. - Create Rect Geometry operation. - Create Sphere Geometry operation. - Create Box Geometry operation. diff --git a/docs/docs/graph/Router.md b/docs/docs/graph/Router.md index 32027935..afe0bf4b 100644 --- a/docs/docs/graph/Router.md +++ b/docs/docs/graph/Router.md @@ -33,11 +33,12 @@ router -> left_extrusion_in; ## Available Predicates -| Name | Description | -|-------|----------------------------------------------------------------------| -| up | Matches objects whose scope's _z_ axis is pointing towards (0,0,1). | -| down | Matches objects whose scope's _z_ axis is pointing towards (0,0,-1). | -| left | Matches objects whose scope's _z_ axis is pointing towards (0,1,0). | -| right | Matches objects whose scope's _z_ axis is pointing towards (0,-1,0). | -| front | Matches objects whose scope's _z_ axis is pointing towards (1,0,0). | -| back | Matches objects whose scope's _z_ axis is pointing towards (-1,0,0). | +| Name | Description | +|-------|---------------------------------------------------------------------------------| +| up | Matches objects whose scope's _z_ axis is pointing towards (0,0,1). | +| down | Matches objects whose scope's _z_ axis is pointing towards (0,0,-1). | +| left | Matches objects whose scope's _z_ axis is pointing towards (0,1,0). | +| right | Matches objects whose scope's _z_ axis is pointing towards (0,-1,0). | +| front | Matches objects whose scope's _z_ axis is pointing towards (1,0,0). | +| back | Matches objects whose scope's _z_ axis is pointing towards (-1,0,0). | +| side | Matches objects that would be matched by left, right, front or back predicates. | diff --git a/source/procedural_objects/extract_faces.cpp b/source/procedural_objects/extract_faces.cpp index ea1eca3b..52613587 100644 --- a/source/procedural_objects/extract_faces.cpp +++ b/source/procedural_objects/extract_faces.cpp @@ -43,14 +43,29 @@ void ExtractFaces::DoWork() std::vector explodedFaces; explodeToFaces.Execute(inGeometry, explodedFaces); + auto inScopeZAxis = inGeometryComponent->GetScope().GetZAxis(); for (auto &g : explodedFaces) { + auto faceNormal = g->GetFaceAttributes(*g->FacesBegin()).m_normal; + auto outObject = CreateOutputProceduralObject(s_outputGeometry); auto outGeometryComponent = geometrySystem->CreateComponentAs(outObject); auto outHierarchicalComponent = hierarchicalSystem->CreateComponentAs(outObject); outGeometryComponent->SetGeometry(g); - outGeometryComponent->SetScope(Scope::FromGeometry(g)); + if (boost::qvm::dot(faceNormal, inScopeZAxis) == 0) + { + Mat3x3F constrainedRotation; + auto xAxis = boost::qvm::normalized(boost::qvm::cross(inScopeZAxis, faceNormal)); + boost::qvm::col<0>(constrainedRotation) = xAxis; + boost::qvm::col<1>(constrainedRotation) = inScopeZAxis; + boost::qvm::col<2>(constrainedRotation) = faceNormal; + outGeometryComponent->SetScope(Scope::FromGeometryAndConstrainedRotation(g, constrainedRotation)); + } + else + { + outGeometryComponent->SetScope(Scope::FromGeometry(g)); + } hierarchicalSystem->SetParent(outHierarchicalComponent, inHierarchicalComponent); } diff --git a/source/procedural_objects/face_offset.cpp b/source/procedural_objects/face_offset.cpp index c081c248..306fc2e4 100644 --- a/source/procedural_objects/face_offset.cpp +++ b/source/procedural_objects/face_offset.cpp @@ -80,7 +80,7 @@ void FaceOffsetOperation::DoWork() for (const auto& i : outerGeometries) { - ProceduralObjectPtr outObject = CreateOutputProceduralObject(outputInnerGeometry); + ProceduralObjectPtr outObject = CreateOutputProceduralObject(outputOuterGeometry); outObject->RegisterOrSetMember("offset_tag", std::make_shared("outer")); std::shared_ptr geometryComponent = diff --git a/source/selector.cpp b/source/selector.cpp index 0de13709..13ece8dc 100644 --- a/source/selector.cpp +++ b/source/selector.cpp @@ -114,6 +114,8 @@ class Selector::Impl "left", std::make_shared(m_proceduralObjectSystem, 'z', Vec3F{0, 1, 0})); m_predicateRegistry->Register( "right", std::make_shared(m_proceduralObjectSystem, 'z', Vec3F{0, -1, 0})); + m_predicateRegistry->Register( + "side", std::make_shared(m_proceduralObjectSystem, 'y', Vec3F{0, 0, 1})); } } From 3d243f93c06b90c8dd21ff3f8c9020f635b7f810 Mon Sep 17 00:00:00 2001 From: Diego Jesus Date: Fri, 1 May 2020 17:28:22 +0100 Subject: [PATCH 08/14] Rename the project to Pagoda --- .github/workflows/build.yaml | 4 +- CMakeLists.txt | 4 +- cmake/{Selector.cmake => Pagoda.cmake} | 42 +++++++++---------- source/CMakeLists.txt | 32 +++++++------- source/common/CMakeLists.txt | 18 ++++---- source/common/assertions.cpp | 4 +- source/common/assertions.h | 24 +++++------ source/common/exception.cpp | 4 +- source/common/exception.h | 4 +- source/common/factory.h | 8 ++-- source/common/file_util.cpp | 4 +- source/common/file_util.h | 8 ++-- source/common/logger.cpp | 12 +++--- source/common/logger.h | 22 +++++----- source/common/profiler.cpp | 4 +- source/common/profiler.h | 14 +++---- source/common/pugixml.cpp | 14 +++---- source/common/range.h | 8 ++-- source/common/statistics.cpp | 4 +- source/common/statistics.h | 10 ++--- source/common/unimplemented.cpp | 4 +- source/common/unimplemented.h | 6 +-- source/common/utils.cpp | 4 +- source/common/utils.h | 8 ++-- source/common/version.cpp | 18 ++++---- source/common/version.h | 10 ++--- source/dynamic_value/CMakeLists.txt | 2 +- source/dynamic_value/binding/binary_ops.h | 4 +- .../binding/call_free_function.h | 4 +- .../binding/call_member_function.h | 4 +- .../binding/can_cast_to_native.h | 4 +- source/dynamic_value/binding/cast_to.h | 4 +- source/dynamic_value/binding/has_operators.h | 4 +- .../binding/make_free_function.h | 4 +- .../binding/make_member_function.h | 4 +- .../binding/native_value_name.cpp | 4 +- .../dynamic_value/binding/native_value_name.h | 4 +- .../binding/return_from_function.h | 4 +- .../binding/return_from_member_function.h | 4 +- source/dynamic_value/binding/type_name.h | 4 +- source/dynamic_value/binding/unary_ops.h | 4 +- source/dynamic_value/boolean_value.cpp | 4 +- source/dynamic_value/boolean_value.h | 4 +- source/dynamic_value/builtin_class.cpp | 4 +- source/dynamic_value/builtin_class.h | 4 +- .../dynamic_value/callable_body_not_set.cpp | 4 +- source/dynamic_value/callable_body_not_set.h | 4 +- source/dynamic_value/class_base.cpp | 4 +- source/dynamic_value/class_base.h | 4 +- source/dynamic_value/dynamic_class.cpp | 4 +- source/dynamic_value/dynamic_class.h | 6 +-- source/dynamic_value/dynamic_instance.cpp | 4 +- source/dynamic_value/dynamic_instance.h | 6 +-- source/dynamic_value/dynamic_plane.cpp | 4 +- source/dynamic_value/dynamic_plane.h | 4 +- source/dynamic_value/dynamic_value_base.cpp | 4 +- source/dynamic_value/dynamic_value_base.h | 6 +-- source/dynamic_value/dynamic_value_table.cpp | 4 +- source/dynamic_value/dynamic_value_table.h | 4 +- source/dynamic_value/expression.cpp | 14 +++---- source/dynamic_value/expression.h | 8 ++-- source/dynamic_value/float_value.cpp | 4 +- source/dynamic_value/float_value.h | 4 +- .../free_function_callable_body.h | 4 +- source/dynamic_value/function.cpp | 4 +- source/dynamic_value/function.h | 4 +- source/dynamic_value/get_value_as.h | 4 +- source/dynamic_value/icallable.h | 4 +- source/dynamic_value/icallable_body.h | 4 +- source/dynamic_value/integer_value.cpp | 4 +- source/dynamic_value/integer_value.h | 4 +- .../member_function_callable_body.h | 4 +- source/dynamic_value/null_object_value.cpp | 4 +- source/dynamic_value/null_object_value.h | 4 +- .../dynamic_value/register_member_function.h | 4 +- source/dynamic_value/set_value_from.h | 4 +- source/dynamic_value/string_value.cpp | 4 +- source/dynamic_value/string_value.h | 4 +- source/dynamic_value/type_info.cpp | 4 +- source/dynamic_value/type_info.h | 4 +- source/dynamic_value/undefined_operator.cpp | 4 +- source/dynamic_value/undefined_operator.h | 4 +- source/dynamic_value/value_not_found.cpp | 4 +- source/dynamic_value/value_not_found.h | 4 +- source/dynamic_value/value_visitor.h | 4 +- source/dynamic_value/vector3.cpp | 4 +- source/dynamic_value/vector3.h | 4 +- source/geometry_core/CMakeLists.txt | 2 +- source/geometry_core/geometry.h | 8 ++-- source/geometry_core/geometry_builder.h | 8 ++-- source/geometry_core/geometry_exporter.h | 8 ++-- source/geometry_core/geometry_sizes.h | 8 ++-- source/geometry_core/indexed_container.h | 8 ++-- source/geometry_core/scope.cpp | 4 +- source/geometry_core/scope.h | 8 ++-- source/geometry_core/split_point_topology.cpp | 4 +- source/geometry_core/split_point_topology.h | 8 ++-- source/geometry_operations/CMakeLists.txt | 2 +- source/geometry_operations/clip.h | 8 ++-- source/geometry_operations/create_box.h | 8 ++-- source/geometry_operations/create_rect.h | 8 ++-- source/geometry_operations/create_sphere.h | 4 +- source/geometry_operations/ear_clipping.h | 4 +- source/geometry_operations/explode_to_faces.h | 4 +- source/geometry_operations/extrusion.h | 8 ++-- .../geometry_operations/extrusion_profile.h | 8 ++-- source/geometry_operations/face_offset.h | 4 +- source/geometry_operations/matrix_transform.h | 4 +- source/geometry_operations/plane_splits.h | 8 ++-- source/geometry_operations/triangulate.h | 8 ++-- source/math_lib/CMakeLists.txt | 2 +- source/math_lib/bissectrix.h | 4 +- source/math_lib/degrees.h | 4 +- source/math_lib/intersection.h | 8 ++-- source/math_lib/length.h | 4 +- source/math_lib/line_3d.h | 8 ++-- source/math_lib/line_segment_3d.h | 8 ++-- source/math_lib/math_utils.h | 4 +- source/math_lib/matrix_base.h | 4 +- source/math_lib/nearest_points.h | 8 ++-- source/math_lib/orthogonal.h | 8 ++-- source/math_lib/plane.h | 12 +++--- source/math_lib/projection.h | 8 ++-- source/math_lib/radians.h | 4 +- source/math_lib/transpose.h | 4 +- source/math_lib/vec_base.h | 8 ++-- source/{selector.cpp => pagoda.cpp} | 26 ++++++------ source/{selector.h => pagoda.h} | 22 +++++----- source/parameter/CMakeLists.txt | 2 +- source/parameter/variable.cpp | 4 +- source/parameter/variable.h | 8 ++-- source/parameter/variable_resolver.cpp | 4 +- source/parameter/variable_resolver.h | 8 ++-- source/{selscript => pgscript}/CMakeLists.txt | 20 ++++----- .../intermediate/CMakeLists.txt | 12 +++--- .../intermediate/anonymous_method.cpp | 4 +- .../intermediate/anonymous_method.h | 4 +- .../intermediate/ast.cpp | 4 +- .../intermediate/ast.h | 4 +- .../intermediate/ast_printer.cpp | 4 +- .../intermediate/ast_printer.h | 4 +- .../intermediate/ast_visitor.h | 4 +- .../intermediate/class_declaration.cpp | 4 +- .../intermediate/class_declaration.h | 4 +- .../intermediate/function_declaration.cpp | 4 +- .../intermediate/function_declaration.h | 4 +- .../intermediate/get_expression.cpp | 4 +- .../intermediate/get_expression.h | 4 +- .../intermediate/parameter.cpp | 4 +- .../intermediate/parameter.h | 4 +- .../intermediate/set_expression.cpp | 4 +- .../intermediate/set_expression.h | 4 +- .../interpreter/CMakeLists.txt | 12 +++--- .../interpreter/interpreter.cpp | 4 +- .../interpreter/interpreter.h | 4 +- .../interpreter/interpreter_visitor.cpp | 6 +-- .../interpreter/interpreter_visitor.h | 4 +- .../parser/CMakeLists.txt | 12 +++--- .../{selscript => pgscript}/parser/grammar.h | 4 +- .../parser/grammar_helpers.cpp | 4 +- .../parser/grammar_helpers.h | 4 +- .../{selscript => pgscript}/parser/parser.cpp | 4 +- .../{selscript => pgscript}/parser/parser.h | 4 +- .../value/CMakeLists.txt | 12 +++--- .../value/builtin_functions.cpp | 4 +- .../value/builtin_functions.h | 4 +- .../value/script_callable_body.cpp | 4 +- .../value/script_callable_body.h | 4 +- source/procedural_graph/CMakeLists.txt | 2 +- .../breadth_first_node_visitor.h | 8 ++-- .../construction_argument_not_found.cpp | 4 +- .../construction_argument_not_found.h | 4 +- source/procedural_graph/default_scheduler.cpp | 4 +- source/procedural_graph/default_scheduler.h | 8 ++-- source/procedural_graph/execution_queue.cpp | 4 +- source/procedural_graph/execution_queue.h | 8 ++-- source/procedural_graph/graph.cpp | 4 +- source/procedural_graph/graph.h | 8 ++-- .../procedural_graph/graph_dot_exporter.cpp | 4 +- source/procedural_graph/graph_dot_exporter.h | 8 ++-- source/procedural_graph/graph_node_visitor.h | 8 ++-- .../procedural_graph/input_interface_node.cpp | 4 +- .../procedural_graph/input_interface_node.h | 8 ++-- source/procedural_graph/node.cpp | 4 +- source/procedural_graph/node.h | 8 ++-- source/procedural_graph/node_factory.cpp | 2 +- source/procedural_graph/node_factory.h | 8 ++-- source/procedural_graph/node_set.cpp | 4 +- source/procedural_graph/node_set.h | 8 ++-- source/procedural_graph/node_set_visitor.h | 8 ++-- source/procedural_graph/node_visitor.h | 4 +- source/procedural_graph/operation_node.cpp | 4 +- source/procedural_graph/operation_node.h | 8 ++-- .../output_interface_node.cpp | 4 +- .../procedural_graph/output_interface_node.h | 8 ++-- source/procedural_graph/parameter_node.cpp | 4 +- source/procedural_graph/parameter_node.h | 8 ++-- source/procedural_graph/parse_result.h | 8 ++-- source/procedural_graph/reader.cpp | 4 +- source/procedural_graph/reader.h | 8 ++-- source/procedural_graph/reader/CMakeLists.txt | 2 +- .../reader/ast_interpreter.cpp | 4 +- .../procedural_graph/reader/ast_interpreter.h | 8 ++-- source/procedural_graph/reader/ast_node.cpp | 4 +- source/procedural_graph/reader/ast_node.h | 8 ++-- .../reader/ast_node_visitor.h | 8 ++-- .../reader/graph_definition_node.cpp | 4 +- .../reader/graph_definition_node.h | 8 ++-- .../reader/graph_reader_grammar.h | 10 ++--- .../reader/graph_reader_grammar_helper.cpp | 4 +- .../reader/graph_reader_grammar_helper.h | 8 ++-- .../reader/graph_statement_node.h | 8 ++-- .../reader/named_argument.cpp | 4 +- .../procedural_graph/reader/named_argument.h | 8 ++-- .../reader/node_definition_node.cpp | 4 +- .../reader/node_definition_node.h | 8 ++-- .../reader/node_link_node.cpp | 4 +- .../procedural_graph/reader/node_link_node.h | 8 ++-- source/procedural_graph/router_node.cpp | 4 +- source/procedural_graph/router_node.h | 4 +- source/procedural_graph/scheduler.h | 8 ++-- source/procedural_graph/unknown_node_type.cpp | 4 +- source/procedural_graph/unknown_node_type.h | 4 +- .../unsupported_node_link.cpp | 4 +- .../procedural_graph/unsupported_node_link.h | 4 +- source/procedural_objects/CMakeLists.txt | 2 +- source/procedural_objects/clip_geometry.cpp | 4 +- source/procedural_objects/clip_geometry.h | 8 ++-- source/procedural_objects/create_box.cpp | 4 +- source/procedural_objects/create_box.h | 8 ++-- source/procedural_objects/create_rect.cpp | 4 +- source/procedural_objects/create_rect.h | 8 ++-- source/procedural_objects/create_sphere.cpp | 4 +- source/procedural_objects/create_sphere.h | 4 +- source/procedural_objects/export_geometry.cpp | 6 +-- source/procedural_objects/export_geometry.h | 8 ++-- source/procedural_objects/extract_faces.cpp | 4 +- source/procedural_objects/extract_faces.h | 4 +- source/procedural_objects/extract_scope.cpp | 4 +- source/procedural_objects/extract_scope.h | 8 ++-- .../procedural_objects/extrude_geometry.cpp | 6 +-- source/procedural_objects/extrude_geometry.h | 8 ++-- source/procedural_objects/face_offset.cpp | 6 +-- source/procedural_objects/face_offset.h | 4 +- .../procedural_objects/geometry_component.cpp | 4 +- .../procedural_objects/geometry_component.h | 8 ++-- source/procedural_objects/geometry_system.cpp | 4 +- source/procedural_objects/geometry_system.h | 8 ++-- .../hierarchical_component.cpp | 4 +- .../hierarchical_component.h | 8 ++-- .../hierarchical_system.cpp | 4 +- .../procedural_objects/hierarchical_system.h | 8 ++-- .../procedural_objects/operation_factory.cpp | 4 +- source/procedural_objects/operation_factory.h | 8 ++-- .../procedural_component.cpp | 4 +- .../procedural_objects/procedural_component.h | 8 ++-- .../procedural_component_system.h | 8 ++-- .../procedural_component_system_base.cpp | 4 +- .../procedural_component_system_base.h | 8 ++-- .../procedural_objects/procedural_object.cpp | 4 +- source/procedural_objects/procedural_object.h | 8 ++-- .../procedural_object_mask.h | 6 +-- .../procedural_object_predicate.cpp | 4 +- .../procedural_object_predicate.h | 4 +- .../procedural_object_predicate_registry.cpp | 4 +- .../procedural_object_predicate_registry.h | 4 +- .../procedural_object_system.cpp | 4 +- .../procedural_object_system.h | 4 +- .../procedural_operation.cpp | 6 +-- .../procedural_objects/procedural_operation.h | 8 ++-- .../procedural_operation_object_interface.cpp | 4 +- .../procedural_operation_object_interface.h | 8 ++-- source/procedural_objects/repeat_split.cpp | 4 +- source/procedural_objects/repeat_split.h | 8 ++-- source/procedural_objects/rotate.cpp | 6 +-- source/procedural_objects/rotate.h | 4 +- source/procedural_objects/scale.cpp | 4 +- source/procedural_objects/scale.h | 4 +- .../scope_axis_direction_predicate.cpp | 4 +- .../scope_axis_direction_predicate.h | 4 +- source/procedural_objects/split.cpp | 4 +- source/procedural_objects/split.h | 4 +- source/procedural_objects/translate.cpp | 4 +- source/procedural_objects/translate.h | 4 +- .../triangulate_geometry.cpp | 6 +-- .../procedural_objects/triangulate_geometry.h | 8 ++-- .../procedural_objects/unknown_operation.cpp | 4 +- source/procedural_objects/unknown_operation.h | 4 +- tests/CMakeLists.txt | 2 +- tests/{selscript => pgscript}/CMakeLists.txt | 20 ++++----- tests/{selscript => pgscript}/main.cpp | 14 +++---- .../test_files/float_operations/ast.txt | 0 .../test_files/float_operations/err.txt | 0 .../float_operations/float_operations.pgx} | 0 .../test_files/float_operations/out.txt | 0 .../test_files/integer_operations/ast.txt | 0 .../test_files/integer_operations/err.txt | 0 .../integer_operations.pgx} | 0 .../test_files/integer_operations/out.txt | 0 .../test_files/plane/ast.txt | 0 .../test_files/plane/err.txt | 0 .../test_files/plane/out.txt | 0 .../test_files/plane/plane.pgx} | 0 .../test_files/string_operations/ast.txt | 0 .../test_files/string_operations/err.txt | 0 .../test_files/string_operations/out.txt | 0 .../string_operations/string_operations.pgx} | 0 .../test_files/vector/ast.txt | 0 .../test_files/vector/err.txt | 0 .../test_files/vector/out.txt | 0 .../test_files/vector/vector.pgx} | 0 tests/regression_tests/CMakeLists.txt | 6 +-- tests/regression_tests/main.cpp.in | 10 ++--- .../banner/{banner.sel => banner.pgd} | 0 .../{clip_geometry.sel => clip_geometry.pgd} | 0 .../{create_box.sel => create_box.pgd} | 0 .../{create_rect.sel => create_rect.pgd} | 0 .../{create_sphere.sel => create_sphere.pgd} | 0 ...xport_geometry.sel => export_geometry.pgd} | 0 .../{expression.sel => expression.pgd} | 0 .../{extract_faces.sel => extract_faces.pgd} | 0 .../{extrusion.sel => extrusion.pgd} | 0 .../{face_offset.sel => face_offset.pgd} | 0 ...efinition.sel => parameter_definition.pgd} | 0 ..._overwrite.sel => parameter_overwrite.pgd} | 0 ...er_renaming.sel => parameter_renaming.pgd} | 0 ...l => parameters_in_procedural_objects.pgd} | 0 .../{repeat_split.sel => repeat_split.pgd} | 0 .../rotate/{rotate.sel => rotate.pgd} | 0 .../router/{router.sel => router.pgd} | 0 .../test_files/scale/{scale.sel => scale.pgd} | 0 .../test_files/split/{split.sel => split.pgd} | 0 .../{translate.sel => translate.pgd} | 0 ..._geometry.sel => triangulate_geometry.pgd} | 0 tests/unit_tests/CMakeLists.txt | 8 ++-- tests/unit_tests/common/profiler.cpp | 2 +- tests/unit_tests/common/range.cpp | 2 +- .../dynamic_value/base_dynamic_values.cpp | 2 +- .../dynamic_value/call_free_function.cpp | 2 +- .../dynamic_value/call_member_function.cpp | 2 +- tests/unit_tests/dynamic_value/cast_to.cpp | 2 +- .../dynamic_value/dynamic_class.cpp | 2 +- .../dynamic_value/dynamic_plane.cpp | 2 +- .../dynamic_value/dynamic_value_table.cpp | 2 +- .../free_function_callable_body.cpp | 2 +- .../dynamic_value/has_operators.cpp | 2 +- .../dynamic_value/make_free_function.cpp | 2 +- .../dynamic_value/make_member_function.cpp | 2 +- tests/unit_tests/dynamic_value/operators.cpp | 16 +++---- .../dynamic_value/return_from_function.cpp | 2 +- tests/unit_tests/dynamic_value/vector.cpp | 2 +- tests/unit_tests/geometry_core/geometry.cpp | 2 +- .../geometry_core/geometry_builder.cpp | 2 +- .../geometry_core/geometry_exporter.cpp | 4 +- .../geometry_core/indexed_container.cpp | 2 +- tests/unit_tests/geometry_core/mock_objects.h | 6 +-- tests/unit_tests/geometry_core/scope.cpp | 2 +- .../geometry_core/split_point_topology.cpp | 18 ++++---- .../geometry_operations/create_rect.cpp | 4 +- .../geometry_operations/ear_clipping.cpp | 4 +- .../geometry_operations/extrusion.cpp | 4 +- .../geometry_operations/triangulate.cpp | 4 +- tests/unit_tests/main.cpp | 6 +-- tests/unit_tests/math_lib/bissectrix.cpp | 2 +- tests/unit_tests/math_lib/intersections.cpp | 2 +- tests/unit_tests/math_lib/line_3d.cpp | 2 +- tests/unit_tests/math_lib/line_segment_3d.cpp | 2 +- tests/unit_tests/math_lib/math_utils.cpp | 2 +- tests/unit_tests/math_lib/matrix_base.cpp | 2 +- tests/unit_tests/math_lib/nearest_points.cpp | 2 +- tests/unit_tests/math_lib/orthogonal.cpp | 2 +- tests/unit_tests/math_lib/plane.cpp | 2 +- tests/unit_tests/math_lib/projection.cpp | 2 +- tests/unit_tests/math_lib/vec_base.cpp | 2 +- tests/unit_tests/parameter/expression.cpp | 2 +- tests/unit_tests/parameter/variable.cpp | 2 +- .../parameter/variable_resolver.cpp | 2 +- .../{selscript => pgscript}/grammar.cpp | 16 +++---- .../procedural_graph/execution_queue.cpp | 8 ++-- tests/unit_tests/procedural_graph/graph.cpp | 8 ++-- .../graph_ast_interpreter.cpp | 2 +- .../procedural_graph/graph_reader_ast.cpp | 2 +- .../procedural_graph/graph_reader_grammar.cpp | 2 +- .../procedural_graph/mock_objects.h | 6 +-- tests/unit_tests/procedural_graph/node.cpp | 2 +- .../procedural_graph/node_set_visitor.cpp | 8 ++-- .../procedural_graph/node_visitor.cpp | 12 +++--- .../procedural_graph/parameter_node.cpp | 2 +- .../procedural_objects/geometry_system.cpp | 2 +- .../procedural_objects/mock_objects.h | 10 ++--- .../procedural_objects/procedural_object.cpp | 2 +- .../procedural_object_interface.cpp | 2 +- .../procedural_object_predicates.cpp | 2 +- tests/unit_tests/test_utils.cpp | 30 ++++++------- tests/unit_tests/test_utils.h | 12 +++--- tools/CMakeLists.txt | 24 +++++------ tools/{sel.cpp => pagoda.cpp} | 20 ++++----- 397 files changed, 1045 insertions(+), 1053 deletions(-) rename cmake/{Selector.cmake => Pagoda.cmake} (55%) rename source/{selector.cpp => pagoda.cpp} (90%) rename source/{selector.h => pagoda.h} (74%) rename source/{selscript => pgscript}/CMakeLists.txt (65%) rename source/{selscript => pgscript}/intermediate/CMakeLists.txt (80%) rename source/{selscript => pgscript}/intermediate/anonymous_method.cpp (90%) rename source/{selscript => pgscript}/intermediate/anonymous_method.h (92%) rename source/{selscript => pgscript}/intermediate/ast.cpp (98%) rename source/{selscript => pgscript}/intermediate/ast.h (99%) rename source/{selscript => pgscript}/intermediate/ast_printer.cpp (99%) rename source/{selscript => pgscript}/intermediate/ast_printer.h (96%) rename source/{selscript => pgscript}/intermediate/ast_visitor.h (96%) rename source/{selscript => pgscript}/intermediate/class_declaration.cpp (90%) rename source/{selscript => pgscript}/intermediate/class_declaration.h (93%) rename source/{selscript => pgscript}/intermediate/function_declaration.cpp (86%) rename source/{selscript => pgscript}/intermediate/function_declaration.h (95%) rename source/{selscript => pgscript}/intermediate/get_expression.cpp (89%) rename source/{selscript => pgscript}/intermediate/get_expression.h (92%) rename source/{selscript => pgscript}/intermediate/parameter.cpp (86%) rename source/{selscript => pgscript}/intermediate/parameter.h (93%) rename source/{selscript => pgscript}/intermediate/set_expression.cpp (90%) rename source/{selscript => pgscript}/intermediate/set_expression.h (93%) rename source/{selscript => pgscript}/interpreter/CMakeLists.txt (73%) rename source/{selscript => pgscript}/interpreter/interpreter.cpp (99%) rename source/{selscript => pgscript}/interpreter/interpreter.h (94%) rename source/{selscript => pgscript}/interpreter/interpreter_visitor.cpp (98%) rename source/{selscript => pgscript}/interpreter/interpreter_visitor.h (98%) rename source/{selscript => pgscript}/parser/CMakeLists.txt (76%) rename source/{selscript => pgscript}/parser/grammar.h (99%) rename source/{selscript => pgscript}/parser/grammar_helpers.cpp (99%) rename source/{selscript => pgscript}/parser/grammar_helpers.h (98%) rename source/{selscript => pgscript}/parser/parser.cpp (95%) rename source/{selscript => pgscript}/parser/parser.h (84%) rename source/{selscript => pgscript}/value/CMakeLists.txt (78%) rename source/{selscript => pgscript}/value/builtin_functions.cpp (89%) rename source/{selscript => pgscript}/value/builtin_functions.h (90%) rename source/{selscript => pgscript}/value/script_callable_body.cpp (93%) rename source/{selscript => pgscript}/value/script_callable_body.h (94%) rename tests/{selscript => pgscript}/CMakeLists.txt (71%) rename tests/{selscript => pgscript}/main.cpp (94%) rename tests/{selscript => pgscript}/test_files/float_operations/ast.txt (100%) rename tests/{selscript => pgscript}/test_files/float_operations/err.txt (100%) rename tests/{selscript/test_files/float_operations/float_operations.sscript => pgscript/test_files/float_operations/float_operations.pgx} (100%) rename tests/{selscript => pgscript}/test_files/float_operations/out.txt (100%) rename tests/{selscript => pgscript}/test_files/integer_operations/ast.txt (100%) rename tests/{selscript => pgscript}/test_files/integer_operations/err.txt (100%) rename tests/{selscript/test_files/integer_operations/integer_operations.sscript => pgscript/test_files/integer_operations/integer_operations.pgx} (100%) rename tests/{selscript => pgscript}/test_files/integer_operations/out.txt (100%) rename tests/{selscript => pgscript}/test_files/plane/ast.txt (100%) rename tests/{selscript => pgscript}/test_files/plane/err.txt (100%) rename tests/{selscript => pgscript}/test_files/plane/out.txt (100%) rename tests/{selscript/test_files/plane/plane.sscript => pgscript/test_files/plane/plane.pgx} (100%) rename tests/{selscript => pgscript}/test_files/string_operations/ast.txt (100%) rename tests/{selscript => pgscript}/test_files/string_operations/err.txt (100%) rename tests/{selscript => pgscript}/test_files/string_operations/out.txt (100%) rename tests/{selscript/test_files/string_operations/string_operations.sscript => pgscript/test_files/string_operations/string_operations.pgx} (100%) rename tests/{selscript => pgscript}/test_files/vector/ast.txt (100%) rename tests/{selscript => pgscript}/test_files/vector/err.txt (100%) rename tests/{selscript => pgscript}/test_files/vector/out.txt (100%) rename tests/{selscript/test_files/vector/vector.sscript => pgscript/test_files/vector/vector.pgx} (100%) rename tests/regression_tests/test_files/banner/{banner.sel => banner.pgd} (100%) rename tests/regression_tests/test_files/clip_geometry/{clip_geometry.sel => clip_geometry.pgd} (100%) rename tests/regression_tests/test_files/create_box/{create_box.sel => create_box.pgd} (100%) rename tests/regression_tests/test_files/create_rect/{create_rect.sel => create_rect.pgd} (100%) rename tests/regression_tests/test_files/create_sphere/{create_sphere.sel => create_sphere.pgd} (100%) rename tests/regression_tests/test_files/export_geometry/{export_geometry.sel => export_geometry.pgd} (100%) rename tests/regression_tests/test_files/expression/{expression.sel => expression.pgd} (100%) rename tests/regression_tests/test_files/extract_faces/{extract_faces.sel => extract_faces.pgd} (100%) rename tests/regression_tests/test_files/extrusion/{extrusion.sel => extrusion.pgd} (100%) rename tests/regression_tests/test_files/face_offset/{face_offset.sel => face_offset.pgd} (100%) rename tests/regression_tests/test_files/parameter_definition/{parameter_definition.sel => parameter_definition.pgd} (100%) rename tests/regression_tests/test_files/parameter_overwrite/{parameter_overwrite.sel => parameter_overwrite.pgd} (100%) rename tests/regression_tests/test_files/parameter_renaming/{parameter_renaming.sel => parameter_renaming.pgd} (100%) rename tests/regression_tests/test_files/parameters_in_procedural_objects/{parameters_in_procedural_objects.sel => parameters_in_procedural_objects.pgd} (100%) rename tests/regression_tests/test_files/repeat_split/{repeat_split.sel => repeat_split.pgd} (100%) rename tests/regression_tests/test_files/rotate/{rotate.sel => rotate.pgd} (100%) rename tests/regression_tests/test_files/router/{router.sel => router.pgd} (100%) rename tests/regression_tests/test_files/scale/{scale.sel => scale.pgd} (100%) rename tests/regression_tests/test_files/split/{split.sel => split.pgd} (100%) rename tests/regression_tests/test_files/translate/{translate.sel => translate.pgd} (100%) rename tests/regression_tests/test_files/triangulate_geometry/{triangulate_geometry.sel => triangulate_geometry.pgd} (100%) rename tests/unit_tests/{selscript => pgscript}/grammar.cpp (77%) rename tools/{sel.cpp => pagoda.cpp} (93%) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 39c27faa..2feb00af 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -71,8 +71,8 @@ jobs: cd ${{ github.workspace }}/build BOOST_ROOT=${GITHUB_WORKSPACE}/third_party/boost cmake .. \ -DCMAKE_BUILD_TYPE=Release \ - -DSELECTOR_VERSION=${{ github.repository }}-${{ github.run_number }} \ - -DSELECTOR_BUILD_NUMBER=${{ github.run_number }} + -DPAGODA_VERSION=${{ github.repository }}-${{ github.run_number }} \ + -DPAGODA_BUILD_NUMBER=${{ github.run_number }} cmake --build . - name: Run tests diff --git a/CMakeLists.txt b/CMakeLists.txt index c4907173..7673b362 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,10 +1,10 @@ cmake_policy(SET CMP0048 NEW) -project("Selector" LANGUAGES CXX VERSION 0.1.0) +project("Pagoda" LANGUAGES CXX VERSION 0.1.0) cmake_minimum_required(VERSION 3.11.0 FATAL_ERROR) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") -include("Selector") +include("Pagoda") include("gtest") set(Boost_USE_STATIC_LIBS ON) diff --git a/cmake/Selector.cmake b/cmake/Pagoda.cmake similarity index 55% rename from cmake/Selector.cmake rename to cmake/Pagoda.cmake index d0c27fb1..97c34a1a 100644 --- a/cmake/Selector.cmake +++ b/cmake/Pagoda.cmake @@ -29,23 +29,23 @@ execute_process( OUTPUT_STRIP_TRAILING_WHITESPACE ) -# Default Selector version, build number and date -if (NOT DEFINED SELECTOR_VERSION) - set(SELECTOR_VERSION "${CMAKE_PROJECT_VERSION}") +# Default Pagoda version, build number and date +if (NOT DEFINED PAGODA_VERSION) + set(PAGODA_VERSION "${CMAKE_PROJECT_VERSION}") endif() -if (NOT DEFINED SELECTOR_BUILD_NUMBER) - set(SELECTOR_BUILD_NUMBER "0") +if (NOT DEFINED PAGODA_BUILD_NUMBER) + set(PAGODA_BUILD_NUMBER "0") endif() -string(TIMESTAMP SELECTOR_BUILD_DATE "%d/%m/%Y %H:%M:%S") +string(TIMESTAMP PAGODA_BUILD_DATE "%d/%m/%Y %H:%M:%S") if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release") - option(SELECTOR_PROFILER_ACTIVE "Enable or disable built in profiling" OFF) - option(SELECTOR_ENABLE_ASSERTIONS "Enable or disable assertions" OFF) + option(PAGODA_PROFILER_ACTIVE "Enable or disable built in profiling" OFF) + option(PAGODA_ENABLE_ASSERTIONS "Enable or disable assertions" OFF) else() - option(SELECTOR_PROFILER_ACTIVE "Enable or disable built in profiling" ON) - option(SELECTOR_ENABLE_ASSERTIONS "Enable or disable assertions" ON) + option(PAGODA_PROFILER_ACTIVE "Enable or disable built in profiling" ON) + option(PAGODA_ENABLE_ASSERTIONS "Enable or disable assertions" ON) endif() string(REPLACE "\"" "" GIT_COMMIT_SUBJECT "${GIT_COMMIT_SUBJECT}") @@ -54,25 +54,25 @@ string(REPLACE "\"" "" GIT_BRANCH "${GIT_BRANCH}") set(GIT_COMMIT_SUBJECT "\"${GIT_COMMIT_SUBJECT}\"") set(GIT_COMMIT_AUTHOR "\"${GIT_COMMIT_AUTHOR}\"") -set(SELECTOR_INCLUDE_GIT_INFO 0) +set(PAGODA_INCLUDE_GIT_INFO 0) if ("${GIT_BRANCH}" STREQUAL "master") - option(SELECTOR_GIT_INFO "Include git information in the version information" OFF) + option(PAGODA_GIT_INFO "Include git information in the version information" OFF) elseif("${GIT_BRANCH}" MATCHES "^release-.+") - option(SELECTOR_GIT_INFO "Include git information in the version information" OFF) + option(PAGODA_GIT_INFO "Include git information in the version information" OFF) else() - option(SELECTOR_GIT_INFO "Include git information in the version information" ON) + option(PAGODA_GIT_INFO "Include git information in the version information" ON) endif() -message(STATUS "Version: ${SELECTOR_VERSION}") -message(STATUS "Build number: ${SELECTOR_BUILD_NUMBER}") -message(STATUS "Build date: ${SELECTOR_BUILD_DATE}") -message(STATUS "Profiler Active: ${SELECTOR_PROFILER_ACTIVE}") -message(STATUS "Assertions Active: ${SELECTOR_ENABLE_ASSERTIONS}") -if (${SELECTOR_GIT_INFO}) +message(STATUS "Version: ${PAGODA_VERSION}") +message(STATUS "Build number: ${PAGODA_BUILD_NUMBER}") +message(STATUS "Build date: ${PAGODA_BUILD_DATE}") +message(STATUS "Profiler Active: ${PAGODA_PROFILER_ACTIVE}") +message(STATUS "Assertions Active: ${PAGODA_ENABLE_ASSERTIONS}") +if (${PAGODA_GIT_INFO}) message(STATUS "Git Branch: ${GIT_BRANCH}") message(STATUS "Git Commit Hash: ${GIT_COMMIT_HASH}") message(STATUS "Git Commit Author: ${GIT_COMMIT_AUTHOR}") message(STATUS "Git Commit Subject: ${GIT_COMMIT_SUBJECT}") - set(SELECTOR_INCLUDE_GIT_INFO 1) + set(PAGODA_INCLUDE_GIT_INFO 1) endif() diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 259262e2..7d8c6953 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -1,10 +1,10 @@ -set(SELECTOR_PUBLIC_HEADERS - "selector.h" +set(PAGODA_PUBLIC_HEADERS + "pagoda.h" ) -set(SELECTOR_SOURCES - "selector.h" - "selector.cpp" +set(PAGODA_SOURCES + "pagoda.h" + "pagoda.cpp" ) add_subdirectory(common) @@ -15,9 +15,9 @@ add_subdirectory(parameter) add_subdirectory(procedural_graph) add_subdirectory(procedural_objects) add_subdirectory(dynamic_value) -add_subdirectory(selscript) +add_subdirectory(pgscript) -add_library(selector STATIC "${SELECTOR_SOURCES}" +add_library(libpagoda STATIC "${PAGODA_SOURCES}" $ $ $ @@ -26,23 +26,23 @@ add_library(selector STATIC "${SELECTOR_SOURCES}" $ $ $ - $ - $ - $ - $ + $ + $ + $ + $ $ ) target_include_directories( - selector + libpagoda PRIVATE - $ + $ $ ${Boost_INCLUDE_DIRS} ) target_compile_features( - selector + libpagoda PRIVATE cxx_std_17 cxx_lambdas @@ -51,7 +51,7 @@ target_compile_features( ) target_compile_options( - selector + libpagoda PRIVATE -Wall $<$:-Werror> @@ -59,7 +59,7 @@ target_compile_options( ) target_compile_definitions( - selector + libpagoda PRIVATE "$<$:DEBUG>" ) diff --git a/source/common/CMakeLists.txt b/source/common/CMakeLists.txt index 3aaf04fb..e24c2aef 100644 --- a/source/common/CMakeLists.txt +++ b/source/common/CMakeLists.txt @@ -46,7 +46,7 @@ add_library(common OBJECT ${COMMON_SRCS}) target_include_directories( common PRIVATE - $ + $ $ ${Boost_INCLUDE_DIRS} ${SELSCRIPT_INCLUDE_DIR} @@ -72,10 +72,10 @@ target_compile_options( target_compile_definitions( common PRIVATE - -DSELECTOR_VERSION=\"${SELECTOR_VERSION}\" - -DSELECTOR_BUILD_NUMBER=\"${SELECTOR_BUILD_NUMBER}\" - -DSELECTOR_BUILD_DATE=\"${SELECTOR_BUILD_DATE}\" - -DSELECTOR_INCLUDE_GIT_INFO=${SELECTOR_INCLUDE_GIT_INFO} + -DPAGODA_VERSION=\"${PAGODA_VERSION}\" + -DPAGODA_BUILD_NUMBER=\"${PAGODA_BUILD_NUMBER}\" + -DPAGODA_BUILD_DATE=\"${PAGODA_BUILD_DATE}\" + -DPAGODA_INCLUDE_GIT_INFO=${PAGODA_INCLUDE_GIT_INFO} -DGIT_BRANCH=\"${GIT_BRANCH}\" -DGIT_COMMIT_HASH=\"${GIT_COMMIT_HASH}\" -DGIT_COMMIT_AUTHOR=${GIT_COMMIT_AUTHOR} @@ -83,11 +83,11 @@ target_compile_definitions( "$<$:DEBUG>" ) -if (${SELECTOR_ENABLE_ASSERTIONS}) - target_compile_options(common PUBLIC -DSELECTOR_ENABLE_ASSERTIONS="${SELECTOR_ENABLE_ASSERTIONS}") +if (${PAGODA_ENABLE_ASSERTIONS}) + target_compile_options(common PUBLIC -DPAGODA_ENABLE_ASSERTIONS="${PAGODA_ENABLE_ASSERTIONS}") endif() -if (${SELECTOR_PROFILER_ACTIVE}) - target_compile_options(common PUBLIC -DSELECTOR_PROFILER_ACTIVE="${SELECTOR_PROFILER_ACTIVE}") +if (${PAGODA_PROFILER_ACTIVE}) + target_compile_options(common PUBLIC -DPAGODA_PROFILER_ACTIVE="${PAGODA_PROFILER_ACTIVE}") endif() target_link_libraries( diff --git a/source/common/assertions.cpp b/source/common/assertions.cpp index 0a327087..4c7790d8 100644 --- a/source/common/assertions.cpp +++ b/source/common/assertions.cpp @@ -3,7 +3,7 @@ #include #include -namespace selector +namespace pagoda { typename Fail::FailBehaviour DefaultHandler(const char *condition, const char *file, const int line, const char *message) @@ -47,4 +47,4 @@ typename Fail::FailBehaviour Fail::ReportFail(const char *condition, const char return sFailHandler(condition, file, line, final_message); } -} // namespace selector +} // namespace pagoda diff --git a/source/common/assertions.h b/source/common/assertions.h index d71d2ee4..5095dd26 100644 --- a/source/common/assertions.h +++ b/source/common/assertions.h @@ -1,11 +1,11 @@ -#ifndef SELECTOR_COMMON_ASSERTIONS_H_ -#define SELECTOR_COMMON_ASSERTIONS_H_ +#ifndef PAGODA_COMMON_ASSERTIONS_H_ +#define PAGODA_COMMON_ASSERTIONS_H_ #include "utils.h" #include -namespace selector +namespace pagoda { /** * Class that deals with the assertion infrastructure. @@ -55,12 +55,12 @@ class Fail typename Fail::FailBehaviour DefaultHandler(const char *condition, const char *file, const int line, const char *message); -} // namespace selector +} // namespace pagoda /// Interrupts the execution and tries to step into debugger #define HALT asm("int $3") -#ifdef SELECTOR_ENABLE_ASSERTIONS +#ifdef PAGODA_ENABLE_ASSERTIONS /** * Assertion that will only be called in DEBUG mode. @@ -70,7 +70,7 @@ typename Fail::FailBehaviour DefaultHandler(const char *condition, const char *f { \ if (!(cond)) \ { \ - if (::selector::Fail::ReportFail(#cond, __FILE__, __LINE__, 0) == ::selector::Fail::FailBehaviour::Halt) \ + if (::pagoda::Fail::ReportFail(#cond, __FILE__, __LINE__, 0) == ::pagoda::Fail::FailBehaviour::Halt) \ { \ HALT; \ } \ @@ -86,8 +86,8 @@ typename Fail::FailBehaviour DefaultHandler(const char *condition, const char *f { \ if (!(cond)) \ { \ - if (::selector::Fail::ReportFail(#cond, __FILE__, __LINE__, __VA_ARGS__) == \ - ::selector::Fail::FailBehaviour::Halt) \ + if (::pagoda::Fail::ReportFail(#cond, __FILE__, __LINE__, __VA_ARGS__) == \ + ::pagoda::Fail::FailBehaviour::Halt) \ { \ HALT; \ } \ @@ -118,8 +118,8 @@ typename Fail::FailBehaviour DefaultHandler(const char *condition, const char *f { \ if (!(cond)) \ { \ - if (::selector::Fail::ReportFail("CRITICAL! " #cond, __FILE__, __LINE__, 0) == \ - ::selector::Fail::FailBehaviour::Halt) \ + if (::pagoda::Fail::ReportFail("CRITICAL! " #cond, __FILE__, __LINE__, 0) == \ + ::pagoda::Fail::FailBehaviour::Halt) \ { \ HALT; \ } \ @@ -135,8 +135,8 @@ typename Fail::FailBehaviour DefaultHandler(const char *condition, const char *f { \ if (!(cond)) \ { \ - if (::selector::Fail::ReportFail("CRITICAL! " #cond, __FILE__, __LINE__, __VA_ARGS__) == \ - ::selector::Fail::FailBehaviour::Halt) \ + if (::pagoda::Fail::ReportFail("CRITICAL! " #cond, __FILE__, __LINE__, __VA_ARGS__) == \ + ::pagoda::Fail::FailBehaviour::Halt) \ { \ HALT; \ } \ diff --git a/source/common/exception.cpp b/source/common/exception.cpp index 2fb60b67..4a44ac8e 100644 --- a/source/common/exception.cpp +++ b/source/common/exception.cpp @@ -2,11 +2,11 @@ #include "assertions.h" -namespace selector +namespace pagoda { Exception::Exception(const std::string exceptionMessage) : m_message(exceptionMessage) { /*DBG_ASSERT(false);*/ } const std::string& Exception::What() const { return m_message; } -} // namespace selector +} // namespace pagoda diff --git a/source/common/exception.h b/source/common/exception.h index 8c80cb52..4c60c9bf 100644 --- a/source/common/exception.h +++ b/source/common/exception.h @@ -2,7 +2,7 @@ #include -namespace selector +namespace pagoda { class Exception { @@ -14,4 +14,4 @@ class Exception private: const std::string m_message; }; -} // namespace selector +} // namespace pagoda diff --git a/source/common/factory.h b/source/common/factory.h index d7e0396e..4d6b9de1 100644 --- a/source/common/factory.h +++ b/source/common/factory.h @@ -1,5 +1,5 @@ -#ifndef SELECTOR_COMMON_FACTORY_H_ -#define SELECTOR_COMMON_FACTORY_H_ +#ifndef PAGODA_COMMON_FACTORY_H_ +#define PAGODA_COMMON_FACTORY_H_ #include "logger.h" #include "utils.h" @@ -9,7 +9,7 @@ #include #include -namespace selector +namespace pagoda { template class Factory @@ -67,6 +67,6 @@ class Factory std::string m_name; }; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/common/file_util.cpp b/source/common/file_util.cpp index 27de8c9d..a70a7e63 100644 --- a/source/common/file_util.cpp +++ b/source/common/file_util.cpp @@ -6,7 +6,7 @@ #include #include -namespace selector::file_util +namespace pagoda::file_util { std::string LoadFileToString(const boost::filesystem::path &path) { return LoadFileToString(path.string()); } @@ -64,4 +64,4 @@ bool CreateDirectories(const boost::filesystem::path &path) throw Exception("Unable to create directories"); } } -} // namespace selector::file_util +} // namespace pagoda::file_util diff --git a/source/common/file_util.h b/source/common/file_util.h index 33c00207..45f80dea 100644 --- a/source/common/file_util.h +++ b/source/common/file_util.h @@ -1,11 +1,11 @@ -#ifndef SELECTOR_COMMON_FILE_UTIL_H_ -#define SELECTOR_COMMON_FILE_UTIL_H_ +#ifndef PAGODA_COMMON_FILE_UTIL_H_ +#define PAGODA_COMMON_FILE_UTIL_H_ #include #include -namespace selector::file_util +namespace pagoda::file_util { std::string LoadFileToString(const boost::filesystem::path &path); std::string LoadFileToString(const std::string &filePath); @@ -36,6 +36,6 @@ void GetAllFilesWithExtension(const boost::filesystem::path &dirPath, const std: ++iterator; } } -} // namespace selector::file_util +} // namespace pagoda::file_util #endif diff --git a/source/common/logger.cpp b/source/common/logger.cpp index 1f4e0eca..33d80b19 100644 --- a/source/common/logger.cpp +++ b/source/common/logger.cpp @@ -4,7 +4,7 @@ #include #include -namespace selector +namespace pagoda { std::unique_ptr Logger::sTrace = nullptr; std::unique_ptr Logger::sDebug = nullptr; @@ -48,7 +48,7 @@ Logger *Logger::info() { if (sInfo == nullptr) { - sInfo = std::make_unique("selector.log"); + sInfo = std::make_unique("pagoda.log"); } return sInfo.get(); } @@ -57,7 +57,7 @@ Logger *Logger::warning() { if (sWarning == nullptr) { - sWarning = std::make_unique("selector.log", ConsoleOutput::StdOut); + sWarning = std::make_unique("pagoda.log", ConsoleOutput::StdOut); } return sWarning.get(); } @@ -66,7 +66,7 @@ Logger *Logger::error() { if (sError == nullptr) { - sError = std::make_unique("selector.log", ConsoleOutput::StdErr); + sError = std::make_unique("pagoda.log", ConsoleOutput::StdErr); } return sError.get(); } @@ -75,7 +75,7 @@ Logger *Logger::fatal() { if (sFatal == nullptr) { - sFatal = std::make_unique("selector.log", ConsoleOutput::StdErr); + sFatal = std::make_unique("pagoda.log", ConsoleOutput::StdErr); } return sFatal.get(); } @@ -215,4 +215,4 @@ void Logger::Shutdown() bool Logger::IsTraceEnabled(const TraceLogs &trace) { return trace_enabled[static_cast(trace)]; } -} // namespace selector +} // namespace pagoda diff --git a/source/common/logger.h b/source/common/logger.h index 0fdb931e..2ce0311f 100644 --- a/source/common/logger.h +++ b/source/common/logger.h @@ -1,5 +1,5 @@ -#ifndef SELECTOR_COMMON_LOGGER_H_ -#define SELECTOR_COMMON_LOGGER_H_ +#ifndef PAGODA_COMMON_LOGGER_H_ +#define PAGODA_COMMON_LOGGER_H_ #include #include @@ -8,7 +8,7 @@ #include #include -namespace selector +namespace pagoda { class Logger { @@ -81,43 +81,43 @@ class Logger }; // class Logger #define LOG_TRACE(TRACE, message) \ - if (selector::Logger::IsTraceEnabled(selector::Logger::TraceLogs::TRACE)) \ + if (pagoda::Logger::IsTraceEnabled(pagoda::Logger::TraceLogs::TRACE)) \ { \ std::stringstream _logger_ss_; \ _logger_ss_ << #TRACE ": " << message; \ - selector::Logger::trace()->Log(_logger_ss_.str()); \ + pagoda::Logger::trace()->Log(_logger_ss_.str()); \ } #define LOG_DEBUG(message) \ { \ std::stringstream _logger_ss_; \ _logger_ss_ << "Debug: " << message; \ - selector::Logger::debug()->Log(_logger_ss_.str()); \ + pagoda::Logger::debug()->Log(_logger_ss_.str()); \ } #define LOG_INFO(message) \ { \ std::stringstream _logger_ss_; \ _logger_ss_ << "Info: " << message; \ - selector::Logger::debug()->Log(_logger_ss_.str()); \ + pagoda::Logger::debug()->Log(_logger_ss_.str()); \ } #define LOG_WARNING(message) \ { \ std::stringstream _logger_ss_; \ _logger_ss_ << "Warning: " << message; \ - selector::Logger::debug()->Log(_logger_ss_.str()); \ + pagoda::Logger::debug()->Log(_logger_ss_.str()); \ } #define LOG_ERROR(message) \ { \ std::stringstream _logger_ss_; \ _logger_ss_ << "Error: " << message; \ - selector::Logger::debug()->Log(_logger_ss_.str()); \ + pagoda::Logger::debug()->Log(_logger_ss_.str()); \ } #define LOG_FATAL(message) \ { \ std::stringstream _logger_ss_; \ _logger_ss_ << "Fatal: " << message; \ - selector::Logger::debug()->Log(_logger_ss_.str()); \ + pagoda::Logger::debug()->Log(_logger_ss_.str()); \ } -} // namespace selector +} // namespace pagoda #endif diff --git a/source/common/profiler.cpp b/source/common/profiler.cpp index e7a0ca57..faaaeabb 100644 --- a/source/common/profiler.cpp +++ b/source/common/profiler.cpp @@ -10,7 +10,7 @@ #include #include -namespace selector +namespace pagoda { ProfilerManager::ProfilerManager() {} @@ -160,4 +160,4 @@ void ConsoleProfilerLogger::Log(std::size_t nLines) } } -} // namespace selector +} // namespace pagoda diff --git a/source/common/profiler.h b/source/common/profiler.h index 7dbceb6a..e2089693 100644 --- a/source/common/profiler.h +++ b/source/common/profiler.h @@ -1,5 +1,5 @@ -#ifndef SELECTOR_COMMON_PROFILER_H_ -#define SELECTOR_COMMON_PROFILER_H_ +#ifndef PAGODA_COMMON_PROFILER_H_ +#define PAGODA_COMMON_PROFILER_H_ #include "utils.h" @@ -10,7 +10,7 @@ #include #include -namespace selector +namespace pagoda { /** * Provides an entry point for the profiling system. @@ -176,10 +176,10 @@ class ConsoleProfilerLogger : public ProfilerLogger void Log(std::size_t nLines = 0) final; }; // class ConsoleProfilerLogger -#ifdef SELECTOR_PROFILER_ACTIVE +#ifdef PAGODA_PROFILER_ACTIVE -#define START_PROFILE selector::Profiler __PROFILER__(__FUNCTION__, __FILE__, __LINE__) -#define START_NAMED_PROFILE(x) selector::Profiler x(#x, __FILE__, __LINE__) +#define START_PROFILE pagoda::Profiler __PROFILER__(__FUNCTION__, __FILE__, __LINE__) +#define START_NAMED_PROFILE(x) pagoda::Profiler x(#x, __FILE__, __LINE__) #define END_NAMED_PROFILE(x) (x).EndProfile() @@ -191,6 +191,6 @@ class ConsoleProfilerLogger : public ProfilerLogger #endif -} // namespace selector +} // namespace pagoda #endif diff --git a/source/common/pugixml.cpp b/source/common/pugixml.cpp index 2afff09d..3dda1b48 100644 --- a/source/common/pugixml.cpp +++ b/source/common/pugixml.cpp @@ -1782,9 +1782,9 @@ PUGI__NS_BEGIN } }; - template struct wchar_selector; + template struct wchar_pagoda; - template <> struct wchar_selector<2> + template <> struct wchar_pagoda<2> { typedef uint16_t type; typedef utf16_counter counter; @@ -1792,7 +1792,7 @@ PUGI__NS_BEGIN typedef utf16_decoder decoder; }; - template <> struct wchar_selector<4> + template <> struct wchar_pagoda<4> { typedef uint32_t type; typedef utf32_counter counter; @@ -1800,8 +1800,8 @@ PUGI__NS_BEGIN typedef utf32_decoder decoder; }; - typedef wchar_selector::counter wchar_counter; - typedef wchar_selector::writer wchar_writer; + typedef wchar_pagoda::counter wchar_counter; + typedef wchar_pagoda::writer wchar_writer; struct wchar_decoder { @@ -1809,7 +1809,7 @@ PUGI__NS_BEGIN template static inline typename Traits::value_type process(const wchar_t* data, size_t size, typename Traits::value_type result, Traits traits) { - typedef wchar_selector::decoder decoder; + typedef wchar_pagoda::decoder decoder; return decoder::process(reinterpret_cast(data), size, result, traits); } @@ -1819,7 +1819,7 @@ PUGI__NS_BEGIN PUGI__FN void convert_wchar_endian_swap(wchar_t* result, const wchar_t* data, size_t length) { for (size_t i = 0; i < length; ++i) - result[i] = static_cast(endian_swap(static_cast::type>(data[i]))); + result[i] = static_cast(endian_swap(static_cast::type>(data[i]))); } #endif PUGI__NS_END diff --git a/source/common/range.h b/source/common/range.h index 635de99c..ee0d4f7f 100644 --- a/source/common/range.h +++ b/source/common/range.h @@ -1,7 +1,7 @@ -#ifndef SELECTOR_COMMON_RANGE_H_ -#define SELECTOR_COMMON_RANGE_H_ +#ifndef PAGODA_COMMON_RANGE_H_ +#define PAGODA_COMMON_RANGE_H_ -namespace selector +namespace pagoda { /** * \brief Implements a Range between two values with increments. @@ -56,5 +56,5 @@ class Range T m_rangeEnd; T m_rangeIncrement; }; // class Range -} // namespace selector +} // namespace pagoda #endif diff --git a/source/common/statistics.cpp b/source/common/statistics.cpp index a94a5ecc..f1cce7c9 100644 --- a/source/common/statistics.cpp +++ b/source/common/statistics.cpp @@ -1,6 +1,6 @@ #include "statistics.h" -namespace selector +namespace pagoda { StatisticsManager *StatisticsManager::Instance() { @@ -42,4 +42,4 @@ void OneShotProfilerStats::Write(std::ostream &outStream) } } -} // namespace selector +} // namespace pagoda diff --git a/source/common/statistics.h b/source/common/statistics.h index 07d75ba3..06fc87cc 100644 --- a/source/common/statistics.h +++ b/source/common/statistics.h @@ -1,5 +1,5 @@ -#ifndef SELECTOR_COMMON_DEBUG_STATISTICS_H_ -#define SELECTOR_COMMON_DEBUG_STATISTICS_H_ +#ifndef PAGODA_COMMON_DEBUG_STATISTICS_H_ +#define PAGODA_COMMON_DEBUG_STATISTICS_H_ #include "assertions.h" @@ -9,7 +9,7 @@ #include #include -namespace selector +namespace pagoda { /** * Main class responsible for holding statistics about execution. @@ -129,7 +129,7 @@ struct OneShotProfilerStats : public StatisticsManager::StatsGroup OneShotProfilerStats() { StatisticsManager::Instance()->AddGroup(this); } }; // struct OneShotProfilerStats -#ifdef SELECTOR_STATISTICS_ENABLED +#ifdef PAGODA_STATISTICS_ENABLED #define LOG_STATISTICS(STAT_INSTRUCTION) (STAT_INSTRUCTION); @@ -139,6 +139,6 @@ struct OneShotProfilerStats : public StatisticsManager::StatsGroup #endif -} // namespace selector +} // namespace pagoda #endif diff --git a/source/common/unimplemented.cpp b/source/common/unimplemented.cpp index 4ad9b98a..2dd5aab0 100644 --- a/source/common/unimplemented.cpp +++ b/source/common/unimplemented.cpp @@ -1,10 +1,10 @@ #include "unimplemented.h" -namespace selector +namespace pagoda { Unimplemented::Unimplemented(const char *file, const char *function, uint32_t line) : Exception("Unimplemented function: " + std::string(function) + " at " + std::string(file) + ":" + std::to_string(line)) { } -} // namespace selector +} // namespace pagoda diff --git a/source/common/unimplemented.h b/source/common/unimplemented.h index cdf3d1f5..e48d22e6 100644 --- a/source/common/unimplemented.h +++ b/source/common/unimplemented.h @@ -2,7 +2,7 @@ #include "exception.h" -namespace selector +namespace pagoda { class Unimplemented : public Exception { @@ -10,5 +10,5 @@ class Unimplemented : public Exception Unimplemented(const char *file, const char *function, uint32_t line); }; -#define UNIMPLEMENTED throw selector::Unimplemented(__FILE__, __FUNCTION__, __LINE__); -} // namespace selector +#define UNIMPLEMENTED throw pagoda::Unimplemented(__FILE__, __FUNCTION__, __LINE__); +} // namespace pagoda diff --git a/source/common/utils.cpp b/source/common/utils.cpp index b3ff3211..c4f60385 100644 --- a/source/common/utils.cpp +++ b/source/common/utils.cpp @@ -2,7 +2,7 @@ #include -namespace selector +namespace pagoda { bool is_float(const std::string &str) { @@ -10,4 +10,4 @@ bool is_float(const std::string &str) return std::regex_match(str, float_regex); } -} // namespace selector +} // namespace pagoda diff --git a/source/common/utils.h b/source/common/utils.h index 7f1c03ea..b183a853 100644 --- a/source/common/utils.h +++ b/source/common/utils.h @@ -1,9 +1,9 @@ -#ifndef SELECTOR_COMMON_UTILS_H_ -#define SELECTOR_COMMON_UTILS_H_ +#ifndef PAGODA_COMMON_UTILS_H_ +#define PAGODA_COMMON_UTILS_H_ #include -namespace selector +namespace pagoda { /// Suppresses warnings about unused values and guarantees that the code is not /// optimised out @@ -15,6 +15,6 @@ namespace selector bool is_float(const std::string &str); -} // namespace selector +} // namespace pagoda #endif diff --git a/source/common/version.cpp b/source/common/version.cpp index d03db95a..5a3207fa 100644 --- a/source/common/version.cpp +++ b/source/common/version.cpp @@ -3,7 +3,7 @@ #include #include -namespace selector +namespace pagoda { struct Feature { @@ -23,12 +23,12 @@ struct Feature std::vector get_features() { std::vector features = { -#ifdef SELECTOR_PROFILER_ACTIVE +#ifdef PAGODA_PROFILER_ACTIVE {"Profiler", true}, #else {"Profiler", false}, #endif -#ifdef SELECTOR_ENABLE_ASSERTIONS +#ifdef PAGODA_ENABLE_ASSERTIONS {"DebugAsserts", true}, #else {"DebugAsserts", false}, @@ -49,17 +49,17 @@ bool has_feature(const std::string &featureName) return false; } -std::string get_version_string() { return SELECTOR_VERSION; } +std::string get_version_string() { return PAGODA_VERSION; } -std::string get_build_number() { return SELECTOR_BUILD_NUMBER; } +std::string get_build_number() { return PAGODA_BUILD_NUMBER; } -std::string get_build_date() { return SELECTOR_BUILD_DATE; } +std::string get_build_date() { return PAGODA_BUILD_DATE; } std::string get_version_information() { std::stringstream ss; - ss << "Selector version " << get_version_string(); + ss << "Pagoda version " << get_version_string(); if (!get_build_number().empty()) { ss << "\n Build Number: " << get_build_number(); @@ -75,7 +75,7 @@ std::string get_version_information() ss << static_cast(f) << " "; } -#if SELECTOR_INCLUDE_GIT_INFO +#if PAGODA_INCLUDE_GIT_INFO { ss << "\n\nGit:" << std::endl; ss << " Branch: " << GIT_BRANCH << " (" << GIT_COMMIT_HASH << ")" << std::endl; @@ -86,4 +86,4 @@ std::string get_version_information() return ss.str(); } -} // namespace selector +} // namespace pagoda diff --git a/source/common/version.h b/source/common/version.h index b4da16e8..cee0153f 100644 --- a/source/common/version.h +++ b/source/common/version.h @@ -1,9 +1,9 @@ -#ifndef SELECTOR_COMMON_VERSION_H_ -#define SELECTOR_COMMON_VERSION_H_ +#ifndef PAGODA_COMMON_VERSION_H_ +#define PAGODA_COMMON_VERSION_H_ #include -namespace selector +namespace pagoda { /** * Returns the current version for the project. @@ -26,9 +26,9 @@ std::string get_build_date(); std::string get_version_information(); /** - * Checks whether selector was compiled with a given feature. + * Checks whether pagoda was compiled with a given feature. */ bool has_feature(const std::string &featureName); -} // namespace selector +} // namespace pagoda #endif diff --git a/source/dynamic_value/CMakeLists.txt b/source/dynamic_value/CMakeLists.txt index 45bb4138..2afb4909 100644 --- a/source/dynamic_value/CMakeLists.txt +++ b/source/dynamic_value/CMakeLists.txt @@ -71,7 +71,7 @@ add_library(dynamic_value OBJECT ${DYNAMIC_VALUE_SRCS}) target_include_directories( dynamic_value PRIVATE - $ + $ $ ${Boost_INCLUDE_DIRS} ${SELSCRIPT_INCLUDE_DIR} diff --git a/source/dynamic_value/binding/binary_ops.h b/source/dynamic_value/binding/binary_ops.h index 7cbc95da..6db244b7 100644 --- a/source/dynamic_value/binding/binary_ops.h +++ b/source/dynamic_value/binding/binary_ops.h @@ -8,7 +8,7 @@ #include "common/exception.h" -namespace selector +namespace pagoda { template class UndefinedBinaryOperator : public Exception @@ -219,4 +219,4 @@ struct binary_op_dispatcher : public ValueVisitor return apply_visitor(rhs_visitor, *m_rhs); } }; -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/binding/call_free_function.h b/source/dynamic_value/binding/call_free_function.h index 02c589d1..9aae9483 100644 --- a/source/dynamic_value/binding/call_free_function.h +++ b/source/dynamic_value/binding/call_free_function.h @@ -6,7 +6,7 @@ #include #include -namespace selector +namespace pagoda { /** * Base template call_free_function_helper. @@ -166,4 +166,4 @@ R call_free_function(std::function f, const std::vector::call(f, args); } -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/binding/call_member_function.h b/source/dynamic_value/binding/call_member_function.h index 0904e732..f0a50171 100644 --- a/source/dynamic_value/binding/call_member_function.h +++ b/source/dynamic_value/binding/call_member_function.h @@ -6,7 +6,7 @@ #include #include -namespace selector +namespace pagoda { /** * Base template call_member_function_helper. @@ -172,4 +172,4 @@ R call_member_function(C& instance, std::function f, const std:: { return call_member_function_helper::call(instance, f, args); } -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/binding/can_cast_to_native.h b/source/dynamic_value/binding/can_cast_to_native.h index e8db26f8..1dc68503 100644 --- a/source/dynamic_value/binding/can_cast_to_native.h +++ b/source/dynamic_value/binding/can_cast_to_native.h @@ -1,6 +1,6 @@ #pragma once -namespace selector +namespace pagoda { /** * Tests whether the \c DynamicValueBase of type T can be cast to a native value of type V. @@ -27,4 +27,4 @@ class can_cast_to_native value = sizeof(test(0)) == sizeof(yes) }; }; -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/binding/cast_to.h b/source/dynamic_value/binding/cast_to.h index 4d052879..4628bf3f 100644 --- a/source/dynamic_value/binding/cast_to.h +++ b/source/dynamic_value/binding/cast_to.h @@ -8,7 +8,7 @@ #include #include -namespace selector +namespace pagoda { /** * Exception thrown if a cast is impossible. @@ -64,4 +64,4 @@ typename std::enable_if(0)) == sizeof(yes)) }; }; -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/binding/make_free_function.h b/source/dynamic_value/binding/make_free_function.h index 80a2870e..f9d37cd8 100644 --- a/source/dynamic_value/binding/make_free_function.h +++ b/source/dynamic_value/binding/make_free_function.h @@ -2,7 +2,7 @@ #include -namespace selector +namespace pagoda { /** * Infers the return and argument types for the function given in \p p, creating a @@ -13,4 +13,4 @@ auto make_free_function(ReturnType (*p)(Args...)) -> std::function -namespace selector +namespace pagoda { /** * Infers the return and argument types for the member function given in \p p, producing a @@ -14,5 +14,5 @@ auto make_member_function(ReturnType (C::*p)(Args...)) -> std::function const std::string native_value_name::GetName() @@ -31,4 +31,4 @@ const std::string native_value_name::GetName() { return "std::string"; } -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/binding/native_value_name.h b/source/dynamic_value/binding/native_value_name.h index 51992a95..994c5879 100644 --- a/source/dynamic_value/binding/native_value_name.h +++ b/source/dynamic_value/binding/native_value_name.h @@ -3,7 +3,7 @@ #include #include -namespace selector +namespace pagoda { template struct native_value_name @@ -25,4 +25,4 @@ const std::string native_value_name::GetName(); template<> const std::string native_value_name::GetName(); -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/binding/return_from_function.h b/source/dynamic_value/binding/return_from_function.h index a06d79f1..ead0790a 100644 --- a/source/dynamic_value/binding/return_from_function.h +++ b/source/dynamic_value/binding/return_from_function.h @@ -5,7 +5,7 @@ #include -namespace selector +namespace pagoda { /** * Calls the free function and throws its return value which must be a \c DynamicValueBasePtr. @@ -42,4 +42,4 @@ void return_from_function(std::function function, const std::vector< return_from_function_helper::call_and_return(function, args); } -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/binding/return_from_member_function.h b/source/dynamic_value/binding/return_from_member_function.h index 523c4b8d..7aa015c0 100644 --- a/source/dynamic_value/binding/return_from_member_function.h +++ b/source/dynamic_value/binding/return_from_member_function.h @@ -2,7 +2,7 @@ #include "call_member_function.h" -namespace selector +namespace pagoda { /** * Calls the member function and throws its return value which must be a \c DynamicValueBasePtr. @@ -42,4 +42,4 @@ void return_from_member_function(C& instance, std::function memb { return_from_member_function_helper::call_and_return(instance, member, args); } -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/binding/type_name.h b/source/dynamic_value/binding/type_name.h index 8be5180f..d880a6be 100644 --- a/source/dynamic_value/binding/type_name.h +++ b/source/dynamic_value/binding/type_name.h @@ -4,7 +4,7 @@ #include "native_value_name.h" -namespace selector +namespace pagoda { /** * Returns a human readable name for the type T. @@ -27,4 +27,4 @@ struct type_name return native_value_name::GetName(); } }; -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/binding/unary_ops.h b/source/dynamic_value/binding/unary_ops.h index de5e0576..116a03a0 100644 --- a/source/dynamic_value/binding/unary_ops.h +++ b/source/dynamic_value/binding/unary_ops.h @@ -6,7 +6,7 @@ #include "../value_visitor.h" #include "has_operators.h" -namespace selector +namespace pagoda { /** * Exception thrown when the negate operator is undefined for a \c DynamicValueBase. @@ -76,4 +76,4 @@ struct unary_ops_dispatcher : public ValueVisitor return Op::apply(operand); } }; -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/boolean_value.cpp b/source/dynamic_value/boolean_value.cpp index a5a3f31a..53e233f1 100644 --- a/source/dynamic_value/boolean_value.cpp +++ b/source/dynamic_value/boolean_value.cpp @@ -3,7 +3,7 @@ #include "type_info.h" #include "value_visitor.h" -namespace selector +namespace pagoda { const TypeInfoPtr Boolean::s_typeInfo = std::make_shared("Boolean"); @@ -27,4 +27,4 @@ Boolean Boolean::operator!=(const Boolean& b) const { return Boolean(m_value != Boolean Boolean::operator!() const { return Boolean(!m_value); } void Boolean::AcceptVisitor(ValueVisitorBase& visitor) { visitor.Visit(*this); } -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/boolean_value.h b/source/dynamic_value/boolean_value.h index 7801ab78..9fb8234c 100644 --- a/source/dynamic_value/boolean_value.h +++ b/source/dynamic_value/boolean_value.h @@ -2,7 +2,7 @@ #include "dynamic_value_base.h" -namespace selector +namespace pagoda { class TypeInfo; using TypeInfoPtr = std::shared_ptr; @@ -45,4 +45,4 @@ class Boolean : public DynamicValueBase bool m_value; }; using BooleanPtr = std::shared_ptr; -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/builtin_class.cpp b/source/dynamic_value/builtin_class.cpp index f377e9ab..c5978bfb 100644 --- a/source/dynamic_value/builtin_class.cpp +++ b/source/dynamic_value/builtin_class.cpp @@ -6,7 +6,7 @@ #include "common/exception.h" #include "common/unimplemented.h" -namespace selector +namespace pagoda { BuiltinClass::BuiltinClass(const TypeInfoPtr& typeInfo) : DynamicValueBase(typeInfo), ClassBase(typeInfo->GetTypeName()) { @@ -18,4 +18,4 @@ FunctionPtr BuiltinClass::Bind(std::shared_ptr callable, std::sha boundMethod->SetVariadic(true); return boundMethod; } -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/builtin_class.h b/source/dynamic_value/builtin_class.h index 57edc20b..52a7d8d1 100644 --- a/source/dynamic_value/builtin_class.h +++ b/source/dynamic_value/builtin_class.h @@ -3,7 +3,7 @@ #include "class_base.h" #include "dynamic_value_base.h" -namespace selector +namespace pagoda { class TypeInfo; using TypeInfoPtr = std::shared_ptr; @@ -15,4 +15,4 @@ class BuiltinClass : public DynamicValueBase, public ClassBase FunctionPtr Bind(std::shared_ptr callable, std::shared_ptr globals = nullptr); }; -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/callable_body_not_set.cpp b/source/dynamic_value/callable_body_not_set.cpp index a50ca015..24f61dc0 100644 --- a/source/dynamic_value/callable_body_not_set.cpp +++ b/source/dynamic_value/callable_body_not_set.cpp @@ -1,9 +1,9 @@ #include "callable_body_not_set.h" -namespace selector +namespace pagoda { CallableBodyNotSet::CallableBodyNotSet(const std::string &dynamicValueName) : Exception("Callable body not set in " + dynamicValueName) { } -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/callable_body_not_set.h b/source/dynamic_value/callable_body_not_set.h index 45ff136b..ea2aef79 100644 --- a/source/dynamic_value/callable_body_not_set.h +++ b/source/dynamic_value/callable_body_not_set.h @@ -2,11 +2,11 @@ #include "common/exception.h" -namespace selector +namespace pagoda { class CallableBodyNotSet : public Exception { public: CallableBodyNotSet(const std::string &dynamicValueName); }; -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/class_base.cpp b/source/dynamic_value/class_base.cpp index 3a80ceea..ec1a3a76 100644 --- a/source/dynamic_value/class_base.cpp +++ b/source/dynamic_value/class_base.cpp @@ -2,7 +2,7 @@ #include "value_not_found.h" -namespace selector +namespace pagoda { ClassBase::ClassBase(const std::string &name) : m_memberTable(std::make_shared(name)) {} @@ -26,4 +26,4 @@ DynamicValueBasePtr ClassBase::GetMember(const std::string &name) { return m_mem DynamicValueTable::iterator ClassBase::GetMembersBegin() { return m_memberTable->begin(); } DynamicValueTable::iterator ClassBase::GetMembersEnd() { return m_memberTable->end(); } std::shared_ptr ClassBase::GetInstanceValueTable() { return m_memberTable; } -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/class_base.h b/source/dynamic_value/class_base.h index b3dbe5e8..9271d487 100644 --- a/source/dynamic_value/class_base.h +++ b/source/dynamic_value/class_base.h @@ -2,7 +2,7 @@ #include "dynamic_value_table.h" -namespace selector +namespace pagoda { class ICallableBody; @@ -35,4 +35,4 @@ class ClassBase protected: std::shared_ptr m_memberTable; }; -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/dynamic_class.cpp b/source/dynamic_value/dynamic_class.cpp index 28db49a7..47f1a196 100644 --- a/source/dynamic_value/dynamic_class.cpp +++ b/source/dynamic_value/dynamic_class.cpp @@ -10,7 +10,7 @@ #include "common/unimplemented.h" -namespace selector +namespace pagoda { const TypeInfoPtr DynamicClass::typeInfo = std::make_shared("DynamicClass"); @@ -73,4 +73,4 @@ FunctionPtr DynamicClass::Bind(std::shared_ptr callable, std::sha UNIMPLEMENTED; } -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/dynamic_class.h b/source/dynamic_value/dynamic_class.h index faada187..2d36a4a8 100644 --- a/source/dynamic_value/dynamic_class.h +++ b/source/dynamic_value/dynamic_class.h @@ -4,7 +4,7 @@ #include "dynamic_value_base.h" #include "icallable.h" -namespace selector +namespace pagoda { class TypeInfo; using TypeInfoPtr = std::shared_ptr; @@ -12,7 +12,7 @@ using TypeInfoPtr = std::shared_ptr; class ICallableBody; /** - * Represents a dynamic class that can be defined in selscript. + * Represents a dynamic class that can be defined in pgscript. */ class DynamicClass : public DynamicValueBase, public ClassBase, public ICallable { @@ -58,4 +58,4 @@ class DynamicClass : public DynamicValueBase, public ClassBase, public ICallable }; using DynamicClassPtr = std::shared_ptr; -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/dynamic_instance.cpp b/source/dynamic_value/dynamic_instance.cpp index 8269f3f3..3e6c8d3f 100644 --- a/source/dynamic_value/dynamic_instance.cpp +++ b/source/dynamic_value/dynamic_instance.cpp @@ -8,7 +8,7 @@ #include "value_not_found.h" #include "value_visitor.h" -namespace selector +namespace pagoda { const TypeInfoPtr DynamicInstance::s_typeInfo = std::make_shared("DynamicInstance"); @@ -41,4 +41,4 @@ FunctionPtr DynamicInstance::Bind(std::shared_ptr callable, std:: boundMethod->SetClosure(closure); return boundMethod; } -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/dynamic_instance.h b/source/dynamic_value/dynamic_instance.h index 079d79fd..c64ba5a0 100644 --- a/source/dynamic_value/dynamic_instance.h +++ b/source/dynamic_value/dynamic_instance.h @@ -3,7 +3,7 @@ #include "dynamic_value_base.h" #include "class_base.h" -namespace selector +namespace pagoda { class TypeInfo; using TypeInfoPtr = std::shared_ptr; @@ -19,7 +19,7 @@ class ICallableBody; class DynamicValueTable; /** - * Represents a dynamic instance that can be created in selscript. + * Represents a dynamic instance that can be created in pgscript. */ class DynamicInstance : public DynamicValueBase, public ClassBase { @@ -40,4 +40,4 @@ class DynamicInstance : public DynamicValueBase, public ClassBase }; using DynamicInstancePtr = std::shared_ptr; -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/dynamic_plane.cpp b/source/dynamic_value/dynamic_plane.cpp index 3c7544c1..f0a29b7f 100644 --- a/source/dynamic_value/dynamic_plane.cpp +++ b/source/dynamic_value/dynamic_plane.cpp @@ -9,7 +9,7 @@ #include "member_function_callable_body.h" #include "register_member_function.h" -namespace selector +namespace pagoda { const TypeInfoPtr DynamicPlane::s_typeInfo = std::make_shared("Plane"); @@ -74,5 +74,5 @@ void DynamicPlane::RegisterMembers() RegisterMemberFunction(this, "GetVector2", make_member_function(&DynamicPlane::GetVector2)); RegisterMemberFunction(this, "GetDistanceToOrigin", make_member_function(&DynamicPlane::GetDistanceToOrigin)); } -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/dynamic_plane.h b/source/dynamic_value/dynamic_plane.h index 1217cffb..df72542b 100644 --- a/source/dynamic_value/dynamic_plane.h +++ b/source/dynamic_value/dynamic_plane.h @@ -6,7 +6,7 @@ #include "math_lib/plane.h" #include "math_lib/vec_base.h" -namespace selector +namespace pagoda { class FloatValue; using FloatValuePtr = std::shared_ptr; @@ -48,4 +48,4 @@ class DynamicPlane : public BuiltinClass Plane m_nativePlane; }; -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/dynamic_value_base.cpp b/source/dynamic_value/dynamic_value_base.cpp index 420658fa..9d372601 100644 --- a/source/dynamic_value/dynamic_value_base.cpp +++ b/source/dynamic_value/dynamic_value_base.cpp @@ -3,11 +3,11 @@ #include "type_info.h" #include "value_visitor.h" -namespace selector +namespace pagoda { const TypeInfoPtr DynamicValueBase::s_typeInfo = std::make_shared("DynamicValueBase"); DynamicValueBase::DynamicValueBase(TypeInfoPtr typeInfo) : m_typeInfo(typeInfo) {} DynamicValueBase::~DynamicValueBase() {} TypeInfoPtr DynamicValueBase::GetTypeInfo() const { return m_typeInfo; } -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/dynamic_value_base.h b/source/dynamic_value/dynamic_value_base.h index 646fcdf4..3b769426 100644 --- a/source/dynamic_value/dynamic_value_base.h +++ b/source/dynamic_value/dynamic_value_base.h @@ -3,7 +3,7 @@ #include #include -namespace selector +namespace pagoda { class TypeInfo; using TypeInfoPtr = std::shared_ptr; @@ -11,7 +11,7 @@ using TypeInfoPtr = std::shared_ptr; class ValueVisitorBase; /** - * Represents a base class that can be used as parameters and as instances in selscript. + * Represents a base class that can be used as parameters and as instances in pgscript. */ class DynamicValueBase : public std::enable_shared_from_this { @@ -42,4 +42,4 @@ class DynamicValueBase : public std::enable_shared_from_this }; using DynamicValueBasePtr = std::shared_ptr; -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/dynamic_value_table.cpp b/source/dynamic_value/dynamic_value_table.cpp index 728f4793..02a3a6f6 100644 --- a/source/dynamic_value/dynamic_value_table.cpp +++ b/source/dynamic_value/dynamic_value_table.cpp @@ -5,7 +5,7 @@ #include -namespace selector +namespace pagoda { DynamicValueTable::DynamicValueTable(const std::string &tableName) : m_tableName(tableName) {} @@ -60,4 +60,4 @@ typename DynamicValueTable::Entry &DynamicValueTable::FindValue(const std::strin } throw ValueNotFoundException(name); } -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/dynamic_value_table.h b/source/dynamic_value/dynamic_value_table.h index fd65c99b..a1c9ebe8 100644 --- a/source/dynamic_value/dynamic_value_table.h +++ b/source/dynamic_value/dynamic_value_table.h @@ -4,7 +4,7 @@ #include #include -namespace selector +namespace pagoda { class DynamicValueBase; using DynamicValueBasePtr = std::shared_ptr; @@ -77,4 +77,4 @@ class DynamicValueTable std::string m_tableName; }; -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/expression.cpp b/source/dynamic_value/expression.cpp index ec224cf5..956af1a2 100644 --- a/source/dynamic_value/expression.cpp +++ b/source/dynamic_value/expression.cpp @@ -12,16 +12,16 @@ #include "value_not_found.h" #include "value_visitor.h" -#include "selscript/intermediate/ast.h" -#include "selscript/intermediate/ast_visitor.h" -#include "selscript/interpreter/interpreter.h" -#include "selscript/parser/parser.h" +#include "pgscript/intermediate/ast.h" +#include "pgscript/intermediate/ast_visitor.h" +#include "pgscript/interpreter/interpreter.h" +#include "pgscript/parser/parser.h" #include "common/profiler.h" #include -namespace selector +namespace pagoda { const TypeInfoPtr Expression::s_typeInfo = std::make_shared("Expression"); @@ -48,7 +48,7 @@ class ExpressionInterpreter : public Interpreter static const DynamicClassPtr m_parameterClass; }; -const DynamicClassPtr ExpressionInterpreter::m_parameterClass = std::make_shared("SelectorObject"); +const DynamicClassPtr ExpressionInterpreter::m_parameterClass = std::make_shared("PagodaObject"); class ExpressionValidator : public AstVisitor { @@ -335,5 +335,5 @@ std::string Expression::ToString() const { return m_implementation->ToString(); void Expression::AcceptVisitor(ValueVisitorBase &visitor) { visitor.Visit(*this); } DynamicValueBasePtr Expression::Evaluate() { return m_implementation->Evaluate(); } -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/expression.h b/source/dynamic_value/expression.h index fcc99ab2..d7ad9487 100644 --- a/source/dynamic_value/expression.h +++ b/source/dynamic_value/expression.h @@ -1,5 +1,5 @@ -#ifndef SELECTOR_PARAMETER_EXPRESSION_H_ -#define SELECTOR_PARAMETER_EXPRESSION_H_ +#ifndef PAGODA_PARAMETER_EXPRESSION_H_ +#define PAGODA_PARAMETER_EXPRESSION_H_ #include "../parameter/variable.h" @@ -10,7 +10,7 @@ #include #include -namespace selector +namespace pagoda { class TypeInfo; using TypeInfoPtr = std::shared_ptr; @@ -81,5 +81,5 @@ class Expression : public DynamicValueBase }; using ExpressionPtr = std::shared_ptr; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/dynamic_value/float_value.cpp b/source/dynamic_value/float_value.cpp index 97f0e180..95996a22 100644 --- a/source/dynamic_value/float_value.cpp +++ b/source/dynamic_value/float_value.cpp @@ -4,7 +4,7 @@ #include "type_info.h" #include "value_visitor.h" -namespace selector +namespace pagoda { const TypeInfoPtr FloatValue::s_typeInfo = std::make_shared("Float"); @@ -57,4 +57,4 @@ bool FloatValue::operator>(const Integer& f) const { return m_value > static_cas bool FloatValue::operator>=(const Integer& f) const { return m_value >= static_cast(f); } void FloatValue::AcceptVisitor(ValueVisitorBase& visitor) { visitor.Visit(*this); } -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/float_value.h b/source/dynamic_value/float_value.h index a3d0ae29..58486ad0 100644 --- a/source/dynamic_value/float_value.h +++ b/source/dynamic_value/float_value.h @@ -2,7 +2,7 @@ #include "dynamic_value_base.h" -namespace selector +namespace pagoda { class Integer; using IntegerPtr = std::shared_ptr; @@ -83,4 +83,4 @@ class FloatValue : public DynamicValueBase float m_value; }; using FloatValuePtr = std::shared_ptr; -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/free_function_callable_body.h b/source/dynamic_value/free_function_callable_body.h index 06220d63..9cf7f36a 100644 --- a/source/dynamic_value/free_function_callable_body.h +++ b/source/dynamic_value/free_function_callable_body.h @@ -4,7 +4,7 @@ #include "binding/return_from_function.h" -namespace selector +namespace pagoda { /** * Implements a wrapper for a c++ free function \c ICallableBody. @@ -34,4 +34,4 @@ struct FreeFunctionCallableBody : public ICallableBody FunctionType m_function; std::shared_ptr m_closure; }; -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/function.cpp b/source/dynamic_value/function.cpp index c55fccfa..d5299fcd 100644 --- a/source/dynamic_value/function.cpp +++ b/source/dynamic_value/function.cpp @@ -4,7 +4,7 @@ #include "type_info.h" #include "value_visitor.h" -namespace selector +namespace pagoda { const TypeInfoPtr Function::s_typeInfo = std::make_shared("Function"); @@ -47,4 +47,4 @@ DynamicValueBasePtr Function::Call(const std::vector& args) } return std::make_shared(); } -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/function.h b/source/dynamic_value/function.h index a122702d..84163369 100644 --- a/source/dynamic_value/function.h +++ b/source/dynamic_value/function.h @@ -4,7 +4,7 @@ #include "icallable.h" #include "icallable_body.h" -namespace selector +namespace pagoda { class Function : public DynamicValueBase, public ICallable { @@ -42,4 +42,4 @@ class Function : public DynamicValueBase, public ICallable std::size_t m_arity; bool m_isVariadic; }; -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/get_value_as.h b/source/dynamic_value/get_value_as.h index dd5cf20f..4e3e048d 100644 --- a/source/dynamic_value/get_value_as.h +++ b/source/dynamic_value/get_value_as.h @@ -7,7 +7,7 @@ #include "common/exception.h" -namespace selector +namespace pagoda { /** * Exception to be thrown when it is impossible to cast a \c DynamicValueBase to a native type. @@ -58,4 +58,4 @@ typename std::remove_reference::type get_value_as(DynamicValueBase& v) convert_to_native_visitor visitor; return apply_visitor(visitor, v); } -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/icallable.h b/source/dynamic_value/icallable.h index dca4d989..db6c59c6 100644 --- a/source/dynamic_value/icallable.h +++ b/source/dynamic_value/icallable.h @@ -2,7 +2,7 @@ #include -namespace selector +namespace pagoda { class DynamicValueBase; using DynamicValueBasePtr = std::shared_ptr; @@ -27,4 +27,4 @@ class ICallable virtual DynamicValueBasePtr Call(const std::vector& args) = 0; }; -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/icallable_body.h b/source/dynamic_value/icallable_body.h index c6137727..c481a5db 100644 --- a/source/dynamic_value/icallable_body.h +++ b/source/dynamic_value/icallable_body.h @@ -5,7 +5,7 @@ #include #include -namespace selector +namespace pagoda { class DynamicValueBase; using DynamicValueBasePtr = std::shared_ptr; @@ -19,4 +19,4 @@ class ICallableBody virtual void SetClosure(const std::shared_ptr&) = 0; virtual const std::shared_ptr& GetClosure() const = 0; }; -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/integer_value.cpp b/source/dynamic_value/integer_value.cpp index 6b6aa4ac..d596a657 100644 --- a/source/dynamic_value/integer_value.cpp +++ b/source/dynamic_value/integer_value.cpp @@ -5,7 +5,7 @@ #include "type_info.h" #include "value_visitor.h" -namespace selector +namespace pagoda { const TypeInfoPtr Integer::s_typeInfo = std::make_shared("Integer"); @@ -62,4 +62,4 @@ bool Integer::operator>(const FloatValue& f) const { return m_value > static_cas bool Integer::operator>=(const FloatValue& f) const { return m_value >= static_cast(f); } void Integer::AcceptVisitor(ValueVisitorBase& visitor) { visitor.Visit(*this); } -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/integer_value.h b/source/dynamic_value/integer_value.h index 7593683e..99e915d8 100644 --- a/source/dynamic_value/integer_value.h +++ b/source/dynamic_value/integer_value.h @@ -2,7 +2,7 @@ #include "dynamic_value_base.h" -namespace selector +namespace pagoda { class TypeInfo; using TypeInfoPtr = std::shared_ptr; @@ -88,4 +88,4 @@ class Integer : public DynamicValueBase int m_value; }; using IntegerPtr = std::shared_ptr; -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/member_function_callable_body.h b/source/dynamic_value/member_function_callable_body.h index 66cf7af5..c5639ffa 100644 --- a/source/dynamic_value/member_function_callable_body.h +++ b/source/dynamic_value/member_function_callable_body.h @@ -4,7 +4,7 @@ #include "binding/return_from_member_function.h" -namespace selector +namespace pagoda { /** * Implements a wrapper for a c++ member function \c ICallableBody. @@ -41,4 +41,4 @@ struct MemberFunctionCallableBody : public ICallableBody FunctionType m_function; std::shared_ptr m_closure; }; -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/null_object_value.cpp b/source/dynamic_value/null_object_value.cpp index 0cb02fbd..63dc28e7 100644 --- a/source/dynamic_value/null_object_value.cpp +++ b/source/dynamic_value/null_object_value.cpp @@ -3,7 +3,7 @@ #include "type_info.h" #include "value_visitor.h" -namespace selector +namespace pagoda { const TypeInfoPtr NullObject::s_typeInfo = std::make_shared("Null"); @@ -13,4 +13,4 @@ NullObject::~NullObject() {} std::string NullObject::ToString() const { return "null"; } void NullObject::AcceptVisitor(ValueVisitorBase& visitor) { visitor.Visit(*this); } -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/null_object_value.h b/source/dynamic_value/null_object_value.h index e2bac05f..ac954019 100644 --- a/source/dynamic_value/null_object_value.h +++ b/source/dynamic_value/null_object_value.h @@ -2,7 +2,7 @@ #include "dynamic_value_base.h" -namespace selector +namespace pagoda { class TypeInfo; using TypeInfoPtr = std::shared_ptr; @@ -21,4 +21,4 @@ class NullObject : public DynamicValueBase }; using NullObjectPtr = std::shared_ptr; -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/register_member_function.h b/source/dynamic_value/register_member_function.h index 44693a72..b0a07b16 100644 --- a/source/dynamic_value/register_member_function.h +++ b/source/dynamic_value/register_member_function.h @@ -1,6 +1,6 @@ #pragma once -namespace selector +namespace pagoda { template void RegisterMemberFunction(C* instance, const std::string& name, const F& memberFunction) @@ -8,4 +8,4 @@ void RegisterMemberFunction(C* instance, const std::string& name, const F& membe instance->RegisterMember(name, std::make_shared(std::make_shared>( *static_cast(instance), memberFunction))); } -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/set_value_from.h b/source/dynamic_value/set_value_from.h index 0c4e8c49..e11f0771 100644 --- a/source/dynamic_value/set_value_from.h +++ b/source/dynamic_value/set_value_from.h @@ -18,7 +18,7 @@ #include "common/exception.h" -namespace selector +namespace pagoda { /** * Exception to be thrown when it is impossible to cast a \c DynamicValueBase to a native type. @@ -95,4 +95,4 @@ void set_value_from(DynamicValueBase& v, const typename std::remove_reference convert_from_native_visitor visitor(n); apply_visitor(visitor, v); } -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/string_value.cpp b/source/dynamic_value/string_value.cpp index 6eb1b447..54fefe5a 100644 --- a/source/dynamic_value/string_value.cpp +++ b/source/dynamic_value/string_value.cpp @@ -4,7 +4,7 @@ #include "type_info.h" #include "value_visitor.h" -namespace selector +namespace pagoda { const TypeInfoPtr String::s_typeInfo = std::make_shared("String"); @@ -38,4 +38,4 @@ bool String::operator==(const String& s) const { return m_value == s.m_value; } bool String::operator!=(const String& s) const { return m_value != s.m_value; } void String::AcceptVisitor(ValueVisitorBase& visitor) { visitor.Visit(*this); } -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/string_value.h b/source/dynamic_value/string_value.h index 46d48338..045de3ec 100644 --- a/source/dynamic_value/string_value.h +++ b/source/dynamic_value/string_value.h @@ -2,7 +2,7 @@ #include "dynamic_value_base.h" -namespace selector +namespace pagoda { class TypeInfo; using TypeInfoPtr = std::shared_ptr; @@ -48,4 +48,4 @@ class String : public DynamicValueBase std::string m_value; }; using StringPtr = std::shared_ptr; -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/type_info.cpp b/source/dynamic_value/type_info.cpp index 52e3f0e9..2d1bcaa4 100644 --- a/source/dynamic_value/type_info.cpp +++ b/source/dynamic_value/type_info.cpp @@ -3,7 +3,7 @@ #include "dynamic_value_base.h" #include "value_visitor.h" -namespace selector +namespace pagoda { const std::shared_ptr TypeInfo::s_typeInfo = std::make_shared("TypeInfo"); @@ -16,4 +16,4 @@ std::string TypeInfo::GetTypeName() const { return m_typeName; } std::string TypeInfo::ToString() const { return ""; } void TypeInfo::AcceptVisitor(ValueVisitorBase& visitor) { visitor.Visit(*this); } -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/type_info.h b/source/dynamic_value/type_info.h index 90dd2a5a..04b96338 100644 --- a/source/dynamic_value/type_info.h +++ b/source/dynamic_value/type_info.h @@ -4,7 +4,7 @@ #include -namespace selector +namespace pagoda { /** * Represents the type information for all \c DynamicValueBase. @@ -37,4 +37,4 @@ class TypeInfo : public DynamicValueBase }; using TypeInfoPtr = std::shared_ptr; -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/undefined_operator.cpp b/source/dynamic_value/undefined_operator.cpp index 7800d6b5..a1a36f00 100644 --- a/source/dynamic_value/undefined_operator.cpp +++ b/source/dynamic_value/undefined_operator.cpp @@ -2,7 +2,7 @@ #include "type_info.h" -namespace selector +namespace pagoda { UndefinedBinaryOperatorException::UndefinedBinaryOperatorException(const std::string &op, const TypeInfoPtr &lhsType, const TypeInfoPtr &rhsType) @@ -23,4 +23,4 @@ UndefinedUnaryOperatorException::UndefinedUnaryOperatorException(const std::stri } UndefinedUnaryOperatorException::~UndefinedUnaryOperatorException() {} -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/undefined_operator.h b/source/dynamic_value/undefined_operator.h index 9c8f410d..f7255c88 100644 --- a/source/dynamic_value/undefined_operator.h +++ b/source/dynamic_value/undefined_operator.h @@ -6,7 +6,7 @@ #include #include -namespace selector +namespace pagoda { class TypeInfo; using TypeInfoPtr = std::shared_ptr; @@ -38,4 +38,4 @@ class UndefinedUnaryOperatorException : public Exception std::string m_operatorName; const TypeInfoPtr &m_operandType; }; -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/value_not_found.cpp b/source/dynamic_value/value_not_found.cpp index b38f8ef2..57e60b13 100644 --- a/source/dynamic_value/value_not_found.cpp +++ b/source/dynamic_value/value_not_found.cpp @@ -1,9 +1,9 @@ #include "value_not_found.h" -namespace selector +namespace pagoda { ValueNotFoundException::ValueNotFoundException(const std::string &valueName) : Exception("Value with name '" + valueName + "' not found in value table") { } -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/value_not_found.h b/source/dynamic_value/value_not_found.h index 665d71ad..36a6d2fd 100644 --- a/source/dynamic_value/value_not_found.h +++ b/source/dynamic_value/value_not_found.h @@ -5,11 +5,11 @@ #include #include -namespace selector +namespace pagoda { class ValueNotFoundException : public Exception { public: ValueNotFoundException(const std::string &name); }; -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/value_visitor.h b/source/dynamic_value/value_visitor.h index 6290791c..a3e16bb2 100644 --- a/source/dynamic_value/value_visitor.h +++ b/source/dynamic_value/value_visitor.h @@ -20,7 +20,7 @@ #include #include -namespace selector +namespace pagoda { template struct ValueVisitor @@ -118,4 +118,4 @@ class value_type_visitor : public ValueVisitor } }; -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/vector3.cpp b/source/dynamic_value/vector3.cpp index 3f49aba9..d8a05d7c 100644 --- a/source/dynamic_value/vector3.cpp +++ b/source/dynamic_value/vector3.cpp @@ -10,7 +10,7 @@ #include "member_function_callable_body.h" #include "register_member_function.h" -namespace selector +namespace pagoda { const TypeInfoPtr Vector3::s_typeInfo = std::make_shared("Vector3"); @@ -63,4 +63,4 @@ void Vector3::RegisterMembers() RegisterMemberFunction(this, "GetY", make_member_function(&Vector3::GetY)); RegisterMemberFunction(this, "GetZ", make_member_function(&Vector3::GetZ)); } -} // namespace selector +} // namespace pagoda diff --git a/source/dynamic_value/vector3.h b/source/dynamic_value/vector3.h index a391590a..e2dce7fd 100644 --- a/source/dynamic_value/vector3.h +++ b/source/dynamic_value/vector3.h @@ -5,7 +5,7 @@ #include "math_lib/vec_base.h" -namespace selector +namespace pagoda { class FloatValue; using FloatValuePtr = std::shared_ptr; @@ -54,4 +54,4 @@ class Vector3 : public BuiltinClass Vec3F m_nativeVector; }; -} // namespace selector +} // namespace pagoda diff --git a/source/geometry_core/CMakeLists.txt b/source/geometry_core/CMakeLists.txt index cf0af5a1..41cadb98 100644 --- a/source/geometry_core/CMakeLists.txt +++ b/source/geometry_core/CMakeLists.txt @@ -27,7 +27,7 @@ add_library(geometry_core OBJECT ${GEOMETRY_CORE_SRCS}) target_include_directories( geometry_core PRIVATE - $ + $ $ ${Boost_INCLUDE_DIRS} ${SELSCRIPT_INCLUDE_DIR} diff --git a/source/geometry_core/geometry.h b/source/geometry_core/geometry.h index a54092e0..48863dda 100644 --- a/source/geometry_core/geometry.h +++ b/source/geometry_core/geometry.h @@ -1,5 +1,5 @@ -#ifndef SELECTOR_GEOMETRY_CORE_GEOMETRY_H_ -#define SELECTOR_GEOMETRY_CORE_GEOMETRY_H_ +#ifndef PAGODA_GEOMETRY_CORE_GEOMETRY_H_ +#define PAGODA_GEOMETRY_CORE_GEOMETRY_H_ #include #include @@ -15,7 +15,7 @@ #include -namespace selector +namespace pagoda { /** * Default attributes for vertices. @@ -85,5 +85,5 @@ class GeometryBase : public Topology AssociativeIndexedContainer m_faceAttributes; }; // class Geometry -} // namespace selector +} // namespace pagoda #endif diff --git a/source/geometry_core/geometry_builder.h b/source/geometry_core/geometry_builder.h index fe8f766c..85267159 100644 --- a/source/geometry_core/geometry_builder.h +++ b/source/geometry_core/geometry_builder.h @@ -1,5 +1,5 @@ -#ifndef SELECTOR_GEOMETRY_CORE_GEOMETRY_BUILDER_H -#define SELECTOR_GEOMETRY_CORE_GEOMETRY_BUILDER_H +#ifndef PAGODA_GEOMETRY_CORE_GEOMETRY_BUILDER_H +#define PAGODA_GEOMETRY_CORE_GEOMETRY_BUILDER_H #include "common/assertions.h" #include "common/logger.h" @@ -13,7 +13,7 @@ #include #include -namespace selector +namespace pagoda { /** * Helper class to build a geometry. @@ -247,6 +247,6 @@ class GeometryBuilderT AssociativeIndexedContainer m_pointData; }; // class GeometryBuilderT -} // namespace selector +} // namespace pagoda #endif diff --git a/source/geometry_core/geometry_exporter.h b/source/geometry_core/geometry_exporter.h index f267b64b..8641a69f 100644 --- a/source/geometry_core/geometry_exporter.h +++ b/source/geometry_core/geometry_exporter.h @@ -1,5 +1,5 @@ -#ifndef SELECTOR_GEOMETRY_CORE_GEOMETRY_EXPORTER_H_ -#define SELECTOR_GEOMETRY_CORE_GEOMETRY_EXPORTER_H_ +#ifndef PAGODA_GEOMETRY_CORE_GEOMETRY_EXPORTER_H_ +#define PAGODA_GEOMETRY_CORE_GEOMETRY_EXPORTER_H_ #include @@ -8,7 +8,7 @@ #include #include -namespace selector +namespace pagoda { template class GeometryExporter @@ -111,5 +111,5 @@ class ObjExporter : public GeometryExporter }; // class ObjExporter -} // namespace selector +} // namespace pagoda #endif diff --git a/source/geometry_core/geometry_sizes.h b/source/geometry_core/geometry_sizes.h index be38373d..a854f739 100644 --- a/source/geometry_core/geometry_sizes.h +++ b/source/geometry_core/geometry_sizes.h @@ -1,10 +1,10 @@ #pragma once -#ifndef SELECTOR_GEOMETRY_CORE_GEOMETRY_SIZES_H_ -#define SELECTOR_GEOMETRY_CORE_GEOMETRY_SIZES_H_ +#ifndef PAGODA_GEOMETRY_CORE_GEOMETRY_SIZES_H_ +#define PAGODA_GEOMETRY_CORE_GEOMETRY_SIZES_H_ #include -namespace selector +namespace pagoda { struct GeometrySizes { @@ -18,6 +18,6 @@ struct GeometrySizes } }; // struct GeometryDimensions -} // namespace selector +} // namespace pagoda #endif diff --git a/source/geometry_core/indexed_container.h b/source/geometry_core/indexed_container.h index 17358113..03656086 100644 --- a/source/geometry_core/indexed_container.h +++ b/source/geometry_core/indexed_container.h @@ -1,5 +1,5 @@ -#ifndef SELECTOR_GEOMETRY_CORE_INDEXED_CONTAINTER_H_ -#define SELECTOR_GEOMETRY_CORE_INDEXED_CONTAINTER_H_ +#ifndef PAGODA_GEOMETRY_CORE_INDEXED_CONTAINTER_H_ +#define PAGODA_GEOMETRY_CORE_INDEXED_CONTAINTER_H_ #include "common/assertions.h" #include "common/exception.h" @@ -10,7 +10,7 @@ #include -namespace selector +namespace pagoda { template class IndexedDeletedException : public Exception @@ -261,6 +261,6 @@ class AssociativeIndexedContainer IndexType m_nextIndex; ContainerType m_container; }; // class AssociativeIndexedContainer -} // namespace selector +} // namespace pagoda #endif diff --git a/source/geometry_core/scope.cpp b/source/geometry_core/scope.cpp index a46fab51..b4019ead 100644 --- a/source/geometry_core/scope.cpp +++ b/source/geometry_core/scope.cpp @@ -7,7 +7,7 @@ #include #include -namespace selector +namespace pagoda { Scope::Scope() : m_position{0, 0, 0}, m_size{0, 0, 0}, m_rotation(boost::qvm::diag_mat(Vec3F{1, 1, 1})) {} @@ -128,4 +128,4 @@ Vec3F Scope::GetCenterPointInLocal() const { return 0.5f * (GetLocalPoint(BoxPoints::LowerBottomLeft) + GetLocalPoint(BoxPoints::HigherTopRight)); } -} // namespace selector +} // namespace pagoda diff --git a/source/geometry_core/scope.h b/source/geometry_core/scope.h index 44c02d0a..c2a4fb29 100644 --- a/source/geometry_core/scope.h +++ b/source/geometry_core/scope.h @@ -1,5 +1,5 @@ -#ifndef SELECTOR_GEOMETRY_CORE_SCOPE_H_ -#define SELECTOR_GEOMETRY_CORE_SCOPE_H_ +#ifndef PAGODA_GEOMETRY_CORE_SCOPE_H_ +#define PAGODA_GEOMETRY_CORE_SCOPE_H_ #include #include @@ -12,7 +12,7 @@ #include #include -namespace selector +namespace pagoda { /** * Represents an oriented bounding box to be used as a local frame of coordinates for geometries. @@ -160,5 +160,5 @@ class Scope /// Scope rotation Mat3x3F m_rotation; }; // class Scope -} // namespace selector +} // namespace pagoda #endif diff --git a/source/geometry_core/split_point_topology.cpp b/source/geometry_core/split_point_topology.cpp index 1c6ee1e8..39102b13 100644 --- a/source/geometry_core/split_point_topology.cpp +++ b/source/geometry_core/split_point_topology.cpp @@ -2,7 +2,7 @@ #include "common/logger.h" -namespace selector +namespace pagoda { const SplitPointTopology::Index_t SplitPointTopology::s_invalidIndex = std::numeric_limits::max(); @@ -966,4 +966,4 @@ void SplitPointTopology::DumpToStream(std::ostream &outStream) } outStream << std::endl; } -} // namespace selector +} // namespace pagoda diff --git a/source/geometry_core/split_point_topology.h b/source/geometry_core/split_point_topology.h index b5507dd7..e9cfac77 100644 --- a/source/geometry_core/split_point_topology.h +++ b/source/geometry_core/split_point_topology.h @@ -1,5 +1,5 @@ -#ifndef SELECTOR_SPLIT_POINT_TOPOLOGY_H_ -#define SELECTOR_SPLIT_POINT_TOPOLOGY_H_ +#ifndef PAGODA_SPLIT_POINT_TOPOLOGY_H_ +#define PAGODA_SPLIT_POINT_TOPOLOGY_H_ #include "indexed_container.h" @@ -7,7 +7,7 @@ #include #include -namespace selector +namespace pagoda { /** * Implements a Split Point Topology to be used by \c Geometry. @@ -667,6 +667,6 @@ class SplitPointTopology FaceContainer_t m_faces; }; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/geometry_operations/CMakeLists.txt b/source/geometry_operations/CMakeLists.txt index b304f2ed..64c090c2 100644 --- a/source/geometry_operations/CMakeLists.txt +++ b/source/geometry_operations/CMakeLists.txt @@ -29,7 +29,7 @@ add_library(geometry_operations OBJECT ${GEOMETRY_OPERATIONS_SRCS}) target_include_directories( geometry_operations PRIVATE - $ + $ $ ${Boost_INCLUDE_DIRS} ${SELSCRIPT_INCLUDE_DIR} diff --git a/source/geometry_operations/clip.h b/source/geometry_operations/clip.h index efa9f0a4..1ed5856a 100644 --- a/source/geometry_operations/clip.h +++ b/source/geometry_operations/clip.h @@ -1,5 +1,5 @@ -#ifndef SELECTOR_GEOMETRY_OPERATIONS_CLIP_H_ -#define SELECTOR_GEOMETRY_OPERATIONS_CLIP_H_ +#ifndef PAGODA_GEOMETRY_OPERATIONS_CLIP_H_ +#define PAGODA_GEOMETRY_OPERATIONS_CLIP_H_ #include "math_lib/intersection.h" #include "math_lib/line_3d.h" @@ -7,7 +7,7 @@ #include "geometry_core/geometry_builder.h" -namespace selector +namespace pagoda { template class Clip @@ -236,6 +236,6 @@ class Clip std::map::PlaneSide> m_faceSide; Plane m_plane; }; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/geometry_operations/create_box.h b/source/geometry_operations/create_box.h index 20fd4ed4..a247a99a 100644 --- a/source/geometry_operations/create_box.h +++ b/source/geometry_operations/create_box.h @@ -1,12 +1,12 @@ -#ifndef SELECTOR_GEOMETRY_OPERATIONS_CREATE_BOX_H_ -#define SELECTOR_GEOMETRY_OPERATIONS_CREATE_BOX_H_ +#ifndef PAGODA_GEOMETRY_OPERATIONS_CREATE_BOX_H_ +#define PAGODA_GEOMETRY_OPERATIONS_CREATE_BOX_H_ #include #include #include #include -namespace selector +namespace pagoda { template class CreateBox @@ -108,6 +108,6 @@ class CreateBox std::array m_points; }; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/geometry_operations/create_rect.h b/source/geometry_operations/create_rect.h index c43d0060..c6582435 100644 --- a/source/geometry_operations/create_rect.h +++ b/source/geometry_operations/create_rect.h @@ -1,5 +1,5 @@ -#ifndef SELECTOR_GEOMETRY_OPERATIONS_CREATE_RECT_H_ -#define SELECTOR_GEOMETRY_OPERATIONS_CREATE_RECT_H_ +#ifndef PAGODA_GEOMETRY_OPERATIONS_CREATE_RECT_H_ +#define PAGODA_GEOMETRY_OPERATIONS_CREATE_RECT_H_ #include #include @@ -8,7 +8,7 @@ #include -namespace selector +namespace pagoda { template class CreateRect @@ -54,6 +54,6 @@ class CreateRect Vec3F m_xAxis; Vec3F m_yAxis; }; // class CreateRect -} // namespace selector +} // namespace pagoda #endif diff --git a/source/geometry_operations/create_sphere.h b/source/geometry_operations/create_sphere.h index 010d5587..5c90908b 100644 --- a/source/geometry_operations/create_sphere.h +++ b/source/geometry_operations/create_sphere.h @@ -5,7 +5,7 @@ #include -namespace selector +namespace pagoda { template class CreateSphere @@ -97,4 +97,4 @@ class CreateSphere uint32_t m_slices; uint32_t m_stacks; }; -} // namespace selector +} // namespace pagoda diff --git a/source/geometry_operations/ear_clipping.h b/source/geometry_operations/ear_clipping.h index 78501f29..a67a182b 100644 --- a/source/geometry_operations/ear_clipping.h +++ b/source/geometry_operations/ear_clipping.h @@ -8,7 +8,7 @@ #include -namespace selector +namespace pagoda { template class EarClipping @@ -228,4 +228,4 @@ class EarClipping return (u >= 0) && (v >= 0) && (u + v < 1); } }; -} // namespace selector +} // namespace pagoda diff --git a/source/geometry_operations/explode_to_faces.h b/source/geometry_operations/explode_to_faces.h index e0a1d939..1825d410 100644 --- a/source/geometry_operations/explode_to_faces.h +++ b/source/geometry_operations/explode_to_faces.h @@ -6,7 +6,7 @@ #include "geometry_core/geometry.h" #include "geometry_core/geometry_builder.h" -namespace selector +namespace pagoda { template class ExplodeToFaces @@ -42,4 +42,4 @@ class ExplodeToFaces } } }; -} // namespace selector +} // namespace pagoda diff --git a/source/geometry_operations/extrusion.h b/source/geometry_operations/extrusion.h index 8e9fb728..f77b886e 100644 --- a/source/geometry_operations/extrusion.h +++ b/source/geometry_operations/extrusion.h @@ -1,5 +1,5 @@ -#ifndef SELECTOR_GEOMETRY_OPERATIONS_EXTRUSION_H_ -#define SELECTOR_GEOMETRY_OPERATIONS_EXTRUSION_H_ +#ifndef PAGODA_GEOMETRY_OPERATIONS_EXTRUSION_H_ +#define PAGODA_GEOMETRY_OPERATIONS_EXTRUSION_H_ #include #include @@ -9,7 +9,7 @@ #include -namespace selector +namespace pagoda { /** * Extrudes all faces of a Geometry along its normal by a given amount. @@ -111,5 +111,5 @@ class Extrusion /// The extrusion amount. float m_extrusionAMount; }; // class Extrusion -} // namespace selector +} // namespace pagoda #endif diff --git a/source/geometry_operations/extrusion_profile.h b/source/geometry_operations/extrusion_profile.h index 12df3562..c57b3474 100644 --- a/source/geometry_operations/extrusion_profile.h +++ b/source/geometry_operations/extrusion_profile.h @@ -1,11 +1,11 @@ -#ifndef SELECTOR_GEOMETRY_OPERATIONS_EXTRUSION_PROFILE_H_ -#define SELECTOR_GEOMETRY_OPERATIONS_EXTRUSION_PROFILE_H_ +#ifndef PAGODA_GEOMETRY_OPERATIONS_EXTRUSION_PROFILE_H_ +#define PAGODA_GEOMETRY_OPERATIONS_EXTRUSION_PROFILE_H_ #include #include -namespace selector +namespace pagoda { /** * Implements an extrusion profile that is to be applied to @@ -28,5 +28,5 @@ class ExtrusionProfile private: std::vector profile; }; // class ExtrusionProfile -} // namespace selector +} // namespace pagoda #endif diff --git a/source/geometry_operations/face_offset.h b/source/geometry_operations/face_offset.h index 0ef27a7c..0db017f9 100644 --- a/source/geometry_operations/face_offset.h +++ b/source/geometry_operations/face_offset.h @@ -7,7 +7,7 @@ #include -namespace selector +namespace pagoda { template class FaceOffset @@ -77,4 +77,4 @@ class FaceOffset private: float m_amount; }; -} // namespace selector +} // namespace pagoda diff --git a/source/geometry_operations/matrix_transform.h b/source/geometry_operations/matrix_transform.h index 7870c711..f54e82f3 100644 --- a/source/geometry_operations/matrix_transform.h +++ b/source/geometry_operations/matrix_transform.h @@ -6,7 +6,7 @@ #include #include -namespace selector +namespace pagoda { template class MatrixTransform @@ -39,4 +39,4 @@ class MatrixTransform private: Mat4x4F m_matrix; }; -} // namespace selector +} // namespace pagoda diff --git a/source/geometry_operations/plane_splits.h b/source/geometry_operations/plane_splits.h index 79bddeb5..789356b3 100644 --- a/source/geometry_operations/plane_splits.h +++ b/source/geometry_operations/plane_splits.h @@ -1,9 +1,9 @@ -#ifndef SELECTOR_GEOMETRY_OPERATIONS_PLANE_SPLITS_H_ -#define SELECTOR_GEOMETRY_OPERATIONS_PLANE_SPLITS_H_ +#ifndef PAGODA_GEOMETRY_OPERATIONS_PLANE_SPLITS_H_ +#define PAGODA_GEOMETRY_OPERATIONS_PLANE_SPLITS_H_ #include "clip.h" -namespace selector +namespace pagoda { template class PlaneSplits @@ -56,6 +56,6 @@ class PlaneSplits private: std::vector> m_planes; }; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/geometry_operations/triangulate.h b/source/geometry_operations/triangulate.h index c93d76e3..648cc7d4 100644 --- a/source/geometry_operations/triangulate.h +++ b/source/geometry_operations/triangulate.h @@ -1,5 +1,5 @@ -#ifndef SELECTOR_GEOMETRY_OPERATIONS_TRIANGULATE_H_ -#define SELECTOR_GEOMETRY_OPERATIONS_TRIANGULATE_H_ +#ifndef PAGODA_GEOMETRY_OPERATIONS_TRIANGULATE_H_ +#define PAGODA_GEOMETRY_OPERATIONS_TRIANGULATE_H_ #include #include @@ -11,7 +11,7 @@ #include -namespace selector +namespace pagoda { template class Triangulate @@ -62,6 +62,6 @@ class Triangulate } } }; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/math_lib/CMakeLists.txt b/source/math_lib/CMakeLists.txt index 264c5179..83750f5a 100644 --- a/source/math_lib/CMakeLists.txt +++ b/source/math_lib/CMakeLists.txt @@ -39,7 +39,7 @@ add_library(math_lib OBJECT ${MATH_LIB_SRCS}) target_include_directories( math_lib PRIVATE - $ + $ $ ${Boost_INCLUDE_DIRS} ${SELSCRIPT_INCLUDE_DIR} diff --git a/source/math_lib/bissectrix.h b/source/math_lib/bissectrix.h index fb0bd41f..46be8e05 100644 --- a/source/math_lib/bissectrix.h +++ b/source/math_lib/bissectrix.h @@ -5,7 +5,7 @@ #include #include -namespace selector +namespace pagoda { template boost::qvm::vec bissectrix(const boost::qvm::vec &v1, const boost::qvm::vec &v2) @@ -16,4 +16,4 @@ boost::qvm::vec bissectrix(const boost::qvm::vec &v1, cons } return boost::qvm::normalized(Rep(0.5) * (v1 + v2)); } -} // namespace selector +} // namespace pagoda diff --git a/source/math_lib/degrees.h b/source/math_lib/degrees.h index 3ad45b1f..affa479a 100644 --- a/source/math_lib/degrees.h +++ b/source/math_lib/degrees.h @@ -2,7 +2,7 @@ #include "math_utils.h" -namespace selector +namespace pagoda { template class Radians; @@ -22,4 +22,4 @@ class Degrees private: T m_degrees; }; -} // namespace selector +} // namespace pagoda diff --git a/source/math_lib/intersection.h b/source/math_lib/intersection.h index 237ae80c..91a4a2d8 100644 --- a/source/math_lib/intersection.h +++ b/source/math_lib/intersection.h @@ -1,5 +1,5 @@ -#ifndef SELECTOR_MATH_LIB_INTERSECTIONS_H_ -#define SELECTOR_MATH_LIB_INTERSECTIONS_H_ +#ifndef PAGODA_MATH_LIB_INTERSECTIONS_H_ +#define PAGODA_MATH_LIB_INTERSECTIONS_H_ #include "line_3d.h" #include "line_segment_3d.h" @@ -8,7 +8,7 @@ #include -namespace selector +namespace pagoda { template struct Intersection @@ -119,6 +119,6 @@ Intersection> intersection(const { return intersection(p, l); } -} // namespace selector +} // namespace pagoda #endif diff --git a/source/math_lib/length.h b/source/math_lib/length.h index 0819d8db..a31bf5b3 100644 --- a/source/math_lib/length.h +++ b/source/math_lib/length.h @@ -1,4 +1,4 @@ -#ifndef SELECTOR_MATH_LIB_LENGHT_H_ -#define SELECTOR_MATH_LIB_LENGHT_H_ +#ifndef PAGODA_MATH_LIB_LENGHT_H_ +#define PAGODA_MATH_LIB_LENGHT_H_ #endif diff --git a/source/math_lib/line_3d.h b/source/math_lib/line_3d.h index 330beb80..6cf7fe7a 100644 --- a/source/math_lib/line_3d.h +++ b/source/math_lib/line_3d.h @@ -1,12 +1,12 @@ -#ifndef SELECTOR_MATH_LIB_LINE_3D_H_ -#define SELECTOR_MATH_LIB_LINE_3D_H_ +#ifndef PAGODA_MATH_LIB_LINE_3D_H_ +#define PAGODA_MATH_LIB_LINE_3D_H_ #include "vec_base.h" #include #include -namespace selector +namespace pagoda { template class Line3D @@ -57,6 +57,6 @@ class Line3D VectorType m_direction; ///< The line's normalized direction }; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/math_lib/line_segment_3d.h b/source/math_lib/line_segment_3d.h index 7df865c6..e9504744 100644 --- a/source/math_lib/line_segment_3d.h +++ b/source/math_lib/line_segment_3d.h @@ -1,12 +1,12 @@ -#ifndef SELECTOR_MATH_LIB_LINE_SEGMENT_3D_H_ -#define SELECTOR_MATH_LIB_LINE_SEGMENT_3D_H_ +#ifndef PAGODA_MATH_LIB_LINE_SEGMENT_3D_H_ +#define PAGODA_MATH_LIB_LINE_SEGMENT_3D_H_ #include "vec_base.h" #include #include -namespace selector +namespace pagoda { template class LineSegment3D @@ -49,6 +49,6 @@ class LineSegment3D VectorType m_supportVector; ///< This line's supporting vector }; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/math_lib/math_utils.h b/source/math_lib/math_utils.h index d6e8ab07..5a29d9cf 100644 --- a/source/math_lib/math_utils.h +++ b/source/math_lib/math_utils.h @@ -1,6 +1,6 @@ #pragma once -namespace selector +namespace pagoda { template class MathUtils @@ -23,4 +23,4 @@ class MathUtils } }; -} // namespace selector +} // namespace pagoda diff --git a/source/math_lib/matrix_base.h b/source/math_lib/matrix_base.h index ee7c604f..d1114331 100644 --- a/source/math_lib/matrix_base.h +++ b/source/math_lib/matrix_base.h @@ -4,7 +4,7 @@ #include -namespace selector +namespace pagoda { template std::ostream &operator<<(std::ostream &o, const boost::qvm::mat &mat) @@ -26,4 +26,4 @@ using Mat2x2F = boost::qvm::mat; using Mat3x3F = boost::qvm::mat; using Mat4x4F = boost::qvm::mat; -} // namespace selector +} // namespace pagoda diff --git a/source/math_lib/nearest_points.h b/source/math_lib/nearest_points.h index 763bfe5e..c05d08f8 100644 --- a/source/math_lib/nearest_points.h +++ b/source/math_lib/nearest_points.h @@ -1,5 +1,5 @@ -#ifndef SELECTOR_MATH_LIB_NEAREST_POINTS_H_ -#define SELECTOR_MATH_LIB_NEAREST_POINTS_H_ +#ifndef PAGODA_MATH_LIB_NEAREST_POINTS_H_ +#define PAGODA_MATH_LIB_NEAREST_POINTS_H_ #include "line_3d.h" #include "line_segment_3d.h" @@ -9,7 +9,7 @@ #include -namespace selector +namespace pagoda { template struct NearestPoints @@ -125,6 +125,6 @@ NearestPoints> nearest_points(const LineSegment3D & std::swap(n.m_point1, n.m_point2); return n; } -} // namespace selector +} // namespace pagoda #endif diff --git a/source/math_lib/orthogonal.h b/source/math_lib/orthogonal.h index 45cbf8ee..99510dab 100644 --- a/source/math_lib/orthogonal.h +++ b/source/math_lib/orthogonal.h @@ -1,10 +1,10 @@ -#ifndef SELECTOR_MATH_LIB_ORTHOGONAL_H_ -#define SELECTOR_MATH_LIB_ORTHOGONAL_H_ +#ifndef PAGODA_MATH_LIB_ORTHOGONAL_H_ +#define PAGODA_MATH_LIB_ORTHOGONAL_H_ #include #include -namespace selector +namespace pagoda { /** * Returns a vector orthogonal to \p v. @@ -40,6 +40,6 @@ boost::qvm::vec orthogonal(const boost::qvm::vec& v) return boost::qvm::vec{1, 1, -(x + y) / z}; } -} // namespace selector +} // namespace pagoda #endif diff --git a/source/math_lib/plane.h b/source/math_lib/plane.h index a4306cbb..1f4442c9 100644 --- a/source/math_lib/plane.h +++ b/source/math_lib/plane.h @@ -1,5 +1,5 @@ -#ifndef SELECTOR_MATH_LIB_PLANE_H_ -#define SELECTOR_MATH_LIB_PLANE_H_ +#ifndef PAGODA_MATH_LIB_PLANE_H_ +#define PAGODA_MATH_LIB_PLANE_H_ #include "orthogonal.h" #include "vec_base.h" @@ -7,7 +7,7 @@ #include #include -namespace selector +namespace pagoda { template class Plane @@ -144,16 +144,16 @@ std::ostream &operator<<(std::ostream &o, const Plane &plane) template std::string to_string(const typename Plane::PlaneSide &side) { - if (side == selector::Plane::PlaneSide::Front) + if (side == pagoda::Plane::PlaneSide::Front) { return "front"; } - if (side == selector::Plane::PlaneSide::Back) + if (side == pagoda::Plane::PlaneSide::Back) { return "back"; } return "contained"; } -} // namespace selector +} // namespace pagoda #endif diff --git a/source/math_lib/projection.h b/source/math_lib/projection.h index b74c2b27..1f00df91 100644 --- a/source/math_lib/projection.h +++ b/source/math_lib/projection.h @@ -1,5 +1,5 @@ -#ifndef SELECTOR_MATH_LIB_PROJECTION_H_ -#define SELECTOR_MATH_LIB_PROJECTION_H_ +#ifndef PAGODA_MATH_LIB_PROJECTION_H_ +#define PAGODA_MATH_LIB_PROJECTION_H_ #include "line_3d.h" #include "line_segment_3d.h" @@ -8,7 +8,7 @@ #include #include -namespace selector +namespace pagoda { /** * Calculates the projection of point \p p onto the line \p l @@ -59,6 +59,6 @@ boost::qvm::vec projection(const boost::qvm::vec &p, const Plane auto dot = boost::qvm::dot(plane.GetPoint() - p, planeNormal); return p + dot * planeNormal; } -} // namespace selector +} // namespace pagoda #endif diff --git a/source/math_lib/radians.h b/source/math_lib/radians.h index 033fc495..7bd06dbe 100644 --- a/source/math_lib/radians.h +++ b/source/math_lib/radians.h @@ -2,7 +2,7 @@ #include "math_utils.h" -namespace selector +namespace pagoda { template class Degrees; @@ -22,5 +22,5 @@ class Radians private: T m_radians; }; -} // namespace selector +} // namespace pagoda diff --git a/source/math_lib/transpose.h b/source/math_lib/transpose.h index 5a8faef0..9c0f1387 100644 --- a/source/math_lib/transpose.h +++ b/source/math_lib/transpose.h @@ -4,7 +4,7 @@ #include -namespace selector +namespace pagoda { /** * Modifies the given matrix \p m to be transposed. @@ -31,4 +31,4 @@ MatrixBase transposed(const MatrixBase #include @@ -8,7 +8,7 @@ #include -namespace selector +namespace pagoda { template std::ostream& operator<<(std::ostream& o, const boost::qvm::vec& vec) @@ -39,6 +39,6 @@ using Vec2D = boost::qvm::vec; using Vec3D = boost::qvm::vec; using Vec4D = boost::qvm::vec; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/selector.cpp b/source/pagoda.cpp similarity index 90% rename from source/selector.cpp rename to source/pagoda.cpp index 13ece8dc..64845656 100644 --- a/source/selector.cpp +++ b/source/pagoda.cpp @@ -1,4 +1,4 @@ -#include "selector.h" +#include "pagoda.h" #include "common/factory.h" #include "common/file_util.h" @@ -33,14 +33,14 @@ #include #include -namespace selector +namespace pagoda { -class Selector::Impl +class Pagoda::Impl { public: Impl() { - LOG_TRACE(Core, "Initializing Selector"); + LOG_TRACE(Core, "Initializing Pagoda"); m_proceduralObjectSystem = std::make_shared(); m_proceduralObjectSystem->RegisterProceduralComponentSystem(std::make_shared()); @@ -121,7 +121,7 @@ class Selector::Impl ~Impl() { - LOG_TRACE(Core, "Shutting down Selector"); + LOG_TRACE(Core, "Shutting down Pagoda"); Logger::Shutdown(); } @@ -148,22 +148,22 @@ class Selector::Impl ProceduralObjectPredicateRegistryPtr m_predicateRegistry; }; -Selector::Selector() : m_implementation(std::make_unique()) {} -Selector::~Selector() {} +Pagoda::Pagoda() : m_implementation(std::make_unique()) {} +Pagoda::~Pagoda() {} -ProceduralObjectSystemPtr Selector::GetProceduralObjectSystem() +ProceduralObjectSystemPtr Pagoda::GetProceduralObjectSystem() { return m_implementation->GetProceduralObjectSystem(); } -OperationFactoryPtr Selector::GetOperationFactory() { return m_implementation->GetOperationFactory(); } +OperationFactoryPtr Pagoda::GetOperationFactory() { return m_implementation->GetOperationFactory(); } -NodeFactoryPtr Selector::GetNodeFactory() { return m_implementation->GetNodeFactory(); } +NodeFactoryPtr Pagoda::GetNodeFactory() { return m_implementation->GetNodeFactory(); } -GraphPtr Selector::CreateGraph() { return m_implementation->CreateGraph(); } +GraphPtr Pagoda::CreateGraph() { return m_implementation->CreateGraph(); } -GraphPtr Selector::CreateGraphFromFile(const std::string &filePath) +GraphPtr Pagoda::CreateGraphFromFile(const std::string &filePath) { return m_implementation->CreateGraphFromFile(filePath); } -} // namespace selector +} // namespace pagoda diff --git a/source/selector.h b/source/pagoda.h similarity index 74% rename from source/selector.h rename to source/pagoda.h index 4ed85c60..90b3616d 100644 --- a/source/selector.h +++ b/source/pagoda.h @@ -5,33 +5,33 @@ #include "procedural_objects/operation_factory.h" #include "procedural_objects/procedural_object_system.h" -namespace selector +namespace pagoda { class Graph; using GraphPtr = std::shared_ptr; /** - * Entry point class for the selector library. + * Entry point class for the pagoda library. * - * Selector is fully initialized on construction of this object and + * Pagoda is fully initialized on construction of this object and * shutdown on destruction. * - * There can be several instances of \c Selector. + * There can be several instances of \c Pagoda. */ -class Selector +class Pagoda { public: /** - * Default constructor. Initializes selector. + * Default constructor. Initializes pagoda. */ - Selector(); + Pagoda(); /** - * Destroys selector, shutting down everything. + * Destroys pagoda, shutting down everything. */ - ~Selector(); + ~Pagoda(); /** - * Returns the \c ProceduralObjectSystem for this \c Selector instance. + * Returns the \c ProceduralObjectSystem for this \c Pagoda instance. * * Different \c ProceduralComponentSystem can be registered in the \c ProceduralObjectSystem. */ @@ -67,6 +67,6 @@ class Selector }; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/parameter/CMakeLists.txt b/source/parameter/CMakeLists.txt index 194143c3..009c77c6 100644 --- a/source/parameter/CMakeLists.txt +++ b/source/parameter/CMakeLists.txt @@ -15,7 +15,7 @@ add_library(parameter OBJECT ${PARAMETER_SRCS}) target_include_directories( parameter PRIVATE - $ + $ $ ${Boost_INCLUDE_DIRS} ) diff --git a/source/parameter/variable.cpp b/source/parameter/variable.cpp index 49c92be9..6589d8d4 100644 --- a/source/parameter/variable.cpp +++ b/source/parameter/variable.cpp @@ -4,7 +4,7 @@ #include -namespace selector +namespace pagoda { Variable::Variable(const std::string &compoundVariable) { @@ -58,4 +58,4 @@ bool Variable::operator==(const std::string &v) const { return ToString() == v; bool Variable::operator!=(const std::string &v) const { return !(*this == v); } -} // namespace selector +} // namespace pagoda diff --git a/source/parameter/variable.h b/source/parameter/variable.h index 1c590f40..a2d98c46 100644 --- a/source/parameter/variable.h +++ b/source/parameter/variable.h @@ -1,10 +1,10 @@ -#ifndef SELECTOR_PARAMETER_VARIABLE_H_ -#define SELECTOR_PARAMETER_VARIABLE_H_ +#ifndef PAGODA_PARAMETER_VARIABLE_H_ +#define PAGODA_PARAMETER_VARIABLE_H_ #include #include -namespace selector +namespace pagoda { /** * Represents a \c Variable in an \c Expression. @@ -62,6 +62,6 @@ class Variable private: std::list m_identifiers; ///< The list of identifiers. }; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/parameter/variable_resolver.cpp b/source/parameter/variable_resolver.cpp index 7ca672b4..971b4946 100644 --- a/source/parameter/variable_resolver.cpp +++ b/source/parameter/variable_resolver.cpp @@ -1,6 +1,6 @@ #include "variable_resolver.h" -namespace selector +namespace pagoda { VariableResolver::VariableResolver(const Variable& v) : m_variable(v) {} @@ -23,4 +23,4 @@ DynamicValueBasePtr VariableResolver::Resolve(DynamicValueBasePtr parameterizabl // throw std::runtime_error("Unimplemented"); return nullptr; } -} // namespace selector +} // namespace pagoda diff --git a/source/parameter/variable_resolver.h b/source/parameter/variable_resolver.h index 4fe33ebe..43563a85 100644 --- a/source/parameter/variable_resolver.h +++ b/source/parameter/variable_resolver.h @@ -1,11 +1,11 @@ -#ifndef SELECTOR_PARAMETER_VARIABLE_RESOLVER_H_ -#define SELECTOR_PARAMETER_VARIABLE_RESOLVER_H_ +#ifndef PAGODA_PARAMETER_VARIABLE_RESOLVER_H_ +#define PAGODA_PARAMETER_VARIABLE_RESOLVER_H_ #include "variable.h" #include -namespace selector +namespace pagoda { class DynamicValueBase; using DynamicValueBasePtr = std::shared_ptr; @@ -25,6 +25,6 @@ class VariableResolver private: Variable m_variable; }; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/selscript/CMakeLists.txt b/source/pgscript/CMakeLists.txt similarity index 65% rename from source/selscript/CMakeLists.txt rename to source/pgscript/CMakeLists.txt index 33d8542a..efee7ecf 100644 --- a/source/selscript/CMakeLists.txt +++ b/source/pgscript/CMakeLists.txt @@ -3,29 +3,29 @@ add_subdirectory(value) add_subdirectory(parser) add_subdirectory(interpreter) -add_library(selscript OBJECT - $ - $ - $ - $ +add_library(pgscript OBJECT + $ + $ + $ + $ ) target_include_directories( - selscript + pgscript PRIVATE - $ + $ $ ${Boost_INCLUDE_DIRS} ) target_compile_features( - selscript + pgscript PRIVATE cxx_std_17 ) target_compile_options( - selscript + pgscript PRIVATE -Wall $<$:-Werror> @@ -33,7 +33,7 @@ target_compile_options( ) target_link_libraries( - selscript + pgscript PRIVATE common ) diff --git a/source/selscript/intermediate/CMakeLists.txt b/source/pgscript/intermediate/CMakeLists.txt similarity index 80% rename from source/selscript/intermediate/CMakeLists.txt rename to source/pgscript/intermediate/CMakeLists.txt index 7292e0ef..0bb89301 100644 --- a/source/selscript/intermediate/CMakeLists.txt +++ b/source/pgscript/intermediate/CMakeLists.txt @@ -21,24 +21,24 @@ set(INTERMEDIATE_PUBLIC_HEADERS "set_expression.h" ) -add_library(selscript_intermediate OBJECT ${INTERMEDIATE_SOURCES}) +add_library(pgscript_intermediate OBJECT ${INTERMEDIATE_SOURCES}) target_include_directories( - selscript_intermediate + pgscript_intermediate PRIVATE - $ + $ $ ${Boost_INCLUDE_DIRS} ) target_compile_features( - selscript_intermediate + pgscript_intermediate PRIVATE cxx_std_17 ) target_compile_options( - selscript_intermediate + pgscript_intermediate PRIVATE -Wall $<$:-Werror> @@ -46,7 +46,7 @@ target_compile_options( ) target_link_libraries( - selscript_intermediate + pgscript_intermediate PRIVATE common ) diff --git a/source/selscript/intermediate/anonymous_method.cpp b/source/pgscript/intermediate/anonymous_method.cpp similarity index 90% rename from source/selscript/intermediate/anonymous_method.cpp rename to source/pgscript/intermediate/anonymous_method.cpp index 010713e3..e0370e89 100644 --- a/source/selscript/intermediate/anonymous_method.cpp +++ b/source/pgscript/intermediate/anonymous_method.cpp @@ -2,7 +2,7 @@ #include "ast_visitor.h" -namespace selector +namespace pagoda { namespace ast { @@ -17,4 +17,4 @@ void AnonymousMethod::AcceptVisitor(AstVisitor *v) v->Visit(std::dynamic_pointer_cast(shared_from_this())); } } // namespace ast -} // namespace selector +} // namespace pagoda diff --git a/source/selscript/intermediate/anonymous_method.h b/source/pgscript/intermediate/anonymous_method.h similarity index 92% rename from source/selscript/intermediate/anonymous_method.h rename to source/pgscript/intermediate/anonymous_method.h index cc6439a0..80c4f4af 100644 --- a/source/selscript/intermediate/anonymous_method.h +++ b/source/pgscript/intermediate/anonymous_method.h @@ -4,7 +4,7 @@ #include -namespace selector +namespace pagoda { namespace ast { @@ -26,4 +26,4 @@ class AnonymousMethod : public Expression }; using AnonymousMethodPtr = std::shared_ptr; } // namespace ast -} // namespace selector +} // namespace pagoda diff --git a/source/selscript/intermediate/ast.cpp b/source/pgscript/intermediate/ast.cpp similarity index 98% rename from source/selscript/intermediate/ast.cpp rename to source/pgscript/intermediate/ast.cpp index 815eb5d8..2c82f07f 100644 --- a/source/selscript/intermediate/ast.cpp +++ b/source/pgscript/intermediate/ast.cpp @@ -2,7 +2,7 @@ #include "ast_visitor.h" -namespace selector +namespace pagoda { namespace ast { @@ -75,4 +75,4 @@ Return::~Return() {} Program::~Program() {} void Program::AcceptVisitor(AstVisitor *v) { v->Visit(std::dynamic_pointer_cast(shared_from_this())); } } // namespace ast -} // namespace selector +} // namespace pagoda diff --git a/source/selscript/intermediate/ast.h b/source/pgscript/intermediate/ast.h similarity index 99% rename from source/selscript/intermediate/ast.h rename to source/pgscript/intermediate/ast.h index 1352e0d1..ef254c34 100644 --- a/source/selscript/intermediate/ast.h +++ b/source/pgscript/intermediate/ast.h @@ -8,7 +8,7 @@ #include -namespace selector +namespace pagoda { class AstVisitor; @@ -377,4 +377,4 @@ class Program : public AstNode using ProgramPtr = std::shared_ptr; } // namespace ast -} // namespace selector +} // namespace pagoda diff --git a/source/selscript/intermediate/ast_printer.cpp b/source/pgscript/intermediate/ast_printer.cpp similarity index 99% rename from source/selscript/intermediate/ast_printer.cpp rename to source/pgscript/intermediate/ast_printer.cpp index 91479279..e9b398d0 100644 --- a/source/selscript/intermediate/ast_printer.cpp +++ b/source/pgscript/intermediate/ast_printer.cpp @@ -1,6 +1,6 @@ #include "ast_printer.h" -namespace selector +namespace pagoda { AstPrinter::AstPrinter(std::ostream &out) : m_indentation(0), m_outStream(out) {} @@ -258,4 +258,4 @@ void AstPrinter::indent() { ++m_indentation; } std::string AstPrinter::indentation() { return std::string(m_indentation, ' '); } void AstPrinter::deindent() { --m_indentation; } -} // namespace selector +} // namespace pagoda diff --git a/source/selscript/intermediate/ast_printer.h b/source/pgscript/intermediate/ast_printer.h similarity index 96% rename from source/selscript/intermediate/ast_printer.h rename to source/pgscript/intermediate/ast_printer.h index 4d883347..7f4fd7f1 100644 --- a/source/selscript/intermediate/ast_printer.h +++ b/source/pgscript/intermediate/ast_printer.h @@ -5,7 +5,7 @@ #include -namespace selector +namespace pagoda { class AstPrinter : public AstVisitor { @@ -45,4 +45,4 @@ class AstPrinter : public AstVisitor uint32_t m_indentation; std::ostream &m_outStream; }; -} // namespace selector +} // namespace pagoda diff --git a/source/selscript/intermediate/ast_visitor.h b/source/pgscript/intermediate/ast_visitor.h similarity index 96% rename from source/selscript/intermediate/ast_visitor.h rename to source/pgscript/intermediate/ast_visitor.h index 330671b9..c5758ecb 100644 --- a/source/selscript/intermediate/ast_visitor.h +++ b/source/pgscript/intermediate/ast_visitor.h @@ -7,7 +7,7 @@ #include "parameter.h" #include "set_expression.h" -namespace selector +namespace pagoda { class AstVisitor { @@ -38,4 +38,4 @@ class AstVisitor virtual void Visit(ast::VarDeclPtr) = 0; virtual void Visit(ast::ParameterPtr) = 0; }; -} // namespace selector +} // namespace pagoda diff --git a/source/selscript/intermediate/class_declaration.cpp b/source/pgscript/intermediate/class_declaration.cpp similarity index 90% rename from source/selscript/intermediate/class_declaration.cpp rename to source/pgscript/intermediate/class_declaration.cpp index d97914e3..eb33b2b7 100644 --- a/source/selscript/intermediate/class_declaration.cpp +++ b/source/pgscript/intermediate/class_declaration.cpp @@ -2,7 +2,7 @@ #include "ast_visitor.h" -namespace selector +namespace pagoda { namespace ast { @@ -16,4 +16,4 @@ void ClassDeclaration::AcceptVisitor(AstVisitor *v) v->Visit(std::dynamic_pointer_cast(shared_from_this())); } } // namespace ast -} // namespace selector +} // namespace pagoda diff --git a/source/selscript/intermediate/class_declaration.h b/source/pgscript/intermediate/class_declaration.h similarity index 93% rename from source/selscript/intermediate/class_declaration.h rename to source/pgscript/intermediate/class_declaration.h index 040de9a8..6b92c907 100644 --- a/source/selscript/intermediate/class_declaration.h +++ b/source/pgscript/intermediate/class_declaration.h @@ -3,7 +3,7 @@ #include "ast.h" #include "function_declaration.h" -namespace selector +namespace pagoda { namespace ast { @@ -26,4 +26,4 @@ class ClassDeclaration : public Statement using ClassDeclarationPtr = std::shared_ptr; } // namespace ast -} // namespace selector +} // namespace pagoda diff --git a/source/selscript/intermediate/function_declaration.cpp b/source/pgscript/intermediate/function_declaration.cpp similarity index 86% rename from source/selscript/intermediate/function_declaration.cpp rename to source/pgscript/intermediate/function_declaration.cpp index 71cc8eaf..6502b17e 100644 --- a/source/selscript/intermediate/function_declaration.cpp +++ b/source/pgscript/intermediate/function_declaration.cpp @@ -2,7 +2,7 @@ #include "ast_visitor.h" -namespace selector +namespace pagoda { namespace ast { @@ -12,4 +12,4 @@ void FunctionDeclaration::AcceptVisitor(AstVisitor *v) v->Visit(std::dynamic_pointer_cast(shared_from_this())); } } // namespace ast -} // namespace selector +} // namespace pagoda diff --git a/source/selscript/intermediate/function_declaration.h b/source/pgscript/intermediate/function_declaration.h similarity index 95% rename from source/selscript/intermediate/function_declaration.h rename to source/pgscript/intermediate/function_declaration.h index 8122f5c5..78fd61d2 100644 --- a/source/selscript/intermediate/function_declaration.h +++ b/source/pgscript/intermediate/function_declaration.h @@ -2,7 +2,7 @@ #include "ast.h" -namespace selector +namespace pagoda { namespace ast { @@ -31,4 +31,4 @@ struct FunctionDeclaration : public Statement using FunctionDeclarationPtr = std::shared_ptr; } // namespace ast -} // namespace selector +} // namespace pagoda diff --git a/source/selscript/intermediate/get_expression.cpp b/source/pgscript/intermediate/get_expression.cpp similarity index 89% rename from source/selscript/intermediate/get_expression.cpp rename to source/pgscript/intermediate/get_expression.cpp index 6c9dae59..52932470 100644 --- a/source/selscript/intermediate/get_expression.cpp +++ b/source/pgscript/intermediate/get_expression.cpp @@ -2,7 +2,7 @@ #include "ast_visitor.h" -namespace selector +namespace pagoda { namespace ast { @@ -19,4 +19,4 @@ void GetExpression::AcceptVisitor(AstVisitor *v) } } // namespace ast -} // namespace selector +} // namespace pagoda diff --git a/source/selscript/intermediate/get_expression.h b/source/pgscript/intermediate/get_expression.h similarity index 92% rename from source/selscript/intermediate/get_expression.h rename to source/pgscript/intermediate/get_expression.h index 4a117451..3e5e8ad4 100644 --- a/source/selscript/intermediate/get_expression.h +++ b/source/pgscript/intermediate/get_expression.h @@ -2,7 +2,7 @@ #include "ast.h" -namespace selector +namespace pagoda { namespace ast { @@ -24,4 +24,4 @@ class GetExpression : public Expression }; using GetExpressionPtr = std::shared_ptr; } // namespace ast -} // namespace selector +} // namespace pagoda diff --git a/source/selscript/intermediate/parameter.cpp b/source/pgscript/intermediate/parameter.cpp similarity index 86% rename from source/selscript/intermediate/parameter.cpp rename to source/pgscript/intermediate/parameter.cpp index 1ce2ad14..9ed10a77 100644 --- a/source/selscript/intermediate/parameter.cpp +++ b/source/pgscript/intermediate/parameter.cpp @@ -2,11 +2,11 @@ #include "ast_visitor.h" -namespace selector +namespace pagoda { namespace ast { Parameter::Parameter(const std::string& identifier) : m_identifierName(identifier) {} void Parameter::AcceptVisitor(AstVisitor* v) { v->Visit(std::dynamic_pointer_cast(shared_from_this())); } } // namespace ast -} // namespace selector +} // namespace pagoda diff --git a/source/selscript/intermediate/parameter.h b/source/pgscript/intermediate/parameter.h similarity index 93% rename from source/selscript/intermediate/parameter.h rename to source/pgscript/intermediate/parameter.h index e347d895..f8f56e79 100644 --- a/source/selscript/intermediate/parameter.h +++ b/source/pgscript/intermediate/parameter.h @@ -2,7 +2,7 @@ #include "ast.h" -namespace selector +namespace pagoda { namespace ast { @@ -24,4 +24,4 @@ class Parameter : public AstNode }; using ParameterPtr = std::shared_ptr; } // namespace ast -} // namespace selector +} // namespace pagoda diff --git a/source/selscript/intermediate/set_expression.cpp b/source/pgscript/intermediate/set_expression.cpp similarity index 90% rename from source/selscript/intermediate/set_expression.cpp rename to source/pgscript/intermediate/set_expression.cpp index 23483c7e..aedf116c 100644 --- a/source/selscript/intermediate/set_expression.cpp +++ b/source/pgscript/intermediate/set_expression.cpp @@ -2,7 +2,7 @@ #include "ast_visitor.h" -namespace selector +namespace pagoda { namespace ast { @@ -17,4 +17,4 @@ void SetExpression::AcceptVisitor(AstVisitor *v) v->Visit(std::dynamic_pointer_cast(shared_from_this())); } } // namespace ast -} // namespace selector +} // namespace pagoda diff --git a/source/selscript/intermediate/set_expression.h b/source/pgscript/intermediate/set_expression.h similarity index 93% rename from source/selscript/intermediate/set_expression.h rename to source/pgscript/intermediate/set_expression.h index b0de2746..ff0bcb3c 100644 --- a/source/selscript/intermediate/set_expression.h +++ b/source/pgscript/intermediate/set_expression.h @@ -2,7 +2,7 @@ #include "ast.h" -namespace selector +namespace pagoda { namespace ast { @@ -26,4 +26,4 @@ class SetExpression : public Expression }; using SetExpressionPtr = std::shared_ptr; } // namespace ast -} // namespace selector +} // namespace pagoda diff --git a/source/selscript/interpreter/CMakeLists.txt b/source/pgscript/interpreter/CMakeLists.txt similarity index 73% rename from source/selscript/interpreter/CMakeLists.txt rename to source/pgscript/interpreter/CMakeLists.txt index fb68ca82..10821914 100644 --- a/source/selscript/interpreter/CMakeLists.txt +++ b/source/pgscript/interpreter/CMakeLists.txt @@ -8,24 +8,24 @@ set(INTERPRETER_PUBLIC_HEADERS "interpreter_visitor.h" ) -add_library(selscript_interpreter OBJECT ${INTERPRETER_SOURCES}) +add_library(pgscript_interpreter OBJECT ${INTERPRETER_SOURCES}) target_include_directories( - selscript_interpreter + pgscript_interpreter PRIVATE - $ + $ $ ${Boost_INCLUDE_DIRS} ) target_compile_features( - selscript_interpreter + pgscript_interpreter PRIVATE cxx_std_17 ) target_compile_options( - selscript_interpreter + pgscript_interpreter PRIVATE -Wall $<$:-Werror> @@ -33,7 +33,7 @@ target_compile_options( ) target_link_libraries( - selscript_interpreter + pgscript_interpreter PRIVATE common ) diff --git a/source/selscript/interpreter/interpreter.cpp b/source/pgscript/interpreter/interpreter.cpp similarity index 99% rename from source/selscript/interpreter/interpreter.cpp rename to source/pgscript/interpreter/interpreter.cpp index d16d616f..51796146 100644 --- a/source/selscript/interpreter/interpreter.cpp +++ b/source/pgscript/interpreter/interpreter.cpp @@ -10,7 +10,7 @@ #include -namespace selector +namespace pagoda { template std::shared_ptr constructor_wrapper(const std::vector &args) @@ -153,4 +153,4 @@ void Interpreter::SetStdOutStream(std::ostream *o) { Interpreter::Impl::SetStdOu std::ostream *Interpreter::GetStdOutStream() { return Interpreter::Impl::GetStdOutStream(); } void Interpreter::SetStdErrStream(std::ostream *o) { Interpreter::Impl::SetStdErrStream(o); } std::ostream *Interpreter::GetStdErrStream() { return Interpreter::Impl::GetStdErrStream(); } -} // namespace selector +} // namespace pagoda diff --git a/source/selscript/interpreter/interpreter.h b/source/pgscript/interpreter/interpreter.h similarity index 94% rename from source/selscript/interpreter/interpreter.h rename to source/pgscript/interpreter/interpreter.h index b45095ec..9f5036d0 100644 --- a/source/selscript/interpreter/interpreter.h +++ b/source/pgscript/interpreter/interpreter.h @@ -3,7 +3,7 @@ #include #include -namespace selector +namespace pagoda { namespace ast { @@ -38,4 +38,4 @@ class Interpreter class Impl; std::unique_ptr m_implementation; }; -} // namespace selector +} // namespace pagoda diff --git a/source/selscript/interpreter/interpreter_visitor.cpp b/source/pgscript/interpreter/interpreter_visitor.cpp similarity index 98% rename from source/selscript/interpreter/interpreter_visitor.cpp rename to source/pgscript/interpreter/interpreter_visitor.cpp index 78c6f98e..fa61203e 100644 --- a/source/selscript/interpreter/interpreter_visitor.cpp +++ b/source/pgscript/interpreter/interpreter_visitor.cpp @@ -25,10 +25,10 @@ #include "common/exception.h" -namespace selector +namespace pagoda { // clang-format off -#define MAKE_BUILTIN_CALLABLE(function) { #function, selector::make_free_function( #function , make_function(function)) } +#define MAKE_BUILTIN_CALLABLE(function) { #function, pagoda::make_free_function( #function , make_function(function)) } // clang-format on interpreter_visitor::interpreter_visitor() @@ -455,4 +455,4 @@ DynamicValueBasePtr interpreter_visitor::PopValue() m_values.pop(); return m_lastValue; } -} // namespace selector +} // namespace pagoda diff --git a/source/selscript/interpreter/interpreter_visitor.h b/source/pgscript/interpreter/interpreter_visitor.h similarity index 98% rename from source/selscript/interpreter/interpreter_visitor.h rename to source/pgscript/interpreter/interpreter_visitor.h index ddd470c5..52970651 100644 --- a/source/selscript/interpreter/interpreter_visitor.h +++ b/source/pgscript/interpreter/interpreter_visitor.h @@ -5,7 +5,7 @@ #include #include -namespace selector +namespace pagoda { namespace ast { @@ -108,4 +108,4 @@ struct interpreter_visitor : public AstVisitor std::shared_ptr m_symbolTable; DynamicValueBasePtr m_lastValue; }; -} // namespace selector +} // namespace pagoda diff --git a/source/selscript/parser/CMakeLists.txt b/source/pgscript/parser/CMakeLists.txt similarity index 76% rename from source/selscript/parser/CMakeLists.txt rename to source/pgscript/parser/CMakeLists.txt index 3970b564..e226e341 100644 --- a/source/selscript/parser/CMakeLists.txt +++ b/source/pgscript/parser/CMakeLists.txt @@ -9,25 +9,25 @@ set(PARSER_PUBLIC_HEADERS "parser.h" ) -add_library(selscript_parser OBJECT ${PARSER_SOURCES} +add_library(pgscript_parser OBJECT ${PARSER_SOURCES} ) target_include_directories( - selscript_parser + pgscript_parser PRIVATE - $ + $ $ ${Boost_INCLUDE_DIRS} ) target_compile_features( - selscript_parser + pgscript_parser PRIVATE cxx_std_17 ) target_compile_options( - selscript_parser + pgscript_parser PRIVATE -Wall $<$:-Werror> @@ -35,7 +35,7 @@ target_compile_options( ) target_link_libraries( - selscript_parser + pgscript_parser PRIVATE common ) diff --git a/source/selscript/parser/grammar.h b/source/pgscript/parser/grammar.h similarity index 99% rename from source/selscript/parser/grammar.h rename to source/pgscript/parser/grammar.h index e8df8a83..fcdbf337 100644 --- a/source/selscript/parser/grammar.h +++ b/source/pgscript/parser/grammar.h @@ -10,7 +10,7 @@ using namespace boost::spirit::qi; -namespace selector +namespace pagoda { template struct grammar : boost::spirit::qi::grammar @@ -300,4 +300,4 @@ struct grammar : boost::spirit::qi::grammar class_declaration; rule primary; }; -} // namespace selector +} // namespace pagoda diff --git a/source/selscript/parser/grammar_helpers.cpp b/source/pgscript/parser/grammar_helpers.cpp similarity index 99% rename from source/selscript/parser/grammar_helpers.cpp rename to source/pgscript/parser/grammar_helpers.cpp index 292e2c41..42895f23 100644 --- a/source/selscript/parser/grammar_helpers.cpp +++ b/source/pgscript/parser/grammar_helpers.cpp @@ -4,7 +4,7 @@ #include -namespace selector +namespace pagoda { ast::IdentifierPtr make_identifier(const std::vector &identifier, const std::vector &identifier2) { @@ -256,4 +256,4 @@ ast::StatementPtr make_for_loop( return outerBlock; } -} // namespace selector +} // namespace pagoda diff --git a/source/selscript/parser/grammar_helpers.h b/source/pgscript/parser/grammar_helpers.h similarity index 98% rename from source/selscript/parser/grammar_helpers.h rename to source/pgscript/parser/grammar_helpers.h index 1682ec31..6a6a6360 100644 --- a/source/selscript/parser/grammar_helpers.h +++ b/source/pgscript/parser/grammar_helpers.h @@ -7,7 +7,7 @@ #include "../intermediate/parameter.h" #include "../intermediate/set_expression.h" -namespace selector +namespace pagoda { ast::IdentifierPtr make_identifier(const std::vector &identifier, const std::vector &identifier2); @@ -72,4 +72,4 @@ ast::StatementPtr make_for_loop( const boost::optional &condition, const boost::optional &increment, const ast::StatementPtr body); -} // namespace selector +} // namespace pagoda diff --git a/source/selscript/parser/parser.cpp b/source/pgscript/parser/parser.cpp similarity index 95% rename from source/selscript/parser/parser.cpp rename to source/pgscript/parser/parser.cpp index a5f8d475..370ec50d 100644 --- a/source/selscript/parser/parser.cpp +++ b/source/pgscript/parser/parser.cpp @@ -6,7 +6,7 @@ #include -namespace selector +namespace pagoda { Parser::Parser() {} @@ -35,4 +35,4 @@ ast::ProgramPtr Parser::Parse(const std::string &source) return program; } -} // namespace selector +} // namespace pagoda diff --git a/source/selscript/parser/parser.h b/source/pgscript/parser/parser.h similarity index 84% rename from source/selscript/parser/parser.h rename to source/pgscript/parser/parser.h index 5c4dc591..58a72722 100644 --- a/source/selscript/parser/parser.h +++ b/source/pgscript/parser/parser.h @@ -2,7 +2,7 @@ #include -namespace selector +namespace pagoda { namespace ast { @@ -19,4 +19,4 @@ class Parser private: }; -} // namespace selector +} // namespace pagoda diff --git a/source/selscript/value/CMakeLists.txt b/source/pgscript/value/CMakeLists.txt similarity index 78% rename from source/selscript/value/CMakeLists.txt rename to source/pgscript/value/CMakeLists.txt index 25f12ff2..5730dda9 100644 --- a/source/selscript/value/CMakeLists.txt +++ b/source/pgscript/value/CMakeLists.txt @@ -10,24 +10,24 @@ set(VALUE_PUBLIC_HEADERS "script_callable_body.h" ) -add_library(selscript_value OBJECT ${VALUE_SOURCES}) +add_library(pgscript_value OBJECT ${VALUE_SOURCES}) target_include_directories( - selscript_value + pgscript_value PRIVATE - $ + $ $ ${Boost_INCLUDE_DIRS} ) target_compile_features( - selscript_value + pgscript_value PRIVATE cxx_std_17 ) target_compile_options( - selscript_value + pgscript_value PRIVATE -Wall $<$:-Werror> @@ -35,7 +35,7 @@ target_compile_options( ) target_link_libraries( - selscript_value + pgscript_value PRIVATE common ) diff --git a/source/selscript/value/builtin_functions.cpp b/source/pgscript/value/builtin_functions.cpp similarity index 89% rename from source/selscript/value/builtin_functions.cpp rename to source/pgscript/value/builtin_functions.cpp index d37a3f5c..405cecd3 100644 --- a/source/selscript/value/builtin_functions.cpp +++ b/source/pgscript/value/builtin_functions.cpp @@ -6,7 +6,7 @@ #include #include -namespace selector +namespace pagoda { void print(const std::vector &args) { @@ -18,4 +18,4 @@ void print(const std::vector &args) } TypeInfoPtr type(const DynamicValueBasePtr &value) { return value->GetTypeInfo(); } -} // namespace selector +} // namespace pagoda diff --git a/source/selscript/value/builtin_functions.h b/source/pgscript/value/builtin_functions.h similarity index 90% rename from source/selscript/value/builtin_functions.h rename to source/pgscript/value/builtin_functions.h index ff516776..f846143d 100644 --- a/source/selscript/value/builtin_functions.h +++ b/source/pgscript/value/builtin_functions.h @@ -3,7 +3,7 @@ #include #include -namespace selector +namespace pagoda { class DynamicValueBase; using DynamicValueBasePtr = std::shared_ptr; @@ -16,4 +16,4 @@ using TypeInfoPtr = std::shared_ptr; void print(const std::vector& args); TypeInfoPtr type(const DynamicValueBasePtr& value); -} // namespace selector +} // namespace pagoda diff --git a/source/selscript/value/script_callable_body.cpp b/source/pgscript/value/script_callable_body.cpp similarity index 93% rename from source/selscript/value/script_callable_body.cpp rename to source/pgscript/value/script_callable_body.cpp index f6d3a2a2..3b9810f7 100644 --- a/source/selscript/value/script_callable_body.cpp +++ b/source/pgscript/value/script_callable_body.cpp @@ -1,6 +1,6 @@ #include "script_callable_body.h" -namespace selector +namespace pagoda { ScriptCallableBody::ScriptCallableBody(ast::IdentifierPtr identifier, ast::StatementBlockPtr body, const std::vector ¶meters) @@ -15,4 +15,4 @@ void ScriptCallableBody::SetClosure(const std::shared_ptr &cl const std::shared_ptr &ScriptCallableBody::GetClosure() const { return m_closure; } -} // namespace selector +} // namespace pagoda diff --git a/source/selscript/value/script_callable_body.h b/source/pgscript/value/script_callable_body.h similarity index 94% rename from source/selscript/value/script_callable_body.h rename to source/pgscript/value/script_callable_body.h index 968a831d..0b717039 100644 --- a/source/selscript/value/script_callable_body.h +++ b/source/pgscript/value/script_callable_body.h @@ -6,7 +6,7 @@ #include -namespace selector +namespace pagoda { class ScriptCallableBody : public ICallableBody { @@ -25,4 +25,4 @@ class ScriptCallableBody : public ICallableBody std::vector m_parameters; std::shared_ptr m_closure; }; -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_graph/CMakeLists.txt b/source/procedural_graph/CMakeLists.txt index dd4fd74b..5f1693b0 100644 --- a/source/procedural_graph/CMakeLists.txt +++ b/source/procedural_graph/CMakeLists.txt @@ -69,7 +69,7 @@ add_library(procedural_graph OBJECT ${PROCEDURAL_GRAPH_SRCS}) target_include_directories( procedural_graph PRIVATE - $ + $ $ ${Boost_INCLUDE_DIRS} ${SELSCRIPT_INCLUDE_DIR} diff --git a/source/procedural_graph/breadth_first_node_visitor.h b/source/procedural_graph/breadth_first_node_visitor.h index d6ab4f03..a4399f46 100644 --- a/source/procedural_graph/breadth_first_node_visitor.h +++ b/source/procedural_graph/breadth_first_node_visitor.h @@ -1,11 +1,11 @@ -#ifndef SELECTOR_PROCEDURAL_GRAPH_BREADTH_FIRST_NODE_VISITOR_H_ -#define SELECTOR_PROCEDURAL_GRAPH_BREADTH_FIRST_NODE_VISITOR_H_ +#ifndef PAGODA_PROCEDURAL_GRAPH_BREADTH_FIRST_NODE_VISITOR_H_ +#define PAGODA_PROCEDURAL_GRAPH_BREADTH_FIRST_NODE_VISITOR_H_ #include "graph_node_visitor.h" #include -namespace selector +namespace pagoda { template class BreadthFirstNodeVisitor : public GraphNodeVisitor @@ -39,6 +39,6 @@ class BreadthFirstNodeVisitor : public GraphNodeVisitor private: std::queue m_nodesToVisit; }; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_graph/construction_argument_not_found.cpp b/source/procedural_graph/construction_argument_not_found.cpp index df7da45d..126dbc43 100644 --- a/source/procedural_graph/construction_argument_not_found.cpp +++ b/source/procedural_graph/construction_argument_not_found.cpp @@ -1,6 +1,6 @@ #include "construction_argument_not_found.h" -namespace selector +namespace pagoda { ConstructionArgumentNotFound::ConstructionArgumentNotFound(const std::string nodeName, const uint32_t nodeId, const std::string &argName) @@ -8,4 +8,4 @@ ConstructionArgumentNotFound::ConstructionArgumentNotFound(const std::string nod " (id: " + std::to_string(nodeId) + ")") { } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_graph/construction_argument_not_found.h b/source/procedural_graph/construction_argument_not_found.h index fd4f5e95..d53e0378 100644 --- a/source/procedural_graph/construction_argument_not_found.h +++ b/source/procedural_graph/construction_argument_not_found.h @@ -4,11 +4,11 @@ #include -namespace selector +namespace pagoda { class ConstructionArgumentNotFound : public Exception { public: ConstructionArgumentNotFound(const std::string nodeName, const uint32_t nodeId, const std::string &argName); }; -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_graph/default_scheduler.cpp b/source/procedural_graph/default_scheduler.cpp index df112eb2..9bfb4205 100644 --- a/source/procedural_graph/default_scheduler.cpp +++ b/source/procedural_graph/default_scheduler.cpp @@ -4,7 +4,7 @@ #include "common/exception.h" #include "common/profiler.h" -namespace selector +namespace pagoda { DefaultScheduler::DefaultScheduler(Graph &graph) : m_graph(graph), m_executionQueue(m_graph) {} @@ -45,4 +45,4 @@ bool DefaultScheduler::Step() } void DefaultScheduler::Finalize() {} -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_graph/default_scheduler.h b/source/procedural_graph/default_scheduler.h index 3016b843..a05caaee 100644 --- a/source/procedural_graph/default_scheduler.h +++ b/source/procedural_graph/default_scheduler.h @@ -1,5 +1,5 @@ -#ifndef SELECTOR_PROCEDURAL_GRAPH_DEFAULT_SCHEDULER_H_ -#define SELECTOR_PROCEDURAL_GRAPH_DEFAULT_SCHEDULER_H_ +#ifndef PAGODA_PROCEDURAL_GRAPH_DEFAULT_SCHEDULER_H_ +#define PAGODA_PROCEDURAL_GRAPH_DEFAULT_SCHEDULER_H_ #include "execution_queue.h" #include "graph.h" @@ -10,7 +10,7 @@ #include #include -namespace selector +namespace pagoda { class DefaultScheduler : public IScheduler { @@ -27,6 +27,6 @@ class DefaultScheduler : public IScheduler Graph &m_graph; ExecutionQueue m_executionQueue; }; // class Scheduler -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_graph/execution_queue.cpp b/source/procedural_graph/execution_queue.cpp index ca680c93..d89f8e83 100644 --- a/source/procedural_graph/execution_queue.cpp +++ b/source/procedural_graph/execution_queue.cpp @@ -7,7 +7,7 @@ #include -namespace selector +namespace pagoda { class ExecutionQueue::Impl { @@ -78,4 +78,4 @@ NodePtr ExecutionQueue::GetNextNode() { return m_implementation->GetNextNode(); void ExecutionQueue::Reset() { m_implementation->Reset(); } std::size_t ExecutionQueue::GetNodeCount() const { return m_implementation->GetNodeCount(); } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_graph/execution_queue.h b/source/procedural_graph/execution_queue.h index 6e5affd2..b05e7821 100644 --- a/source/procedural_graph/execution_queue.h +++ b/source/procedural_graph/execution_queue.h @@ -1,9 +1,9 @@ -#ifndef SELECTOR_PROCEDURAL_GRAPH_EXECUTION_QUEUE_H_ -#define SELECTOR_PROCEDURAL_GRAPH_EXECUTION_QUEUE_H_ +#ifndef PAGODA_PROCEDURAL_GRAPH_EXECUTION_QUEUE_H_ +#define PAGODA_PROCEDURAL_GRAPH_EXECUTION_QUEUE_H_ #include -namespace selector +namespace pagoda { class Graph; using GraphPtr = std::shared_ptr; @@ -43,6 +43,6 @@ class ExecutionQueue class Impl; std::unique_ptr m_implementation; }; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_graph/graph.cpp b/source/procedural_graph/graph.cpp index 66889b10..5ce3c4dc 100644 --- a/source/procedural_graph/graph.cpp +++ b/source/procedural_graph/graph.cpp @@ -9,7 +9,7 @@ #include -namespace selector +namespace pagoda { class Graph::Impl { @@ -264,4 +264,4 @@ Graph::SchedulerFactoryFunction_t Graph::GetSchedulerFactory() { return s_schedu Graph::SchedulerFactoryFunction_t Graph::s_schedulerFactoryFunction = [](Graph &graph) { return std::make_unique(graph); }; -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_graph/graph.h b/source/procedural_graph/graph.h index 616f1451..3d02861d 100644 --- a/source/procedural_graph/graph.h +++ b/source/procedural_graph/graph.h @@ -1,6 +1,6 @@ #pragma once -#ifndef SELECTOR_PROCEDURAL_GRAH_GRAPH_H_ -#define SELECTOR_PROCEDURAL_GRAH_GRAPH_H_ +#ifndef PAGODA_PROCEDURAL_GRAH_GRAPH_H_ +#define PAGODA_PROCEDURAL_GRAH_GRAPH_H_ #include "node_set.h" #include "scheduler.h" @@ -11,7 +11,7 @@ #include #include -namespace selector +namespace pagoda { class Node; using NodePtr = std::shared_ptr; @@ -188,6 +188,6 @@ class Graph using GraphPtr = std::shared_ptr; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_graph/graph_dot_exporter.cpp b/source/procedural_graph/graph_dot_exporter.cpp index 4eb4001b..550e54ca 100644 --- a/source/procedural_graph/graph_dot_exporter.cpp +++ b/source/procedural_graph/graph_dot_exporter.cpp @@ -5,7 +5,7 @@ #include "graph.h" #include "node.h" -namespace selector +namespace pagoda { GraphDotExporter::GraphDotExporter(GraphPtr graph) : m_graph(graph), m_rankBy(RankBy::None), m_rankDirection(RankDirection::LeftToRight), m_showParameters(false) @@ -126,5 +126,5 @@ std::vector GraphDotExporter::GetNodes() return nodes; } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_graph/graph_dot_exporter.h b/source/procedural_graph/graph_dot_exporter.h index 5d623f18..25c4ff59 100644 --- a/source/procedural_graph/graph_dot_exporter.h +++ b/source/procedural_graph/graph_dot_exporter.h @@ -1,11 +1,11 @@ -#ifndef SELECTOR_PROCEDURAL_GRAPH_GRAPH_DOT_EXPORTER_H_ -#define SELECTOR_PROCEDURAL_GRAPH_GRAPH_DOT_EXPORTER_H_ +#ifndef PAGODA_PROCEDURAL_GRAPH_GRAPH_DOT_EXPORTER_H_ +#define PAGODA_PROCEDURAL_GRAPH_GRAPH_DOT_EXPORTER_H_ #include #include #include -namespace selector +namespace pagoda { class Graph; using GraphPtr = std::shared_ptr; @@ -92,6 +92,6 @@ class GraphDotExporter RankDirection m_rankDirection; bool m_showParameters; }; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_graph/graph_node_visitor.h b/source/procedural_graph/graph_node_visitor.h index 8c674f72..9e3ad102 100644 --- a/source/procedural_graph/graph_node_visitor.h +++ b/source/procedural_graph/graph_node_visitor.h @@ -1,10 +1,10 @@ -#ifndef SELECTOR_PROCEDURAL_GRAPH_NODE_VISITOR -#define SELECTOR_PROCEDURAL_GRAPH_NODE_VISITOR +#ifndef PAGODA_PROCEDURAL_GRAPH_NODE_VISITOR +#define PAGODA_PROCEDURAL_GRAPH_NODE_VISITOR #include "graph.h" #include "node.h" -namespace selector +namespace pagoda { template class GraphNodeVisitor @@ -26,6 +26,6 @@ class GraphNodeVisitor Graph& m_graph; Delegate_t& m_delegate; }; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_graph/input_interface_node.cpp b/source/procedural_graph/input_interface_node.cpp index ecb34942..ffb4b82e 100644 --- a/source/procedural_graph/input_interface_node.cpp +++ b/source/procedural_graph/input_interface_node.cpp @@ -12,7 +12,7 @@ #include -namespace selector +namespace pagoda { const char* InputInterfaceNode::name = "InputInterface"; @@ -91,4 +91,4 @@ void InputInterfaceNode::Execute(const NodeSet& inNodes, const NodeSetAcceptNodeVisitor(&v); } } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_graph/input_interface_node.h b/source/procedural_graph/input_interface_node.h index 62ec066a..edfd1cf4 100644 --- a/source/procedural_graph/input_interface_node.h +++ b/source/procedural_graph/input_interface_node.h @@ -1,12 +1,12 @@ #pragma once -#ifndef SELECTOR_PROCEDURAL_GRAPH_INPUT_INTERFACE_NODE_H_ -#define SELECTOR_PROCEDURAL_GRAPH_INPUT_INTERFACE_NODE_H_ +#ifndef PAGODA_PROCEDURAL_GRAPH_INPUT_INTERFACE_NODE_H_ +#define PAGODA_PROCEDURAL_GRAPH_INPUT_INTERFACE_NODE_H_ #include "node.h" #include -namespace selector +namespace pagoda { class ProceduralOperation; using ProceduralOperationPtr = std::shared_ptr; @@ -35,6 +35,6 @@ class InputInterfaceNode : public Node std::string m_interfaceName; std::list m_proceduralObjects; }; // class OperationExecution -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_graph/node.cpp b/source/procedural_graph/node.cpp index b4307a6c..a2736157 100644 --- a/source/procedural_graph/node.cpp +++ b/source/procedural_graph/node.cpp @@ -5,7 +5,7 @@ #include "dynamic_value/type_info.h" #include "dynamic_value/value_not_found.h" -namespace selector +namespace pagoda { const TypeInfoPtr Node::s_typeInfo = std::make_shared("Node"); @@ -55,4 +55,4 @@ std::string Node::ToString() const { return ""; } void Node::AcceptVisitor(ValueVisitorBase &visitor) { throw Exception("Unimplemented"); } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_graph/node.h b/source/procedural_graph/node.h index 16ab4464..6909a950 100644 --- a/source/procedural_graph/node.h +++ b/source/procedural_graph/node.h @@ -1,5 +1,5 @@ -#ifndef SELECTOR_PROCEDURAL_GRAPH_NODE_H_ -#define SELECTOR_PROCEDURAL_GRAPH_NODE_H_ +#ifndef PAGODA_PROCEDURAL_GRAPH_NODE_H_ +#define PAGODA_PROCEDURAL_GRAPH_NODE_H_ #include "common/factory.h" #include "dynamic_value/builtin_class.h" @@ -9,7 +9,7 @@ #include #include -namespace selector +namespace pagoda { class Node; using NodePtr = std::shared_ptr; @@ -109,6 +109,6 @@ struct NodeWeakPtrEqual bool operator()(const NodeWeakPtr &lhs, const NodeWeakPtr &rhs) const { return lhs.lock() == rhs.lock(); } }; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_graph/node_factory.cpp b/source/procedural_graph/node_factory.cpp index c92e890d..c4886d7a 100644 --- a/source/procedural_graph/node_factory.cpp +++ b/source/procedural_graph/node_factory.cpp @@ -1,6 +1,6 @@ #include "node_factory.h" -namespace selector +namespace pagoda { NodeFactory::NodeFactory() : Factory("Node") {} diff --git a/source/procedural_graph/node_factory.h b/source/procedural_graph/node_factory.h index f98a8e4c..2c84b189 100644 --- a/source/procedural_graph/node_factory.h +++ b/source/procedural_graph/node_factory.h @@ -1,11 +1,11 @@ -#ifndef SELECTOR_NODE_FACTORY_H_ -#define SELECTOR_NODE_FACTORY_H_ +#ifndef PAGODA_NODE_FACTORY_H_ +#define PAGODA_NODE_FACTORY_H_ #include "common/factory.h" #include "node.h" -namespace selector +namespace pagoda { class NodeFactory : public Factory { @@ -15,6 +15,6 @@ class NodeFactory : public Factory }; using NodeFactoryPtr = std::shared_ptr; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_graph/node_set.cpp b/source/procedural_graph/node_set.cpp index 9cc6c307..cc1bf827 100644 --- a/source/procedural_graph/node_set.cpp +++ b/source/procedural_graph/node_set.cpp @@ -4,7 +4,7 @@ #include "common/assertions.h" -namespace selector +namespace pagoda { bool NodePtrCompare::operator()(const NodePtr &lhs, const NodePtr &rhs) const { return lhs->GetId() < rhs->GetId(); } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_graph/node_set.h b/source/procedural_graph/node_set.h index 715415b7..e357904e 100644 --- a/source/procedural_graph/node_set.h +++ b/source/procedural_graph/node_set.h @@ -1,10 +1,10 @@ -#ifndef SELECTOR_PROCEDURAL_GRAPH_NODE_SET_H_ -#define SELECTOR_PROCEDURAL_GRAPH_NODE_SET_H_ +#ifndef PAGODA_PROCEDURAL_GRAPH_NODE_SET_H_ +#define PAGODA_PROCEDURAL_GRAPH_NODE_SET_H_ #include #include -namespace selector +namespace pagoda { class Node; using NodePtr = std::shared_ptr; @@ -16,6 +16,6 @@ struct NodePtrCompare template using NodeSet = std::set, NodePtrCompare>; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_graph/node_set_visitor.h b/source/procedural_graph/node_set_visitor.h index 030d2390..5c3b7379 100644 --- a/source/procedural_graph/node_set_visitor.h +++ b/source/procedural_graph/node_set_visitor.h @@ -1,10 +1,10 @@ -#ifndef SELECTOR_PROCEDURAL_GRAPH_NODE_SET_VISITOR_H_ -#define SELECTOR_PROCEDURAL_GRAPH_NODE_SET_VISITOR_H_ +#ifndef PAGODA_PROCEDURAL_GRAPH_NODE_SET_VISITOR_H_ +#define PAGODA_PROCEDURAL_GRAPH_NODE_SET_VISITOR_H_ #include "node.h" #include "node_set.h" -namespace selector +namespace pagoda { template void node_type_filter(const NodeSet &nodeSet, NodeSet &outNodes) @@ -18,6 +18,6 @@ void node_type_filter(const NodeSet &nodeSet, NodeSet &outNodes) } } } -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_graph/node_visitor.h b/source/procedural_graph/node_visitor.h index 87f4d373..872b8d17 100644 --- a/source/procedural_graph/node_visitor.h +++ b/source/procedural_graph/node_visitor.h @@ -2,7 +2,7 @@ #include -namespace selector +namespace pagoda { class OperationNode; class InputInterfaceNode; @@ -19,4 +19,4 @@ class NodeVisitor virtual void Visit(std::shared_ptr n) = 0; virtual void Visit(std::shared_ptr n) = 0; }; -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_graph/operation_node.cpp b/source/procedural_graph/operation_node.cpp index 5cd0cb39..3cdfd73d 100644 --- a/source/procedural_graph/operation_node.cpp +++ b/source/procedural_graph/operation_node.cpp @@ -15,7 +15,7 @@ #include "procedural_objects/procedural_operation.h" #include "procedural_objects/unknown_operation.h" -namespace selector +namespace pagoda { const char *OperationNode::name = "Operation"; @@ -108,4 +108,4 @@ void OperationNode::Execute(const NodeSet &inNodes, const NodeSet &o } } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_graph/operation_node.h b/source/procedural_graph/operation_node.h index 037fcb0a..9d1c3424 100644 --- a/source/procedural_graph/operation_node.h +++ b/source/procedural_graph/operation_node.h @@ -1,10 +1,10 @@ #pragma once -#ifndef SELECTOR_PROCEDURAL_GRAPH_OPERATION_NODE_H_ -#define SELECTOR_PROCEDURAL_GRAPH_OPERATION_NODE_H_ +#ifndef PAGODA_PROCEDURAL_GRAPH_OPERATION_NODE_H_ +#define PAGODA_PROCEDURAL_GRAPH_OPERATION_NODE_H_ #include "node.h" -namespace selector +namespace pagoda { class ProceduralOperation; using ProceduralOperationPtr = std::shared_ptr; @@ -30,6 +30,6 @@ class OperationNode : public Node ProceduralOperationPtr m_operation; OperationFactoryPtr m_operationFactory; }; // class OperationNode -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_graph/output_interface_node.cpp b/source/procedural_graph/output_interface_node.cpp index dab11603..d8cce3c1 100644 --- a/source/procedural_graph/output_interface_node.cpp +++ b/source/procedural_graph/output_interface_node.cpp @@ -13,7 +13,7 @@ #include -namespace selector +namespace pagoda { const char* OutputInterfaceNode::name = "OutputInterface"; @@ -91,4 +91,4 @@ void OutputInterfaceNode::Execute(const NodeSet& inNodes, const NodeSet -namespace selector +namespace pagoda { class ProceduralOperation; using ProceduralOperationPtr = std::shared_ptr; @@ -35,6 +35,6 @@ class OutputInterfaceNode : public Node std::string m_interfaceName; std::list m_proceduralObjects; }; // class OutputInterfaceNode -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_graph/parameter_node.cpp b/source/procedural_graph/parameter_node.cpp index bcf8ee28..99a74b24 100644 --- a/source/procedural_graph/parameter_node.cpp +++ b/source/procedural_graph/parameter_node.cpp @@ -6,7 +6,7 @@ #include "node_visitor.h" -namespace selector +namespace pagoda { const char *ParameterNode::name = "Parameter"; @@ -37,4 +37,4 @@ void ParameterNode::Execute(const NodeSet &inNodes, const NodeSet &o } } } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_graph/parameter_node.h b/source/procedural_graph/parameter_node.h index bc1fc1de..b52155db 100644 --- a/source/procedural_graph/parameter_node.h +++ b/source/procedural_graph/parameter_node.h @@ -1,10 +1,10 @@ #pragma once -#ifndef SELECTOR_PROCEDURAL_GRAPH_PARAMETER_NODE_H_ -#define SELECTOR_PROCEDURAL_GRAPH_PARAMETER_NODE_H_ +#ifndef PAGODA_PROCEDURAL_GRAPH_PARAMETER_NODE_H_ +#define PAGODA_PROCEDURAL_GRAPH_PARAMETER_NODE_H_ #include "node.h" -namespace selector +namespace pagoda { /** * Node to propagate parameters to its out nodes. @@ -25,6 +25,6 @@ class ParameterNode : public Node void Execute(const NodeSet &inNodes, const NodeSet &outNodes) override; }; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_graph/parse_result.h b/source/procedural_graph/parse_result.h index 73917214..101651fd 100644 --- a/source/procedural_graph/parse_result.h +++ b/source/procedural_graph/parse_result.h @@ -1,7 +1,7 @@ -#ifndef SELECTOR_PROCEDURAL_GRAPH_XML_PARSE_RESULT_H_ -#define SELECTOR_PROCEDURAL_GRAPH_XML_PARSE_RESULT_H_ +#ifndef PAGODA_PROCEDURAL_GRAPH_XML_PARSE_RESULT_H_ +#define PAGODA_PROCEDURAL_GRAPH_XML_PARSE_RESULT_H_ -namespace selector +namespace pagoda { struct ParseResult { @@ -29,6 +29,6 @@ struct ParseResult Status status; uint32_t offset; }; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_graph/reader.cpp b/source/procedural_graph/reader.cpp index 4b6f7837..995e467b 100644 --- a/source/procedural_graph/reader.cpp +++ b/source/procedural_graph/reader.cpp @@ -16,7 +16,7 @@ #include #include -namespace selector +namespace pagoda { struct GraphReader::Impl { @@ -61,4 +61,4 @@ GraphReader::~GraphReader() {} GraphPtr GraphReader::Read(const std::string &str) { return m_implementation->Read(str); } const ParseResult &GraphReader::GetParseResult() const { return m_implementation->GetParseResult(); } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_graph/reader.h b/source/procedural_graph/reader.h index 3279ecf4..fee02a79 100644 --- a/source/procedural_graph/reader.h +++ b/source/procedural_graph/reader.h @@ -1,5 +1,5 @@ -#ifndef SELECTOR_PROCEDURAL_GRAPH_READER_H_ -#define SELECTOR_PROCEDURAL_GRAPH_READER_H_ +#ifndef PAGODA_PROCEDURAL_GRAPH_READER_H_ +#define PAGODA_PROCEDURAL_GRAPH_READER_H_ #include "graph.h" #include "node.h" @@ -8,7 +8,7 @@ #include #include -namespace selector +namespace pagoda { class NodeFactory; using NodeFactoryPtr = std::shared_ptr; @@ -26,6 +26,6 @@ class GraphReader struct Impl; std::unique_ptr m_implementation; }; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_graph/reader/CMakeLists.txt b/source/procedural_graph/reader/CMakeLists.txt index 9d291efa..4f6f39e0 100644 --- a/source/procedural_graph/reader/CMakeLists.txt +++ b/source/procedural_graph/reader/CMakeLists.txt @@ -36,7 +36,7 @@ add_library(procedural_graph_reader OBJECT ${PROCEDURAL_GRAPH_READER_SRCS}) target_include_directories( procedural_graph_reader PRIVATE - $ + $ $ ${Boost_INCLUDE_DIRS} ${SELSCRIPT_INCLUDE_DIR} diff --git a/source/procedural_graph/reader/ast_interpreter.cpp b/source/procedural_graph/reader/ast_interpreter.cpp index 92002cf1..7c49a8aa 100644 --- a/source/procedural_graph/reader/ast_interpreter.cpp +++ b/source/procedural_graph/reader/ast_interpreter.cpp @@ -13,7 +13,7 @@ #include "procedural_graph/graph.h" #include "procedural_graph/node.h" -namespace selector +namespace pagoda { AstInterpreter::AstInterpreter(GraphPtr graph) : m_graph(graph) {} @@ -108,5 +108,5 @@ const std::unordered_map &AstInterpreter::GetC return m_currentNamedParameters; } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_graph/reader/ast_interpreter.h b/source/procedural_graph/reader/ast_interpreter.h index 486015ef..d9ad5317 100644 --- a/source/procedural_graph/reader/ast_interpreter.h +++ b/source/procedural_graph/reader/ast_interpreter.h @@ -1,5 +1,5 @@ -#ifndef SELECTOR_PROCEDURAL_GRAPH_AST_INTERPRETER_H_ -#define SELECTOR_PROCEDURAL_GRAPH_AST_INTERPRETER_H_ +#ifndef PAGODA_PROCEDURAL_GRAPH_AST_INTERPRETER_H_ +#define PAGODA_PROCEDURAL_GRAPH_AST_INTERPRETER_H_ #include #include @@ -7,7 +7,7 @@ #include "ast_node_visitor.h" #include "procedural_graph/node_factory.h" -namespace selector +namespace pagoda { class Graph; using GraphPtr = std::shared_ptr; @@ -36,5 +36,5 @@ class AstInterpreter : public AstNodeVisitor std::unordered_map m_nodeTable; std::unordered_map m_currentNamedParameters; }; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_graph/reader/ast_node.cpp b/source/procedural_graph/reader/ast_node.cpp index f024b851..8cd26a4b 100644 --- a/source/procedural_graph/reader/ast_node.cpp +++ b/source/procedural_graph/reader/ast_node.cpp @@ -1,6 +1,6 @@ #include "ast_node.h" -namespace selector +namespace pagoda { AstNode::AstNode() : AstNode(0,0) { @@ -34,4 +34,4 @@ void AstNode::SetNodeRange(const AstNode::NodeRange_t &range) AstNode::NodeRange_t AstNode::GetNodeRange() const { return std::make_pair(m_startOffset, m_endOffset); } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_graph/reader/ast_node.h b/source/procedural_graph/reader/ast_node.h index 5137346b..e2f20fbe 100644 --- a/source/procedural_graph/reader/ast_node.h +++ b/source/procedural_graph/reader/ast_node.h @@ -1,9 +1,9 @@ -#ifndef SELECTOR_PROCEDURAL_GRAPH_AST_NODE_H_ -#define SELECTOR_PROCEDURAL_GRAPH_AST_NODE_H_ +#ifndef PAGODA_PROCEDURAL_GRAPH_AST_NODE_H_ +#define PAGODA_PROCEDURAL_GRAPH_AST_NODE_H_ #include -namespace selector +namespace pagoda { class AstNodeVisitor; @@ -72,6 +72,6 @@ class AstNode : public std::enable_shared_from_this using AstNodePtr = std::shared_ptr; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_graph/reader/ast_node_visitor.h b/source/procedural_graph/reader/ast_node_visitor.h index b40a8c4b..0e10dc9c 100644 --- a/source/procedural_graph/reader/ast_node_visitor.h +++ b/source/procedural_graph/reader/ast_node_visitor.h @@ -1,7 +1,7 @@ -#ifndef SELECTOR_PROCEDURAL_GRAPH_AST_NODE_VISITOR_H_ -#define SELECTOR_PROCEDURAL_GRAPH_AST_NODE_VISITOR_H_ +#ifndef PAGODA_PROCEDURAL_GRAPH_AST_NODE_VISITOR_H_ +#define PAGODA_PROCEDURAL_GRAPH_AST_NODE_VISITOR_H_ -namespace selector +namespace pagoda { class GraphDefinitionNode; class NamedArgument; @@ -18,6 +18,6 @@ class AstNodeVisitor virtual void Visit(NodeDefinitionNode *nodeDefinition) = 0; virtual void Visit(NodeLinkNode *nodeLink) = 0; }; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_graph/reader/graph_definition_node.cpp b/source/procedural_graph/reader/graph_definition_node.cpp index 5897bb24..52a22745 100644 --- a/source/procedural_graph/reader/graph_definition_node.cpp +++ b/source/procedural_graph/reader/graph_definition_node.cpp @@ -2,7 +2,7 @@ #include "ast_node_visitor.h" -namespace selector +namespace pagoda { GraphDefinitionNode::GraphDefinitionNode() {} @@ -43,4 +43,4 @@ void GraphDefinitionNode::AcceptVisitor(AstNodeVisitor *visitor) visitor->Visit(std::dynamic_pointer_cast(shared_from_this()).get()); } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_graph/reader/graph_definition_node.h b/source/procedural_graph/reader/graph_definition_node.h index 962e4e39..ead7d468 100644 --- a/source/procedural_graph/reader/graph_definition_node.h +++ b/source/procedural_graph/reader/graph_definition_node.h @@ -1,11 +1,11 @@ -#ifndef SELECTOR_PROCEDURAL_GRAPH_GRAPH_DEFINITION_NODE_H_ -#define SELECTOR_PROCEDURAL_GRAPH_GRAPH_DEFINITION_NODE_H_ +#ifndef PAGODA_PROCEDURAL_GRAPH_GRAPH_DEFINITION_NODE_H_ +#define PAGODA_PROCEDURAL_GRAPH_GRAPH_DEFINITION_NODE_H_ #include "ast_node.h" #include -namespace selector +namespace pagoda { class GraphStatementNode; using GraphStatementNodePtr = std::shared_ptr; @@ -107,6 +107,6 @@ class GraphDefinitionNode : public AstNode }; using GraphDefinitionNodePtr = std::shared_ptr; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_graph/reader/graph_reader_grammar.h b/source/procedural_graph/reader/graph_reader_grammar.h index 24ffaf8a..2faf9c8f 100644 --- a/source/procedural_graph/reader/graph_reader_grammar.h +++ b/source/procedural_graph/reader/graph_reader_grammar.h @@ -1,5 +1,5 @@ -#ifndef SELECTOR_PROCEDURAL_GRAPH_GRAPH_FORMAT_GRAMMAR_H_ -#define SELECTOR_PROCEDURAL_GRAPH_GRAPH_FORMAT_GRAMMAR_H_ +#ifndef PAGODA_PROCEDURAL_GRAPH_GRAPH_FORMAT_GRAMMAR_H_ +#define PAGODA_PROCEDURAL_GRAPH_GRAPH_FORMAT_GRAMMAR_H_ #include "graph_definition_node.h" #include "graph_reader_grammar_helper.h" @@ -9,7 +9,7 @@ #include -namespace selector +namespace pagoda { template struct GraphReaderGrammar @@ -38,7 +38,7 @@ struct GraphReaderGrammar using namespace boost::spirit; using namespace boost::spirit::qi; - using namespace selector::grammar_helpers; + using namespace pagoda::grammar_helpers; using boost::phoenix::bind; // clang-format off @@ -129,6 +129,6 @@ struct GraphReaderGrammar Rule_t graph_definition; }; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_graph/reader/graph_reader_grammar_helper.cpp b/source/procedural_graph/reader/graph_reader_grammar_helper.cpp index 43973a16..33d78468 100644 --- a/source/procedural_graph/reader/graph_reader_grammar_helper.cpp +++ b/source/procedural_graph/reader/graph_reader_grammar_helper.cpp @@ -6,7 +6,7 @@ #include "node_definition_node.h" #include "node_link_node.h" -namespace selector +namespace pagoda { namespace grammar_helpers { @@ -56,4 +56,4 @@ void AddNodeDefinition(GraphDefinitionNodePtr graph, NodeDefinitionNodePtr state void AddNodeLinks(GraphDefinitionNodePtr graph, NodeLinkNodePtr statement) { graph->AddGraphStatementNode(statement); } } // namespace grammar_helpers -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_graph/reader/graph_reader_grammar_helper.h b/source/procedural_graph/reader/graph_reader_grammar_helper.h index d4ab4b02..d68f2d95 100644 --- a/source/procedural_graph/reader/graph_reader_grammar_helper.h +++ b/source/procedural_graph/reader/graph_reader_grammar_helper.h @@ -1,10 +1,10 @@ -#ifndef SELECTOR_PROCEDURAL_GRAPH_GRAPH_READER_GRAMMAR_HELPER_H_ -#define SELECTOR_PROCEDURAL_GRAPH_GRAPH_READER_GRAMMAR_HELPER_H_ +#ifndef PAGODA_PROCEDURAL_GRAPH_GRAPH_READER_GRAMMAR_HELPER_H_ +#define PAGODA_PROCEDURAL_GRAPH_GRAPH_READER_GRAMMAR_HELPER_H_ #include #include -namespace selector +namespace pagoda { class NamedArgument; using NamedArgumentPtr = std::shared_ptr; @@ -37,6 +37,6 @@ GraphDefinitionNodePtr CreateGraphDefinition(); void AddNodeDefinition(GraphDefinitionNodePtr graph, NodeDefinitionNodePtr statement); void AddNodeLinks(GraphDefinitionNodePtr graph, NodeLinkNodePtr statement); } // namespace grammar_helpers -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_graph/reader/graph_statement_node.h b/source/procedural_graph/reader/graph_statement_node.h index 7873edfb..053c22f3 100644 --- a/source/procedural_graph/reader/graph_statement_node.h +++ b/source/procedural_graph/reader/graph_statement_node.h @@ -1,9 +1,9 @@ -#ifndef SELECTOR_PROCEDURAL_GRAPH_GRAPH_STATEMENT_NODE_H_ -#define SELECTOR_PROCEDURAL_GRAPH_GRAPH_STATEMENT_NODE_H_ +#ifndef PAGODA_PROCEDURAL_GRAPH_GRAPH_STATEMENT_NODE_H_ +#define PAGODA_PROCEDURAL_GRAPH_GRAPH_STATEMENT_NODE_H_ #include "ast_node.h" -namespace selector +namespace pagoda { /** * Represents a statement in the graph format. @@ -25,6 +25,6 @@ class GraphStatementNode : public AstNode }; using GraphStatementNodePtr = std::shared_ptr; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_graph/reader/named_argument.cpp b/source/procedural_graph/reader/named_argument.cpp index 54f97bc0..98ed26d7 100644 --- a/source/procedural_graph/reader/named_argument.cpp +++ b/source/procedural_graph/reader/named_argument.cpp @@ -2,7 +2,7 @@ #include "ast_node_visitor.h" -namespace selector +namespace pagoda { NamedArgument::NamedArgument(const std::string& name, const ArgumentType type, const std::string& value) : m_name(name), m_argumentType(type), m_argumentValue(value) @@ -45,4 +45,4 @@ void NamedArgument::AcceptVisitor(AstNodeVisitor* visitor) { visitor->Visit(std::dynamic_pointer_cast(shared_from_this()).get()); } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_graph/reader/named_argument.h b/source/procedural_graph/reader/named_argument.h index 7b488fcf..d28729fe 100644 --- a/source/procedural_graph/reader/named_argument.h +++ b/source/procedural_graph/reader/named_argument.h @@ -1,11 +1,11 @@ -#ifndef SELECTOR_PROCEDURAL_GRAPH_NAMED_ARGUMENT_H_ -#define SELECTOR_PROCEDURAL_GRAPH_NAMED_ARGUMENT_H_ +#ifndef PAGODA_PROCEDURAL_GRAPH_NAMED_ARGUMENT_H_ +#define PAGODA_PROCEDURAL_GRAPH_NAMED_ARGUMENT_H_ #include "ast_node.h" #include -namespace selector +namespace pagoda { /** * Represents a named argument (both construction and execution arguments) in the graph format. @@ -93,6 +93,6 @@ class NamedArgument : public AstNode ArgumentType m_argumentType; ///< The type of the \c NamedArgument std::string m_argumentValue; ///< The string representation of the value of the \c NamedArgument }; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_graph/reader/node_definition_node.cpp b/source/procedural_graph/reader/node_definition_node.cpp index 0a71515c..b10e58f1 100644 --- a/source/procedural_graph/reader/node_definition_node.cpp +++ b/source/procedural_graph/reader/node_definition_node.cpp @@ -2,7 +2,7 @@ #include "ast_node_visitor.h" -namespace selector +namespace pagoda { NodeDefinitionNode::NodeDefinitionNode() : GraphStatementNode() {} @@ -70,4 +70,4 @@ void NodeDefinitionNode::AcceptVisitor(AstNodeVisitor *visitor) { visitor->Visit(std::dynamic_pointer_cast(shared_from_this()).get()); } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_graph/reader/node_definition_node.h b/source/procedural_graph/reader/node_definition_node.h index 5094c9da..b5b562df 100644 --- a/source/procedural_graph/reader/node_definition_node.h +++ b/source/procedural_graph/reader/node_definition_node.h @@ -1,12 +1,12 @@ -#ifndef SELECTOR_PROCEDURAL_GRAPH_NODE_DEFINITION_NODE_H_ -#define SELECTOR_PROCEDURAL_GRAPH_NODE_DEFINITION_NODE_H_ +#ifndef PAGODA_PROCEDURAL_GRAPH_NODE_DEFINITION_NODE_H_ +#define PAGODA_PROCEDURAL_GRAPH_NODE_DEFINITION_NODE_H_ #include "graph_statement_node.h" #include #include -namespace selector +namespace pagoda { class NamedArgument; using NamedArgumentPtr = std::shared_ptr; @@ -145,6 +145,6 @@ class NodeDefinitionNode : public GraphStatementNode }; using NodeDefinitionNodePtr = std::shared_ptr; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_graph/reader/node_link_node.cpp b/source/procedural_graph/reader/node_link_node.cpp index 1cdbd3b7..d8e6662b 100644 --- a/source/procedural_graph/reader/node_link_node.cpp +++ b/source/procedural_graph/reader/node_link_node.cpp @@ -2,7 +2,7 @@ #include "ast_node_visitor.h" -namespace selector +namespace pagoda { NodeLinkNode::NodeLinkNode() : GraphStatementNode() {} @@ -37,4 +37,4 @@ void NodeLinkNode::AcceptVisitor(AstNodeVisitor *visitor) { visitor->Visit(std::dynamic_pointer_cast(shared_from_this()).get()); } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_graph/reader/node_link_node.h b/source/procedural_graph/reader/node_link_node.h index b4b364be..4cf25e73 100644 --- a/source/procedural_graph/reader/node_link_node.h +++ b/source/procedural_graph/reader/node_link_node.h @@ -1,12 +1,12 @@ -#ifndef SELECTOR_PROCEDURAL_GRAPH_NODE_LINK_NODE_H_ -#define SELECTOR_PROCEDURAL_GRAPH_NODE_LINK_NODE_H_ +#ifndef PAGODA_PROCEDURAL_GRAPH_NODE_LINK_NODE_H_ +#define PAGODA_PROCEDURAL_GRAPH_NODE_LINK_NODE_H_ #include "graph_statement_node.h" #include #include -namespace selector +namespace pagoda { /** * Represents node links in the graph format. @@ -80,6 +80,6 @@ class NodeLinkNode : public GraphStatementNode private: NodeLinkContainer_t m_linkedNodes; ///< List of linked nodes. }; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_graph/router_node.cpp b/source/procedural_graph/router_node.cpp index 12a6df9c..930d1be2 100644 --- a/source/procedural_graph/router_node.cpp +++ b/source/procedural_graph/router_node.cpp @@ -14,7 +14,7 @@ #include "node_visitor.h" -namespace selector +namespace pagoda { const char *RouterNode::name = "Router"; @@ -105,4 +105,4 @@ void RouterNode::Execute(const NodeSet &inNodes, const NodeSet &outN } } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_graph/router_node.h b/source/procedural_graph/router_node.h index 8db4b2a3..488ec87b 100644 --- a/source/procedural_graph/router_node.h +++ b/source/procedural_graph/router_node.h @@ -4,7 +4,7 @@ #include -namespace selector +namespace pagoda { class ProceduralObject; using ProceduralObjectPtr = std::shared_ptr; @@ -29,4 +29,4 @@ class RouterNode : public Node std::list m_proceduralObjects; ProceduralObjectPredicateRegistryPtr m_predicateRegistry; }; -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_graph/scheduler.h b/source/procedural_graph/scheduler.h index 44ac3052..1d082ace 100644 --- a/source/procedural_graph/scheduler.h +++ b/source/procedural_graph/scheduler.h @@ -1,7 +1,7 @@ -#ifndef SELECTOR_PROCEDURAL_GRAPH_SCHEDULER_H_ -#define SELECTOR_PROCEDURAL_GRAPH_SCHEDULER_H_ +#ifndef PAGODA_PROCEDURAL_GRAPH_SCHEDULER_H_ +#define PAGODA_PROCEDURAL_GRAPH_SCHEDULER_H_ -namespace selector +namespace pagoda { class IScheduler { @@ -12,5 +12,5 @@ class IScheduler virtual bool Step() = 0; virtual void Finalize() = 0; }; // class IScheduler -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_graph/unknown_node_type.cpp b/source/procedural_graph/unknown_node_type.cpp index c46b8d28..7ed3ea54 100644 --- a/source/procedural_graph/unknown_node_type.cpp +++ b/source/procedural_graph/unknown_node_type.cpp @@ -1,9 +1,9 @@ #include "unknown_node_type.h" -namespace selector +namespace pagoda { UnknownNodeTypeException::UnknownNodeTypeException(const std::string &nodeType) : Exception("Unknown Node Type " + nodeType) { } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_graph/unknown_node_type.h b/source/procedural_graph/unknown_node_type.h index 6fdfe843..9f001adb 100644 --- a/source/procedural_graph/unknown_node_type.h +++ b/source/procedural_graph/unknown_node_type.h @@ -4,11 +4,11 @@ #include -namespace selector +namespace pagoda { class UnknownNodeTypeException : public Exception { public: UnknownNodeTypeException(const std::string &nodeType); }; -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_graph/unsupported_node_link.cpp b/source/procedural_graph/unsupported_node_link.cpp index 5fe3b2c8..a5e1c677 100644 --- a/source/procedural_graph/unsupported_node_link.cpp +++ b/source/procedural_graph/unsupported_node_link.cpp @@ -1,9 +1,9 @@ #include "unsupported_node_link.h" -namespace selector +namespace pagoda { UnsupportedNodeLink::UnsupportedNodeLink(const std::string &direction, const std::string nodeType) : Exception("Unsupported " + direction + " node link for " + nodeType + " node type") { } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_graph/unsupported_node_link.h b/source/procedural_graph/unsupported_node_link.h index 4eae9d47..164dcb30 100644 --- a/source/procedural_graph/unsupported_node_link.h +++ b/source/procedural_graph/unsupported_node_link.h @@ -2,11 +2,11 @@ #include "common/exception.h" -namespace selector +namespace pagoda { class UnsupportedNodeLink : Exception { public: UnsupportedNodeLink(const std::string &direction, const std::string nodeType); }; -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/CMakeLists.txt b/source/procedural_objects/CMakeLists.txt index 79ab16ac..735033f4 100644 --- a/source/procedural_objects/CMakeLists.txt +++ b/source/procedural_objects/CMakeLists.txt @@ -103,7 +103,7 @@ add_library(procedural_objects OBJECT ${PROCEDURAL_OBJECTS_SRCS}) target_include_directories( procedural_objects PRIVATE - $ + $ $ ${Boost_INCLUDE_DIRS} ${SELSCRIPT_INCLUDE_DIR} diff --git a/source/procedural_objects/clip_geometry.cpp b/source/procedural_objects/clip_geometry.cpp index 7da4043f..02ed8a80 100644 --- a/source/procedural_objects/clip_geometry.cpp +++ b/source/procedural_objects/clip_geometry.cpp @@ -10,7 +10,7 @@ #include "geometry_operations/clip.h" -namespace selector +namespace pagoda { const std::string ClipGeometry::inputGeometry("in"); const std::string ClipGeometry::frontGeometry("front"); @@ -73,4 +73,4 @@ void ClipGeometry::DoWork() } } } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/clip_geometry.h b/source/procedural_objects/clip_geometry.h index f7c71d67..eb98b728 100644 --- a/source/procedural_objects/clip_geometry.h +++ b/source/procedural_objects/clip_geometry.h @@ -1,9 +1,9 @@ -#ifndef SELECTOR_PROCEDURAL_OBJECTS_CLIP_GEOMETRY_H_ -#define SELECTOR_PROCEDURAL_OBJECTS_CLIP_GEOMETRY_H_ +#ifndef PAGODA_PROCEDURAL_OBJECTS_CLIP_GEOMETRY_H_ +#define PAGODA_PROCEDURAL_OBJECTS_CLIP_GEOMETRY_H_ #include "procedural_operation.h" -namespace selector +namespace pagoda { class ClipGeometry : public ProceduralOperation { @@ -18,6 +18,6 @@ class ClipGeometry : public ProceduralOperation void DoWork() override; }; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_objects/create_box.cpp b/source/procedural_objects/create_box.cpp index 225c3422..5191e109 100644 --- a/source/procedural_objects/create_box.cpp +++ b/source/procedural_objects/create_box.cpp @@ -11,7 +11,7 @@ #include -namespace selector +namespace pagoda { const std::string CreateBoxGeometry::outputGeometry("out"); const char* CreateBoxGeometry::name = "CreateBoxGeometry"; @@ -54,4 +54,4 @@ void CreateBoxGeometry::DoWork() std::shared_ptr hierarchical_component = hierarchicalSystem->CreateComponentAs(object); } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/create_box.h b/source/procedural_objects/create_box.h index 7ffa0031..3a37d271 100644 --- a/source/procedural_objects/create_box.h +++ b/source/procedural_objects/create_box.h @@ -1,9 +1,9 @@ -#ifndef SELECTOR_PROCEDURAL_OBJECTS_CREATE_BOX_H_ -#define SELECTOR_PROCEDURAL_OBJECTS_CREATE_BOX_H_ +#ifndef PAGODA_PROCEDURAL_OBJECTS_CREATE_BOX_H_ +#define PAGODA_PROCEDURAL_OBJECTS_CREATE_BOX_H_ #include "procedural_operation.h" -namespace selector +namespace pagoda { class CreateBoxGeometry : public ProceduralOperation { @@ -16,5 +16,5 @@ class CreateBoxGeometry : public ProceduralOperation void DoWork() override; }; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_objects/create_rect.cpp b/source/procedural_objects/create_rect.cpp index b63995a4..573b28e3 100644 --- a/source/procedural_objects/create_rect.cpp +++ b/source/procedural_objects/create_rect.cpp @@ -11,7 +11,7 @@ #include -namespace selector +namespace pagoda { const std::string CreateRectGeometry::output_geometry("out"); const char* CreateRectGeometry::name = "CreateRectGeometry"; @@ -76,4 +76,4 @@ void CreateRectGeometry::DoWork() std::shared_ptr hierarchical_component = hierarchicalSystem->CreateComponentAs(object); } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/create_rect.h b/source/procedural_objects/create_rect.h index 0c93a6b3..bf6ff379 100644 --- a/source/procedural_objects/create_rect.h +++ b/source/procedural_objects/create_rect.h @@ -1,9 +1,9 @@ -#ifndef SELECTOR_PROCEDURAL_OBJECTS_CREATE_RECT -#define SELECTOR_PROCEDURAL_OBJECTS_CREATE_RECT +#ifndef PAGODA_PROCEDURAL_OBJECTS_CREATE_RECT +#define PAGODA_PROCEDURAL_OBJECTS_CREATE_RECT #include "procedural_operation.h" -namespace selector +namespace pagoda { class CreateRectGeometry : public ProceduralOperation { @@ -17,6 +17,6 @@ class CreateRectGeometry : public ProceduralOperation void DoWork() override; }; // class CreateSquareGeometry -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_objects/create_sphere.cpp b/source/procedural_objects/create_sphere.cpp index c4f200ae..76408301 100644 --- a/source/procedural_objects/create_sphere.cpp +++ b/source/procedural_objects/create_sphere.cpp @@ -11,7 +11,7 @@ #include -namespace selector +namespace pagoda { const std::string CreateSphereGeometry::outputGeometry("out"); const char* CreateSphereGeometry::name = "CreateSphereGeometry"; @@ -55,4 +55,4 @@ void CreateSphereGeometry::DoWork() std::shared_ptr hierarchical_component = hierarchicalSystem->CreateComponentAs(object); } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/create_sphere.h b/source/procedural_objects/create_sphere.h index a72ab320..0c59ebb7 100644 --- a/source/procedural_objects/create_sphere.h +++ b/source/procedural_objects/create_sphere.h @@ -2,7 +2,7 @@ #include "procedural_operation.h" -namespace selector +namespace pagoda { class CreateSphereGeometry : public ProceduralOperation { @@ -15,4 +15,4 @@ class CreateSphereGeometry : public ProceduralOperation void DoWork() override; }; -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/export_geometry.cpp b/source/procedural_objects/export_geometry.cpp index 7427b90a..7f9a569a 100644 --- a/source/procedural_objects/export_geometry.cpp +++ b/source/procedural_objects/export_geometry.cpp @@ -14,7 +14,7 @@ #include -namespace selector +namespace pagoda { const char* ExportGeometry::name = "ExportGeometry"; const std::string ExportGeometry::inputGeometry("in"); @@ -44,7 +44,7 @@ void ExportGeometry::DoWork() auto geometryComponent = geometrySystem->GetComponentAs(inObject); auto geometry = geometryComponent->GetGeometry(); - selector::ObjExporter exporter(geometry); + pagoda::ObjExporter exporter(geometry); std::string outputPath = get_value_as(*GetValue("path")); file_util::CreateDirectories(boost::filesystem::path(outputPath).parent_path()); @@ -57,4 +57,4 @@ void ExportGeometry::DoWork() } } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/export_geometry.h b/source/procedural_objects/export_geometry.h index a88faaf4..5caf4b40 100644 --- a/source/procedural_objects/export_geometry.h +++ b/source/procedural_objects/export_geometry.h @@ -1,9 +1,9 @@ -#ifndef SELECTOR_PROCEDURAL_OPERATIONS_EXPORT_GEOMETRY_H_ -#define SELECTOR_PROCEDURAL_OPERATIONS_EXPORT_GEOMETRY_H_ +#ifndef PAGODA_PROCEDURAL_OPERATIONS_EXPORT_GEOMETRY_H_ +#define PAGODA_PROCEDURAL_OPERATIONS_EXPORT_GEOMETRY_H_ #include "procedural_operation.h" -namespace selector +namespace pagoda { class ExportGeometry : public ProceduralOperation { @@ -16,6 +16,6 @@ class ExportGeometry : public ProceduralOperation void DoWork() override; }; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_objects/extract_faces.cpp b/source/procedural_objects/extract_faces.cpp index 52613587..bd42dbd4 100644 --- a/source/procedural_objects/extract_faces.cpp +++ b/source/procedural_objects/extract_faces.cpp @@ -9,7 +9,7 @@ #include "hierarchical_system.h" #include "procedural_object_system.h" -namespace selector +namespace pagoda { const std::string ExtractFaces::s_inputGeometry("in"); const std::string ExtractFaces::s_outputGeometry("out"); @@ -71,4 +71,4 @@ void ExtractFaces::DoWork() } } } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/extract_faces.h b/source/procedural_objects/extract_faces.h index f178c3f7..3d2ef689 100644 --- a/source/procedural_objects/extract_faces.h +++ b/source/procedural_objects/extract_faces.h @@ -2,7 +2,7 @@ #include "procedural_operation.h" -namespace selector +namespace pagoda { class ExtractFaces : public ProceduralOperation { @@ -15,4 +15,4 @@ class ExtractFaces : public ProceduralOperation void DoWork() override; }; // class ExtractFaces -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/extract_scope.cpp b/source/procedural_objects/extract_scope.cpp index ad920835..d8de9379 100644 --- a/source/procedural_objects/extract_scope.cpp +++ b/source/procedural_objects/extract_scope.cpp @@ -8,7 +8,7 @@ #include "procedural_component.h" #include "procedural_object_system.h" -namespace selector +namespace pagoda { const std::string ExtractScope::inputGeometry("in"); const std::string ExtractScope::outputGeometry("out"); @@ -60,5 +60,5 @@ void ExtractScope::DoWork() hierarchicalSystem->SetParent(outHierarchicalComponent, inHierarchicalComponent); } } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/extract_scope.h b/source/procedural_objects/extract_scope.h index feb70eb6..efc84509 100644 --- a/source/procedural_objects/extract_scope.h +++ b/source/procedural_objects/extract_scope.h @@ -1,9 +1,9 @@ -#ifndef SELECTOR_PROCEDURAL_OBJECTS_EXTRACT_SCOPE_H_ -#define SELECTOR_PROCEDURAL_OBJECTS_EXTRACT_SCOPE_H_ +#ifndef PAGODA_PROCEDURAL_OBJECTS_EXTRACT_SCOPE_H_ +#define PAGODA_PROCEDURAL_OBJECTS_EXTRACT_SCOPE_H_ #include "procedural_operation.h" -namespace selector +namespace pagoda { class ExtractScope : public ProceduralOperation { @@ -17,6 +17,6 @@ class ExtractScope : public ProceduralOperation void DoWork() override; }; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_objects/extrude_geometry.cpp b/source/procedural_objects/extrude_geometry.cpp index 756abe85..525b6b7f 100644 --- a/source/procedural_objects/extrude_geometry.cpp +++ b/source/procedural_objects/extrude_geometry.cpp @@ -10,11 +10,9 @@ #include "hierarchical_system.h" #include "procedural_component.h" -#include "../selector.h" - #include -namespace selector +namespace pagoda { const char* ExtrudeGeometry::name = "ExtrudeGeometry"; const std::string ExtrudeGeometry::input_geometry("in"); @@ -70,4 +68,4 @@ void ExtrudeGeometry::DoWork() hierarchicalSystem->SetParent(out_hierarchical_component, in_hierarchical_component); } } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/extrude_geometry.h b/source/procedural_objects/extrude_geometry.h index 93bd3b3a..b62303c7 100644 --- a/source/procedural_objects/extrude_geometry.h +++ b/source/procedural_objects/extrude_geometry.h @@ -1,9 +1,9 @@ -#ifndef SELECTOR_PROCEDURAL_OBJECTS_EXTRUDE_GEOMETRY -#define SELECTOR_PROCEDURAL_OBJECTS_EXTRUDE_GEOMETRY +#ifndef PAGODA_PROCEDURAL_OBJECTS_EXTRUDE_GEOMETRY +#define PAGODA_PROCEDURAL_OBJECTS_EXTRUDE_GEOMETRY #include "procedural_operation.h" -namespace selector +namespace pagoda { class ExtrudeGeometry : public ProceduralOperation { @@ -18,6 +18,6 @@ class ExtrudeGeometry : public ProceduralOperation void DoWork() override; }; // class ExtrudeGEometry -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_objects/face_offset.cpp b/source/procedural_objects/face_offset.cpp index 306fc2e4..47ceb239 100644 --- a/source/procedural_objects/face_offset.cpp +++ b/source/procedural_objects/face_offset.cpp @@ -12,11 +12,9 @@ #include "geometry_operations/face_offset.h" -#include "../selector.h" - #include -namespace selector +namespace pagoda { const char* FaceOffsetOperation::name = "FaceOffsetOperation"; const std::string FaceOffsetOperation::inputGeometry("in"); @@ -95,5 +93,5 @@ void FaceOffsetOperation::DoWork() } } } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/face_offset.h b/source/procedural_objects/face_offset.h index b1b2b640..ce950df2 100644 --- a/source/procedural_objects/face_offset.h +++ b/source/procedural_objects/face_offset.h @@ -2,7 +2,7 @@ #include "procedural_operation.h" -namespace selector +namespace pagoda { class FaceOffsetOperation : public ProceduralOperation { @@ -17,4 +17,4 @@ class FaceOffsetOperation : public ProceduralOperation void DoWork() override; }; -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/geometry_component.cpp b/source/procedural_objects/geometry_component.cpp index 5de077d6..c65b5c51 100644 --- a/source/procedural_objects/geometry_component.cpp +++ b/source/procedural_objects/geometry_component.cpp @@ -1,10 +1,10 @@ #include "geometry_component.h" -namespace selector +namespace pagoda { std::string GeometryComponent::GetComponentSystemName() { return GeometrySystem::GetComponentSystemName(); } const Scope& GeometryComponent::GetScope() const { return m_scope; } void GeometryComponent::SetScope(const Scope& scope) { m_scope = scope; } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/geometry_component.h b/source/procedural_objects/geometry_component.h index 2cc319e9..7d4b7bb1 100644 --- a/source/procedural_objects/geometry_component.h +++ b/source/procedural_objects/geometry_component.h @@ -1,5 +1,5 @@ -#ifndef SELECTOR_PROCEDURAL_OBJECTS_GEOMETRY_COMPONENT_H_ -#define SELECTOR_PROCEDURAL_OBJECTS_GEOMETRY_COMPONENT_H_ +#ifndef PAGODA_PROCEDURAL_OBJECTS_GEOMETRY_COMPONENT_H_ +#define PAGODA_PROCEDURAL_OBJECTS_GEOMETRY_COMPONENT_H_ #include "geometry_system.h" @@ -7,7 +7,7 @@ #include "geometry_core/geometry_builder.h" #include "geometry_core/scope.h" -namespace selector +namespace pagoda { class GeometryComponent : public ProceduralComponent { @@ -27,6 +27,6 @@ class GeometryComponent : public ProceduralComponent Scope m_scope; }; // class GeometryComponent -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_objects/geometry_system.cpp b/source/procedural_objects/geometry_system.cpp index 8eda9db0..4d599a43 100644 --- a/source/procedural_objects/geometry_system.cpp +++ b/source/procedural_objects/geometry_system.cpp @@ -5,11 +5,11 @@ #include "geometry_component.h" #include "procedural_object.h" -namespace selector +namespace pagoda { const std::string GeometrySystem::GetComponentSystemName() { return "GeometrySystem"; } GeometrySystem::GeometrySystem() : ProceduralComponentSystem(GetComponentSystemName()) {} GeometrySystem::~GeometrySystem() {} -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/geometry_system.h b/source/procedural_objects/geometry_system.h index 4ddd8ae6..9b7c8ead 100644 --- a/source/procedural_objects/geometry_system.h +++ b/source/procedural_objects/geometry_system.h @@ -1,5 +1,5 @@ -#ifndef SELECTOR_PROCEDURAL_OBJECTS_GEOMETRY_SYSTEM_H_ -#define SELECTOR_PROCEDURAL_OBJECTS_GEOMETRY_SYSTEM_H_ +#ifndef PAGODA_PROCEDURAL_OBJECTS_GEOMETRY_SYSTEM_H_ +#define PAGODA_PROCEDURAL_OBJECTS_GEOMETRY_SYSTEM_H_ #include "procedural_component_system.h" #include "procedural_object.h" @@ -10,7 +10,7 @@ #include #include -namespace selector +namespace pagoda { // TODO: Maybe move these type defs to geometry core using Geometry = GeometryBase<>; @@ -37,6 +37,6 @@ class GeometrySystem : public ProceduralComponentSystem using GeometrySystemPtr = std::shared_ptr; using GeometrySystemWeakPtr = std::weak_ptr; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_objects/hierarchical_component.cpp b/source/procedural_objects/hierarchical_component.cpp index b8038d67..911ed8ec 100644 --- a/source/procedural_objects/hierarchical_component.cpp +++ b/source/procedural_objects/hierarchical_component.cpp @@ -3,7 +3,7 @@ #include "common/profiler.h" #include "hierarchical_system.h" -namespace selector +namespace pagoda { std::string HierarchicalComponent::GetComponentSystemName() { return HierarchicalSystem::GetComponentSystemName(); } @@ -26,4 +26,4 @@ void HierarchicalComponent::SetParent(std::shared_ptr par } } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/hierarchical_component.h b/source/procedural_objects/hierarchical_component.h index 3a7b0cb6..c02ba9e3 100644 --- a/source/procedural_objects/hierarchical_component.h +++ b/source/procedural_objects/hierarchical_component.h @@ -1,12 +1,12 @@ -#ifndef SELECTOR_PROCEDURAL_OBJECTS_HIERARCHICAL_COMPONENT_H_ -#define SELECTOR_PROCEDURAL_OBJECTS_HIERARCHICAL_COMPONENT_H_ +#ifndef PAGODA_PROCEDURAL_OBJECTS_HIERARCHICAL_COMPONENT_H_ +#define PAGODA_PROCEDURAL_OBJECTS_HIERARCHICAL_COMPONENT_H_ #include "procedural_component.h" #include #include -namespace selector +namespace pagoda { class HierarchicalComponent : public ProceduralComponent, public std::enable_shared_from_this { @@ -30,6 +30,6 @@ class HierarchicalComponent : public ProceduralComponent, public std::enable_sha std::weak_ptr parent; std::list> children; }; // class HierarchicalComponent -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_objects/hierarchical_system.cpp b/source/procedural_objects/hierarchical_system.cpp index 77a70a0c..dc0ac031 100644 --- a/source/procedural_objects/hierarchical_system.cpp +++ b/source/procedural_objects/hierarchical_system.cpp @@ -2,7 +2,7 @@ #include "hierarchical_component.h" -namespace selector +namespace pagoda { const std::string HierarchicalSystem::GetComponentSystemName() { return "HierarchicalSystem"; } @@ -28,4 +28,4 @@ void HierarchicalSystem::SetParent(std::shared_ptr parent } } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/hierarchical_system.h b/source/procedural_objects/hierarchical_system.h index a1bd6053..f43ec1a3 100644 --- a/source/procedural_objects/hierarchical_system.h +++ b/source/procedural_objects/hierarchical_system.h @@ -1,11 +1,11 @@ -#ifndef SELECTOR_PROCEDURAL_OBJECTS_HIERARCHICAL_SYSTEM_H_ -#define SELECTOR_PROCEDURAL_OBJECTS_HIERARCHICAL_SYSTEM_H_ +#ifndef PAGODA_PROCEDURAL_OBJECTS_HIERARCHICAL_SYSTEM_H_ +#define PAGODA_PROCEDURAL_OBJECTS_HIERARCHICAL_SYSTEM_H_ #include "procedural_object.h" #include "procedural_operation.h" #include "procedural_component_system.h" -namespace selector +namespace pagoda { class HierarchicalComponent; @@ -46,6 +46,6 @@ class HierarchicalSystem : public ProceduralComponentSystem; using HierarchicalSystemWeakPtr = std::weak_ptr; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_objects/operation_factory.cpp b/source/procedural_objects/operation_factory.cpp index 7287c564..d02c4d7d 100644 --- a/source/procedural_objects/operation_factory.cpp +++ b/source/procedural_objects/operation_factory.cpp @@ -1,8 +1,8 @@ #include "operation_factory.h" -namespace selector +namespace pagoda { OperationFactory::OperationFactory() : Factory("ProceduralOperation") {} OperationFactory::~OperationFactory() {} -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/operation_factory.h b/source/procedural_objects/operation_factory.h index 177cdfac..7164c26d 100644 --- a/source/procedural_objects/operation_factory.h +++ b/source/procedural_objects/operation_factory.h @@ -1,11 +1,11 @@ -#ifndef SELECTOR_OPERATION_FACTORY_H_ -#define SELECTOR_OPERATION_FACTORY_H_ +#ifndef PAGODA_OPERATION_FACTORY_H_ +#define PAGODA_OPERATION_FACTORY_H_ #include "common/factory.h" #include "procedural_operation.h" -namespace selector +namespace pagoda { class OperationFactory : public Factory { @@ -15,5 +15,5 @@ class OperationFactory : public Factory }; using OperationFactoryPtr = std::shared_ptr; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_objects/procedural_component.cpp b/source/procedural_objects/procedural_component.cpp index 3655e314..9df9c7ca 100644 --- a/source/procedural_objects/procedural_component.cpp +++ b/source/procedural_objects/procedural_component.cpp @@ -1,7 +1,7 @@ #include "procedural_component.h" -namespace selector +namespace pagoda { void ProceduralComponent::SetParentObject(ProceduralObjectPtr parent) { parent_object = parent; } ProceduralObjectPtr ProceduralComponent::GetParentObject() { return parent_object.lock(); } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/procedural_component.h b/source/procedural_objects/procedural_component.h index 1717341f..340a152b 100644 --- a/source/procedural_objects/procedural_component.h +++ b/source/procedural_objects/procedural_component.h @@ -1,9 +1,9 @@ -#ifndef SELECTOR_PROCEDURAL_OBJECTS_PROCEDURAL_COMPONENT_H_ -#define SELECTOR_PROCEDURAL_OBJECTS_PROCEDURAL_COMPONENT_H_ +#ifndef PAGODA_PROCEDURAL_OBJECTS_PROCEDURAL_COMPONENT_H_ +#define PAGODA_PROCEDURAL_OBJECTS_PROCEDURAL_COMPONENT_H_ #include -namespace selector +namespace pagoda { class ProceduralObject; using ProceduralObjectPtr = std::shared_ptr; @@ -27,6 +27,6 @@ class ProceduralComponent using ProceduralComponentPtr = std::shared_ptr; using ProceduralComponentWeakPtr = std::weak_ptr; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_objects/procedural_component_system.h b/source/procedural_objects/procedural_component_system.h index a8b9c610..6b23c760 100644 --- a/source/procedural_objects/procedural_component_system.h +++ b/source/procedural_objects/procedural_component_system.h @@ -1,5 +1,5 @@ -#ifndef SELECTOR_PROCEDURAL_COMPONENT_SYSTEM_H_ -#define SELECTOR_PROCEDURAL_COMPONENT_SYSTEM_H_ +#ifndef PAGODA_PROCEDURAL_COMPONENT_SYSTEM_H_ +#define PAGODA_PROCEDURAL_COMPONENT_SYSTEM_H_ #include "common/assertions.h" #include "common/logger.h" @@ -9,7 +9,7 @@ #include #include -namespace selector +namespace pagoda { class ProceduralObject; using ProceduralObjectPtr = std::shared_ptr; @@ -74,6 +74,6 @@ class ProceduralComponentSystem : public ProceduralComponentSystemBase std::unordered_map> m_components; }; // class ProceduralComponentSystem -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_objects/procedural_component_system_base.cpp b/source/procedural_objects/procedural_component_system_base.cpp index 8b99d484..7d3006e3 100644 --- a/source/procedural_objects/procedural_component_system_base.cpp +++ b/source/procedural_objects/procedural_component_system_base.cpp @@ -4,7 +4,7 @@ #include "common/logger.h" #include "common/profiler.h" -namespace selector +namespace pagoda { ProceduralComponentSystemBase::ProceduralComponentSystemBase(const std::string &name) : m_systemName(name) { @@ -17,4 +17,4 @@ ProceduralComponentSystemBase::~ProceduralComponentSystemBase() } std::string ProceduralComponentSystemBase::GetComponentSystemTypeName() const { return m_systemName; } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/procedural_component_system_base.h b/source/procedural_objects/procedural_component_system_base.h index 4e78fcd6..2f681d06 100644 --- a/source/procedural_objects/procedural_component_system_base.h +++ b/source/procedural_objects/procedural_component_system_base.h @@ -1,10 +1,10 @@ -#ifndef SELECTOR_PROCEDURAL_COMPONENT_SYSTEM_BASE_H_ -#define SELECTOR_PROCEDURAL_COMPONENT_SYSTEM_BASE_H_ +#ifndef PAGODA_PROCEDURAL_COMPONENT_SYSTEM_BASE_H_ +#define PAGODA_PROCEDURAL_COMPONENT_SYSTEM_BASE_H_ #include #include -namespace selector +namespace pagoda { class ProceduralObject; using ProceduralObjectPtr = std::shared_ptr; @@ -41,5 +41,5 @@ class ProceduralComponentSystemBase private: const std::string m_systemName; }; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_objects/procedural_object.cpp b/source/procedural_objects/procedural_object.cpp index 0901c39f..2a55a25f 100644 --- a/source/procedural_objects/procedural_object.cpp +++ b/source/procedural_objects/procedural_object.cpp @@ -2,7 +2,7 @@ #include "dynamic_value/type_info.h" -namespace selector +namespace pagoda { const TypeInfoPtr ProceduralObject::s_typeInfo = std::make_shared("ProceduralObject"); @@ -13,4 +13,4 @@ ProceduralObject::~ProceduralObject() {} std::string ProceduralObject::ToString() const { return ""; } void ProceduralObject::AcceptVisitor(ValueVisitorBase& visitor) { throw Exception("Unimplemented"); } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/procedural_object.h b/source/procedural_objects/procedural_object.h index a6e22d87..cc553d06 100644 --- a/source/procedural_objects/procedural_object.h +++ b/source/procedural_objects/procedural_object.h @@ -1,5 +1,5 @@ -#ifndef SELECTOR_PROCEDURAL_OBJECTS_PROCEDURAL_OBJECT_H_ -#define SELECTOR_PROCEDURAL_OBJECTS_PROCEDURAL_OBJECT_H_ +#ifndef PAGODA_PROCEDURAL_OBJECTS_PROCEDURAL_OBJECT_H_ +#define PAGODA_PROCEDURAL_OBJECTS_PROCEDURAL_OBJECT_H_ #include "dynamic_value/builtin_class.h" #include "geometry_core/geometry.h" @@ -11,7 +11,7 @@ #include #include -namespace selector +namespace pagoda { class Context; using ContextPtr = std::shared_ptr; @@ -36,6 +36,6 @@ class ProceduralObject : public std::enable_shared_from_this, using ProceduralObjectPtr = std::shared_ptr; using ProceduralObjectWeakPtr = std::weak_ptr; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_objects/procedural_object_mask.h b/source/procedural_objects/procedural_object_mask.h index 255a94dc..d9ba9270 100644 --- a/source/procedural_objects/procedural_object_mask.h +++ b/source/procedural_objects/procedural_object_mask.h @@ -1,11 +1,11 @@ -#ifndef SELECTOR_PROCEDURAL_OBJECT_MASK_H_ -#define SELECTOR_PROCEDURAL_OBJECT_MASK_H_ +#ifndef PAGODA_PROCEDURAL_OBJECT_MASK_H_ +#define PAGODA_PROCEDURAL_OBJECT_MASK_H_ #include "procedural_component.h" #include -namespace selector +namespace pagoda { } diff --git a/source/procedural_objects/procedural_object_predicate.cpp b/source/procedural_objects/procedural_object_predicate.cpp index 8aed1046..e80d2a9e 100644 --- a/source/procedural_objects/procedural_object_predicate.cpp +++ b/source/procedural_objects/procedural_object_predicate.cpp @@ -1,9 +1,9 @@ #include "procedural_object_predicate.h" -namespace selector +namespace pagoda { ProceduralObjectPredicate::ProceduralObjectPredicate(ProceduralObjectSystemPtr objectSystem) : m_objectSystem(objectSystem) { } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/procedural_object_predicate.h b/source/procedural_objects/procedural_object_predicate.h index 87aa4bda..bfb4b550 100644 --- a/source/procedural_objects/procedural_object_predicate.h +++ b/source/procedural_objects/procedural_object_predicate.h @@ -3,7 +3,7 @@ #include #include -namespace selector +namespace pagoda { class ProceduralObject; using ProceduralObjectPtr = std::shared_ptr; @@ -33,4 +33,4 @@ class ProceduralObjectPredicate protected: ProceduralObjectSystemPtr m_objectSystem; }; -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/procedural_object_predicate_registry.cpp b/source/procedural_objects/procedural_object_predicate_registry.cpp index b598c709..189624c1 100644 --- a/source/procedural_objects/procedural_object_predicate_registry.cpp +++ b/source/procedural_objects/procedural_object_predicate_registry.cpp @@ -2,7 +2,7 @@ #include "procedural_object_predicate.h" -namespace selector +namespace pagoda { void ProceduralObjectPredicateRegistry::Register(const std::string &name, ProceduralObjectPredicatePtr predicate) { @@ -18,4 +18,4 @@ ProceduralObjectPredicatePtr ProceduralObjectPredicateRegistry::Get(const std::s } return iter->second; } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/procedural_object_predicate_registry.h b/source/procedural_objects/procedural_object_predicate_registry.h index 3c5490e0..e13d8b89 100644 --- a/source/procedural_objects/procedural_object_predicate_registry.h +++ b/source/procedural_objects/procedural_object_predicate_registry.h @@ -4,7 +4,7 @@ #include #include -namespace selector +namespace pagoda { class ProceduralObjectPredicate; using ProceduralObjectPredicatePtr = std::shared_ptr; @@ -23,4 +23,4 @@ class ProceduralObjectPredicateRegistry }; using ProceduralObjectPredicateRegistryPtr = std::shared_ptr; -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/procedural_object_system.cpp b/source/procedural_objects/procedural_object_system.cpp index 8d0c4152..ffd2e314 100644 --- a/source/procedural_objects/procedural_object_system.cpp +++ b/source/procedural_objects/procedural_object_system.cpp @@ -7,7 +7,7 @@ #include "procedural_component_system.h" #include "procedural_object.h" -namespace selector +namespace pagoda { ProceduralObjectSystem::ProceduralObjectSystem() { LOG_TRACE(Core, "Creating ProceduralObjectSystem"); } @@ -88,4 +88,4 @@ void ProceduralObjectSystem::KillProceduralObject(std::shared_ptr #include -namespace selector +namespace pagoda { class ProceduralObject; class ProceduralComponentSystemBase; @@ -70,5 +70,5 @@ class ProceduralObjectSystem using ProceduralObjectSystemPtr = std::shared_ptr; using ProceduralObjectSystemWeakPtr = std::weak_ptr; -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/procedural_operation.cpp b/source/procedural_objects/procedural_operation.cpp index 8155621e..945a6e94 100644 --- a/source/procedural_objects/procedural_operation.cpp +++ b/source/procedural_objects/procedural_operation.cpp @@ -6,9 +6,7 @@ #include "dynamic_value/value_visitor.h" #include "procedural_object.h" -#include "../selector.h" - -namespace selector +namespace pagoda { const TypeInfoPtr ProceduralOperation::s_typeInfo = std::make_shared("ProceduralOperation"); @@ -120,4 +118,4 @@ void ProceduralOperation::UpdateValue(const std::string& valueName) DynamicValueBasePtr ProceduralOperation::GetValue(const std::string& valueName) { return GetMember(valueName); } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/procedural_operation.h b/source/procedural_objects/procedural_operation.h index 7a82444d..799d3c15 100644 --- a/source/procedural_objects/procedural_operation.h +++ b/source/procedural_objects/procedural_operation.h @@ -1,5 +1,5 @@ -#ifndef SELECTOR_PROCEDURAL_OBJECTS_PROCEDURAL_OPERATION_H_ -#define SELECTOR_PROCEDURAL_OBJECTS_PROCEDURAL_OPERATION_H_ +#ifndef PAGODA_PROCEDURAL_OBJECTS_PROCEDURAL_OPERATION_H_ +#define PAGODA_PROCEDURAL_OBJECTS_PROCEDURAL_OPERATION_H_ #include "common/factory.h" #include "dynamic_value/builtin_class.h" @@ -11,7 +11,7 @@ #include #include -namespace selector +namespace pagoda { class ProceduralObjectSystem; using ProceduralObjectSystemPtr = std::shared_ptr; @@ -87,5 +87,5 @@ class ProceduralOperation : public std::enable_shared_from_this #include -namespace selector +namespace pagoda { class ProceduralOperationObjectInterface { @@ -25,6 +25,6 @@ class ProceduralOperationObjectInterface std::string interface_name; std::list procedural_objects; }; // class ProceduralOperationObjectInterface -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_objects/repeat_split.cpp b/source/procedural_objects/repeat_split.cpp index 532a7b9a..46f0836f 100644 --- a/source/procedural_objects/repeat_split.cpp +++ b/source/procedural_objects/repeat_split.cpp @@ -13,7 +13,7 @@ #include "geometry_operations/plane_splits.h" -namespace selector +namespace pagoda { const std::string RepeatSplit::inputGeometry("in"); const std::string RepeatSplit::outputGeometry("out"); @@ -129,4 +129,4 @@ std::vector> RepeatSplit::CreatePlanes(const Scope& scope, const fl return planes; } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/repeat_split.h b/source/procedural_objects/repeat_split.h index b19138e8..5576b329 100644 --- a/source/procedural_objects/repeat_split.h +++ b/source/procedural_objects/repeat_split.h @@ -1,11 +1,11 @@ -#ifndef SELECTOR_PROCEDURAL_OBJECTS_REPEAT_SPLIT_H_ -#define SELECTOR_PROCEDURAL_OBJECTS_REPEAT_SPLIT_H_ +#ifndef PAGODA_PROCEDURAL_OBJECTS_REPEAT_SPLIT_H_ +#define PAGODA_PROCEDURAL_OBJECTS_REPEAT_SPLIT_H_ #include "math_lib/plane.h" #include "procedural_operation.h" -namespace selector +namespace pagoda { class Scope; @@ -24,6 +24,6 @@ class RepeatSplit : public ProceduralOperation private: std::vector> CreatePlanes(const Scope &scope, const float &size, const std::string &axis, bool adjust); }; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_objects/rotate.cpp b/source/procedural_objects/rotate.cpp index 90df0965..dca7ed55 100644 --- a/source/procedural_objects/rotate.cpp +++ b/source/procedural_objects/rotate.cpp @@ -18,7 +18,7 @@ #include #include -namespace selector +namespace pagoda { const std::string Rotate::s_inputGeometry("in"); const std::string Rotate::s_outputGeometry("out"); @@ -121,5 +121,5 @@ void Rotate::DoWork() auto outHierarchicalComponent = hierarchicalSystem->CreateComponentAs(outObject); hierarchicalSystem->SetParent(outHierarchicalComponent, inHierarchicalComponent); } -} // namespace selector -} // namespace selector +} // namespace pagoda +} // namespace pagoda diff --git a/source/procedural_objects/rotate.h b/source/procedural_objects/rotate.h index af77adfe..5d656f9c 100644 --- a/source/procedural_objects/rotate.h +++ b/source/procedural_objects/rotate.h @@ -2,7 +2,7 @@ #include "procedural_operation.h" -namespace selector +namespace pagoda { class Rotate : public ProceduralOperation { @@ -15,4 +15,4 @@ class Rotate : public ProceduralOperation void DoWork() override; }; -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/scale.cpp b/source/procedural_objects/scale.cpp index 875815bd..b3165360 100644 --- a/source/procedural_objects/scale.cpp +++ b/source/procedural_objects/scale.cpp @@ -15,7 +15,7 @@ #include #include -namespace selector +namespace pagoda { const std::string Scale::s_inputGeometry("in"); const std::string Scale::s_outputGeometry("out"); @@ -92,5 +92,5 @@ void Scale::DoWork() hierarchicalSystem->SetParent(outHierarchicalComponent, inHierarchicalComponent); } } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/scale.h b/source/procedural_objects/scale.h index 2ad2144b..f15399da 100644 --- a/source/procedural_objects/scale.h +++ b/source/procedural_objects/scale.h @@ -2,7 +2,7 @@ #include "procedural_operation.h" -namespace selector +namespace pagoda { class Scale : public ProceduralOperation { @@ -15,5 +15,5 @@ class Scale : public ProceduralOperation void DoWork() override; }; -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/scope_axis_direction_predicate.cpp b/source/procedural_objects/scope_axis_direction_predicate.cpp index 04954940..0612c2b6 100644 --- a/source/procedural_objects/scope_axis_direction_predicate.cpp +++ b/source/procedural_objects/scope_axis_direction_predicate.cpp @@ -11,7 +11,7 @@ #include #include -namespace selector +namespace pagoda { ScopeAxisDirectionPredicate::ScopeAxisDirectionPredicate(ProceduralObjectSystemPtr objectSystem, char scopeAxis, const Vec3F& direction, const Degrees& tolerance) @@ -51,4 +51,4 @@ std::string ScopeAxisDirectionPredicate::ToString() << " tolerance: " << static_cast(m_tolerance); return ss.str(); } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/scope_axis_direction_predicate.h b/source/procedural_objects/scope_axis_direction_predicate.h index d9f1ea90..a21000d0 100644 --- a/source/procedural_objects/scope_axis_direction_predicate.h +++ b/source/procedural_objects/scope_axis_direction_predicate.h @@ -4,7 +4,7 @@ #include "math_lib/vec_base.h" #include "procedural_object_predicate.h" -namespace selector +namespace pagoda { class GeometrySystem; using GeometrySystemPtr = std::shared_ptr; @@ -37,4 +37,4 @@ class ScopeAxisDirectionPredicate : public ProceduralObjectPredicate GeometrySystemPtr m_geometrySystem; }; -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/split.cpp b/source/procedural_objects/split.cpp index 538d38c2..a8e64fdd 100644 --- a/source/procedural_objects/split.cpp +++ b/source/procedural_objects/split.cpp @@ -12,7 +12,7 @@ #include "geometry_operations/plane_splits.h" -namespace selector +namespace pagoda { const std::string Split::s_inputGeometry("in"); @@ -134,4 +134,4 @@ void Split::DoWork() } } } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/split.h b/source/procedural_objects/split.h index ad32335a..141d63d7 100644 --- a/source/procedural_objects/split.h +++ b/source/procedural_objects/split.h @@ -2,7 +2,7 @@ #include "procedural_operation.h" -namespace selector +namespace pagoda { class Split : public ProceduralOperation { @@ -14,4 +14,4 @@ class Split : public ProceduralOperation void DoWork() override; }; -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/translate.cpp b/source/procedural_objects/translate.cpp index 35a73773..c09fbc2a 100644 --- a/source/procedural_objects/translate.cpp +++ b/source/procedural_objects/translate.cpp @@ -15,7 +15,7 @@ #include #include -namespace selector +namespace pagoda { const std::string Translate::s_inputGeometry("in"); const std::string Translate::s_outputGeometry("out"); @@ -80,4 +80,4 @@ void Translate::DoWork() hierarchicalSystem->SetParent(outHierarchicalComponent, inHierarchicalComponent); } } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/translate.h b/source/procedural_objects/translate.h index 49e5049e..1eb807b1 100644 --- a/source/procedural_objects/translate.h +++ b/source/procedural_objects/translate.h @@ -2,7 +2,7 @@ #include "procedural_operation.h" -namespace selector +namespace pagoda { class Translate : public ProceduralOperation { @@ -15,4 +15,4 @@ class Translate : public ProceduralOperation void DoWork() override; }; -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/triangulate_geometry.cpp b/source/procedural_objects/triangulate_geometry.cpp index 190998b8..e8718007 100644 --- a/source/procedural_objects/triangulate_geometry.cpp +++ b/source/procedural_objects/triangulate_geometry.cpp @@ -10,11 +10,9 @@ #include "geometry_operations/ear_clipping.h" -#include "../selector.h" - #include -namespace selector +namespace pagoda { const std::string TriangulateGeometry::sInputGeometry("in"); const std::string TriangulateGeometry::sOutputGeometry("out"); @@ -66,4 +64,4 @@ void TriangulateGeometry::DoWork() } } -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/triangulate_geometry.h b/source/procedural_objects/triangulate_geometry.h index 76969fbc..c17321da 100644 --- a/source/procedural_objects/triangulate_geometry.h +++ b/source/procedural_objects/triangulate_geometry.h @@ -1,10 +1,10 @@ #pragma once -#ifndef SELECTOR_PROCEDURAL_OBJECT_TRIANGULATE_GEOMETRY_H_ -#define SELECTOR_PROCEDURAL_OBJECT_TRIANGULATE_GEOMETRY_H_ +#ifndef PAGODA_PROCEDURAL_OBJECT_TRIANGULATE_GEOMETRY_H_ +#define PAGODA_PROCEDURAL_OBJECT_TRIANGULATE_GEOMETRY_H_ #include "procedural_operation.h" -namespace selector +namespace pagoda { class TriangulateGeometry : public ProceduralOperation { @@ -18,6 +18,6 @@ class TriangulateGeometry : public ProceduralOperation void DoWork() override; }; -} // namespace selector +} // namespace pagoda #endif diff --git a/source/procedural_objects/unknown_operation.cpp b/source/procedural_objects/unknown_operation.cpp index f2a9f9e3..1a4f344a 100644 --- a/source/procedural_objects/unknown_operation.cpp +++ b/source/procedural_objects/unknown_operation.cpp @@ -1,6 +1,6 @@ #include "unknown_operation.h" -namespace selector +namespace pagoda { UnknownOperation::UnknownOperation(const std::string operationName) : Exception("Unknown operation " + operationName) {} -} // namespace selector +} // namespace pagoda diff --git a/source/procedural_objects/unknown_operation.h b/source/procedural_objects/unknown_operation.h index f1c01a66..f0b07d97 100644 --- a/source/procedural_objects/unknown_operation.h +++ b/source/procedural_objects/unknown_operation.h @@ -4,12 +4,12 @@ #include -namespace selector +namespace pagoda { class UnknownOperation : public Exception { public: UnknownOperation(const std::string operationName); }; -} // namespace selector +} // namespace pagoda diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index fb65dff7..8b5e3aa9 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,3 +1,3 @@ add_subdirectory(unit_tests) add_subdirectory(regression_tests) -add_subdirectory(selscript) +add_subdirectory(pgscript) diff --git a/tests/selscript/CMakeLists.txt b/tests/pgscript/CMakeLists.txt similarity index 71% rename from tests/selscript/CMakeLists.txt rename to tests/pgscript/CMakeLists.txt index ce5a140d..261ccfe2 100644 --- a/tests/selscript/CMakeLists.txt +++ b/tests/pgscript/CMakeLists.txt @@ -2,10 +2,10 @@ set(test_srcs "main.cpp" ) -add_executable(selscript_tests ${test_srcs}) +add_executable(pgscript_tests ${test_srcs}) target_compile_features( - selscript_tests + pgscript_tests PRIVATE cxx_std_17 cxx_constexpr @@ -13,7 +13,7 @@ target_compile_features( ) target_compile_options( - selscript_tests + pgscript_tests PRIVATE -Wall $<$:-Werror> @@ -21,9 +21,9 @@ target_compile_options( ) target_include_directories( - selscript_tests + pgscript_tests PUBLIC - $ + $ $ PRIVATE ${CMAKE_SOURCE_DIR}/source @@ -31,15 +31,15 @@ target_include_directories( ) target_compile_definitions( - selscript_tests + pgscript_tests PRIVATE - -DASSERTS_ENABLED=${Selector_ENABLE_ASSERTIONS} + -DASSERTS_ENABLED=${Pagoda_ENABLE_ASSERTIONS} ) target_link_libraries( - selscript_tests + pgscript_tests PRIVATE - selector + libpagoda Boost::chrono Boost::system Boost::filesystem @@ -50,4 +50,4 @@ target_link_libraries( file(COPY test_files DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) -add_test(NAME selscript_tests COMMAND selscript_tests) +add_test(NAME pgscript_tests COMMAND pgscript_tests) diff --git a/tests/selscript/main.cpp b/tests/pgscript/main.cpp similarity index 94% rename from tests/selscript/main.cpp rename to tests/pgscript/main.cpp index a00d9dbe..ddf451a8 100644 --- a/tests/selscript/main.cpp +++ b/tests/pgscript/main.cpp @@ -1,10 +1,10 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -19,7 +19,7 @@ #include -using namespace selector; +using namespace pagoda; class RegressionTest { @@ -74,7 +74,7 @@ class RegressionTest } } - boost::filesystem::path GetScriptFile() const { return (m_testDir / (m_regressionTestName + ".sscript")); } + boost::filesystem::path GetScriptFile() const { return (m_testDir / (m_regressionTestName + ".pgx")); } boost::filesystem::path GetASTFile() const { return (m_testDir / "ast.txt"); } boost::filesystem::path GetStdOutFile() const { return (m_testDir / "out.txt"); } boost::filesystem::path GetStdErrFile() const { return (m_testDir / "err.txt"); } diff --git a/tests/selscript/test_files/float_operations/ast.txt b/tests/pgscript/test_files/float_operations/ast.txt similarity index 100% rename from tests/selscript/test_files/float_operations/ast.txt rename to tests/pgscript/test_files/float_operations/ast.txt diff --git a/tests/selscript/test_files/float_operations/err.txt b/tests/pgscript/test_files/float_operations/err.txt similarity index 100% rename from tests/selscript/test_files/float_operations/err.txt rename to tests/pgscript/test_files/float_operations/err.txt diff --git a/tests/selscript/test_files/float_operations/float_operations.sscript b/tests/pgscript/test_files/float_operations/float_operations.pgx similarity index 100% rename from tests/selscript/test_files/float_operations/float_operations.sscript rename to tests/pgscript/test_files/float_operations/float_operations.pgx diff --git a/tests/selscript/test_files/float_operations/out.txt b/tests/pgscript/test_files/float_operations/out.txt similarity index 100% rename from tests/selscript/test_files/float_operations/out.txt rename to tests/pgscript/test_files/float_operations/out.txt diff --git a/tests/selscript/test_files/integer_operations/ast.txt b/tests/pgscript/test_files/integer_operations/ast.txt similarity index 100% rename from tests/selscript/test_files/integer_operations/ast.txt rename to tests/pgscript/test_files/integer_operations/ast.txt diff --git a/tests/selscript/test_files/integer_operations/err.txt b/tests/pgscript/test_files/integer_operations/err.txt similarity index 100% rename from tests/selscript/test_files/integer_operations/err.txt rename to tests/pgscript/test_files/integer_operations/err.txt diff --git a/tests/selscript/test_files/integer_operations/integer_operations.sscript b/tests/pgscript/test_files/integer_operations/integer_operations.pgx similarity index 100% rename from tests/selscript/test_files/integer_operations/integer_operations.sscript rename to tests/pgscript/test_files/integer_operations/integer_operations.pgx diff --git a/tests/selscript/test_files/integer_operations/out.txt b/tests/pgscript/test_files/integer_operations/out.txt similarity index 100% rename from tests/selscript/test_files/integer_operations/out.txt rename to tests/pgscript/test_files/integer_operations/out.txt diff --git a/tests/selscript/test_files/plane/ast.txt b/tests/pgscript/test_files/plane/ast.txt similarity index 100% rename from tests/selscript/test_files/plane/ast.txt rename to tests/pgscript/test_files/plane/ast.txt diff --git a/tests/selscript/test_files/plane/err.txt b/tests/pgscript/test_files/plane/err.txt similarity index 100% rename from tests/selscript/test_files/plane/err.txt rename to tests/pgscript/test_files/plane/err.txt diff --git a/tests/selscript/test_files/plane/out.txt b/tests/pgscript/test_files/plane/out.txt similarity index 100% rename from tests/selscript/test_files/plane/out.txt rename to tests/pgscript/test_files/plane/out.txt diff --git a/tests/selscript/test_files/plane/plane.sscript b/tests/pgscript/test_files/plane/plane.pgx similarity index 100% rename from tests/selscript/test_files/plane/plane.sscript rename to tests/pgscript/test_files/plane/plane.pgx diff --git a/tests/selscript/test_files/string_operations/ast.txt b/tests/pgscript/test_files/string_operations/ast.txt similarity index 100% rename from tests/selscript/test_files/string_operations/ast.txt rename to tests/pgscript/test_files/string_operations/ast.txt diff --git a/tests/selscript/test_files/string_operations/err.txt b/tests/pgscript/test_files/string_operations/err.txt similarity index 100% rename from tests/selscript/test_files/string_operations/err.txt rename to tests/pgscript/test_files/string_operations/err.txt diff --git a/tests/selscript/test_files/string_operations/out.txt b/tests/pgscript/test_files/string_operations/out.txt similarity index 100% rename from tests/selscript/test_files/string_operations/out.txt rename to tests/pgscript/test_files/string_operations/out.txt diff --git a/tests/selscript/test_files/string_operations/string_operations.sscript b/tests/pgscript/test_files/string_operations/string_operations.pgx similarity index 100% rename from tests/selscript/test_files/string_operations/string_operations.sscript rename to tests/pgscript/test_files/string_operations/string_operations.pgx diff --git a/tests/selscript/test_files/vector/ast.txt b/tests/pgscript/test_files/vector/ast.txt similarity index 100% rename from tests/selscript/test_files/vector/ast.txt rename to tests/pgscript/test_files/vector/ast.txt diff --git a/tests/selscript/test_files/vector/err.txt b/tests/pgscript/test_files/vector/err.txt similarity index 100% rename from tests/selscript/test_files/vector/err.txt rename to tests/pgscript/test_files/vector/err.txt diff --git a/tests/selscript/test_files/vector/out.txt b/tests/pgscript/test_files/vector/out.txt similarity index 100% rename from tests/selscript/test_files/vector/out.txt rename to tests/pgscript/test_files/vector/out.txt diff --git a/tests/selscript/test_files/vector/vector.sscript b/tests/pgscript/test_files/vector/vector.pgx similarity index 100% rename from tests/selscript/test_files/vector/vector.sscript rename to tests/pgscript/test_files/vector/vector.pgx diff --git a/tests/regression_tests/CMakeLists.txt b/tests/regression_tests/CMakeLists.txt index d233d0e9..98c9da8a 100644 --- a/tests/regression_tests/CMakeLists.txt +++ b/tests/regression_tests/CMakeLists.txt @@ -28,7 +28,7 @@ target_compile_options( target_include_directories( regression_tests PUBLIC - $ + $ $ PRIVATE ${CMAKE_SOURCE_DIR}/source @@ -38,13 +38,13 @@ target_include_directories( target_compile_definitions( regression_tests PRIVATE - -DASSERTS_ENABLED=${Selector_ENABLE_ASSERTIONS} + -DASSERTS_ENABLED=${Pagoda_ENABLE_ASSERTIONS} ) target_link_libraries( regression_tests PRIVATE - selector + libpagoda Boost::chrono Boost::system Boost::filesystem diff --git a/tests/regression_tests/main.cpp.in b/tests/regression_tests/main.cpp.in index fa9ac516..52887ddc 100644 --- a/tests/regression_tests/main.cpp.in +++ b/tests/regression_tests/main.cpp.in @@ -10,11 +10,11 @@ #include #include -#include +#include #include -using namespace selector; +using namespace pagoda; class RegressionTest { @@ -36,7 +36,7 @@ public: auto pathToGraphFile = GetTestFilesDirectory(); pathToGraphFile /= "test_files"; pathToGraphFile /= m_regressionTestName; - pathToGraphFile /= m_regressionTestName + ".sel"; + pathToGraphFile /= m_regressionTestName + ".pgd"; return pathToGraphFile; } @@ -84,7 +84,7 @@ public: std::shared_ptr ReadGraphFromFile(const std::string& filePath) { - m_graph = m_selector.CreateGraphFromFile(filePath); + m_graph = m_pagoda.CreateGraphFromFile(filePath); return m_graph; } @@ -122,7 +122,7 @@ private: std::string m_regressionTestName; GraphPtr m_graph; - Selector m_selector; + Pagoda m_pagoda; static bool s_writeFiles; }; diff --git a/tests/regression_tests/test_files/banner/banner.sel b/tests/regression_tests/test_files/banner/banner.pgd similarity index 100% rename from tests/regression_tests/test_files/banner/banner.sel rename to tests/regression_tests/test_files/banner/banner.pgd diff --git a/tests/regression_tests/test_files/clip_geometry/clip_geometry.sel b/tests/regression_tests/test_files/clip_geometry/clip_geometry.pgd similarity index 100% rename from tests/regression_tests/test_files/clip_geometry/clip_geometry.sel rename to tests/regression_tests/test_files/clip_geometry/clip_geometry.pgd diff --git a/tests/regression_tests/test_files/create_box/create_box.sel b/tests/regression_tests/test_files/create_box/create_box.pgd similarity index 100% rename from tests/regression_tests/test_files/create_box/create_box.sel rename to tests/regression_tests/test_files/create_box/create_box.pgd diff --git a/tests/regression_tests/test_files/create_rect/create_rect.sel b/tests/regression_tests/test_files/create_rect/create_rect.pgd similarity index 100% rename from tests/regression_tests/test_files/create_rect/create_rect.sel rename to tests/regression_tests/test_files/create_rect/create_rect.pgd diff --git a/tests/regression_tests/test_files/create_sphere/create_sphere.sel b/tests/regression_tests/test_files/create_sphere/create_sphere.pgd similarity index 100% rename from tests/regression_tests/test_files/create_sphere/create_sphere.sel rename to tests/regression_tests/test_files/create_sphere/create_sphere.pgd diff --git a/tests/regression_tests/test_files/export_geometry/export_geometry.sel b/tests/regression_tests/test_files/export_geometry/export_geometry.pgd similarity index 100% rename from tests/regression_tests/test_files/export_geometry/export_geometry.sel rename to tests/regression_tests/test_files/export_geometry/export_geometry.pgd diff --git a/tests/regression_tests/test_files/expression/expression.sel b/tests/regression_tests/test_files/expression/expression.pgd similarity index 100% rename from tests/regression_tests/test_files/expression/expression.sel rename to tests/regression_tests/test_files/expression/expression.pgd diff --git a/tests/regression_tests/test_files/extract_faces/extract_faces.sel b/tests/regression_tests/test_files/extract_faces/extract_faces.pgd similarity index 100% rename from tests/regression_tests/test_files/extract_faces/extract_faces.sel rename to tests/regression_tests/test_files/extract_faces/extract_faces.pgd diff --git a/tests/regression_tests/test_files/extrusion/extrusion.sel b/tests/regression_tests/test_files/extrusion/extrusion.pgd similarity index 100% rename from tests/regression_tests/test_files/extrusion/extrusion.sel rename to tests/regression_tests/test_files/extrusion/extrusion.pgd diff --git a/tests/regression_tests/test_files/face_offset/face_offset.sel b/tests/regression_tests/test_files/face_offset/face_offset.pgd similarity index 100% rename from tests/regression_tests/test_files/face_offset/face_offset.sel rename to tests/regression_tests/test_files/face_offset/face_offset.pgd diff --git a/tests/regression_tests/test_files/parameter_definition/parameter_definition.sel b/tests/regression_tests/test_files/parameter_definition/parameter_definition.pgd similarity index 100% rename from tests/regression_tests/test_files/parameter_definition/parameter_definition.sel rename to tests/regression_tests/test_files/parameter_definition/parameter_definition.pgd diff --git a/tests/regression_tests/test_files/parameter_overwrite/parameter_overwrite.sel b/tests/regression_tests/test_files/parameter_overwrite/parameter_overwrite.pgd similarity index 100% rename from tests/regression_tests/test_files/parameter_overwrite/parameter_overwrite.sel rename to tests/regression_tests/test_files/parameter_overwrite/parameter_overwrite.pgd diff --git a/tests/regression_tests/test_files/parameter_renaming/parameter_renaming.sel b/tests/regression_tests/test_files/parameter_renaming/parameter_renaming.pgd similarity index 100% rename from tests/regression_tests/test_files/parameter_renaming/parameter_renaming.sel rename to tests/regression_tests/test_files/parameter_renaming/parameter_renaming.pgd diff --git a/tests/regression_tests/test_files/parameters_in_procedural_objects/parameters_in_procedural_objects.sel b/tests/regression_tests/test_files/parameters_in_procedural_objects/parameters_in_procedural_objects.pgd similarity index 100% rename from tests/regression_tests/test_files/parameters_in_procedural_objects/parameters_in_procedural_objects.sel rename to tests/regression_tests/test_files/parameters_in_procedural_objects/parameters_in_procedural_objects.pgd diff --git a/tests/regression_tests/test_files/repeat_split/repeat_split.sel b/tests/regression_tests/test_files/repeat_split/repeat_split.pgd similarity index 100% rename from tests/regression_tests/test_files/repeat_split/repeat_split.sel rename to tests/regression_tests/test_files/repeat_split/repeat_split.pgd diff --git a/tests/regression_tests/test_files/rotate/rotate.sel b/tests/regression_tests/test_files/rotate/rotate.pgd similarity index 100% rename from tests/regression_tests/test_files/rotate/rotate.sel rename to tests/regression_tests/test_files/rotate/rotate.pgd diff --git a/tests/regression_tests/test_files/router/router.sel b/tests/regression_tests/test_files/router/router.pgd similarity index 100% rename from tests/regression_tests/test_files/router/router.sel rename to tests/regression_tests/test_files/router/router.pgd diff --git a/tests/regression_tests/test_files/scale/scale.sel b/tests/regression_tests/test_files/scale/scale.pgd similarity index 100% rename from tests/regression_tests/test_files/scale/scale.sel rename to tests/regression_tests/test_files/scale/scale.pgd diff --git a/tests/regression_tests/test_files/split/split.sel b/tests/regression_tests/test_files/split/split.pgd similarity index 100% rename from tests/regression_tests/test_files/split/split.sel rename to tests/regression_tests/test_files/split/split.pgd diff --git a/tests/regression_tests/test_files/translate/translate.sel b/tests/regression_tests/test_files/translate/translate.pgd similarity index 100% rename from tests/regression_tests/test_files/translate/translate.sel rename to tests/regression_tests/test_files/translate/translate.pgd diff --git a/tests/regression_tests/test_files/triangulate_geometry/triangulate_geometry.sel b/tests/regression_tests/test_files/triangulate_geometry/triangulate_geometry.pgd similarity index 100% rename from tests/regression_tests/test_files/triangulate_geometry/triangulate_geometry.sel rename to tests/regression_tests/test_files/triangulate_geometry/triangulate_geometry.pgd diff --git a/tests/unit_tests/CMakeLists.txt b/tests/unit_tests/CMakeLists.txt index a282f77e..a381f7cf 100644 --- a/tests/unit_tests/CMakeLists.txt +++ b/tests/unit_tests/CMakeLists.txt @@ -50,7 +50,7 @@ set(test_srcs "procedural_graph/graph_reader_grammar.cpp" "procedural_graph/parameter_node.cpp" "procedural_graph/graph_reader_ast.cpp" - "selscript/grammar.cpp" + "pgscript/grammar.cpp" ) add_executable(unit_tests ${test_srcs}) @@ -74,7 +74,7 @@ target_compile_options( target_include_directories( unit_tests PUBLIC - $ + $ $ PRIVATE ${CMAKE_SOURCE_DIR}/source @@ -85,13 +85,13 @@ target_include_directories( target_compile_definitions( unit_tests PRIVATE - -DASSERTS_ENABLED=${Selector_ENABLE_ASSERTIONS} + -DASSERTS_ENABLED=${Pagoda_ENABLE_ASSERTIONS} ) target_link_libraries( unit_tests PRIVATE - selector + libpagoda Boost::chrono Boost::system Boost::filesystem diff --git a/tests/unit_tests/common/profiler.cpp b/tests/unit_tests/common/profiler.cpp index 048163c9..65bb43a7 100644 --- a/tests/unit_tests/common/profiler.cpp +++ b/tests/unit_tests/common/profiler.cpp @@ -13,7 +13,7 @@ #include -using namespace selector; +using namespace pagoda; void GetInstance(ProfilerManager** instance) { *instance = ProfilerManager::Instance(); } diff --git a/tests/unit_tests/common/range.cpp b/tests/unit_tests/common/range.cpp index 3e6fbc84..952a9430 100644 --- a/tests/unit_tests/common/range.cpp +++ b/tests/unit_tests/common/range.cpp @@ -4,7 +4,7 @@ #include -using namespace selector; +using namespace pagoda; template class RangeTest : public ::testing::Test diff --git a/tests/unit_tests/dynamic_value/base_dynamic_values.cpp b/tests/unit_tests/dynamic_value/base_dynamic_values.cpp index b069f67f..effe75bd 100644 --- a/tests/unit_tests/dynamic_value/base_dynamic_values.cpp +++ b/tests/unit_tests/dynamic_value/base_dynamic_values.cpp @@ -12,7 +12,7 @@ #include "../test_utils.h" -using namespace selector; +using namespace pagoda; TEST(FloatValue, test_constructions) { diff --git a/tests/unit_tests/dynamic_value/call_free_function.cpp b/tests/unit_tests/dynamic_value/call_free_function.cpp index 942026ec..f6391b22 100644 --- a/tests/unit_tests/dynamic_value/call_free_function.cpp +++ b/tests/unit_tests/dynamic_value/call_free_function.cpp @@ -7,7 +7,7 @@ #include "../test_utils.h" -using namespace selector; +using namespace pagoda; static bool called_f = false; static void f() { called_f = true; } diff --git a/tests/unit_tests/dynamic_value/call_member_function.cpp b/tests/unit_tests/dynamic_value/call_member_function.cpp index 907754dc..2aed9632 100644 --- a/tests/unit_tests/dynamic_value/call_member_function.cpp +++ b/tests/unit_tests/dynamic_value/call_member_function.cpp @@ -7,7 +7,7 @@ #include "../test_utils.h" -using namespace selector; +using namespace pagoda; class C { diff --git a/tests/unit_tests/dynamic_value/cast_to.cpp b/tests/unit_tests/dynamic_value/cast_to.cpp index c8a0ece2..3c43c625 100644 --- a/tests/unit_tests/dynamic_value/cast_to.cpp +++ b/tests/unit_tests/dynamic_value/cast_to.cpp @@ -8,7 +8,7 @@ #include "../test_utils.h" -using namespace selector; +using namespace pagoda; TEST(CastTo, test_dynamic_value_cast_to_native) { diff --git a/tests/unit_tests/dynamic_value/dynamic_class.cpp b/tests/unit_tests/dynamic_value/dynamic_class.cpp index 96b29e1f..7ba08ffc 100644 --- a/tests/unit_tests/dynamic_value/dynamic_class.cpp +++ b/tests/unit_tests/dynamic_value/dynamic_class.cpp @@ -8,7 +8,7 @@ #include "../test_utils.h" -using namespace selector; +using namespace pagoda; class TestCallableBody : public ICallableBody { diff --git a/tests/unit_tests/dynamic_value/dynamic_plane.cpp b/tests/unit_tests/dynamic_value/dynamic_plane.cpp index d924c5c2..04415350 100644 --- a/tests/unit_tests/dynamic_value/dynamic_plane.cpp +++ b/tests/unit_tests/dynamic_value/dynamic_plane.cpp @@ -11,7 +11,7 @@ #include "../test_utils.h" -using namespace selector; +using namespace pagoda; TEST(DynamicPlaneTest, test_construction) { diff --git a/tests/unit_tests/dynamic_value/dynamic_value_table.cpp b/tests/unit_tests/dynamic_value/dynamic_value_table.cpp index 86e68a69..f3ffa6b9 100644 --- a/tests/unit_tests/dynamic_value/dynamic_value_table.cpp +++ b/tests/unit_tests/dynamic_value/dynamic_value_table.cpp @@ -7,7 +7,7 @@ #include "../test_utils.h" -using namespace selector; +using namespace pagoda; class DynamicValueTableTest : public ::testing::Test { diff --git a/tests/unit_tests/dynamic_value/free_function_callable_body.cpp b/tests/unit_tests/dynamic_value/free_function_callable_body.cpp index abf8fc7f..ba4f1395 100644 --- a/tests/unit_tests/dynamic_value/free_function_callable_body.cpp +++ b/tests/unit_tests/dynamic_value/free_function_callable_body.cpp @@ -6,7 +6,7 @@ #include "../test_utils.h" -using namespace selector; +using namespace pagoda; static bool test_function1Called = false; void test_function1() { test_function1Called = true; } diff --git a/tests/unit_tests/dynamic_value/has_operators.cpp b/tests/unit_tests/dynamic_value/has_operators.cpp index 69726ca1..24e607b1 100644 --- a/tests/unit_tests/dynamic_value/has_operators.cpp +++ b/tests/unit_tests/dynamic_value/has_operators.cpp @@ -12,7 +12,7 @@ #include "../test_utils.h" -using namespace selector; +using namespace pagoda; template bool assertHasAddOperator() diff --git a/tests/unit_tests/dynamic_value/make_free_function.cpp b/tests/unit_tests/dynamic_value/make_free_function.cpp index 352bb518..1cf35686 100644 --- a/tests/unit_tests/dynamic_value/make_free_function.cpp +++ b/tests/unit_tests/dynamic_value/make_free_function.cpp @@ -5,7 +5,7 @@ #include "../test_utils.h" -using namespace selector; +using namespace pagoda; static bool called_f = false; static void f() { called_f = true; } diff --git a/tests/unit_tests/dynamic_value/make_member_function.cpp b/tests/unit_tests/dynamic_value/make_member_function.cpp index 540659aa..fdb3853b 100644 --- a/tests/unit_tests/dynamic_value/make_member_function.cpp +++ b/tests/unit_tests/dynamic_value/make_member_function.cpp @@ -5,7 +5,7 @@ #include "../test_utils.h" -using namespace selector; +using namespace pagoda; class C { diff --git a/tests/unit_tests/dynamic_value/operators.cpp b/tests/unit_tests/dynamic_value/operators.cpp index ce55f9f3..f68f74b2 100644 --- a/tests/unit_tests/dynamic_value/operators.cpp +++ b/tests/unit_tests/dynamic_value/operators.cpp @@ -19,7 +19,7 @@ #include #include "../test_utils.h" -using namespace selector; +using namespace pagoda; TEST(UnaryOperators, test_valid_negate_operator) { @@ -125,7 +125,7 @@ TEST(BinaryOperators, test_valid_div_operator) auto f1 = std::make_shared(123.0f); auto f2 = std::make_shared(2.0f); - binary_op_dispatcher dispatcher(f1, f2); + binary_op_dispatcher dispatcher(f1, f2); FloatValuePtr result = std::dynamic_pointer_cast(apply_visitor(dispatcher, *f1)); ASSERT_NE(result, nullptr); EXPECT_EQ(123.0f / 2.0f, static_cast(*result)); @@ -136,7 +136,7 @@ TEST(BinaryOperators, test_valid_eq_operator) auto f1 = std::make_shared(123.0f); auto f2 = std::make_shared(123.0f); - binary_op_dispatcher dispatcher(f1, f2); + binary_op_dispatcher dispatcher(f1, f2); BooleanPtr result = std::dynamic_pointer_cast(apply_visitor(dispatcher, *f1)); ASSERT_NE(result, nullptr); EXPECT_TRUE(static_cast(*result)); @@ -147,7 +147,7 @@ TEST(BinaryOperators, test_valid_neq_operator) auto f1 = std::make_shared(123.0f); auto f2 = std::make_shared(23.0f); - binary_op_dispatcher dispatcher(f1, f2); + binary_op_dispatcher dispatcher(f1, f2); BooleanPtr result = std::dynamic_pointer_cast(apply_visitor(dispatcher, *f1)); ASSERT_NE(result, nullptr); EXPECT_TRUE(static_cast(*result)); @@ -158,7 +158,7 @@ TEST(BinaryOperators, test_valid_gt_operator) auto f1 = std::make_shared(123.0f); auto f2 = std::make_shared(23.0f); - binary_op_dispatcher dispatcher(f1, f2); + binary_op_dispatcher dispatcher(f1, f2); BooleanPtr result = std::dynamic_pointer_cast(apply_visitor(dispatcher, *f1)); ASSERT_NE(result, nullptr); EXPECT_TRUE(static_cast(*result)); @@ -169,7 +169,7 @@ TEST(BinaryOperators, test_valid_gte_operator) auto f1 = std::make_shared(123.0f); auto f2 = std::make_shared(23.0f); - binary_op_dispatcher dispatcher(f1, f2); + binary_op_dispatcher dispatcher(f1, f2); BooleanPtr result = std::dynamic_pointer_cast(apply_visitor(dispatcher, *f1)); ASSERT_NE(result, nullptr); EXPECT_TRUE(static_cast(*result)); @@ -180,7 +180,7 @@ TEST(BinaryOperators, test_valid_lt_operator) auto f2 = std::make_shared(123.0f); auto f1 = std::make_shared(23.0f); - binary_op_dispatcher dispatcher(f1, f2); + binary_op_dispatcher dispatcher(f1, f2); BooleanPtr result = std::dynamic_pointer_cast(apply_visitor(dispatcher, *f1)); ASSERT_NE(result, nullptr); EXPECT_TRUE(static_cast(*result)); @@ -191,7 +191,7 @@ TEST(BinaryOperators, test_valid_lte_operator) auto f2 = std::make_shared(123.0f); auto f1 = std::make_shared(23.0f); - binary_op_dispatcher dispatcher(f1, f2); + binary_op_dispatcher dispatcher(f1, f2); BooleanPtr result = std::dynamic_pointer_cast(apply_visitor(dispatcher, *f1)); ASSERT_NE(result, nullptr); EXPECT_TRUE(static_cast(*result)); diff --git a/tests/unit_tests/dynamic_value/return_from_function.cpp b/tests/unit_tests/dynamic_value/return_from_function.cpp index 7628d84f..b2bb83b4 100644 --- a/tests/unit_tests/dynamic_value/return_from_function.cpp +++ b/tests/unit_tests/dynamic_value/return_from_function.cpp @@ -9,7 +9,7 @@ #include "../test_utils.h" -using namespace selector; +using namespace pagoda; static BooleanPtr f2(BooleanPtr b) { return b; } diff --git a/tests/unit_tests/dynamic_value/vector.cpp b/tests/unit_tests/dynamic_value/vector.cpp index f97d9cc6..80d74108 100644 --- a/tests/unit_tests/dynamic_value/vector.cpp +++ b/tests/unit_tests/dynamic_value/vector.cpp @@ -9,7 +9,7 @@ #include "../test_utils.h" -using namespace selector; +using namespace pagoda; TEST(Vector3, test_constructions) { diff --git a/tests/unit_tests/geometry_core/geometry.cpp b/tests/unit_tests/geometry_core/geometry.cpp index 6d17a249..212b90ba 100644 --- a/tests/unit_tests/geometry_core/geometry.cpp +++ b/tests/unit_tests/geometry_core/geometry.cpp @@ -6,7 +6,7 @@ #include "../test_utils.h" -using namespace selector; +using namespace pagoda; class GeometryTest : public ::testing::Test { diff --git a/tests/unit_tests/geometry_core/geometry_builder.cpp b/tests/unit_tests/geometry_core/geometry_builder.cpp index 4351ed9c..25a959eb 100644 --- a/tests/unit_tests/geometry_core/geometry_builder.cpp +++ b/tests/unit_tests/geometry_core/geometry_builder.cpp @@ -8,7 +8,7 @@ #include "../test_utils.h" #include "mock_objects.h" -using namespace selector; +using namespace pagoda; using namespace ::testing; using GeometryType = GeometryBase<>; diff --git a/tests/unit_tests/geometry_core/geometry_exporter.cpp b/tests/unit_tests/geometry_core/geometry_exporter.cpp index 192d9805..2367584d 100644 --- a/tests/unit_tests/geometry_core/geometry_exporter.cpp +++ b/tests/unit_tests/geometry_core/geometry_exporter.cpp @@ -11,11 +11,11 @@ #include "../test_utils.h" -using namespace selector; +using namespace pagoda; using GeometryType = GeometryBase<>; -class GeometryExporterTest : public SelectorTestFixture<::testing::Test> +class GeometryExporterTest : public PagodaTestFixture<::testing::Test> { public: void SetUp() { m_geometry = std::make_shared(); } diff --git a/tests/unit_tests/geometry_core/indexed_container.cpp b/tests/unit_tests/geometry_core/indexed_container.cpp index 51717eb2..2e1a67de 100644 --- a/tests/unit_tests/geometry_core/indexed_container.cpp +++ b/tests/unit_tests/geometry_core/indexed_container.cpp @@ -6,7 +6,7 @@ #include -using namespace selector; +using namespace pagoda; class Value { diff --git a/tests/unit_tests/geometry_core/mock_objects.h b/tests/unit_tests/geometry_core/mock_objects.h index eaaae039..cca9e2dc 100644 --- a/tests/unit_tests/geometry_core/mock_objects.h +++ b/tests/unit_tests/geometry_core/mock_objects.h @@ -1,5 +1,5 @@ -#ifndef SELECTOR_TESTS_GEOMETRY_CORE_MOCK_OBJECTS_H_ -#define SELECTOR_TESTS_GEOMETRY_CORE_MOCK_OBJECTS_H_ +#ifndef PAGODA_TESTS_GEOMETRY_CORE_MOCK_OBJECTS_H_ +#define PAGODA_TESTS_GEOMETRY_CORE_MOCK_OBJECTS_H_ #include @@ -7,7 +7,7 @@ class MockGeometry { public: using Index_t = uint32_t; - using PositionType = selector::Vec3F; + using PositionType = pagoda::Vec3F; MOCK_METHOD1(CreateVertex, Index_t(const PositionType &position)); MOCK_CONST_METHOD0(GetNumVertices, uint32_t(void)); diff --git a/tests/unit_tests/geometry_core/scope.cpp b/tests/unit_tests/geometry_core/scope.cpp index 46525cfa..9ec498b6 100644 --- a/tests/unit_tests/geometry_core/scope.cpp +++ b/tests/unit_tests/geometry_core/scope.cpp @@ -8,7 +8,7 @@ #include #include -using namespace selector; +using namespace pagoda; using GeometryType = GeometryBase<>; TEST(Scope, test_scope_construction) diff --git a/tests/unit_tests/geometry_core/split_point_topology.cpp b/tests/unit_tests/geometry_core/split_point_topology.cpp index da004782..b70a99d5 100644 --- a/tests/unit_tests/geometry_core/split_point_topology.cpp +++ b/tests/unit_tests/geometry_core/split_point_topology.cpp @@ -7,7 +7,7 @@ #include "../test_utils.h" -using namespace selector; +using namespace pagoda; TEST(HandleImplicitCastTest, test_implicit_casts) { @@ -31,7 +31,7 @@ TEST(HandleImplicitCastTest, test_implicit_casts) EXPECT_EQ(i, 4); } -class SplitPointTopologyCreateFaceTest : public SelectorTestFixture<::testing::Test> +class SplitPointTopologyCreateFaceTest : public PagodaTestFixture<::testing::Test> { protected: void SetUp() {} @@ -93,7 +93,7 @@ TEST_F(SplitPointTopologyCreateFaceTest, when_creating_faces_should_be_able_to_r match.Match(ss.str()); } -class SplitPointTopologyOperationsTest : public SelectorTestFixture<::testing::Test> +class SplitPointTopologyOperationsTest : public PagodaTestFixture<::testing::Test> { protected: void SetUp() {} @@ -149,7 +149,7 @@ TEST_F(SplitPointTopologyOperationsTest, when_getting_the_face_from_an_edge_shou } } -class SplitPointTopologyNavigationTest : public SelectorTestFixture<::testing::Test> +class SplitPointTopologyNavigationTest : public PagodaTestFixture<::testing::Test> { protected: void SetUp() {} @@ -193,7 +193,7 @@ TEST_F(SplitPointTopologyNavigationTest, when_navigating_the_edges_should_be_abl } } -class SplitPointTopologyIteratorsTest : public SelectorTestFixture<::testing::Test> +class SplitPointTopologyIteratorsTest : public PagodaTestFixture<::testing::Test> { protected: void SetUp() @@ -351,7 +351,7 @@ TEST_F(SplitPointTopologyIteratorsTest, when_circulating_over_face_points_should EXPECT_EQ(seenPoints.size(), 3); } -class SplitPointTopologySplitEdgeTest : public SelectorTestFixture<::testing::Test> +class SplitPointTopologySplitEdgeTest : public PagodaTestFixture<::testing::Test> { protected: void SetUp() {} @@ -375,7 +375,7 @@ TEST_F(SplitPointTopologySplitEdgeTest, when_splitting_an_edge_should_create_a_n match.Match(ss.str()); } -class SplitPointTopologyCollapseEdgeTest : public SelectorTestFixture<::testing::Test> +class SplitPointTopologyCollapseEdgeTest : public PagodaTestFixture<::testing::Test> { protected: void SetUp() @@ -404,7 +404,7 @@ TEST_F(SplitPointTopologyCollapseEdgeTest, when_collapsing_an_edge_should_remove TEST_F(SplitPointTopologyCollapseEdgeTest, when_face_is_a_triangle_should_not_allow_collapsing) {} -class SplitPointTopologyDeleteTest : public SelectorTestFixture<::testing::Test> +class SplitPointTopologyDeleteTest : public PagodaTestFixture<::testing::Test> { protected: void SetUp() @@ -542,7 +542,7 @@ TEST_F(SplitPointTopologyDeleteTest, when_deleting_an_edge_should_not_affect_unr match.Match(ss.str()); } -class SplitPointTopologySplitFaceTest : public SelectorTestFixture<::testing::Test> +class SplitPointTopologySplitFaceTest : public PagodaTestFixture<::testing::Test> { protected: void SetUp() diff --git a/tests/unit_tests/geometry_operations/create_rect.cpp b/tests/unit_tests/geometry_operations/create_rect.cpp index 366ff23d..2445666c 100644 --- a/tests/unit_tests/geometry_operations/create_rect.cpp +++ b/tests/unit_tests/geometry_operations/create_rect.cpp @@ -9,12 +9,12 @@ #include -using namespace selector; +using namespace pagoda; using GeometryType = GeometryBase<>; using GeometryPtr = std::shared_ptr; -class CreateRectTest : public SelectorTestFixture<::testing::Test> +class CreateRectTest : public PagodaTestFixture<::testing::Test> { public: void SetUp() {} diff --git a/tests/unit_tests/geometry_operations/ear_clipping.cpp b/tests/unit_tests/geometry_operations/ear_clipping.cpp index ec8a4bad..49805aad 100644 --- a/tests/unit_tests/geometry_operations/ear_clipping.cpp +++ b/tests/unit_tests/geometry_operations/ear_clipping.cpp @@ -12,12 +12,12 @@ #include -using namespace selector; +using namespace pagoda; using GeometryType = GeometryBase<>; using GeometryPtr = std::shared_ptr; -class EarClippingTest : public SelectorTestFixture<::testing::Test> +class EarClippingTest : public PagodaTestFixture<::testing::Test> { public: void SetUp() diff --git a/tests/unit_tests/geometry_operations/extrusion.cpp b/tests/unit_tests/geometry_operations/extrusion.cpp index f841d76d..b63d408a 100644 --- a/tests/unit_tests/geometry_operations/extrusion.cpp +++ b/tests/unit_tests/geometry_operations/extrusion.cpp @@ -11,12 +11,12 @@ #include -using namespace selector; +using namespace pagoda; using GeometryType = GeometryBase<>; using GeometryPtr = std::shared_ptr; -class ExtrusionTest : public SelectorTestFixture<::testing::Test> +class ExtrusionTest : public PagodaTestFixture<::testing::Test> { public: void SetUp() {} diff --git a/tests/unit_tests/geometry_operations/triangulate.cpp b/tests/unit_tests/geometry_operations/triangulate.cpp index 33ee26ce..37223b55 100644 --- a/tests/unit_tests/geometry_operations/triangulate.cpp +++ b/tests/unit_tests/geometry_operations/triangulate.cpp @@ -8,12 +8,12 @@ #include "../test_utils.h" -using namespace selector; +using namespace pagoda; using GeometryType = GeometryBase<>; using GeometryPtr = std::shared_ptr; -class TriangulateTest : public SelectorTestFixture<::testing::Test> +class TriangulateTest : public PagodaTestFixture<::testing::Test> { public: void SetUp() diff --git a/tests/unit_tests/main.cpp b/tests/unit_tests/main.cpp index 56fcb384..7ecfc94c 100644 --- a/tests/unit_tests/main.cpp +++ b/tests/unit_tests/main.cpp @@ -16,13 +16,13 @@ int main(int argc, char *argv[]) } } - SelectorTestFixtureBase::SetExecutablePath(argv[0]); - SelectorTestFixtureBase::SetShouldWriteFiles(shouldWriteFiles); + PagodaTestFixtureBase::SetExecutablePath(argv[0]); + PagodaTestFixtureBase::SetShouldWriteFiles(shouldWriteFiles); ::testing::InitGoogleTest(&argc, argv); auto returnVal = RUN_ALL_TESTS(); - selector::Logger::Shutdown(); + pagoda::Logger::Shutdown(); return returnVal; } diff --git a/tests/unit_tests/math_lib/bissectrix.cpp b/tests/unit_tests/math_lib/bissectrix.cpp index 5226a9e9..a20e2057 100644 --- a/tests/unit_tests/math_lib/bissectrix.cpp +++ b/tests/unit_tests/math_lib/bissectrix.cpp @@ -6,7 +6,7 @@ #include -using namespace selector; +using namespace pagoda; TEST(Bissectrix, when_finding_the_bissectrix_between_two_vectors_should_return_a_vector) { diff --git a/tests/unit_tests/math_lib/intersections.cpp b/tests/unit_tests/math_lib/intersections.cpp index 290b5435..2b40d96a 100644 --- a/tests/unit_tests/math_lib/intersections.cpp +++ b/tests/unit_tests/math_lib/intersections.cpp @@ -6,7 +6,7 @@ #include -using namespace selector; +using namespace pagoda; TEST(PlaneVsPlaneIntersectionTest, when_the_planes_intersect_should_return_a_line_intersection) { diff --git a/tests/unit_tests/math_lib/line_3d.cpp b/tests/unit_tests/math_lib/line_3d.cpp index e323a4a5..27a2f374 100644 --- a/tests/unit_tests/math_lib/line_3d.cpp +++ b/tests/unit_tests/math_lib/line_3d.cpp @@ -4,7 +4,7 @@ #include -using namespace selector; +using namespace pagoda; TEST(Line3D, when_using_default_constructor_should_create_the_x_axis) { diff --git a/tests/unit_tests/math_lib/line_segment_3d.cpp b/tests/unit_tests/math_lib/line_segment_3d.cpp index 5e4c33ea..1588c86c 100644 --- a/tests/unit_tests/math_lib/line_segment_3d.cpp +++ b/tests/unit_tests/math_lib/line_segment_3d.cpp @@ -6,7 +6,7 @@ #include -using namespace selector; +using namespace pagoda; TEST(LineSegment3D, when_using_default_constructor_should_create_a_unit_line_segment_in_the_x_axis) { diff --git a/tests/unit_tests/math_lib/math_utils.cpp b/tests/unit_tests/math_lib/math_utils.cpp index 10d3cc74..20009d5e 100644 --- a/tests/unit_tests/math_lib/math_utils.cpp +++ b/tests/unit_tests/math_lib/math_utils.cpp @@ -4,7 +4,7 @@ #include -using namespace selector; +using namespace pagoda; using mt = MathUtils; TEST(ConversionTests, RadiansToDegrees) diff --git a/tests/unit_tests/math_lib/matrix_base.cpp b/tests/unit_tests/math_lib/matrix_base.cpp index 44121578..5b3cafb2 100644 --- a/tests/unit_tests/math_lib/matrix_base.cpp +++ b/tests/unit_tests/math_lib/matrix_base.cpp @@ -3,7 +3,7 @@ #include -using namespace selector; +using namespace pagoda; TEST(MatrixBase, when_constructing_with_default_constructor_should_set_all_elements_to_zero) { diff --git a/tests/unit_tests/math_lib/nearest_points.cpp b/tests/unit_tests/math_lib/nearest_points.cpp index 6c39b78d..e7aeab3e 100644 --- a/tests/unit_tests/math_lib/nearest_points.cpp +++ b/tests/unit_tests/math_lib/nearest_points.cpp @@ -2,7 +2,7 @@ #include -using namespace selector; +using namespace pagoda; TEST(LineVsLineNearestPointsTest, when_lines_dont_interset_should_return_the_nearest_points_on_both) { diff --git a/tests/unit_tests/math_lib/orthogonal.cpp b/tests/unit_tests/math_lib/orthogonal.cpp index 292a26f4..1e17c140 100644 --- a/tests/unit_tests/math_lib/orthogonal.cpp +++ b/tests/unit_tests/math_lib/orthogonal.cpp @@ -6,7 +6,7 @@ #include -using namespace selector; +using namespace pagoda; TEST(Orthogonal, when_calculating_the_orthogonal_vector_of_a_2d_vector_should_have_zero_as_dot_product) { diff --git a/tests/unit_tests/math_lib/plane.cpp b/tests/unit_tests/math_lib/plane.cpp index 6b87e7dc..8d34a5eb 100644 --- a/tests/unit_tests/math_lib/plane.cpp +++ b/tests/unit_tests/math_lib/plane.cpp @@ -5,7 +5,7 @@ #include -using namespace selector; +using namespace pagoda; TEST(Plane, when_using_default_constructor_should_construct_the_xy_plane) { diff --git a/tests/unit_tests/math_lib/projection.cpp b/tests/unit_tests/math_lib/projection.cpp index ead8aad2..bc97f668 100644 --- a/tests/unit_tests/math_lib/projection.cpp +++ b/tests/unit_tests/math_lib/projection.cpp @@ -4,7 +4,7 @@ #include -using namespace selector; +using namespace pagoda; TEST(ProjectionTest, when_projecting_a_point_to_a_line_should_return_the_correct_point) { diff --git a/tests/unit_tests/math_lib/vec_base.cpp b/tests/unit_tests/math_lib/vec_base.cpp index 98b2654c..155b54f1 100644 --- a/tests/unit_tests/math_lib/vec_base.cpp +++ b/tests/unit_tests/math_lib/vec_base.cpp @@ -4,7 +4,7 @@ #include -using namespace selector; +using namespace pagoda; TEST(VecBase, when_using_default_constructor_should_initizalize_all_elements_to_zero) { diff --git a/tests/unit_tests/parameter/expression.cpp b/tests/unit_tests/parameter/expression.cpp index dc8cb199..bac3171f 100644 --- a/tests/unit_tests/parameter/expression.cpp +++ b/tests/unit_tests/parameter/expression.cpp @@ -3,7 +3,7 @@ #include -using namespace selector; +using namespace pagoda; class ExpressionTest : public ::testing::Test { diff --git a/tests/unit_tests/parameter/variable.cpp b/tests/unit_tests/parameter/variable.cpp index ed240155..ec3db083 100644 --- a/tests/unit_tests/parameter/variable.cpp +++ b/tests/unit_tests/parameter/variable.cpp @@ -2,7 +2,7 @@ #include -using namespace selector; +using namespace pagoda; TEST(VariableTest, when_creating_a_variable_with_a_single_identifier_should_store_the_identifier) { diff --git a/tests/unit_tests/parameter/variable_resolver.cpp b/tests/unit_tests/parameter/variable_resolver.cpp index 6635479c..69c3344d 100644 --- a/tests/unit_tests/parameter/variable_resolver.cpp +++ b/tests/unit_tests/parameter/variable_resolver.cpp @@ -3,7 +3,7 @@ #include -using namespace selector; +using namespace pagoda; class VariableResolverTest : public ::testing::Test { diff --git a/tests/unit_tests/selscript/grammar.cpp b/tests/unit_tests/pgscript/grammar.cpp similarity index 77% rename from tests/unit_tests/selscript/grammar.cpp rename to tests/unit_tests/pgscript/grammar.cpp index ac35f28c..852d5888 100644 --- a/tests/unit_tests/selscript/grammar.cpp +++ b/tests/unit_tests/pgscript/grammar.cpp @@ -1,18 +1,18 @@ -#include -#include +#include +#include #include -using namespace selector; +using namespace pagoda; class GrammarTest : public ::testing::Test { protected: using iterator = std::string::iterator; - virtual void SetUp() { program = std::make_shared(); } + virtual void SetUp() { program = std::make_shared(); } - selector::grammar parser; - selector::ast::ProgramPtr program; + pagoda::grammar parser; + pagoda::ast::ProgramPtr program; }; class IdentifierTest : public GrammarTest, public ::testing::WithParamInterface @@ -24,7 +24,7 @@ TEST_P(IdentifierTest, testIdentifier) std::string test = GetParam(); iterator begin = test.begin(); iterator end = test.end(); - selector::ast::IdentifierPtr i; + pagoda::ast::IdentifierPtr i; boost::spirit::qi::phrase_parse(begin, end, parser.identifier, boost::spirit::qi::space, i); } @@ -35,7 +35,7 @@ TEST_P(IdentifierTest, testIdentifierAsStatement) iterator begin = test.begin(); iterator end = test.end(); - selector::grammar p; + pagoda::grammar p; ast::IdentifierPtr ident; boost::spirit::qi::phrase_parse(begin, end, p.identifier, boost::spirit::qi::space, ident); ASSERT_NE(ident, nullptr); diff --git a/tests/unit_tests/procedural_graph/execution_queue.cpp b/tests/unit_tests/procedural_graph/execution_queue.cpp index 2ee733ed..451f8754 100644 --- a/tests/unit_tests/procedural_graph/execution_queue.cpp +++ b/tests/unit_tests/procedural_graph/execution_queue.cpp @@ -2,18 +2,18 @@ #include #include -#include +#include #include -using namespace selector; +using namespace pagoda; class ExecutionQueueTest : public ::testing::Test { protected: void SetUp() { - m_graph = std::make_shared(m_selector.GetNodeFactory()); + m_graph = std::make_shared(m_pagoda.GetNodeFactory()); a = m_graph->CreateNode(); b = m_graph->CreateNode(); c = m_graph->CreateNode(); @@ -29,7 +29,7 @@ class ExecutionQueueTest : public ::testing::Test NodePtr c; NodePtr d; NodePtr e; - Selector m_selector; + Pagoda m_pagoda; }; TEST_F(ExecutionQueueTest, when_iterating_the_nodes_should_visit_them_by_depth) diff --git a/tests/unit_tests/procedural_graph/graph.cpp b/tests/unit_tests/procedural_graph/graph.cpp index 7f8f2d1f..b0f9580e 100644 --- a/tests/unit_tests/procedural_graph/graph.cpp +++ b/tests/unit_tests/procedural_graph/graph.cpp @@ -4,20 +4,20 @@ #include #include -#include +#include #include #include "mock_objects.h" -using namespace selector; +using namespace pagoda; class GraphSimpleOperationsTest : public ::testing::Test { protected: virtual void SetUp() { - graph = std::make_shared(m_selector.GetNodeFactory()); + graph = std::make_shared(m_pagoda.GetNodeFactory()); input_interface_node = graph->CreateNode(); output_interface_node = graph->CreateNode(); operation_node = graph->CreateNode(); @@ -27,7 +27,7 @@ class GraphSimpleOperationsTest : public ::testing::Test NodePtr input_interface_node; NodePtr output_interface_node; NodePtr operation_node; - Selector m_selector; + Pagoda m_pagoda; }; TEST_F(GraphSimpleOperationsTest, when_destroying_a_node_should_remove_it_from_the_graph) diff --git a/tests/unit_tests/procedural_graph/graph_ast_interpreter.cpp b/tests/unit_tests/procedural_graph/graph_ast_interpreter.cpp index 8a9ff69d..4774d804 100644 --- a/tests/unit_tests/procedural_graph/graph_ast_interpreter.cpp +++ b/tests/unit_tests/procedural_graph/graph_ast_interpreter.cpp @@ -8,7 +8,7 @@ #include -using namespace selector; +using namespace pagoda; class AstInterpreterTest : public ::testing::Test { diff --git a/tests/unit_tests/procedural_graph/graph_reader_ast.cpp b/tests/unit_tests/procedural_graph/graph_reader_ast.cpp index 8fefa232..2debf07d 100644 --- a/tests/unit_tests/procedural_graph/graph_reader_ast.cpp +++ b/tests/unit_tests/procedural_graph/graph_reader_ast.cpp @@ -5,7 +5,7 @@ #include -using namespace selector; +using namespace pagoda; /* *********** * Ast Node * diff --git a/tests/unit_tests/procedural_graph/graph_reader_grammar.cpp b/tests/unit_tests/procedural_graph/graph_reader_grammar.cpp index 78797371..67e0bf57 100644 --- a/tests/unit_tests/procedural_graph/graph_reader_grammar.cpp +++ b/tests/unit_tests/procedural_graph/graph_reader_grammar.cpp @@ -7,7 +7,7 @@ #include -using namespace selector; +using namespace pagoda; using namespace boost::spirit; class GraphReaderGrammarTest : public ::testing::Test diff --git a/tests/unit_tests/procedural_graph/mock_objects.h b/tests/unit_tests/procedural_graph/mock_objects.h index 29f890a4..9decc192 100644 --- a/tests/unit_tests/procedural_graph/mock_objects.h +++ b/tests/unit_tests/procedural_graph/mock_objects.h @@ -1,8 +1,8 @@ -#ifndef SELECTOR_TESTS_PROCEDURAL_GRAPH_MOCK_OBJECTS_H_ -#define SELECTOR_TESTS_PROCEDURAL_GRAPH_MOCK_OBJECTS_H_ +#ifndef PAGODA_TESTS_PROCEDURAL_GRAPH_MOCK_OBJECTS_H_ +#define PAGODA_TESTS_PROCEDURAL_GRAPH_MOCK_OBJECTS_H_ #include -using namespace selector; +using namespace pagoda; #endif diff --git a/tests/unit_tests/procedural_graph/node.cpp b/tests/unit_tests/procedural_graph/node.cpp index 9326274c..9ef568b8 100644 --- a/tests/unit_tests/procedural_graph/node.cpp +++ b/tests/unit_tests/procedural_graph/node.cpp @@ -5,7 +5,7 @@ #include -using namespace selector; +using namespace pagoda; class NodeTest : public ::testing::Test { diff --git a/tests/unit_tests/procedural_graph/node_set_visitor.cpp b/tests/unit_tests/procedural_graph/node_set_visitor.cpp index 9d8c2456..32849f52 100644 --- a/tests/unit_tests/procedural_graph/node_set_visitor.cpp +++ b/tests/unit_tests/procedural_graph/node_set_visitor.cpp @@ -3,11 +3,11 @@ #include #include -#include +#include #include -using namespace selector; +using namespace pagoda; class NodeTypeFilterTest : public ::testing::Test { @@ -16,7 +16,7 @@ class NodeTypeFilterTest : public ::testing::Test { m_inputInterfaceNode = std::make_shared(); m_outputInterfaceNode = std::make_shared(); - m_operationNode = std::make_shared(m_selector.GetOperationFactory()); + m_operationNode = std::make_shared(m_pagoda.GetOperationFactory()); m_nodeSet.insert(m_inputInterfaceNode); m_nodeSet.insert(m_outputInterfaceNode); @@ -27,7 +27,7 @@ class NodeTypeFilterTest : public ::testing::Test std::shared_ptr m_outputInterfaceNode; std::shared_ptr m_operationNode; NodeSet m_nodeSet; - Selector m_selector; + Pagoda m_pagoda; }; TEST_F(NodeTypeFilterTest, when_visiting_a_node_set_should_call_visitor_methods_for_different_node_types) diff --git a/tests/unit_tests/procedural_graph/node_visitor.cpp b/tests/unit_tests/procedural_graph/node_visitor.cpp index d80f5704..9cfe4701 100644 --- a/tests/unit_tests/procedural_graph/node_visitor.cpp +++ b/tests/unit_tests/procedural_graph/node_visitor.cpp @@ -4,11 +4,11 @@ #include #include -#include +#include #include -using namespace selector; +using namespace pagoda; class Delegate { @@ -23,7 +23,7 @@ class NodeVisitorTest : public ::testing::Test protected: void SetUp() { - m_graph = std::make_shared(m_selector.GetNodeFactory()); + m_graph = std::make_shared(m_pagoda.GetNodeFactory()); m_nodes.push_back(m_graph->CreateNode()); m_nodes.push_back(m_graph->CreateNode()); m_nodes.push_back(m_graph->CreateNode()); @@ -34,7 +34,7 @@ class NodeVisitorTest : public ::testing::Test GraphPtr m_graph; std::vector m_nodes; - Selector m_selector; + Pagoda m_pagoda; }; TEST_F(NodeVisitorTest, when_visiting_should_call_the_delegate_for_each_node) @@ -53,7 +53,7 @@ class BreadthFirstNodeVisitorTest : public ::testing::Test protected: void SetUp() { - m_graph = std::make_shared(m_selector.GetNodeFactory()); + m_graph = std::make_shared(m_pagoda.GetNodeFactory()); m_nodes.push_back(m_graph->CreateNode()); m_nodes.push_back(m_graph->CreateNode()); m_nodes.push_back(m_graph->CreateNode()); @@ -65,7 +65,7 @@ class BreadthFirstNodeVisitorTest : public ::testing::Test GraphPtr m_graph; std::vector m_nodes; - Selector m_selector; + Pagoda m_pagoda; }; TEST_F(BreadthFirstNodeVisitorTest, when_visiting_should_call_the_delegate_for_each_node) diff --git a/tests/unit_tests/procedural_graph/parameter_node.cpp b/tests/unit_tests/procedural_graph/parameter_node.cpp index 7015bf5d..c54ddc1d 100644 --- a/tests/unit_tests/procedural_graph/parameter_node.cpp +++ b/tests/unit_tests/procedural_graph/parameter_node.cpp @@ -3,7 +3,7 @@ #include -using namespace selector; +using namespace pagoda; TEST(ParameterNode, when_executing_a_parameter_node_should_propagate_the_parameters_to_its_outnodes) { diff --git a/tests/unit_tests/procedural_objects/geometry_system.cpp b/tests/unit_tests/procedural_objects/geometry_system.cpp index 5dabffa3..7cc60ee1 100644 --- a/tests/unit_tests/procedural_objects/geometry_system.cpp +++ b/tests/unit_tests/procedural_objects/geometry_system.cpp @@ -11,7 +11,7 @@ #include #include -using namespace selector; +using namespace pagoda; class GeometrySystemTest : public ::testing::Test { diff --git a/tests/unit_tests/procedural_objects/mock_objects.h b/tests/unit_tests/procedural_objects/mock_objects.h index 8fb6f1f4..5f360c98 100644 --- a/tests/unit_tests/procedural_objects/mock_objects.h +++ b/tests/unit_tests/procedural_objects/mock_objects.h @@ -1,5 +1,5 @@ -#ifndef SELECTOR_TESTS_PROCEDURAL_OBJECTS_MOCK_OBJECTS_H_ -#define SELECTOR_TESTS_PROCEDURAL_OBJECTS_MOCK_OBJECTS_H_ +#ifndef PAGODA_TESTS_PROCEDURAL_OBJECTS_MOCK_OBJECTS_H_ +#define PAGODA_TESTS_PROCEDURAL_OBJECTS_MOCK_OBJECTS_H_ #include #include @@ -8,13 +8,13 @@ #include -using namespace selector; +using namespace pagoda; class GeometrySystemMock : public GeometrySystem { public: - MOCK_METHOD2(GetCreateRect, selector::CreateRect(const float&, const float&)); - MOCK_METHOD1(GetExtrude, selector::Extrusion(const float&)); + MOCK_METHOD2(GetCreateRect, pagoda::CreateRect(const float&, const float&)); + MOCK_METHOD1(GetExtrude, pagoda::Extrusion(const float&)); }; #endif diff --git a/tests/unit_tests/procedural_objects/procedural_object.cpp b/tests/unit_tests/procedural_objects/procedural_object.cpp index abc401b5..28d00ab5 100644 --- a/tests/unit_tests/procedural_objects/procedural_object.cpp +++ b/tests/unit_tests/procedural_objects/procedural_object.cpp @@ -8,7 +8,7 @@ #include -using namespace selector; +using namespace pagoda; TEST(ProceduralObject, hierarchical_component_set_parent) { diff --git a/tests/unit_tests/procedural_objects/procedural_object_interface.cpp b/tests/unit_tests/procedural_objects/procedural_object_interface.cpp index e723f28e..b71a7994 100644 --- a/tests/unit_tests/procedural_objects/procedural_object_interface.cpp +++ b/tests/unit_tests/procedural_objects/procedural_object_interface.cpp @@ -5,7 +5,7 @@ #include -using namespace selector; +using namespace pagoda; class ProceduralOperationObjectInterfaceTest : public ::testing::Test { diff --git a/tests/unit_tests/procedural_objects/procedural_object_predicates.cpp b/tests/unit_tests/procedural_objects/procedural_object_predicates.cpp index 0df6e9dd..4ecaf90b 100644 --- a/tests/unit_tests/procedural_objects/procedural_object_predicates.cpp +++ b/tests/unit_tests/procedural_objects/procedural_object_predicates.cpp @@ -11,7 +11,7 @@ #include -using namespace selector; +using namespace pagoda; class ProceduralObjectPredicateTest : public ::testing::Test { diff --git a/tests/unit_tests/test_utils.cpp b/tests/unit_tests/test_utils.cpp index d5672130..93c5247b 100644 --- a/tests/unit_tests/test_utils.cpp +++ b/tests/unit_tests/test_utils.cpp @@ -3,23 +3,23 @@ #include bool g_asserted = false; -selector::Fail::FailBehaviour AssertExpected(const char *condition, const char *file, const int line, +pagoda::Fail::FailBehaviour AssertExpected(const char *condition, const char *file, const int line, const char *message) { g_asserted = true; - return selector::Fail::FailBehaviour::Continue; + return pagoda::Fail::FailBehaviour::Continue; } ExpectAssert::ExpectAssert() { g_asserted = false; - selector::Fail::SetFailHandler(AssertExpected); + pagoda::Fail::SetFailHandler(AssertExpected); } ExpectAssert::~ExpectAssert() { g_asserted = false; - selector::Fail::SetFailHandler(selector::DefaultHandler); + pagoda::Fail::SetFailHandler(pagoda::DefaultHandler); } bool ExpectAssert::Asserted() { return g_asserted; } @@ -29,7 +29,7 @@ MatchFile::MatchFile(const boost::filesystem::path &filePath, bool saveFile) { try { - m_fileContents = selector::file_util::LoadFileToString(filePath.string()); + m_fileContents = pagoda::file_util::LoadFileToString(filePath.string()); } catch (...) { @@ -41,8 +41,8 @@ bool MatchFile::Match(const std::string &in) { if (m_saveFile) { - selector::file_util::CreateDirectories(m_filePath.parent_path()); - selector::file_util::WriteStringToFile(m_filePath.string(), in); + pagoda::file_util::CreateDirectories(m_filePath.parent_path()); + pagoda::file_util::WriteStringToFile(m_filePath.string(), in); m_fileContents = in; return true; } @@ -51,19 +51,19 @@ bool MatchFile::Match(const std::string &in) return m_fileContents == in; } -void SelectorTestFixtureBase::SetExecutablePath(const std::string &path) +void PagodaTestFixtureBase::SetExecutablePath(const std::string &path) { s_executablePath = path; s_executableDirectory = s_executablePath.remove_filename(); } -boost::filesystem::path SelectorTestFixtureBase::GetExecutablePath() { return s_executablePath; } +boost::filesystem::path PagodaTestFixtureBase::GetExecutablePath() { return s_executablePath; } -boost::filesystem::path SelectorTestFixtureBase::GetExecutableDirectory() { return s_executableDirectory; } +boost::filesystem::path PagodaTestFixtureBase::GetExecutableDirectory() { return s_executableDirectory; } -void SelectorTestFixtureBase::SetShouldWriteFiles(const bool &write) { s_writeFiles = write; } -bool SelectorTestFixtureBase::GetShouldWriteFiles() { return s_writeFiles; } +void PagodaTestFixtureBase::SetShouldWriteFiles(const bool &write) { s_writeFiles = write; } +bool PagodaTestFixtureBase::GetShouldWriteFiles() { return s_writeFiles; } -boost::filesystem::path SelectorTestFixtureBase::s_executablePath = ""; -boost::filesystem::path SelectorTestFixtureBase::s_executableDirectory = ""; -bool SelectorTestFixtureBase::s_writeFiles = false; +boost::filesystem::path PagodaTestFixtureBase::s_executablePath = ""; +boost::filesystem::path PagodaTestFixtureBase::s_executableDirectory = ""; +bool PagodaTestFixtureBase::s_writeFiles = false; diff --git a/tests/unit_tests/test_utils.h b/tests/unit_tests/test_utils.h index 35422d7a..66127f23 100644 --- a/tests/unit_tests/test_utils.h +++ b/tests/unit_tests/test_utils.h @@ -1,5 +1,5 @@ -#ifndef SELECTOR_TEST_TEST_UTILS_H_ -#define SELECTOR_TEST_TEST_UTILS_H_ +#ifndef PAGODA_TEST_TEST_UTILS_H_ +#define PAGODA_TEST_TEST_UTILS_H_ #include @@ -7,7 +7,7 @@ #include -selector::Fail::FailBehaviour AssertExpected(const char *condition, const char *file, const int line, +pagoda::Fail::FailBehaviour AssertExpected(const char *condition, const char *file, const int line, const char *message); struct ExpectAssert { @@ -29,7 +29,7 @@ class MatchFile bool m_saveFile; }; -class SelectorTestFixtureBase +class PagodaTestFixtureBase { public: static void SetExecutablePath(const std::string &path); @@ -44,12 +44,12 @@ class SelectorTestFixtureBase }; template -class SelectorTestFixture : public SelectorTestFixtureBase, public F +class PagodaTestFixture : public PagodaTestFixtureBase, public F { public: boost::filesystem::path GetTestFilesDir() const { - return SelectorTestFixtureBase::GetExecutableDirectory() /= "test_files"; + return PagodaTestFixtureBase::GetExecutableDirectory() /= "test_files"; } boost::filesystem::path GetCurrentTestFileInputDirectory() diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index cb155bcd..bb733640 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -1,17 +1,17 @@ -set(SelSources - sel.cpp +set(PagodaSources + pagoda.cpp ) -add_executable(sel ${SelSources}) +add_executable(pagoda ${PagodaSources}) target_compile_features( - sel + pagoda PRIVATE cxx_std_17 ) target_compile_options( - sel + pagoda PRIVATE -Wall $<$:-Werror> @@ -19,9 +19,9 @@ target_compile_options( ) target_include_directories( - sel + pagoda PUBLIC - $ + $ $ PRIVATE ${CMAKE_SOURCE_DIR}/source @@ -30,14 +30,14 @@ target_include_directories( ) target_compile_definitions( - sel + pagoda PRIVATE ) target_link_libraries( - sel + pagoda PRIVATE - selector + libpagoda Boost::chrono Boost::filesystem Boost::system @@ -45,7 +45,7 @@ target_link_libraries( ) include(GNUInstallDirs) -install(TARGETS sel - EXPORT sel-export +install(TARGETS pagoda + EXPORT pagoda-export RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) diff --git a/tools/sel.cpp b/tools/pagoda.cpp similarity index 93% rename from tools/sel.cpp rename to tools/pagoda.cpp index afcef96f..a8665dd9 100644 --- a/tools/sel.cpp +++ b/tools/pagoda.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include @@ -37,10 +37,10 @@ #include namespace po = boost::program_options; -using namespace selector; +using namespace pagoda; bool ParseCommandLine(int argc, char* argv[], po::variables_map* out_vm); -std::shared_ptr ReadGraphFromFile(Selector& selector, const std::string& file_path); +std::shared_ptr ReadGraphFromFile(Pagoda& pagoda, const std::string& file_path); void SetParameter(const NodeSet& nodes, const std::string& param); void WriteDotFile(std::shared_ptr graph, const std::string& file_path); void ListGraph(std::shared_ptr graph); @@ -51,7 +51,7 @@ int main(int argc, char* argv[]) { po::variables_map vm; - Selector selector; + Pagoda pagoda; if (!ParseCommandLine(argc, argv, &vm)) { @@ -84,7 +84,7 @@ int main(int argc, char* argv[]) { try { - std::shared_ptr graph = ReadGraphFromFile(selector, file_path); + std::shared_ptr graph = ReadGraphFromFile(pagoda, file_path); if (graph == nullptr) { LOG_FATAL("Unable read a graph file (" << file_path << ")"); @@ -132,9 +132,9 @@ int main(int argc, char* argv[]) void ExecuteGraph(std::shared_ptr graph) { graph->Execute(); } -std::shared_ptr ReadGraphFromFile(Selector& selector, const std::string& file_path) +std::shared_ptr ReadGraphFromFile(Pagoda& pagoda, const std::string& file_path) { - return selector.CreateGraphFromFile(file_path); + return pagoda.CreateGraphFromFile(file_path); } struct PrintVisitor : NodeVisitor @@ -243,8 +243,8 @@ void PrintProfile() { if (!has_feature("Profiler")) { - LOG_WARNING("Selector was compiled without the Profiler feature."); - LOG_WARNING(" Please build Selector with '-DSELECTOR_PROFILER_ACTIVE=ON'."); + LOG_WARNING("Pagoda was compiled without the Profiler feature."); + LOG_WARNING(" Please build Pagoda with '-DPAGODA_PROFILER_ACTIVE=ON'."); return; } @@ -278,7 +278,7 @@ bool ParseCommandLine(int argc, char* argv[], po::variables_map* out_vm) if (out_vm->count("help")) { - std::cout << "Selector command line tool" << std::endl << desc << std::endl; + std::cout << "Pagoda command line tool" << std::endl << desc << std::endl; return false; } From 98aef54fdfb86a7e3cc14ffab1918a258f39acb0 Mon Sep 17 00:00:00 2001 From: Diego Jesus Date: Fri, 1 May 2020 17:37:10 +0100 Subject: [PATCH 09/14] Changes selector and selscript references to pagoda and pgscript in documentation. --- CHANGELOG.md | 2 +- README.md | 62 ++++++++-------------------- docs/docs/about.md | 6 +-- docs/docs/graph/graph.md | 4 +- docs/docs/index.md | 16 +++---- docs/docs/objects/objects.md | 2 +- docs/docs/operations/ClipGeometry.md | 2 +- docs/docs/operations/Split.md | 2 +- source/common/README.md | 4 +- source/geometry_core/README.md | 2 +- 10 files changed, 37 insertions(+), 65 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2acec5e9..21625486 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,5 +31,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Split operation. - Scale operation. - Rotate operation. -- Selscript scripting language. +- Pgscript scripting language. - Geometry implementation with Split Point topology. diff --git a/README.md b/README.md index 2122a844..6bd1f7b5 100644 --- a/README.md +++ b/README.md @@ -1,56 +1,56 @@ Buy Me A Coffee -| Branch | master| development | selscript | -|--------|-------|-------------|-----------| -| | ![Build](https://github.com/diegoarjz/selector/workflows/Build/badge.svg?branch=master) | ![Build](https://github.com/diegoarjz/selector/workflows/Build/badge.svg?branch=development) | ![Build](https://github.com/diegoarjz/selector/workflows/Build/badge.svg?branch=selscript) | +| Branch | master| development | +|--------|-------|-------------| +| | ![Build](https://github.com/diegoarjz/pagoda/workflows/Build/badge.svg?branch=master) | ![Build](https://github.com/diegoarjz/pagoda/workflows/Build/badge.svg?branch=development) | -You can find Selector's documentation [here](https://diegoarjz.github.io/selector). +You can find Pagoda's documentation [here](https://diegoarjz.github.io/pagoda). -# What is Selector +# What is Pagoda ![banner](https://user-images.githubusercontent.com/6498824/68999381-481b2f80-08b7-11ea-8259-05bbc2b0a454.png) ![graph](https://user-images.githubusercontent.com/6498824/68999389-5bc69600-08b7-11ea-93f0-c16b6dabc04a.png) -The goal of Selector is to be a procedural modelling framework aimed at +The goal of Pagoda is to be a procedural modelling framework aimed at supporting researchers and academics in this field. Therefore, it must be flexible enough to allow the implementation of multiple algorithms and methodologies. -Currently, Selector implements a graph-based approach since it is considered to +Currently, Pagoda implements a graph-based approach since it is considered to be one of the most flexible methods to specify the rules in procedural modelling. The idea is to, eventually, reach a design that allows its users to re-use code from any of the available layers to implement other methodologies. -# Building Selector +# Building Pagoda -Before building selector, you need to install the +Before building pagoda, you need to install the [Boost](https://www.boost.org) libraries. Instructions on how to do so can be found on its website. -Selector also needs [Google Test](https://github.com/google/googletest). +Pagoda also needs [Google Test](https://github.com/google/googletest). However, this dependency is built for you automatically. Once you have installed [Boost](https://www.boost.org) execute the following commands in the terminal: ``` -$ git clone https://github.com/diegarjz/selector.git selector -$ cd selector +$ git clone https://github.com/diegarjz/pagoda.git pagoda +$ cd pagoda $ mkdir build $ cd build $ cmake .. -DCMAKE_BUILD_TYPE=Release $ make && make test && make install ``` -If all goes well you will have built and installed the selector library, -headers and the sel executable. The sel executable is what -allows you to execute a procedural graph in the specified in the selector +If all goes well you will have built and installed the pagoda library, +headers and the `pagoda` executable. The `pagoda` executable is what +allows you to execute a procedural graph in the specified in the pagoda format. # Executing your first procedural graph -The sel executable takes a procedural graph file and optionally executes it. +The `pagoda` executable takes a procedural graph file and optionally executes it. A procedural graph is a directed graph that details the execution of the operations and the flow of procedural objects through the operations. @@ -103,36 +103,8 @@ operation and the export geometry. To execute this node you can run the following on the command line: ``` -sel create_rect.sel --execute +pagoda create_rect.pgd --execute ``` You will then have a rect.obj file with the square. -# Selector Roadmap - -## Version 0.1 - -- [x] Basic maths library -- [x] Basic geometry representation -- [x] Procedural Object System - - [x] Component System - - [x] Geometry Component -- [x] Basic geometry operations - - [x] Create Rectangle - - [x] Create Sphere - - [x] Create Box - - [x] Extrusion - - [x] Split - - [x] Repeat split - - [x] Extract Faces - - [x] Offset - - [x] Rotation - - [x] Translation - - [x] Scale - - [x] Geometry Triangulation -- [x] Procedural graph - - [x] Parametrised procedural rules - - [x] Expressions in parameters - - [x] Basic procedural graph reader -- [x] Basic geometry exporter - diff --git a/docs/docs/about.md b/docs/docs/about.md index c3699d83..2cebc1f4 100644 --- a/docs/docs/about.md +++ b/docs/docs/about.md @@ -1,11 +1,11 @@ -# About Selector +# About Pagoda -The goal of Selector is to be a procedural modelling framework aimed at +The goal of Pagoda is to be a procedural modelling framework aimed at supporting researchers and academics in this field. Therefore, it must be flexible enough to allow the implementation of multiple algorithms and methodologies. -Currently, Selector implements a graph-based approach since it is considered to +Currently, Pagoda implements a graph-based approach since it is considered to be one of the most flexible methods to specify the rules in procedural modelling. The idea is to, eventually, reach a design that allows its users to re-use code from any of the available layers to implement other methodologies. diff --git a/docs/docs/graph/graph.md b/docs/docs/graph/graph.md index ebb4404a..e1f8c75b 100644 --- a/docs/docs/graph/graph.md +++ b/docs/docs/graph/graph.md @@ -2,9 +2,9 @@ Procedural graphs specify how [procedural objects](/objects/objects) flow through the graph's nodes and, therefore, define the rules for procedural -generation in selector. +generation in pagoda. -Graphs are created by reading from a graph file in selector's own graph format. +Graphs are created by reading from a graph file in pagoda's own graph format. ## Nodes diff --git a/docs/docs/index.md b/docs/docs/index.md index 76a19b88..b3a02436 100644 --- a/docs/docs/index.md +++ b/docs/docs/index.md @@ -1,28 +1,28 @@ -# Welcome to Selector +# Welcome to Pagoda -The goal of Selector is to be a procedural modelling framework aimed at +The goal of Pagoda is to be a procedural modelling framework aimed at supporting researchers and academics in this field. Therefore, it must be flexible enough to allow the implementation of multiple algorithms and methodologies. -Currently, Selector implements a graph-based approach since it is considered to +Currently, Pagoda implements a graph-based approach since it is considered to be one of the most flexible methods to specify the rules in procedural modelling. The idea is to, eventually, reach a design that allows its users to re-use code from any of the available layers to implement other methodologies. ## Project layout - selector/ - source/ # Selector's library source code + pagoda/ + source/ # Pagoda's library source code common/ # Code common to all layers - dynamic_value/ # Interface between selector and selscript + dynamic_value/ # Interface between pagoda and pgscript geometry_core/ # Core geometry and topology representation geometry_operations/ # Operations on geometries math_lib/ # Mathematics Library procedural_graph/ # Procedural graph, nodes and reader procedural_objects/ # Procedural objects, components and operations - selscript/ # Grammar, parser and interpreter for selscript - tests/ # Unit tests and regression tests for selector and selscript + pgscript/ # Grammar, parser and interpreter for pgscript + tests/ # Unit tests and regression tests for pagoda and pgscript tools/ # Executables ## Procedural Objects diff --git a/docs/docs/objects/objects.md b/docs/docs/objects/objects.md index b5025d73..d3dc1366 100644 --- a/docs/docs/objects/objects.md +++ b/docs/docs/objects/objects.md @@ -1,6 +1,6 @@ # Procedural Objects -To achieve more flexibility Selector implements the concept of *Procedural +To achieve more flexibility Pagoda implements the concept of *Procedural Objects* and *Procedural Components* which is implemented with an [Entity Component System](https://en.wikipedia.org/wiki/Entity_component_system) architectural pattern. You can, therefore, think of *Procedural Objects* as diff --git a/docs/docs/operations/ClipGeometry.md b/docs/docs/operations/ClipGeometry.md index 773bebf3..1dfa9227 100644 --- a/docs/docs/operations/ClipGeometry.md +++ b/docs/docs/operations/ClipGeometry.md @@ -20,7 +20,7 @@ Clips the incoming geometries agains an arbitrary plane. | Name | Type | Allowed values | Default | Description | |-------|-------|----------------|---------|-------------------------------------------------------------------------------------------------------| -| plane | Plane | | | The plane with which to clip the geometries. Currently must be specified from a selscript expression. | +| plane | Plane | | | The plane with which to clip the geometries. Currently must be specified from a pgscript expression. | ## Exposed Parameters diff --git a/docs/docs/operations/Split.md b/docs/docs/operations/Split.md index b5d68c12..b64b7284 100644 --- a/docs/docs/operations/Split.md +++ b/docs/docs/operations/Split.md @@ -18,7 +18,7 @@ along a scope's axis. ## Parameters Note: the parameters for the Split operation are most likely to change as soon -as lists are implemented in selscript. +as lists are implemented in pgscript. | Name | Type | Allowed values | Default | Description | diff --git a/source/common/README.md b/source/common/README.md index a5cf158f..e5b97324 100644 --- a/source/common/README.md +++ b/source/common/README.md @@ -13,7 +13,7 @@ These files should contain things like: ## Assertion System -The main class of the assertions subsystem is the `selector::common::debug::Fail`. There are two fail behaviour modes, +The main class of the assertions subsystem is the `pagoda::common::debug::Fail`. There are two fail behaviour modes, specified in `Fail::FailBehaviour`, allowing to either halt the program (debug break) or print a message and continue. The FailMode is returned from the FailHandler method. @@ -35,7 +35,7 @@ Fail::SetFailHandler(NewHandler); ## Profiling System -The main class in the Profiler system is `selector::comon::debug::ProfilerManager`. It registers scoped profile data +The main class in the Profiler system is `pagoda::comon::debug::ProfilerManager`. It registers scoped profile data where outer scopes don't account for time spent in inner scopes. It is possible to profile different threads since the `ProfilerManager::Instance` method returns a thread local instance diff --git a/source/geometry_core/README.md b/source/geometry_core/README.md index a02f97a3..a5b752d3 100644 --- a/source/geometry_core/README.md +++ b/source/geometry_core/README.md @@ -129,4 +129,4 @@ Topology queries are more complex than the operations described above as they us * $faces(p)$: Returns the Faces around Point $p$. * $faces(p_0, p_1)$: Returns the faces that have an Edge connecting Points $p_0$ and $p_1$ in any direction. * $shared\_edges(f_0, f_1)$: Returns the edges that both Faces $f_0$ and $f_1$ share. -* $is\_valid()$: Checks whether the topology and all its elements are valid. This should only be used for debugging purposes. \ No newline at end of file +* $is\_valid()$: Checks whether the topology and all its elements are valid. This should only be used for debugging purposes. From 8467a84c2cbcf4e9b26f50defa2fc66aea378a91 Mon Sep 17 00:00:00 2001 From: Diego Jesus Date: Fri, 1 May 2020 17:49:26 +0100 Subject: [PATCH 10/14] Fixes a github workflow problem. Removes a few more selector references. --- .github/workflows/build.yaml | 2 +- source/common/CMakeLists.txt | 2 +- source/common/pugiconfig.hpp | 74 - source/common/pugixml.cpp | 12796 ---------------- source/common/pugixml.hpp | 1461 -- source/dynamic_value/CMakeLists.txt | 2 +- source/geometry_core/CMakeLists.txt | 2 +- source/geometry_operations/CMakeLists.txt | 2 +- source/math_lib/CMakeLists.txt | 2 +- source/pagoda.h | 4 +- source/procedural_graph/CMakeLists.txt | 2 +- source/procedural_graph/reader/CMakeLists.txt | 2 +- source/procedural_objects/CMakeLists.txt | 2 +- tests/unit_tests/CMakeLists.txt | 2 +- tools/CMakeLists.txt | 2 +- 15 files changed, 13 insertions(+), 14344 deletions(-) delete mode 100644 source/common/pugiconfig.hpp delete mode 100644 source/common/pugixml.cpp delete mode 100644 source/common/pugixml.hpp diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2feb00af..925f3ce4 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -79,7 +79,7 @@ jobs: run: | cd build ./tests/unit_tests/unit_tests - ./tests/selscript/selscript_tests + ./tests/pgscript/pgscript_tests ./tests/regression_tests/regression_tests - name: Pack Regression Test Results if: always() diff --git a/source/common/CMakeLists.txt b/source/common/CMakeLists.txt index e24c2aef..2282452b 100644 --- a/source/common/CMakeLists.txt +++ b/source/common/CMakeLists.txt @@ -49,7 +49,7 @@ target_include_directories( $ $ ${Boost_INCLUDE_DIRS} - ${SELSCRIPT_INCLUDE_DIR} + ${PGSCRIPT_INCLUDE_DIR} ) target_compile_features( diff --git a/source/common/pugiconfig.hpp b/source/common/pugiconfig.hpp deleted file mode 100644 index f739e062..00000000 --- a/source/common/pugiconfig.hpp +++ /dev/null @@ -1,74 +0,0 @@ -/** - * pugixml parser - version 1.9 - * -------------------------------------------------------- - * Copyright (C) 2006-2018, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com) - * Report bugs and download new versions at http://pugixml.org/ - * - * This library is distributed under the MIT License. See notice at the end - * of this file. - * - * This work is based on the pugxml parser, which is: - * Copyright (C) 2003, by Kristen Wegner (kristen@tima.net) - */ - -#ifndef HEADER_PUGICONFIG_HPP -#define HEADER_PUGICONFIG_HPP - -// Uncomment this to enable wchar_t mode -// #define PUGIXML_WCHAR_MODE - -// Uncomment this to enable compact mode -// #define PUGIXML_COMPACT - -// Uncomment this to disable XPath -// #define PUGIXML_NO_XPATH - -// Uncomment this to disable STL -// #define PUGIXML_NO_STL - -// Uncomment this to disable exceptions -// #define PUGIXML_NO_EXCEPTIONS - -// Set this to control attributes for public classes/functions, i.e.: -// #define PUGIXML_API __declspec(dllexport) // to export all public symbols from DLL -// #define PUGIXML_CLASS __declspec(dllimport) // to import all classes from DLL -// #define PUGIXML_FUNCTION __fastcall // to set calling conventions to all public functions to fastcall -// In absence of PUGIXML_CLASS/PUGIXML_FUNCTION definitions PUGIXML_API is used instead - -// Tune these constants to adjust memory-related behavior -// #define PUGIXML_MEMORY_PAGE_SIZE 32768 -// #define PUGIXML_MEMORY_OUTPUT_STACK 10240 -// #define PUGIXML_MEMORY_XPATH_PAGE_SIZE 4096 - -// Uncomment this to switch to header-only version -// #define PUGIXML_HEADER_ONLY - -// Uncomment this to enable long long support -// #define PUGIXML_HAS_LONG_LONG - -#endif - -/** - * Copyright (c) 2006-2018 Arseny Kapoulkine - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ diff --git a/source/common/pugixml.cpp b/source/common/pugixml.cpp deleted file mode 100644 index 3dda1b48..00000000 --- a/source/common/pugixml.cpp +++ /dev/null @@ -1,12796 +0,0 @@ -/** - * pugixml parser - version 1.9 - * -------------------------------------------------------- - * Copyright (C) 2006-2018, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com) - * Report bugs and download new versions at http://pugixml.org/ - * - * This library is distributed under the MIT License. See notice at the end - * of this file. - * - * This work is based on the pugxml parser, which is: - * Copyright (C) 2003, by Kristen Wegner (kristen@tima.net) - */ - -#ifndef SOURCE_PUGIXML_CPP -#define SOURCE_PUGIXML_CPP - -#include "pugixml.hpp" - -#include -#include -#include -#include -#include - -#ifdef PUGIXML_WCHAR_MODE -# include -#endif - -#ifndef PUGIXML_NO_XPATH -# include -# include -#endif - -#ifndef PUGIXML_NO_STL -# include -# include -# include -#endif - -// For placement new -#include - -#ifdef _MSC_VER -# pragma warning(push) -# pragma warning(disable: 4127) // conditional expression is constant -# pragma warning(disable: 4324) // structure was padded due to __declspec(align()) -# pragma warning(disable: 4702) // unreachable code -# pragma warning(disable: 4996) // this function or variable may be unsafe -#endif - -#if defined(_MSC_VER) && defined(__c2__) -# pragma clang diagnostic push -# pragma clang diagnostic ignored "-Wdeprecated" // this function or variable may be unsafe -#endif - -#ifdef __INTEL_COMPILER -# pragma warning(disable: 177) // function was declared but never referenced -# pragma warning(disable: 279) // controlling expression is constant -# pragma warning(disable: 1478 1786) // function was declared "deprecated" -# pragma warning(disable: 1684) // conversion from pointer to same-sized integral type -#endif - -#if defined(__BORLANDC__) && defined(PUGIXML_HEADER_ONLY) -# pragma warn -8080 // symbol is declared but never used; disabling this inside push/pop bracket does not make the warning go away -#endif - -#ifdef __BORLANDC__ -# pragma option push -# pragma warn -8008 // condition is always false -# pragma warn -8066 // unreachable code -#endif - -#ifdef __SNC__ -// Using diag_push/diag_pop does not disable the warnings inside templates due to a compiler bug -# pragma diag_suppress=178 // function was declared but never referenced -# pragma diag_suppress=237 // controlling expression is constant -#endif - -#ifdef __TI_COMPILER_VERSION__ -# pragma diag_suppress 179 // function was declared but never referenced -#endif - -// Inlining controls -#if defined(_MSC_VER) && _MSC_VER >= 1300 -# define PUGI__NO_INLINE __declspec(noinline) -#elif defined(__GNUC__) -# define PUGI__NO_INLINE __attribute__((noinline)) -#else -# define PUGI__NO_INLINE -#endif - -// Branch weight controls -#if defined(__GNUC__) && !defined(__c2__) -# define PUGI__UNLIKELY(cond) __builtin_expect(cond, 0) -#else -# define PUGI__UNLIKELY(cond) (cond) -#endif - -// Simple static assertion -#define PUGI__STATIC_ASSERT(cond) { static const char condition_failed[(cond) ? 1 : -1] = {0}; (void)condition_failed[0]; } - -// Digital Mars C++ bug workaround for passing char loaded from memory via stack -#ifdef __DMC__ -# define PUGI__DMC_VOLATILE volatile -#else -# define PUGI__DMC_VOLATILE -#endif - -// Integer sanitizer workaround; we only apply this for clang since gcc8 has no_sanitize but not unsigned-integer-overflow and produces "attribute directive ignored" warnings -#if defined(__clang__) && defined(__has_attribute) -# if __has_attribute(no_sanitize) -# define PUGI__UNSIGNED_OVERFLOW __attribute__((no_sanitize("unsigned-integer-overflow"))) -# else -# define PUGI__UNSIGNED_OVERFLOW -# endif -#else -# define PUGI__UNSIGNED_OVERFLOW -#endif - -// Borland C++ bug workaround for not defining ::memcpy depending on header include order (can't always use std::memcpy because some compilers don't have it at all) -#if defined(__BORLANDC__) && !defined(__MEM_H_USING_LIST) -using std::memcpy; -using std::memmove; -using std::memset; -#endif - -// Some MinGW/GCC versions have headers that erroneously omit LLONG_MIN/LLONG_MAX/ULLONG_MAX definitions from limits.h in some configurations -#if defined(PUGIXML_HAS_LONG_LONG) && defined(__GNUC__) && !defined(LLONG_MAX) && !defined(LLONG_MIN) && !defined(ULLONG_MAX) -# define LLONG_MIN (-LLONG_MAX - 1LL) -# define LLONG_MAX __LONG_LONG_MAX__ -# define ULLONG_MAX (LLONG_MAX * 2ULL + 1ULL) -#endif - -// In some environments MSVC is a compiler but the CRT lacks certain MSVC-specific features -#if defined(_MSC_VER) && !defined(__S3E__) -# define PUGI__MSVC_CRT_VERSION _MSC_VER -#endif - -// Not all platforms have snprintf; we define a wrapper that uses snprintf if possible. This only works with buffers with a known size. -#if __cplusplus >= 201103 -# define PUGI__SNPRINTF(buf, ...) snprintf(buf, sizeof(buf), __VA_ARGS__) -#elif defined(PUGI__MSVC_CRT_VERSION) && PUGI__MSVC_CRT_VERSION >= 1400 -# define PUGI__SNPRINTF(buf, ...) _snprintf_s(buf, _countof(buf), _TRUNCATE, __VA_ARGS__) -#else -# define PUGI__SNPRINTF sprintf -#endif - -// We put implementation details into an anonymous namespace in source mode, but have to keep it in non-anonymous namespace in header-only mode to prevent binary bloat. -#ifdef PUGIXML_HEADER_ONLY -# define PUGI__NS_BEGIN namespace pugi { namespace impl { -# define PUGI__NS_END } } -# define PUGI__FN inline -# define PUGI__FN_NO_INLINE inline -#else -# if defined(_MSC_VER) && _MSC_VER < 1300 // MSVC6 seems to have an amusing bug with anonymous namespaces inside namespaces -# define PUGI__NS_BEGIN namespace pugi { namespace impl { -# define PUGI__NS_END } } -# else -# define PUGI__NS_BEGIN namespace pugi { namespace impl { namespace { -# define PUGI__NS_END } } } -# endif -# define PUGI__FN -# define PUGI__FN_NO_INLINE PUGI__NO_INLINE -#endif - -// uintptr_t -#if (defined(_MSC_VER) && _MSC_VER < 1600) || (defined(__BORLANDC__) && __BORLANDC__ < 0x561) -namespace pugi -{ -# ifndef _UINTPTR_T_DEFINED - typedef size_t uintptr_t; -# endif - - typedef unsigned __int8 uint8_t; - typedef unsigned __int16 uint16_t; - typedef unsigned __int32 uint32_t; -} -#else -# include -#endif - -// Memory allocation -PUGI__NS_BEGIN - PUGI__FN void* default_allocate(size_t size) - { - return malloc(size); - } - - PUGI__FN void default_deallocate(void* ptr) - { - free(ptr); - } - - template - struct xml_memory_management_function_storage - { - static allocation_function allocate; - static deallocation_function deallocate; - }; - - // Global allocation functions are stored in class statics so that in header mode linker deduplicates them - // Without a template<> we'll get multiple definitions of the same static - template allocation_function xml_memory_management_function_storage::allocate = default_allocate; - template deallocation_function xml_memory_management_function_storage::deallocate = default_deallocate; - - typedef xml_memory_management_function_storage xml_memory; -PUGI__NS_END - -// String utilities -PUGI__NS_BEGIN - // Get string length - PUGI__FN size_t strlength(const char_t* s) - { - assert(s); - - #ifdef PUGIXML_WCHAR_MODE - return wcslen(s); - #else - return strlen(s); - #endif - } - - // Compare two strings - PUGI__FN bool strequal(const char_t* src, const char_t* dst) - { - assert(src && dst); - - #ifdef PUGIXML_WCHAR_MODE - return wcscmp(src, dst) == 0; - #else - return strcmp(src, dst) == 0; - #endif - } - - // Compare lhs with [rhs_begin, rhs_end) - PUGI__FN bool strequalrange(const char_t* lhs, const char_t* rhs, size_t count) - { - for (size_t i = 0; i < count; ++i) - if (lhs[i] != rhs[i]) - return false; - - return lhs[count] == 0; - } - - // Get length of wide string, even if CRT lacks wide character support - PUGI__FN size_t strlength_wide(const wchar_t* s) - { - assert(s); - - #ifdef PUGIXML_WCHAR_MODE - return wcslen(s); - #else - const wchar_t* end = s; - while (*end) end++; - return static_cast(end - s); - #endif - } -PUGI__NS_END - -// auto_ptr-like object for exception recovery -PUGI__NS_BEGIN - template struct auto_deleter - { - typedef void (*D)(T*); - - T* data; - D deleter; - - auto_deleter(T* data_, D deleter_): data(data_), deleter(deleter_) - { - } - - ~auto_deleter() - { - if (data) deleter(data); - } - - T* release() - { - T* result = data; - data = 0; - return result; - } - }; -PUGI__NS_END - -#ifdef PUGIXML_COMPACT -PUGI__NS_BEGIN - class compact_hash_table - { - public: - compact_hash_table(): _items(0), _capacity(0), _count(0) - { - } - - void clear() - { - if (_items) - { - xml_memory::deallocate(_items); - _items = 0; - _capacity = 0; - _count = 0; - } - } - - void* find(const void* key) - { - if (_capacity == 0) return 0; - - item_t* item = get_item(key); - assert(item); - assert(item->key == key || (item->key == 0 && item->value == 0)); - - return item->value; - } - - void insert(const void* key, void* value) - { - assert(_capacity != 0 && _count < _capacity - _capacity / 4); - - item_t* item = get_item(key); - assert(item); - - if (item->key == 0) - { - _count++; - item->key = key; - } - - item->value = value; - } - - bool reserve(size_t extra = 16) - { - if (_count + extra >= _capacity - _capacity / 4) - return rehash(_count + extra); - - return true; - } - - private: - struct item_t - { - const void* key; - void* value; - }; - - item_t* _items; - size_t _capacity; - - size_t _count; - - bool rehash(size_t count); - - item_t* get_item(const void* key) - { - assert(key); - assert(_capacity > 0); - - size_t hashmod = _capacity - 1; - size_t bucket = hash(key) & hashmod; - - for (size_t probe = 0; probe <= hashmod; ++probe) - { - item_t& probe_item = _items[bucket]; - - if (probe_item.key == key || probe_item.key == 0) - return &probe_item; - - // hash collision, quadratic probing - bucket = (bucket + probe + 1) & hashmod; - } - - assert(false && "Hash table is full"); // unreachable - return 0; - } - - static PUGI__UNSIGNED_OVERFLOW unsigned int hash(const void* key) - { - unsigned int h = static_cast(reinterpret_cast(key)); - - // MurmurHash3 32-bit finalizer - h ^= h >> 16; - h *= 0x85ebca6bu; - h ^= h >> 13; - h *= 0xc2b2ae35u; - h ^= h >> 16; - - return h; - } - }; - - PUGI__FN_NO_INLINE bool compact_hash_table::rehash(size_t count) - { - size_t capacity = 32; - while (count >= capacity - capacity / 4) - capacity *= 2; - - compact_hash_table rt; - rt._capacity = capacity; - rt._items = static_cast(xml_memory::allocate(sizeof(item_t) * capacity)); - - if (!rt._items) - return false; - - memset(rt._items, 0, sizeof(item_t) * capacity); - - for (size_t i = 0; i < _capacity; ++i) - if (_items[i].key) - rt.insert(_items[i].key, _items[i].value); - - if (_items) - xml_memory::deallocate(_items); - - _capacity = capacity; - _items = rt._items; - - assert(_count == rt._count); - - return true; - } - -PUGI__NS_END -#endif - -PUGI__NS_BEGIN -#ifdef PUGIXML_COMPACT - static const uintptr_t xml_memory_block_alignment = 4; -#else - static const uintptr_t xml_memory_block_alignment = sizeof(void*); -#endif - - // extra metadata bits - static const uintptr_t xml_memory_page_contents_shared_mask = 64; - static const uintptr_t xml_memory_page_name_allocated_mask = 32; - static const uintptr_t xml_memory_page_value_allocated_mask = 16; - static const uintptr_t xml_memory_page_type_mask = 15; - - // combined masks for string uniqueness - static const uintptr_t xml_memory_page_name_allocated_or_shared_mask = xml_memory_page_name_allocated_mask | xml_memory_page_contents_shared_mask; - static const uintptr_t xml_memory_page_value_allocated_or_shared_mask = xml_memory_page_value_allocated_mask | xml_memory_page_contents_shared_mask; - -#ifdef PUGIXML_COMPACT - #define PUGI__GETHEADER_IMPL(object, page, flags) // unused - #define PUGI__GETPAGE_IMPL(header) (header).get_page() -#else - #define PUGI__GETHEADER_IMPL(object, page, flags) (((reinterpret_cast(object) - reinterpret_cast(page)) << 8) | (flags)) - // this macro casts pointers through void* to avoid 'cast increases required alignment of target type' warnings - #define PUGI__GETPAGE_IMPL(header) static_cast(const_cast(static_cast(reinterpret_cast(&header) - (header >> 8)))) -#endif - - #define PUGI__GETPAGE(n) PUGI__GETPAGE_IMPL((n)->header) - #define PUGI__NODETYPE(n) static_cast((n)->header & impl::xml_memory_page_type_mask) - - struct xml_allocator; - - struct xml_memory_page - { - static xml_memory_page* construct(void* memory) - { - xml_memory_page* result = static_cast(memory); - - result->allocator = 0; - result->prev = 0; - result->next = 0; - result->busy_size = 0; - result->freed_size = 0; - - #ifdef PUGIXML_COMPACT - result->compact_string_base = 0; - result->compact_shared_parent = 0; - result->compact_page_marker = 0; - #endif - - return result; - } - - xml_allocator* allocator; - - xml_memory_page* prev; - xml_memory_page* next; - - size_t busy_size; - size_t freed_size; - - #ifdef PUGIXML_COMPACT - char_t* compact_string_base; - void* compact_shared_parent; - uint32_t* compact_page_marker; - #endif - }; - - static const size_t xml_memory_page_size = - #ifdef PUGIXML_MEMORY_PAGE_SIZE - (PUGIXML_MEMORY_PAGE_SIZE) - #else - 32768 - #endif - - sizeof(xml_memory_page); - - struct xml_memory_string_header - { - uint16_t page_offset; // offset from page->data - uint16_t full_size; // 0 if string occupies whole page - }; - - struct xml_allocator - { - xml_allocator(xml_memory_page* root): _root(root), _busy_size(root->busy_size) - { - #ifdef PUGIXML_COMPACT - _hash = 0; - #endif - } - - xml_memory_page* allocate_page(size_t data_size) - { - size_t size = sizeof(xml_memory_page) + data_size; - - // allocate block with some alignment, leaving memory for worst-case padding - void* memory = xml_memory::allocate(size); - if (!memory) return 0; - - // prepare page structure - xml_memory_page* page = xml_memory_page::construct(memory); - assert(page); - - page->allocator = _root->allocator; - - return page; - } - - static void deallocate_page(xml_memory_page* page) - { - xml_memory::deallocate(page); - } - - void* allocate_memory_oob(size_t size, xml_memory_page*& out_page); - - void* allocate_memory(size_t size, xml_memory_page*& out_page) - { - if (PUGI__UNLIKELY(_busy_size + size > xml_memory_page_size)) - return allocate_memory_oob(size, out_page); - - void* buf = reinterpret_cast(_root) + sizeof(xml_memory_page) + _busy_size; - - _busy_size += size; - - out_page = _root; - - return buf; - } - - #ifdef PUGIXML_COMPACT - void* allocate_object(size_t size, xml_memory_page*& out_page) - { - void* result = allocate_memory(size + sizeof(uint32_t), out_page); - if (!result) return 0; - - // adjust for marker - ptrdiff_t offset = static_cast(result) - reinterpret_cast(out_page->compact_page_marker); - - if (PUGI__UNLIKELY(static_cast(offset) >= 256 * xml_memory_block_alignment)) - { - // insert new marker - uint32_t* marker = static_cast(result); - - *marker = static_cast(reinterpret_cast(marker) - reinterpret_cast(out_page)); - out_page->compact_page_marker = marker; - - // since we don't reuse the page space until we reallocate it, we can just pretend that we freed the marker block - // this will make sure deallocate_memory correctly tracks the size - out_page->freed_size += sizeof(uint32_t); - - return marker + 1; - } - else - { - // roll back uint32_t part - _busy_size -= sizeof(uint32_t); - - return result; - } - } - #else - void* allocate_object(size_t size, xml_memory_page*& out_page) - { - return allocate_memory(size, out_page); - } - #endif - - void deallocate_memory(void* ptr, size_t size, xml_memory_page* page) - { - if (page == _root) page->busy_size = _busy_size; - - assert(ptr >= reinterpret_cast(page) + sizeof(xml_memory_page) && ptr < reinterpret_cast(page) + sizeof(xml_memory_page) + page->busy_size); - (void)!ptr; - - page->freed_size += size; - assert(page->freed_size <= page->busy_size); - - if (page->freed_size == page->busy_size) - { - if (page->next == 0) - { - assert(_root == page); - - // top page freed, just reset sizes - page->busy_size = 0; - page->freed_size = 0; - - #ifdef PUGIXML_COMPACT - // reset compact state to maximize efficiency - page->compact_string_base = 0; - page->compact_shared_parent = 0; - page->compact_page_marker = 0; - #endif - - _busy_size = 0; - } - else - { - assert(_root != page); - assert(page->prev); - - // remove from the list - page->prev->next = page->next; - page->next->prev = page->prev; - - // deallocate - deallocate_page(page); - } - } - } - - char_t* allocate_string(size_t length) - { - static const size_t max_encoded_offset = (1 << 16) * xml_memory_block_alignment; - - PUGI__STATIC_ASSERT(xml_memory_page_size <= max_encoded_offset); - - // allocate memory for string and header block - size_t size = sizeof(xml_memory_string_header) + length * sizeof(char_t); - - // round size up to block alignment boundary - size_t full_size = (size + (xml_memory_block_alignment - 1)) & ~(xml_memory_block_alignment - 1); - - xml_memory_page* page; - xml_memory_string_header* header = static_cast(allocate_memory(full_size, page)); - - if (!header) return 0; - - // setup header - ptrdiff_t page_offset = reinterpret_cast(header) - reinterpret_cast(page) - sizeof(xml_memory_page); - - assert(page_offset % xml_memory_block_alignment == 0); - assert(page_offset >= 0 && static_cast(page_offset) < max_encoded_offset); - header->page_offset = static_cast(static_cast(page_offset) / xml_memory_block_alignment); - - // full_size == 0 for large strings that occupy the whole page - assert(full_size % xml_memory_block_alignment == 0); - assert(full_size < max_encoded_offset || (page->busy_size == full_size && page_offset == 0)); - header->full_size = static_cast(full_size < max_encoded_offset ? full_size / xml_memory_block_alignment : 0); - - // round-trip through void* to avoid 'cast increases required alignment of target type' warning - // header is guaranteed a pointer-sized alignment, which should be enough for char_t - return static_cast(static_cast(header + 1)); - } - - void deallocate_string(char_t* string) - { - // this function casts pointers through void* to avoid 'cast increases required alignment of target type' warnings - // we're guaranteed the proper (pointer-sized) alignment on the input string if it was allocated via allocate_string - - // get header - xml_memory_string_header* header = static_cast(static_cast(string)) - 1; - assert(header); - - // deallocate - size_t page_offset = sizeof(xml_memory_page) + header->page_offset * xml_memory_block_alignment; - xml_memory_page* page = reinterpret_cast(static_cast(reinterpret_cast(header) - page_offset)); - - // if full_size == 0 then this string occupies the whole page - size_t full_size = header->full_size == 0 ? page->busy_size : header->full_size * xml_memory_block_alignment; - - deallocate_memory(header, full_size, page); - } - - bool reserve() - { - #ifdef PUGIXML_COMPACT - return _hash->reserve(); - #else - return true; - #endif - } - - xml_memory_page* _root; - size_t _busy_size; - - #ifdef PUGIXML_COMPACT - compact_hash_table* _hash; - #endif - }; - - PUGI__FN_NO_INLINE void* xml_allocator::allocate_memory_oob(size_t size, xml_memory_page*& out_page) - { - const size_t large_allocation_threshold = xml_memory_page_size / 4; - - xml_memory_page* page = allocate_page(size <= large_allocation_threshold ? xml_memory_page_size : size); - out_page = page; - - if (!page) return 0; - - if (size <= large_allocation_threshold) - { - _root->busy_size = _busy_size; - - // insert page at the end of linked list - page->prev = _root; - _root->next = page; - _root = page; - - _busy_size = size; - } - else - { - // insert page before the end of linked list, so that it is deleted as soon as possible - // the last page is not deleted even if it's empty (see deallocate_memory) - assert(_root->prev); - - page->prev = _root->prev; - page->next = _root; - - _root->prev->next = page; - _root->prev = page; - - page->busy_size = size; - } - - return reinterpret_cast(page) + sizeof(xml_memory_page); - } -PUGI__NS_END - -#ifdef PUGIXML_COMPACT -PUGI__NS_BEGIN - static const uintptr_t compact_alignment_log2 = 2; - static const uintptr_t compact_alignment = 1 << compact_alignment_log2; - - class compact_header - { - public: - compact_header(xml_memory_page* page, unsigned int flags) - { - PUGI__STATIC_ASSERT(xml_memory_block_alignment == compact_alignment); - - ptrdiff_t offset = (reinterpret_cast(this) - reinterpret_cast(page->compact_page_marker)); - assert(offset % compact_alignment == 0 && static_cast(offset) < 256 * compact_alignment); - - _page = static_cast(offset >> compact_alignment_log2); - _flags = static_cast(flags); - } - - void operator&=(uintptr_t mod) - { - _flags &= static_cast(mod); - } - - void operator|=(uintptr_t mod) - { - _flags |= static_cast(mod); - } - - uintptr_t operator&(uintptr_t mod) const - { - return _flags & mod; - } - - xml_memory_page* get_page() const - { - // round-trip through void* to silence 'cast increases required alignment of target type' warnings - const char* page_marker = reinterpret_cast(this) - (_page << compact_alignment_log2); - const char* page = page_marker - *reinterpret_cast(static_cast(page_marker)); - - return const_cast(reinterpret_cast(static_cast(page))); - } - - private: - unsigned char _page; - unsigned char _flags; - }; - - PUGI__FN xml_memory_page* compact_get_page(const void* object, int header_offset) - { - const compact_header* header = reinterpret_cast(static_cast(object) - header_offset); - - return header->get_page(); - } - - template PUGI__FN_NO_INLINE T* compact_get_value(const void* object) - { - return static_cast(compact_get_page(object, header_offset)->allocator->_hash->find(object)); - } - - template PUGI__FN_NO_INLINE void compact_set_value(const void* object, T* value) - { - compact_get_page(object, header_offset)->allocator->_hash->insert(object, value); - } - - template class compact_pointer - { - public: - compact_pointer(): _data(0) - { - } - - void operator=(const compact_pointer& rhs) - { - *this = rhs + 0; - } - - void operator=(T* value) - { - if (value) - { - // value is guaranteed to be compact-aligned; 'this' is not - // our decoding is based on 'this' aligned to compact alignment downwards (see operator T*) - // so for negative offsets (e.g. -3) we need to adjust the diff by compact_alignment - 1 to - // compensate for arithmetic shift rounding for negative values - ptrdiff_t diff = reinterpret_cast(value) - reinterpret_cast(this); - ptrdiff_t offset = ((diff + int(compact_alignment - 1)) >> compact_alignment_log2) - start; - - if (static_cast(offset) <= 253) - _data = static_cast(offset + 1); - else - { - compact_set_value(this, value); - - _data = 255; - } - } - else - _data = 0; - } - - operator T*() const - { - if (_data) - { - if (_data < 255) - { - uintptr_t base = reinterpret_cast(this) & ~(compact_alignment - 1); - - return reinterpret_cast(base + (_data - 1 + start) * compact_alignment); - } - else - return compact_get_value(this); - } - else - return 0; - } - - T* operator->() const - { - return *this; - } - - private: - unsigned char _data; - }; - - template class compact_pointer_parent - { - public: - compact_pointer_parent(): _data(0) - { - } - - void operator=(const compact_pointer_parent& rhs) - { - *this = rhs + 0; - } - - void operator=(T* value) - { - if (value) - { - // value is guaranteed to be compact-aligned; 'this' is not - // our decoding is based on 'this' aligned to compact alignment downwards (see operator T*) - // so for negative offsets (e.g. -3) we need to adjust the diff by compact_alignment - 1 to - // compensate for arithmetic shift behavior for negative values - ptrdiff_t diff = reinterpret_cast(value) - reinterpret_cast(this); - ptrdiff_t offset = ((diff + int(compact_alignment - 1)) >> compact_alignment_log2) + 65533; - - if (static_cast(offset) <= 65533) - { - _data = static_cast(offset + 1); - } - else - { - xml_memory_page* page = compact_get_page(this, header_offset); - - if (PUGI__UNLIKELY(page->compact_shared_parent == 0)) - page->compact_shared_parent = value; - - if (page->compact_shared_parent == value) - { - _data = 65534; - } - else - { - compact_set_value(this, value); - - _data = 65535; - } - } - } - else - { - _data = 0; - } - } - - operator T*() const - { - if (_data) - { - if (_data < 65534) - { - uintptr_t base = reinterpret_cast(this) & ~(compact_alignment - 1); - - return reinterpret_cast(base + (_data - 1 - 65533) * compact_alignment); - } - else if (_data == 65534) - return static_cast(compact_get_page(this, header_offset)->compact_shared_parent); - else - return compact_get_value(this); - } - else - return 0; - } - - T* operator->() const - { - return *this; - } - - private: - uint16_t _data; - }; - - template class compact_string - { - public: - compact_string(): _data(0) - { - } - - void operator=(const compact_string& rhs) - { - *this = rhs + 0; - } - - void operator=(char_t* value) - { - if (value) - { - xml_memory_page* page = compact_get_page(this, header_offset); - - if (PUGI__UNLIKELY(page->compact_string_base == 0)) - page->compact_string_base = value; - - ptrdiff_t offset = value - page->compact_string_base; - - if (static_cast(offset) < (65535 << 7)) - { - // round-trip through void* to silence 'cast increases required alignment of target type' warnings - uint16_t* base = reinterpret_cast(static_cast(reinterpret_cast(this) - base_offset)); - - if (*base == 0) - { - *base = static_cast((offset >> 7) + 1); - _data = static_cast((offset & 127) + 1); - } - else - { - ptrdiff_t remainder = offset - ((*base - 1) << 7); - - if (static_cast(remainder) <= 253) - { - _data = static_cast(remainder + 1); - } - else - { - compact_set_value(this, value); - - _data = 255; - } - } - } - else - { - compact_set_value(this, value); - - _data = 255; - } - } - else - { - _data = 0; - } - } - - operator char_t*() const - { - if (_data) - { - if (_data < 255) - { - xml_memory_page* page = compact_get_page(this, header_offset); - - // round-trip through void* to silence 'cast increases required alignment of target type' warnings - const uint16_t* base = reinterpret_cast(static_cast(reinterpret_cast(this) - base_offset)); - assert(*base); - - ptrdiff_t offset = ((*base - 1) << 7) + (_data - 1); - - return page->compact_string_base + offset; - } - else - { - return compact_get_value(this); - } - } - else - return 0; - } - - private: - unsigned char _data; - }; -PUGI__NS_END -#endif - -#ifdef PUGIXML_COMPACT -namespace pugi -{ - struct xml_attribute_struct - { - xml_attribute_struct(impl::xml_memory_page* page): header(page, 0), namevalue_base(0) - { - PUGI__STATIC_ASSERT(sizeof(xml_attribute_struct) == 8); - } - - impl::compact_header header; - - uint16_t namevalue_base; - - impl::compact_string<4, 2> name; - impl::compact_string<5, 3> value; - - impl::compact_pointer prev_attribute_c; - impl::compact_pointer next_attribute; - }; - - struct xml_node_struct - { - xml_node_struct(impl::xml_memory_page* page, xml_node_type type): header(page, type), namevalue_base(0) - { - PUGI__STATIC_ASSERT(sizeof(xml_node_struct) == 12); - } - - impl::compact_header header; - - uint16_t namevalue_base; - - impl::compact_string<4, 2> name; - impl::compact_string<5, 3> value; - - impl::compact_pointer_parent parent; - - impl::compact_pointer first_child; - - impl::compact_pointer prev_sibling_c; - impl::compact_pointer next_sibling; - - impl::compact_pointer first_attribute; - }; -} -#else -namespace pugi -{ - struct xml_attribute_struct - { - xml_attribute_struct(impl::xml_memory_page* page): name(0), value(0), prev_attribute_c(0), next_attribute(0) - { - header = PUGI__GETHEADER_IMPL(this, page, 0); - } - - uintptr_t header; - - char_t* name; - char_t* value; - - xml_attribute_struct* prev_attribute_c; - xml_attribute_struct* next_attribute; - }; - - struct xml_node_struct - { - xml_node_struct(impl::xml_memory_page* page, xml_node_type type): name(0), value(0), parent(0), first_child(0), prev_sibling_c(0), next_sibling(0), first_attribute(0) - { - header = PUGI__GETHEADER_IMPL(this, page, type); - } - - uintptr_t header; - - char_t* name; - char_t* value; - - xml_node_struct* parent; - - xml_node_struct* first_child; - - xml_node_struct* prev_sibling_c; - xml_node_struct* next_sibling; - - xml_attribute_struct* first_attribute; - }; -} -#endif - -PUGI__NS_BEGIN - struct xml_extra_buffer - { - char_t* buffer; - xml_extra_buffer* next; - }; - - struct xml_document_struct: public xml_node_struct, public xml_allocator - { - xml_document_struct(xml_memory_page* page): xml_node_struct(page, node_document), xml_allocator(page), buffer(0), extra_buffers(0) - { - } - - const char_t* buffer; - - xml_extra_buffer* extra_buffers; - - #ifdef PUGIXML_COMPACT - compact_hash_table hash; - #endif - }; - - template inline xml_allocator& get_allocator(const Object* object) - { - assert(object); - - return *PUGI__GETPAGE(object)->allocator; - } - - template inline xml_document_struct& get_document(const Object* object) - { - assert(object); - - return *static_cast(PUGI__GETPAGE(object)->allocator); - } -PUGI__NS_END - -// Low-level DOM operations -PUGI__NS_BEGIN - inline xml_attribute_struct* allocate_attribute(xml_allocator& alloc) - { - xml_memory_page* page; - void* memory = alloc.allocate_object(sizeof(xml_attribute_struct), page); - if (!memory) return 0; - - return new (memory) xml_attribute_struct(page); - } - - inline xml_node_struct* allocate_node(xml_allocator& alloc, xml_node_type type) - { - xml_memory_page* page; - void* memory = alloc.allocate_object(sizeof(xml_node_struct), page); - if (!memory) return 0; - - return new (memory) xml_node_struct(page, type); - } - - inline void destroy_attribute(xml_attribute_struct* a, xml_allocator& alloc) - { - if (a->header & impl::xml_memory_page_name_allocated_mask) - alloc.deallocate_string(a->name); - - if (a->header & impl::xml_memory_page_value_allocated_mask) - alloc.deallocate_string(a->value); - - alloc.deallocate_memory(a, sizeof(xml_attribute_struct), PUGI__GETPAGE(a)); - } - - inline void destroy_node(xml_node_struct* n, xml_allocator& alloc) - { - if (n->header & impl::xml_memory_page_name_allocated_mask) - alloc.deallocate_string(n->name); - - if (n->header & impl::xml_memory_page_value_allocated_mask) - alloc.deallocate_string(n->value); - - for (xml_attribute_struct* attr = n->first_attribute; attr; ) - { - xml_attribute_struct* next = attr->next_attribute; - - destroy_attribute(attr, alloc); - - attr = next; - } - - for (xml_node_struct* child = n->first_child; child; ) - { - xml_node_struct* next = child->next_sibling; - - destroy_node(child, alloc); - - child = next; - } - - alloc.deallocate_memory(n, sizeof(xml_node_struct), PUGI__GETPAGE(n)); - } - - inline void append_node(xml_node_struct* child, xml_node_struct* node) - { - child->parent = node; - - xml_node_struct* head = node->first_child; - - if (head) - { - xml_node_struct* tail = head->prev_sibling_c; - - tail->next_sibling = child; - child->prev_sibling_c = tail; - head->prev_sibling_c = child; - } - else - { - node->first_child = child; - child->prev_sibling_c = child; - } - } - - inline void prepend_node(xml_node_struct* child, xml_node_struct* node) - { - child->parent = node; - - xml_node_struct* head = node->first_child; - - if (head) - { - child->prev_sibling_c = head->prev_sibling_c; - head->prev_sibling_c = child; - } - else - child->prev_sibling_c = child; - - child->next_sibling = head; - node->first_child = child; - } - - inline void insert_node_after(xml_node_struct* child, xml_node_struct* node) - { - xml_node_struct* parent = node->parent; - - child->parent = parent; - - if (node->next_sibling) - node->next_sibling->prev_sibling_c = child; - else - parent->first_child->prev_sibling_c = child; - - child->next_sibling = node->next_sibling; - child->prev_sibling_c = node; - - node->next_sibling = child; - } - - inline void insert_node_before(xml_node_struct* child, xml_node_struct* node) - { - xml_node_struct* parent = node->parent; - - child->parent = parent; - - if (node->prev_sibling_c->next_sibling) - node->prev_sibling_c->next_sibling = child; - else - parent->first_child = child; - - child->prev_sibling_c = node->prev_sibling_c; - child->next_sibling = node; - - node->prev_sibling_c = child; - } - - inline void remove_node(xml_node_struct* node) - { - xml_node_struct* parent = node->parent; - - if (node->next_sibling) - node->next_sibling->prev_sibling_c = node->prev_sibling_c; - else - parent->first_child->prev_sibling_c = node->prev_sibling_c; - - if (node->prev_sibling_c->next_sibling) - node->prev_sibling_c->next_sibling = node->next_sibling; - else - parent->first_child = node->next_sibling; - - node->parent = 0; - node->prev_sibling_c = 0; - node->next_sibling = 0; - } - - inline void append_attribute(xml_attribute_struct* attr, xml_node_struct* node) - { - xml_attribute_struct* head = node->first_attribute; - - if (head) - { - xml_attribute_struct* tail = head->prev_attribute_c; - - tail->next_attribute = attr; - attr->prev_attribute_c = tail; - head->prev_attribute_c = attr; - } - else - { - node->first_attribute = attr; - attr->prev_attribute_c = attr; - } - } - - inline void prepend_attribute(xml_attribute_struct* attr, xml_node_struct* node) - { - xml_attribute_struct* head = node->first_attribute; - - if (head) - { - attr->prev_attribute_c = head->prev_attribute_c; - head->prev_attribute_c = attr; - } - else - attr->prev_attribute_c = attr; - - attr->next_attribute = head; - node->first_attribute = attr; - } - - inline void insert_attribute_after(xml_attribute_struct* attr, xml_attribute_struct* place, xml_node_struct* node) - { - if (place->next_attribute) - place->next_attribute->prev_attribute_c = attr; - else - node->first_attribute->prev_attribute_c = attr; - - attr->next_attribute = place->next_attribute; - attr->prev_attribute_c = place; - place->next_attribute = attr; - } - - inline void insert_attribute_before(xml_attribute_struct* attr, xml_attribute_struct* place, xml_node_struct* node) - { - if (place->prev_attribute_c->next_attribute) - place->prev_attribute_c->next_attribute = attr; - else - node->first_attribute = attr; - - attr->prev_attribute_c = place->prev_attribute_c; - attr->next_attribute = place; - place->prev_attribute_c = attr; - } - - inline void remove_attribute(xml_attribute_struct* attr, xml_node_struct* node) - { - if (attr->next_attribute) - attr->next_attribute->prev_attribute_c = attr->prev_attribute_c; - else - node->first_attribute->prev_attribute_c = attr->prev_attribute_c; - - if (attr->prev_attribute_c->next_attribute) - attr->prev_attribute_c->next_attribute = attr->next_attribute; - else - node->first_attribute = attr->next_attribute; - - attr->prev_attribute_c = 0; - attr->next_attribute = 0; - } - - PUGI__FN_NO_INLINE xml_node_struct* append_new_node(xml_node_struct* node, xml_allocator& alloc, xml_node_type type = node_element) - { - if (!alloc.reserve()) return 0; - - xml_node_struct* child = allocate_node(alloc, type); - if (!child) return 0; - - append_node(child, node); - - return child; - } - - PUGI__FN_NO_INLINE xml_attribute_struct* append_new_attribute(xml_node_struct* node, xml_allocator& alloc) - { - if (!alloc.reserve()) return 0; - - xml_attribute_struct* attr = allocate_attribute(alloc); - if (!attr) return 0; - - append_attribute(attr, node); - - return attr; - } -PUGI__NS_END - -// Helper classes for code generation -PUGI__NS_BEGIN - struct opt_false - { - enum { value = 0 }; - }; - - struct opt_true - { - enum { value = 1 }; - }; -PUGI__NS_END - -// Unicode utilities -PUGI__NS_BEGIN - inline uint16_t endian_swap(uint16_t value) - { - return static_cast(((value & 0xff) << 8) | (value >> 8)); - } - - inline uint32_t endian_swap(uint32_t value) - { - return ((value & 0xff) << 24) | ((value & 0xff00) << 8) | ((value & 0xff0000) >> 8) | (value >> 24); - } - - struct utf8_counter - { - typedef size_t value_type; - - static value_type low(value_type result, uint32_t ch) - { - // U+0000..U+007F - if (ch < 0x80) return result + 1; - // U+0080..U+07FF - else if (ch < 0x800) return result + 2; - // U+0800..U+FFFF - else return result + 3; - } - - static value_type high(value_type result, uint32_t) - { - // U+10000..U+10FFFF - return result + 4; - } - }; - - struct utf8_writer - { - typedef uint8_t* value_type; - - static value_type low(value_type result, uint32_t ch) - { - // U+0000..U+007F - if (ch < 0x80) - { - *result = static_cast(ch); - return result + 1; - } - // U+0080..U+07FF - else if (ch < 0x800) - { - result[0] = static_cast(0xC0 | (ch >> 6)); - result[1] = static_cast(0x80 | (ch & 0x3F)); - return result + 2; - } - // U+0800..U+FFFF - else - { - result[0] = static_cast(0xE0 | (ch >> 12)); - result[1] = static_cast(0x80 | ((ch >> 6) & 0x3F)); - result[2] = static_cast(0x80 | (ch & 0x3F)); - return result + 3; - } - } - - static value_type high(value_type result, uint32_t ch) - { - // U+10000..U+10FFFF - result[0] = static_cast(0xF0 | (ch >> 18)); - result[1] = static_cast(0x80 | ((ch >> 12) & 0x3F)); - result[2] = static_cast(0x80 | ((ch >> 6) & 0x3F)); - result[3] = static_cast(0x80 | (ch & 0x3F)); - return result + 4; - } - - static value_type any(value_type result, uint32_t ch) - { - return (ch < 0x10000) ? low(result, ch) : high(result, ch); - } - }; - - struct utf16_counter - { - typedef size_t value_type; - - static value_type low(value_type result, uint32_t) - { - return result + 1; - } - - static value_type high(value_type result, uint32_t) - { - return result + 2; - } - }; - - struct utf16_writer - { - typedef uint16_t* value_type; - - static value_type low(value_type result, uint32_t ch) - { - *result = static_cast(ch); - - return result + 1; - } - - static value_type high(value_type result, uint32_t ch) - { - uint32_t msh = static_cast(ch - 0x10000) >> 10; - uint32_t lsh = static_cast(ch - 0x10000) & 0x3ff; - - result[0] = static_cast(0xD800 + msh); - result[1] = static_cast(0xDC00 + lsh); - - return result + 2; - } - - static value_type any(value_type result, uint32_t ch) - { - return (ch < 0x10000) ? low(result, ch) : high(result, ch); - } - }; - - struct utf32_counter - { - typedef size_t value_type; - - static value_type low(value_type result, uint32_t) - { - return result + 1; - } - - static value_type high(value_type result, uint32_t) - { - return result + 1; - } - }; - - struct utf32_writer - { - typedef uint32_t* value_type; - - static value_type low(value_type result, uint32_t ch) - { - *result = ch; - - return result + 1; - } - - static value_type high(value_type result, uint32_t ch) - { - *result = ch; - - return result + 1; - } - - static value_type any(value_type result, uint32_t ch) - { - *result = ch; - - return result + 1; - } - }; - - struct latin1_writer - { - typedef uint8_t* value_type; - - static value_type low(value_type result, uint32_t ch) - { - *result = static_cast(ch > 255 ? '?' : ch); - - return result + 1; - } - - static value_type high(value_type result, uint32_t ch) - { - (void)ch; - - *result = '?'; - - return result + 1; - } - }; - - struct utf8_decoder - { - typedef uint8_t type; - - template static inline typename Traits::value_type process(const uint8_t* data, size_t size, typename Traits::value_type result, Traits) - { - const uint8_t utf8_byte_mask = 0x3f; - - while (size) - { - uint8_t lead = *data; - - // 0xxxxxxx -> U+0000..U+007F - if (lead < 0x80) - { - result = Traits::low(result, lead); - data += 1; - size -= 1; - - // process aligned single-byte (ascii) blocks - if ((reinterpret_cast(data) & 3) == 0) - { - // round-trip through void* to silence 'cast increases required alignment of target type' warnings - while (size >= 4 && (*static_cast(static_cast(data)) & 0x80808080) == 0) - { - result = Traits::low(result, data[0]); - result = Traits::low(result, data[1]); - result = Traits::low(result, data[2]); - result = Traits::low(result, data[3]); - data += 4; - size -= 4; - } - } - } - // 110xxxxx -> U+0080..U+07FF - else if (static_cast(lead - 0xC0) < 0x20 && size >= 2 && (data[1] & 0xc0) == 0x80) - { - result = Traits::low(result, ((lead & ~0xC0) << 6) | (data[1] & utf8_byte_mask)); - data += 2; - size -= 2; - } - // 1110xxxx -> U+0800-U+FFFF - else if (static_cast(lead - 0xE0) < 0x10 && size >= 3 && (data[1] & 0xc0) == 0x80 && (data[2] & 0xc0) == 0x80) - { - result = Traits::low(result, ((lead & ~0xE0) << 12) | ((data[1] & utf8_byte_mask) << 6) | (data[2] & utf8_byte_mask)); - data += 3; - size -= 3; - } - // 11110xxx -> U+10000..U+10FFFF - else if (static_cast(lead - 0xF0) < 0x08 && size >= 4 && (data[1] & 0xc0) == 0x80 && (data[2] & 0xc0) == 0x80 && (data[3] & 0xc0) == 0x80) - { - result = Traits::high(result, ((lead & ~0xF0) << 18) | ((data[1] & utf8_byte_mask) << 12) | ((data[2] & utf8_byte_mask) << 6) | (data[3] & utf8_byte_mask)); - data += 4; - size -= 4; - } - // 10xxxxxx or 11111xxx -> invalid - else - { - data += 1; - size -= 1; - } - } - - return result; - } - }; - - template struct utf16_decoder - { - typedef uint16_t type; - - template static inline typename Traits::value_type process(const uint16_t* data, size_t size, typename Traits::value_type result, Traits) - { - while (size) - { - uint16_t lead = opt_swap::value ? endian_swap(*data) : *data; - - // U+0000..U+D7FF - if (lead < 0xD800) - { - result = Traits::low(result, lead); - data += 1; - size -= 1; - } - // U+E000..U+FFFF - else if (static_cast(lead - 0xE000) < 0x2000) - { - result = Traits::low(result, lead); - data += 1; - size -= 1; - } - // surrogate pair lead - else if (static_cast(lead - 0xD800) < 0x400 && size >= 2) - { - uint16_t next = opt_swap::value ? endian_swap(data[1]) : data[1]; - - if (static_cast(next - 0xDC00) < 0x400) - { - result = Traits::high(result, 0x10000 + ((lead & 0x3ff) << 10) + (next & 0x3ff)); - data += 2; - size -= 2; - } - else - { - data += 1; - size -= 1; - } - } - else - { - data += 1; - size -= 1; - } - } - - return result; - } - }; - - template struct utf32_decoder - { - typedef uint32_t type; - - template static inline typename Traits::value_type process(const uint32_t* data, size_t size, typename Traits::value_type result, Traits) - { - while (size) - { - uint32_t lead = opt_swap::value ? endian_swap(*data) : *data; - - // U+0000..U+FFFF - if (lead < 0x10000) - { - result = Traits::low(result, lead); - data += 1; - size -= 1; - } - // U+10000..U+10FFFF - else - { - result = Traits::high(result, lead); - data += 1; - size -= 1; - } - } - - return result; - } - }; - - struct latin1_decoder - { - typedef uint8_t type; - - template static inline typename Traits::value_type process(const uint8_t* data, size_t size, typename Traits::value_type result, Traits) - { - while (size) - { - result = Traits::low(result, *data); - data += 1; - size -= 1; - } - - return result; - } - }; - - template struct wchar_pagoda; - - template <> struct wchar_pagoda<2> - { - typedef uint16_t type; - typedef utf16_counter counter; - typedef utf16_writer writer; - typedef utf16_decoder decoder; - }; - - template <> struct wchar_pagoda<4> - { - typedef uint32_t type; - typedef utf32_counter counter; - typedef utf32_writer writer; - typedef utf32_decoder decoder; - }; - - typedef wchar_pagoda::counter wchar_counter; - typedef wchar_pagoda::writer wchar_writer; - - struct wchar_decoder - { - typedef wchar_t type; - - template static inline typename Traits::value_type process(const wchar_t* data, size_t size, typename Traits::value_type result, Traits traits) - { - typedef wchar_pagoda::decoder decoder; - - return decoder::process(reinterpret_cast(data), size, result, traits); - } - }; - -#ifdef PUGIXML_WCHAR_MODE - PUGI__FN void convert_wchar_endian_swap(wchar_t* result, const wchar_t* data, size_t length) - { - for (size_t i = 0; i < length; ++i) - result[i] = static_cast(endian_swap(static_cast::type>(data[i]))); - } -#endif -PUGI__NS_END - -PUGI__NS_BEGIN - enum chartype_t - { - ct_parse_pcdata = 1, // \0, &, \r, < - ct_parse_attr = 2, // \0, &, \r, ', " - ct_parse_attr_ws = 4, // \0, &, \r, ', ", \n, tab - ct_space = 8, // \r, \n, space, tab - ct_parse_cdata = 16, // \0, ], >, \r - ct_parse_comment = 32, // \0, -, >, \r - ct_symbol = 64, // Any symbol > 127, a-z, A-Z, 0-9, _, :, -, . - ct_start_symbol = 128 // Any symbol > 127, a-z, A-Z, _, : - }; - - static const unsigned char chartype_table[256] = - { - 55, 0, 0, 0, 0, 0, 0, 0, 0, 12, 12, 0, 0, 63, 0, 0, // 0-15 - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 16-31 - 8, 0, 6, 0, 0, 0, 7, 6, 0, 0, 0, 0, 0, 96, 64, 0, // 32-47 - 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 192, 0, 1, 0, 48, 0, // 48-63 - 0, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, // 64-79 - 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 0, 0, 16, 0, 192, // 80-95 - 0, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, // 96-111 - 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 0, 0, 0, 0, 0, // 112-127 - - 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, // 128+ - 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, - 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, - 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, - 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, - 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, - 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, - 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192 - }; - - enum chartypex_t - { - ctx_special_pcdata = 1, // Any symbol >= 0 and < 32 (except \t, \r, \n), &, <, > - ctx_special_attr = 2, // Any symbol >= 0 and < 32 (except \t), &, <, >, " - ctx_start_symbol = 4, // Any symbol > 127, a-z, A-Z, _ - ctx_digit = 8, // 0-9 - ctx_symbol = 16 // Any symbol > 127, a-z, A-Z, 0-9, _, -, . - }; - - static const unsigned char chartypex_table[256] = - { - 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 2, 3, 3, 2, 3, 3, // 0-15 - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 16-31 - 0, 0, 2, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 16, 16, 0, // 32-47 - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 0, 0, 3, 0, 3, 0, // 48-63 - - 0, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, // 64-79 - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 0, 0, 0, 0, 20, // 80-95 - 0, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, // 96-111 - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 0, 0, 0, 0, 0, // 112-127 - - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, // 128+ - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20 - }; - -#ifdef PUGIXML_WCHAR_MODE - #define PUGI__IS_CHARTYPE_IMPL(c, ct, table) ((static_cast(c) < 128 ? table[static_cast(c)] : table[128]) & (ct)) -#else - #define PUGI__IS_CHARTYPE_IMPL(c, ct, table) (table[static_cast(c)] & (ct)) -#endif - - #define PUGI__IS_CHARTYPE(c, ct) PUGI__IS_CHARTYPE_IMPL(c, ct, chartype_table) - #define PUGI__IS_CHARTYPEX(c, ct) PUGI__IS_CHARTYPE_IMPL(c, ct, chartypex_table) - - PUGI__FN bool is_little_endian() - { - unsigned int ui = 1; - - return *reinterpret_cast(&ui) == 1; - } - - PUGI__FN xml_encoding get_wchar_encoding() - { - PUGI__STATIC_ASSERT(sizeof(wchar_t) == 2 || sizeof(wchar_t) == 4); - - if (sizeof(wchar_t) == 2) - return is_little_endian() ? encoding_utf16_le : encoding_utf16_be; - else - return is_little_endian() ? encoding_utf32_le : encoding_utf32_be; - } - - PUGI__FN bool parse_declaration_encoding(const uint8_t* data, size_t size, const uint8_t*& out_encoding, size_t& out_length) - { - #define PUGI__SCANCHAR(ch) { if (offset >= size || data[offset] != ch) return false; offset++; } - #define PUGI__SCANCHARTYPE(ct) { while (offset < size && PUGI__IS_CHARTYPE(data[offset], ct)) offset++; } - - // check if we have a non-empty XML declaration - if (size < 6 || !((data[0] == '<') & (data[1] == '?') & (data[2] == 'x') & (data[3] == 'm') & (data[4] == 'l') && PUGI__IS_CHARTYPE(data[5], ct_space))) - return false; - - // scan XML declaration until the encoding field - for (size_t i = 6; i + 1 < size; ++i) - { - // declaration can not contain ? in quoted values - if (data[i] == '?') - return false; - - if (data[i] == 'e' && data[i + 1] == 'n') - { - size_t offset = i; - - // encoding follows the version field which can't contain 'en' so this has to be the encoding if XML is well formed - PUGI__SCANCHAR('e'); PUGI__SCANCHAR('n'); PUGI__SCANCHAR('c'); PUGI__SCANCHAR('o'); - PUGI__SCANCHAR('d'); PUGI__SCANCHAR('i'); PUGI__SCANCHAR('n'); PUGI__SCANCHAR('g'); - - // S? = S? - PUGI__SCANCHARTYPE(ct_space); - PUGI__SCANCHAR('='); - PUGI__SCANCHARTYPE(ct_space); - - // the only two valid delimiters are ' and " - uint8_t delimiter = (offset < size && data[offset] == '"') ? '"' : '\''; - - PUGI__SCANCHAR(delimiter); - - size_t start = offset; - - out_encoding = data + offset; - - PUGI__SCANCHARTYPE(ct_symbol); - - out_length = offset - start; - - PUGI__SCANCHAR(delimiter); - - return true; - } - } - - return false; - - #undef PUGI__SCANCHAR - #undef PUGI__SCANCHARTYPE - } - - PUGI__FN xml_encoding guess_buffer_encoding(const uint8_t* data, size_t size) - { - // skip encoding autodetection if input buffer is too small - if (size < 4) return encoding_utf8; - - uint8_t d0 = data[0], d1 = data[1], d2 = data[2], d3 = data[3]; - - // look for BOM in first few bytes - if (d0 == 0 && d1 == 0 && d2 == 0xfe && d3 == 0xff) return encoding_utf32_be; - if (d0 == 0xff && d1 == 0xfe && d2 == 0 && d3 == 0) return encoding_utf32_le; - if (d0 == 0xfe && d1 == 0xff) return encoding_utf16_be; - if (d0 == 0xff && d1 == 0xfe) return encoding_utf16_le; - if (d0 == 0xef && d1 == 0xbb && d2 == 0xbf) return encoding_utf8; - - // look for <, (contents); - - return guess_buffer_encoding(data, size); - } - - PUGI__FN bool get_mutable_buffer(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, bool is_mutable) - { - size_t length = size / sizeof(char_t); - - if (is_mutable) - { - out_buffer = static_cast(const_cast(contents)); - out_length = length; - } - else - { - char_t* buffer = static_cast(xml_memory::allocate((length + 1) * sizeof(char_t))); - if (!buffer) return false; - - if (contents) - memcpy(buffer, contents, length * sizeof(char_t)); - else - assert(length == 0); - - buffer[length] = 0; - - out_buffer = buffer; - out_length = length + 1; - } - - return true; - } - -#ifdef PUGIXML_WCHAR_MODE - PUGI__FN bool need_endian_swap_utf(xml_encoding le, xml_encoding re) - { - return (le == encoding_utf16_be && re == encoding_utf16_le) || (le == encoding_utf16_le && re == encoding_utf16_be) || - (le == encoding_utf32_be && re == encoding_utf32_le) || (le == encoding_utf32_le && re == encoding_utf32_be); - } - - PUGI__FN bool convert_buffer_endian_swap(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, bool is_mutable) - { - const char_t* data = static_cast(contents); - size_t length = size / sizeof(char_t); - - if (is_mutable) - { - char_t* buffer = const_cast(data); - - convert_wchar_endian_swap(buffer, data, length); - - out_buffer = buffer; - out_length = length; - } - else - { - char_t* buffer = static_cast(xml_memory::allocate((length + 1) * sizeof(char_t))); - if (!buffer) return false; - - convert_wchar_endian_swap(buffer, data, length); - buffer[length] = 0; - - out_buffer = buffer; - out_length = length + 1; - } - - return true; - } - - template PUGI__FN bool convert_buffer_generic(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, D) - { - const typename D::type* data = static_cast(contents); - size_t data_length = size / sizeof(typename D::type); - - // first pass: get length in wchar_t units - size_t length = D::process(data, data_length, 0, wchar_counter()); - - // allocate buffer of suitable length - char_t* buffer = static_cast(xml_memory::allocate((length + 1) * sizeof(char_t))); - if (!buffer) return false; - - // second pass: convert utf16 input to wchar_t - wchar_writer::value_type obegin = reinterpret_cast(buffer); - wchar_writer::value_type oend = D::process(data, data_length, obegin, wchar_writer()); - - assert(oend == obegin + length); - *oend = 0; - - out_buffer = buffer; - out_length = length + 1; - - return true; - } - - PUGI__FN bool convert_buffer(char_t*& out_buffer, size_t& out_length, xml_encoding encoding, const void* contents, size_t size, bool is_mutable) - { - // get native encoding - xml_encoding wchar_encoding = get_wchar_encoding(); - - // fast path: no conversion required - if (encoding == wchar_encoding) - return get_mutable_buffer(out_buffer, out_length, contents, size, is_mutable); - - // only endian-swapping is required - if (need_endian_swap_utf(encoding, wchar_encoding)) - return convert_buffer_endian_swap(out_buffer, out_length, contents, size, is_mutable); - - // source encoding is utf8 - if (encoding == encoding_utf8) - return convert_buffer_generic(out_buffer, out_length, contents, size, utf8_decoder()); - - // source encoding is utf16 - if (encoding == encoding_utf16_be || encoding == encoding_utf16_le) - { - xml_encoding native_encoding = is_little_endian() ? encoding_utf16_le : encoding_utf16_be; - - return (native_encoding == encoding) ? - convert_buffer_generic(out_buffer, out_length, contents, size, utf16_decoder()) : - convert_buffer_generic(out_buffer, out_length, contents, size, utf16_decoder()); - } - - // source encoding is utf32 - if (encoding == encoding_utf32_be || encoding == encoding_utf32_le) - { - xml_encoding native_encoding = is_little_endian() ? encoding_utf32_le : encoding_utf32_be; - - return (native_encoding == encoding) ? - convert_buffer_generic(out_buffer, out_length, contents, size, utf32_decoder()) : - convert_buffer_generic(out_buffer, out_length, contents, size, utf32_decoder()); - } - - // source encoding is latin1 - if (encoding == encoding_latin1) - return convert_buffer_generic(out_buffer, out_length, contents, size, latin1_decoder()); - - assert(false && "Invalid encoding"); // unreachable - return false; - } -#else - template PUGI__FN bool convert_buffer_generic(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, D) - { - const typename D::type* data = static_cast(contents); - size_t data_length = size / sizeof(typename D::type); - - // first pass: get length in utf8 units - size_t length = D::process(data, data_length, 0, utf8_counter()); - - // allocate buffer of suitable length - char_t* buffer = static_cast(xml_memory::allocate((length + 1) * sizeof(char_t))); - if (!buffer) return false; - - // second pass: convert utf16 input to utf8 - uint8_t* obegin = reinterpret_cast(buffer); - uint8_t* oend = D::process(data, data_length, obegin, utf8_writer()); - - assert(oend == obegin + length); - *oend = 0; - - out_buffer = buffer; - out_length = length + 1; - - return true; - } - - PUGI__FN size_t get_latin1_7bit_prefix_length(const uint8_t* data, size_t size) - { - for (size_t i = 0; i < size; ++i) - if (data[i] > 127) - return i; - - return size; - } - - PUGI__FN bool convert_buffer_latin1(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, bool is_mutable) - { - const uint8_t* data = static_cast(contents); - size_t data_length = size; - - // get size of prefix that does not need utf8 conversion - size_t prefix_length = get_latin1_7bit_prefix_length(data, data_length); - assert(prefix_length <= data_length); - - const uint8_t* postfix = data + prefix_length; - size_t postfix_length = data_length - prefix_length; - - // if no conversion is needed, just return the original buffer - if (postfix_length == 0) return get_mutable_buffer(out_buffer, out_length, contents, size, is_mutable); - - // first pass: get length in utf8 units - size_t length = prefix_length + latin1_decoder::process(postfix, postfix_length, 0, utf8_counter()); - - // allocate buffer of suitable length - char_t* buffer = static_cast(xml_memory::allocate((length + 1) * sizeof(char_t))); - if (!buffer) return false; - - // second pass: convert latin1 input to utf8 - memcpy(buffer, data, prefix_length); - - uint8_t* obegin = reinterpret_cast(buffer); - uint8_t* oend = latin1_decoder::process(postfix, postfix_length, obegin + prefix_length, utf8_writer()); - - assert(oend == obegin + length); - *oend = 0; - - out_buffer = buffer; - out_length = length + 1; - - return true; - } - - PUGI__FN bool convert_buffer(char_t*& out_buffer, size_t& out_length, xml_encoding encoding, const void* contents, size_t size, bool is_mutable) - { - // fast path: no conversion required - if (encoding == encoding_utf8) - return get_mutable_buffer(out_buffer, out_length, contents, size, is_mutable); - - // source encoding is utf16 - if (encoding == encoding_utf16_be || encoding == encoding_utf16_le) - { - xml_encoding native_encoding = is_little_endian() ? encoding_utf16_le : encoding_utf16_be; - - return (native_encoding == encoding) ? - convert_buffer_generic(out_buffer, out_length, contents, size, utf16_decoder()) : - convert_buffer_generic(out_buffer, out_length, contents, size, utf16_decoder()); - } - - // source encoding is utf32 - if (encoding == encoding_utf32_be || encoding == encoding_utf32_le) - { - xml_encoding native_encoding = is_little_endian() ? encoding_utf32_le : encoding_utf32_be; - - return (native_encoding == encoding) ? - convert_buffer_generic(out_buffer, out_length, contents, size, utf32_decoder()) : - convert_buffer_generic(out_buffer, out_length, contents, size, utf32_decoder()); - } - - // source encoding is latin1 - if (encoding == encoding_latin1) - return convert_buffer_latin1(out_buffer, out_length, contents, size, is_mutable); - - assert(false && "Invalid encoding"); // unreachable - return false; - } -#endif - - PUGI__FN size_t as_utf8_begin(const wchar_t* str, size_t length) - { - // get length in utf8 characters - return wchar_decoder::process(str, length, 0, utf8_counter()); - } - - PUGI__FN void as_utf8_end(char* buffer, size_t size, const wchar_t* str, size_t length) - { - // convert to utf8 - uint8_t* begin = reinterpret_cast(buffer); - uint8_t* end = wchar_decoder::process(str, length, begin, utf8_writer()); - - assert(begin + size == end); - (void)!end; - (void)!size; - } - -#ifndef PUGIXML_NO_STL - PUGI__FN std::string as_utf8_impl(const wchar_t* str, size_t length) - { - // first pass: get length in utf8 characters - size_t size = as_utf8_begin(str, length); - - // allocate resulting string - std::string result; - result.resize(size); - - // second pass: convert to utf8 - if (size > 0) as_utf8_end(&result[0], size, str, length); - - return result; - } - - PUGI__FN std::basic_string as_wide_impl(const char* str, size_t size) - { - const uint8_t* data = reinterpret_cast(str); - - // first pass: get length in wchar_t units - size_t length = utf8_decoder::process(data, size, 0, wchar_counter()); - - // allocate resulting string - std::basic_string result; - result.resize(length); - - // second pass: convert to wchar_t - if (length > 0) - { - wchar_writer::value_type begin = reinterpret_cast(&result[0]); - wchar_writer::value_type end = utf8_decoder::process(data, size, begin, wchar_writer()); - - assert(begin + length == end); - (void)!end; - } - - return result; - } -#endif - - template - inline bool strcpy_insitu_allow(size_t length, const Header& header, uintptr_t header_mask, char_t* target) - { - // never reuse shared memory - if (header & xml_memory_page_contents_shared_mask) return false; - - size_t target_length = strlength(target); - - // always reuse document buffer memory if possible - if ((header & header_mask) == 0) return target_length >= length; - - // reuse heap memory if waste is not too great - const size_t reuse_threshold = 32; - - return target_length >= length && (target_length < reuse_threshold || target_length - length < target_length / 2); - } - - template - PUGI__FN bool strcpy_insitu(String& dest, Header& header, uintptr_t header_mask, const char_t* source, size_t source_length) - { - if (source_length == 0) - { - // empty string and null pointer are equivalent, so just deallocate old memory - xml_allocator* alloc = PUGI__GETPAGE_IMPL(header)->allocator; - - if (header & header_mask) alloc->deallocate_string(dest); - - // mark the string as not allocated - dest = 0; - header &= ~header_mask; - - return true; - } - else if (dest && strcpy_insitu_allow(source_length, header, header_mask, dest)) - { - // we can reuse old buffer, so just copy the new data (including zero terminator) - memcpy(dest, source, source_length * sizeof(char_t)); - dest[source_length] = 0; - - return true; - } - else - { - xml_allocator* alloc = PUGI__GETPAGE_IMPL(header)->allocator; - - if (!alloc->reserve()) return false; - - // allocate new buffer - char_t* buf = alloc->allocate_string(source_length + 1); - if (!buf) return false; - - // copy the string (including zero terminator) - memcpy(buf, source, source_length * sizeof(char_t)); - buf[source_length] = 0; - - // deallocate old buffer (*after* the above to protect against overlapping memory and/or allocation failures) - if (header & header_mask) alloc->deallocate_string(dest); - - // the string is now allocated, so set the flag - dest = buf; - header |= header_mask; - - return true; - } - } - - struct gap - { - char_t* end; - size_t size; - - gap(): end(0), size(0) - { - } - - // Push new gap, move s count bytes further (skipping the gap). - // Collapse previous gap. - void push(char_t*& s, size_t count) - { - if (end) // there was a gap already; collapse it - { - // Move [old_gap_end, new_gap_start) to [old_gap_start, ...) - assert(s >= end); - memmove(end - size, end, reinterpret_cast(s) - reinterpret_cast(end)); - } - - s += count; // end of current gap - - // "merge" two gaps - end = s; - size += count; - } - - // Collapse all gaps, return past-the-end pointer - char_t* flush(char_t* s) - { - if (end) - { - // Move [old_gap_end, current_pos) to [old_gap_start, ...) - assert(s >= end); - memmove(end - size, end, reinterpret_cast(s) - reinterpret_cast(end)); - - return s - size; - } - else return s; - } - }; - - PUGI__FN char_t* strconv_escape(char_t* s, gap& g) - { - char_t* stre = s + 1; - - switch (*stre) - { - case '#': // &#... - { - unsigned int ucsc = 0; - - if (stre[1] == 'x') // &#x... (hex code) - { - stre += 2; - - char_t ch = *stre; - - if (ch == ';') return stre; - - for (;;) - { - if (static_cast(ch - '0') <= 9) - ucsc = 16 * ucsc + (ch - '0'); - else if (static_cast((ch | ' ') - 'a') <= 5) - ucsc = 16 * ucsc + ((ch | ' ') - 'a' + 10); - else if (ch == ';') - break; - else // cancel - return stre; - - ch = *++stre; - } - - ++stre; - } - else // &#... (dec code) - { - char_t ch = *++stre; - - if (ch == ';') return stre; - - for (;;) - { - if (static_cast(ch - '0') <= 9) - ucsc = 10 * ucsc + (ch - '0'); - else if (ch == ';') - break; - else // cancel - return stre; - - ch = *++stre; - } - - ++stre; - } - - #ifdef PUGIXML_WCHAR_MODE - s = reinterpret_cast(wchar_writer::any(reinterpret_cast(s), ucsc)); - #else - s = reinterpret_cast(utf8_writer::any(reinterpret_cast(s), ucsc)); - #endif - - g.push(s, stre - s); - return stre; - } - - case 'a': // &a - { - ++stre; - - if (*stre == 'm') // &am - { - if (*++stre == 'p' && *++stre == ';') // & - { - *s++ = '&'; - ++stre; - - g.push(s, stre - s); - return stre; - } - } - else if (*stre == 'p') // &ap - { - if (*++stre == 'o' && *++stre == 's' && *++stre == ';') // ' - { - *s++ = '\''; - ++stre; - - g.push(s, stre - s); - return stre; - } - } - break; - } - - case 'g': // &g - { - if (*++stre == 't' && *++stre == ';') // > - { - *s++ = '>'; - ++stre; - - g.push(s, stre - s); - return stre; - } - break; - } - - case 'l': // &l - { - if (*++stre == 't' && *++stre == ';') // < - { - *s++ = '<'; - ++stre; - - g.push(s, stre - s); - return stre; - } - break; - } - - case 'q': // &q - { - if (*++stre == 'u' && *++stre == 'o' && *++stre == 't' && *++stre == ';') // " - { - *s++ = '"'; - ++stre; - - g.push(s, stre - s); - return stre; - } - break; - } - - default: - break; - } - - return stre; - } - - // Parser utilities - #define PUGI__ENDSWITH(c, e) ((c) == (e) || ((c) == 0 && endch == (e))) - #define PUGI__SKIPWS() { while (PUGI__IS_CHARTYPE(*s, ct_space)) ++s; } - #define PUGI__OPTSET(OPT) ( optmsk & (OPT) ) - #define PUGI__PUSHNODE(TYPE) { cursor = append_new_node(cursor, *alloc, TYPE); if (!cursor) PUGI__THROW_ERROR(status_out_of_memory, s); } - #define PUGI__POPNODE() { cursor = cursor->parent; } - #define PUGI__SCANFOR(X) { while (*s != 0 && !(X)) ++s; } - #define PUGI__SCANWHILE(X) { while (X) ++s; } - #define PUGI__SCANWHILE_UNROLL(X) { for (;;) { char_t ss = s[0]; if (PUGI__UNLIKELY(!(X))) { break; } ss = s[1]; if (PUGI__UNLIKELY(!(X))) { s += 1; break; } ss = s[2]; if (PUGI__UNLIKELY(!(X))) { s += 2; break; } ss = s[3]; if (PUGI__UNLIKELY(!(X))) { s += 3; break; } s += 4; } } - #define PUGI__ENDSEG() { ch = *s; *s = 0; ++s; } - #define PUGI__THROW_ERROR(err, m) return error_offset = m, error_status = err, static_cast(0) - #define PUGI__CHECK_ERROR(err, m) { if (*s == 0) PUGI__THROW_ERROR(err, m); } - - PUGI__FN char_t* strconv_comment(char_t* s, char_t endch) - { - gap g; - - while (true) - { - PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_comment)); - - if (*s == '\r') // Either a single 0x0d or 0x0d 0x0a pair - { - *s++ = '\n'; // replace first one with 0x0a - - if (*s == '\n') g.push(s, 1); - } - else if (s[0] == '-' && s[1] == '-' && PUGI__ENDSWITH(s[2], '>')) // comment ends here - { - *g.flush(s) = 0; - - return s + (s[2] == '>' ? 3 : 2); - } - else if (*s == 0) - { - return 0; - } - else ++s; - } - } - - PUGI__FN char_t* strconv_cdata(char_t* s, char_t endch) - { - gap g; - - while (true) - { - PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_cdata)); - - if (*s == '\r') // Either a single 0x0d or 0x0d 0x0a pair - { - *s++ = '\n'; // replace first one with 0x0a - - if (*s == '\n') g.push(s, 1); - } - else if (s[0] == ']' && s[1] == ']' && PUGI__ENDSWITH(s[2], '>')) // CDATA ends here - { - *g.flush(s) = 0; - - return s + 1; - } - else if (*s == 0) - { - return 0; - } - else ++s; - } - } - - typedef char_t* (*strconv_pcdata_t)(char_t*); - - template struct strconv_pcdata_impl - { - static char_t* parse(char_t* s) - { - gap g; - - char_t* begin = s; - - while (true) - { - PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_pcdata)); - - if (*s == '<') // PCDATA ends here - { - char_t* end = g.flush(s); - - if (opt_trim::value) - while (end > begin && PUGI__IS_CHARTYPE(end[-1], ct_space)) - --end; - - *end = 0; - - return s + 1; - } - else if (opt_eol::value && *s == '\r') // Either a single 0x0d or 0x0d 0x0a pair - { - *s++ = '\n'; // replace first one with 0x0a - - if (*s == '\n') g.push(s, 1); - } - else if (opt_escape::value && *s == '&') - { - s = strconv_escape(s, g); - } - else if (*s == 0) - { - char_t* end = g.flush(s); - - if (opt_trim::value) - while (end > begin && PUGI__IS_CHARTYPE(end[-1], ct_space)) - --end; - - *end = 0; - - return s; - } - else ++s; - } - } - }; - - PUGI__FN strconv_pcdata_t get_strconv_pcdata(unsigned int optmask) - { - PUGI__STATIC_ASSERT(parse_escapes == 0x10 && parse_eol == 0x20 && parse_trim_pcdata == 0x0800); - - switch (((optmask >> 4) & 3) | ((optmask >> 9) & 4)) // get bitmask for flags (eol escapes trim) - { - case 0: return strconv_pcdata_impl::parse; - case 1: return strconv_pcdata_impl::parse; - case 2: return strconv_pcdata_impl::parse; - case 3: return strconv_pcdata_impl::parse; - case 4: return strconv_pcdata_impl::parse; - case 5: return strconv_pcdata_impl::parse; - case 6: return strconv_pcdata_impl::parse; - case 7: return strconv_pcdata_impl::parse; - default: assert(false); return 0; // unreachable - } - } - - typedef char_t* (*strconv_attribute_t)(char_t*, char_t); - - template struct strconv_attribute_impl - { - static char_t* parse_wnorm(char_t* s, char_t end_quote) - { - gap g; - - // trim leading whitespaces - if (PUGI__IS_CHARTYPE(*s, ct_space)) - { - char_t* str = s; - - do ++str; - while (PUGI__IS_CHARTYPE(*str, ct_space)); - - g.push(s, str - s); - } - - while (true) - { - PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_attr_ws | ct_space)); - - if (*s == end_quote) - { - char_t* str = g.flush(s); - - do *str-- = 0; - while (PUGI__IS_CHARTYPE(*str, ct_space)); - - return s + 1; - } - else if (PUGI__IS_CHARTYPE(*s, ct_space)) - { - *s++ = ' '; - - if (PUGI__IS_CHARTYPE(*s, ct_space)) - { - char_t* str = s + 1; - while (PUGI__IS_CHARTYPE(*str, ct_space)) ++str; - - g.push(s, str - s); - } - } - else if (opt_escape::value && *s == '&') - { - s = strconv_escape(s, g); - } - else if (!*s) - { - return 0; - } - else ++s; - } - } - - static char_t* parse_wconv(char_t* s, char_t end_quote) - { - gap g; - - while (true) - { - PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_attr_ws)); - - if (*s == end_quote) - { - *g.flush(s) = 0; - - return s + 1; - } - else if (PUGI__IS_CHARTYPE(*s, ct_space)) - { - if (*s == '\r') - { - *s++ = ' '; - - if (*s == '\n') g.push(s, 1); - } - else *s++ = ' '; - } - else if (opt_escape::value && *s == '&') - { - s = strconv_escape(s, g); - } - else if (!*s) - { - return 0; - } - else ++s; - } - } - - static char_t* parse_eol(char_t* s, char_t end_quote) - { - gap g; - - while (true) - { - PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_attr)); - - if (*s == end_quote) - { - *g.flush(s) = 0; - - return s + 1; - } - else if (*s == '\r') - { - *s++ = '\n'; - - if (*s == '\n') g.push(s, 1); - } - else if (opt_escape::value && *s == '&') - { - s = strconv_escape(s, g); - } - else if (!*s) - { - return 0; - } - else ++s; - } - } - - static char_t* parse_simple(char_t* s, char_t end_quote) - { - gap g; - - while (true) - { - PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_attr)); - - if (*s == end_quote) - { - *g.flush(s) = 0; - - return s + 1; - } - else if (opt_escape::value && *s == '&') - { - s = strconv_escape(s, g); - } - else if (!*s) - { - return 0; - } - else ++s; - } - } - }; - - PUGI__FN strconv_attribute_t get_strconv_attribute(unsigned int optmask) - { - PUGI__STATIC_ASSERT(parse_escapes == 0x10 && parse_eol == 0x20 && parse_wconv_attribute == 0x40 && parse_wnorm_attribute == 0x80); - - switch ((optmask >> 4) & 15) // get bitmask for flags (wconv wnorm eol escapes) - { - case 0: return strconv_attribute_impl::parse_simple; - case 1: return strconv_attribute_impl::parse_simple; - case 2: return strconv_attribute_impl::parse_eol; - case 3: return strconv_attribute_impl::parse_eol; - case 4: return strconv_attribute_impl::parse_wconv; - case 5: return strconv_attribute_impl::parse_wconv; - case 6: return strconv_attribute_impl::parse_wconv; - case 7: return strconv_attribute_impl::parse_wconv; - case 8: return strconv_attribute_impl::parse_wnorm; - case 9: return strconv_attribute_impl::parse_wnorm; - case 10: return strconv_attribute_impl::parse_wnorm; - case 11: return strconv_attribute_impl::parse_wnorm; - case 12: return strconv_attribute_impl::parse_wnorm; - case 13: return strconv_attribute_impl::parse_wnorm; - case 14: return strconv_attribute_impl::parse_wnorm; - case 15: return strconv_attribute_impl::parse_wnorm; - default: assert(false); return 0; // unreachable - } - } - - inline xml_parse_result make_parse_result(xml_parse_status status, ptrdiff_t offset = 0) - { - xml_parse_result result; - result.status = status; - result.offset = offset; - - return result; - } - - struct xml_parser - { - xml_allocator* alloc; - char_t* error_offset; - xml_parse_status error_status; - - xml_parser(xml_allocator* alloc_): alloc(alloc_), error_offset(0), error_status(status_ok) - { - } - - // DOCTYPE consists of nested sections of the following possible types: - // , , "...", '...' - // - // - // First group can not contain nested groups - // Second group can contain nested groups of the same type - // Third group can contain all other groups - char_t* parse_doctype_primitive(char_t* s) - { - if (*s == '"' || *s == '\'') - { - // quoted string - char_t ch = *s++; - PUGI__SCANFOR(*s == ch); - if (!*s) PUGI__THROW_ERROR(status_bad_doctype, s); - - s++; - } - else if (s[0] == '<' && s[1] == '?') - { - // - s += 2; - PUGI__SCANFOR(s[0] == '?' && s[1] == '>'); // no need for ENDSWITH because ?> can't terminate proper doctype - if (!*s) PUGI__THROW_ERROR(status_bad_doctype, s); - - s += 2; - } - else if (s[0] == '<' && s[1] == '!' && s[2] == '-' && s[3] == '-') - { - s += 4; - PUGI__SCANFOR(s[0] == '-' && s[1] == '-' && s[2] == '>'); // no need for ENDSWITH because --> can't terminate proper doctype - if (!*s) PUGI__THROW_ERROR(status_bad_doctype, s); - - s += 3; - } - else PUGI__THROW_ERROR(status_bad_doctype, s); - - return s; - } - - char_t* parse_doctype_ignore(char_t* s) - { - size_t depth = 0; - - assert(s[0] == '<' && s[1] == '!' && s[2] == '['); - s += 3; - - while (*s) - { - if (s[0] == '<' && s[1] == '!' && s[2] == '[') - { - // nested ignore section - s += 3; - depth++; - } - else if (s[0] == ']' && s[1] == ']' && s[2] == '>') - { - // ignore section end - s += 3; - - if (depth == 0) - return s; - - depth--; - } - else s++; - } - - PUGI__THROW_ERROR(status_bad_doctype, s); - } - - char_t* parse_doctype_group(char_t* s, char_t endch) - { - size_t depth = 0; - - assert((s[0] == '<' || s[0] == 0) && s[1] == '!'); - s += 2; - - while (*s) - { - if (s[0] == '<' && s[1] == '!' && s[2] != '-') - { - if (s[2] == '[') - { - // ignore - s = parse_doctype_ignore(s); - if (!s) return s; - } - else - { - // some control group - s += 2; - depth++; - } - } - else if (s[0] == '<' || s[0] == '"' || s[0] == '\'') - { - // unknown tag (forbidden), or some primitive group - s = parse_doctype_primitive(s); - if (!s) return s; - } - else if (*s == '>') - { - if (depth == 0) - return s; - - depth--; - s++; - } - else s++; - } - - if (depth != 0 || endch != '>') PUGI__THROW_ERROR(status_bad_doctype, s); - - return s; - } - - char_t* parse_exclamation(char_t* s, xml_node_struct* cursor, unsigned int optmsk, char_t endch) - { - // parse node contents, starting with exclamation mark - ++s; - - if (*s == '-') // 'value = s; // Save the offset. - } - - if (PUGI__OPTSET(parse_eol) && PUGI__OPTSET(parse_comments)) - { - s = strconv_comment(s, endch); - - if (!s) PUGI__THROW_ERROR(status_bad_comment, cursor->value); - } - else - { - // Scan for terminating '-->'. - PUGI__SCANFOR(s[0] == '-' && s[1] == '-' && PUGI__ENDSWITH(s[2], '>')); - PUGI__CHECK_ERROR(status_bad_comment, s); - - if (PUGI__OPTSET(parse_comments)) - *s = 0; // Zero-terminate this segment at the first terminating '-'. - - s += (s[2] == '>' ? 3 : 2); // Step over the '\0->'. - } - } - else PUGI__THROW_ERROR(status_bad_comment, s); - } - else if (*s == '[') - { - // 'value = s; // Save the offset. - - if (PUGI__OPTSET(parse_eol)) - { - s = strconv_cdata(s, endch); - - if (!s) PUGI__THROW_ERROR(status_bad_cdata, cursor->value); - } - else - { - // Scan for terminating ']]>'. - PUGI__SCANFOR(s[0] == ']' && s[1] == ']' && PUGI__ENDSWITH(s[2], '>')); - PUGI__CHECK_ERROR(status_bad_cdata, s); - - *s++ = 0; // Zero-terminate this segment. - } - } - else // Flagged for discard, but we still have to scan for the terminator. - { - // Scan for terminating ']]>'. - PUGI__SCANFOR(s[0] == ']' && s[1] == ']' && PUGI__ENDSWITH(s[2], '>')); - PUGI__CHECK_ERROR(status_bad_cdata, s); - - ++s; - } - - s += (s[1] == '>' ? 2 : 1); // Step over the last ']>'. - } - else PUGI__THROW_ERROR(status_bad_cdata, s); - } - else if (s[0] == 'D' && s[1] == 'O' && s[2] == 'C' && s[3] == 'T' && s[4] == 'Y' && s[5] == 'P' && PUGI__ENDSWITH(s[6], 'E')) - { - s -= 2; - - if (cursor->parent) PUGI__THROW_ERROR(status_bad_doctype, s); - - char_t* mark = s + 9; - - s = parse_doctype_group(s, endch); - if (!s) return s; - - assert((*s == 0 && endch == '>') || *s == '>'); - if (*s) *s++ = 0; - - if (PUGI__OPTSET(parse_doctype)) - { - while (PUGI__IS_CHARTYPE(*mark, ct_space)) ++mark; - - PUGI__PUSHNODE(node_doctype); - - cursor->value = mark; - } - } - else if (*s == 0 && endch == '-') PUGI__THROW_ERROR(status_bad_comment, s); - else if (*s == 0 && endch == '[') PUGI__THROW_ERROR(status_bad_cdata, s); - else PUGI__THROW_ERROR(status_unrecognized_tag, s); - - return s; - } - - char_t* parse_question(char_t* s, xml_node_struct*& ref_cursor, unsigned int optmsk, char_t endch) - { - // load into registers - xml_node_struct* cursor = ref_cursor; - char_t ch = 0; - - // parse node contents, starting with question mark - ++s; - - // read PI target - char_t* target = s; - - if (!PUGI__IS_CHARTYPE(*s, ct_start_symbol)) PUGI__THROW_ERROR(status_bad_pi, s); - - PUGI__SCANWHILE(PUGI__IS_CHARTYPE(*s, ct_symbol)); - PUGI__CHECK_ERROR(status_bad_pi, s); - - // determine node type; stricmp / strcasecmp is not portable - bool declaration = (target[0] | ' ') == 'x' && (target[1] | ' ') == 'm' && (target[2] | ' ') == 'l' && target + 3 == s; - - if (declaration ? PUGI__OPTSET(parse_declaration) : PUGI__OPTSET(parse_pi)) - { - if (declaration) - { - // disallow non top-level declarations - if (cursor->parent) PUGI__THROW_ERROR(status_bad_pi, s); - - PUGI__PUSHNODE(node_declaration); - } - else - { - PUGI__PUSHNODE(node_pi); - } - - cursor->name = target; - - PUGI__ENDSEG(); - - // parse value/attributes - if (ch == '?') - { - // empty node - if (!PUGI__ENDSWITH(*s, '>')) PUGI__THROW_ERROR(status_bad_pi, s); - s += (*s == '>'); - - PUGI__POPNODE(); - } - else if (PUGI__IS_CHARTYPE(ch, ct_space)) - { - PUGI__SKIPWS(); - - // scan for tag end - char_t* value = s; - - PUGI__SCANFOR(s[0] == '?' && PUGI__ENDSWITH(s[1], '>')); - PUGI__CHECK_ERROR(status_bad_pi, s); - - if (declaration) - { - // replace ending ? with / so that 'element' terminates properly - *s = '/'; - - // we exit from this function with cursor at node_declaration, which is a signal to parse() to go to LOC_ATTRIBUTES - s = value; - } - else - { - // store value and step over > - cursor->value = value; - - PUGI__POPNODE(); - - PUGI__ENDSEG(); - - s += (*s == '>'); - } - } - else PUGI__THROW_ERROR(status_bad_pi, s); - } - else - { - // scan for tag end - PUGI__SCANFOR(s[0] == '?' && PUGI__ENDSWITH(s[1], '>')); - PUGI__CHECK_ERROR(status_bad_pi, s); - - s += (s[1] == '>' ? 2 : 1); - } - - // store from registers - ref_cursor = cursor; - - return s; - } - - char_t* parse_tree(char_t* s, xml_node_struct* root, unsigned int optmsk, char_t endch) - { - strconv_attribute_t strconv_attribute = get_strconv_attribute(optmsk); - strconv_pcdata_t strconv_pcdata = get_strconv_pcdata(optmsk); - - char_t ch = 0; - xml_node_struct* cursor = root; - char_t* mark = s; - - while (*s != 0) - { - if (*s == '<') - { - ++s; - - LOC_TAG: - if (PUGI__IS_CHARTYPE(*s, ct_start_symbol)) // '<#...' - { - PUGI__PUSHNODE(node_element); // Append a new node to the tree. - - cursor->name = s; - - PUGI__SCANWHILE_UNROLL(PUGI__IS_CHARTYPE(ss, ct_symbol)); // Scan for a terminator. - PUGI__ENDSEG(); // Save char in 'ch', terminate & step over. - - if (ch == '>') - { - // end of tag - } - else if (PUGI__IS_CHARTYPE(ch, ct_space)) - { - LOC_ATTRIBUTES: - while (true) - { - PUGI__SKIPWS(); // Eat any whitespace. - - if (PUGI__IS_CHARTYPE(*s, ct_start_symbol)) // <... #... - { - xml_attribute_struct* a = append_new_attribute(cursor, *alloc); // Make space for this attribute. - if (!a) PUGI__THROW_ERROR(status_out_of_memory, s); - - a->name = s; // Save the offset. - - PUGI__SCANWHILE_UNROLL(PUGI__IS_CHARTYPE(ss, ct_symbol)); // Scan for a terminator. - PUGI__ENDSEG(); // Save char in 'ch', terminate & step over. - - if (PUGI__IS_CHARTYPE(ch, ct_space)) - { - PUGI__SKIPWS(); // Eat any whitespace. - - ch = *s; - ++s; - } - - if (ch == '=') // '<... #=...' - { - PUGI__SKIPWS(); // Eat any whitespace. - - if (*s == '"' || *s == '\'') // '<... #="...' - { - ch = *s; // Save quote char to avoid breaking on "''" -or- '""'. - ++s; // Step over the quote. - a->value = s; // Save the offset. - - s = strconv_attribute(s, ch); - - if (!s) PUGI__THROW_ERROR(status_bad_attribute, a->value); - - // After this line the loop continues from the start; - // Whitespaces, / and > are ok, symbols and EOF are wrong, - // everything else will be detected - if (PUGI__IS_CHARTYPE(*s, ct_start_symbol)) PUGI__THROW_ERROR(status_bad_attribute, s); - } - else PUGI__THROW_ERROR(status_bad_attribute, s); - } - else PUGI__THROW_ERROR(status_bad_attribute, s); - } - else if (*s == '/') - { - ++s; - - if (*s == '>') - { - PUGI__POPNODE(); - s++; - break; - } - else if (*s == 0 && endch == '>') - { - PUGI__POPNODE(); - break; - } - else PUGI__THROW_ERROR(status_bad_start_element, s); - } - else if (*s == '>') - { - ++s; - - break; - } - else if (*s == 0 && endch == '>') - { - break; - } - else PUGI__THROW_ERROR(status_bad_start_element, s); - } - - // !!! - } - else if (ch == '/') // '<#.../' - { - if (!PUGI__ENDSWITH(*s, '>')) PUGI__THROW_ERROR(status_bad_start_element, s); - - PUGI__POPNODE(); // Pop. - - s += (*s == '>'); - } - else if (ch == 0) - { - // we stepped over null terminator, backtrack & handle closing tag - --s; - - if (endch != '>') PUGI__THROW_ERROR(status_bad_start_element, s); - } - else PUGI__THROW_ERROR(status_bad_start_element, s); - } - else if (*s == '/') - { - ++s; - - mark = s; - - char_t* name = cursor->name; - if (!name) PUGI__THROW_ERROR(status_end_element_mismatch, mark); - - while (PUGI__IS_CHARTYPE(*s, ct_symbol)) - { - if (*s++ != *name++) PUGI__THROW_ERROR(status_end_element_mismatch, mark); - } - - if (*name) - { - if (*s == 0 && name[0] == endch && name[1] == 0) PUGI__THROW_ERROR(status_bad_end_element, s); - else PUGI__THROW_ERROR(status_end_element_mismatch, mark); - } - - PUGI__POPNODE(); // Pop. - - PUGI__SKIPWS(); - - if (*s == 0) - { - if (endch != '>') PUGI__THROW_ERROR(status_bad_end_element, s); - } - else - { - if (*s != '>') PUGI__THROW_ERROR(status_bad_end_element, s); - ++s; - } - } - else if (*s == '?') // 'first_child) continue; - } - } - - if (!PUGI__OPTSET(parse_trim_pcdata)) - s = mark; - - if (cursor->parent || PUGI__OPTSET(parse_fragment)) - { - if (PUGI__OPTSET(parse_embed_pcdata) && cursor->parent && !cursor->first_child && !cursor->value) - { - cursor->value = s; // Save the offset. - } - else - { - PUGI__PUSHNODE(node_pcdata); // Append a new node on the tree. - - cursor->value = s; // Save the offset. - - PUGI__POPNODE(); // Pop since this is a standalone. - } - - s = strconv_pcdata(s); - - if (!*s) break; - } - else - { - PUGI__SCANFOR(*s == '<'); // '...<' - if (!*s) break; - - ++s; - } - - // We're after '<' - goto LOC_TAG; - } - } - - // check that last tag is closed - if (cursor != root) PUGI__THROW_ERROR(status_end_element_mismatch, s); - - return s; - } - - #ifdef PUGIXML_WCHAR_MODE - static char_t* parse_skip_bom(char_t* s) - { - unsigned int bom = 0xfeff; - return (s[0] == static_cast(bom)) ? s + 1 : s; - } - #else - static char_t* parse_skip_bom(char_t* s) - { - return (s[0] == '\xef' && s[1] == '\xbb' && s[2] == '\xbf') ? s + 3 : s; - } - #endif - - static bool has_element_node_siblings(xml_node_struct* node) - { - while (node) - { - if (PUGI__NODETYPE(node) == node_element) return true; - - node = node->next_sibling; - } - - return false; - } - - static xml_parse_result parse(char_t* buffer, size_t length, xml_document_struct* xmldoc, xml_node_struct* root, unsigned int optmsk) - { - // early-out for empty documents - if (length == 0) - return make_parse_result(PUGI__OPTSET(parse_fragment) ? status_ok : status_no_document_element); - - // get last child of the root before parsing - xml_node_struct* last_root_child = root->first_child ? root->first_child->prev_sibling_c + 0 : 0; - - // create parser on stack - xml_parser parser(static_cast(xmldoc)); - - // save last character and make buffer zero-terminated (speeds up parsing) - char_t endch = buffer[length - 1]; - buffer[length - 1] = 0; - - // skip BOM to make sure it does not end up as part of parse output - char_t* buffer_data = parse_skip_bom(buffer); - - // perform actual parsing - parser.parse_tree(buffer_data, root, optmsk, endch); - - xml_parse_result result = make_parse_result(parser.error_status, parser.error_offset ? parser.error_offset - buffer : 0); - assert(result.offset >= 0 && static_cast(result.offset) <= length); - - if (result) - { - // since we removed last character, we have to handle the only possible false positive (stray <) - if (endch == '<') - return make_parse_result(status_unrecognized_tag, length - 1); - - // check if there are any element nodes parsed - xml_node_struct* first_root_child_parsed = last_root_child ? last_root_child->next_sibling + 0 : root->first_child+ 0; - - if (!PUGI__OPTSET(parse_fragment) && !has_element_node_siblings(first_root_child_parsed)) - return make_parse_result(status_no_document_element, length - 1); - } - else - { - // roll back offset if it occurs on a null terminator in the source buffer - if (result.offset > 0 && static_cast(result.offset) == length - 1 && endch == 0) - result.offset--; - } - - return result; - } - }; - - // Output facilities - PUGI__FN xml_encoding get_write_native_encoding() - { - #ifdef PUGIXML_WCHAR_MODE - return get_wchar_encoding(); - #else - return encoding_utf8; - #endif - } - - PUGI__FN xml_encoding get_write_encoding(xml_encoding encoding) - { - // replace wchar encoding with utf implementation - if (encoding == encoding_wchar) return get_wchar_encoding(); - - // replace utf16 encoding with utf16 with specific endianness - if (encoding == encoding_utf16) return is_little_endian() ? encoding_utf16_le : encoding_utf16_be; - - // replace utf32 encoding with utf32 with specific endianness - if (encoding == encoding_utf32) return is_little_endian() ? encoding_utf32_le : encoding_utf32_be; - - // only do autodetection if no explicit encoding is requested - if (encoding != encoding_auto) return encoding; - - // assume utf8 encoding - return encoding_utf8; - } - - template PUGI__FN size_t convert_buffer_output_generic(typename T::value_type dest, const char_t* data, size_t length, D, T) - { - PUGI__STATIC_ASSERT(sizeof(char_t) == sizeof(typename D::type)); - - typename T::value_type end = D::process(reinterpret_cast(data), length, dest, T()); - - return static_cast(end - dest) * sizeof(*dest); - } - - template PUGI__FN size_t convert_buffer_output_generic(typename T::value_type dest, const char_t* data, size_t length, D, T, bool opt_swap) - { - PUGI__STATIC_ASSERT(sizeof(char_t) == sizeof(typename D::type)); - - typename T::value_type end = D::process(reinterpret_cast(data), length, dest, T()); - - if (opt_swap) - { - for (typename T::value_type i = dest; i != end; ++i) - *i = endian_swap(*i); - } - - return static_cast(end - dest) * sizeof(*dest); - } - -#ifdef PUGIXML_WCHAR_MODE - PUGI__FN size_t get_valid_length(const char_t* data, size_t length) - { - if (length < 1) return 0; - - // discard last character if it's the lead of a surrogate pair - return (sizeof(wchar_t) == 2 && static_cast(static_cast(data[length - 1]) - 0xD800) < 0x400) ? length - 1 : length; - } - - PUGI__FN size_t convert_buffer_output(char_t* r_char, uint8_t* r_u8, uint16_t* r_u16, uint32_t* r_u32, const char_t* data, size_t length, xml_encoding encoding) - { - // only endian-swapping is required - if (need_endian_swap_utf(encoding, get_wchar_encoding())) - { - convert_wchar_endian_swap(r_char, data, length); - - return length * sizeof(char_t); - } - - // convert to utf8 - if (encoding == encoding_utf8) - return convert_buffer_output_generic(r_u8, data, length, wchar_decoder(), utf8_writer()); - - // convert to utf16 - if (encoding == encoding_utf16_be || encoding == encoding_utf16_le) - { - xml_encoding native_encoding = is_little_endian() ? encoding_utf16_le : encoding_utf16_be; - - return convert_buffer_output_generic(r_u16, data, length, wchar_decoder(), utf16_writer(), native_encoding != encoding); - } - - // convert to utf32 - if (encoding == encoding_utf32_be || encoding == encoding_utf32_le) - { - xml_encoding native_encoding = is_little_endian() ? encoding_utf32_le : encoding_utf32_be; - - return convert_buffer_output_generic(r_u32, data, length, wchar_decoder(), utf32_writer(), native_encoding != encoding); - } - - // convert to latin1 - if (encoding == encoding_latin1) - return convert_buffer_output_generic(r_u8, data, length, wchar_decoder(), latin1_writer()); - - assert(false && "Invalid encoding"); // unreachable - return 0; - } -#else - PUGI__FN size_t get_valid_length(const char_t* data, size_t length) - { - if (length < 5) return 0; - - for (size_t i = 1; i <= 4; ++i) - { - uint8_t ch = static_cast(data[length - i]); - - // either a standalone character or a leading one - if ((ch & 0xc0) != 0x80) return length - i; - } - - // there are four non-leading characters at the end, sequence tail is broken so might as well process the whole chunk - return length; - } - - PUGI__FN size_t convert_buffer_output(char_t* /* r_char */, uint8_t* r_u8, uint16_t* r_u16, uint32_t* r_u32, const char_t* data, size_t length, xml_encoding encoding) - { - if (encoding == encoding_utf16_be || encoding == encoding_utf16_le) - { - xml_encoding native_encoding = is_little_endian() ? encoding_utf16_le : encoding_utf16_be; - - return convert_buffer_output_generic(r_u16, data, length, utf8_decoder(), utf16_writer(), native_encoding != encoding); - } - - if (encoding == encoding_utf32_be || encoding == encoding_utf32_le) - { - xml_encoding native_encoding = is_little_endian() ? encoding_utf32_le : encoding_utf32_be; - - return convert_buffer_output_generic(r_u32, data, length, utf8_decoder(), utf32_writer(), native_encoding != encoding); - } - - if (encoding == encoding_latin1) - return convert_buffer_output_generic(r_u8, data, length, utf8_decoder(), latin1_writer()); - - assert(false && "Invalid encoding"); // unreachable - return 0; - } -#endif - - class xml_buffered_writer - { - xml_buffered_writer(const xml_buffered_writer&); - xml_buffered_writer& operator=(const xml_buffered_writer&); - - public: - xml_buffered_writer(xml_writer& writer_, xml_encoding user_encoding): writer(writer_), bufsize(0), encoding(get_write_encoding(user_encoding)) - { - PUGI__STATIC_ASSERT(bufcapacity >= 8); - } - - size_t flush() - { - flush(buffer, bufsize); - bufsize = 0; - return 0; - } - - void flush(const char_t* data, size_t size) - { - if (size == 0) return; - - // fast path, just write data - if (encoding == get_write_native_encoding()) - writer.write(data, size * sizeof(char_t)); - else - { - // convert chunk - size_t result = convert_buffer_output(scratch.data_char, scratch.data_u8, scratch.data_u16, scratch.data_u32, data, size, encoding); - assert(result <= sizeof(scratch)); - - // write data - writer.write(scratch.data_u8, result); - } - } - - void write_direct(const char_t* data, size_t length) - { - // flush the remaining buffer contents - flush(); - - // handle large chunks - if (length > bufcapacity) - { - if (encoding == get_write_native_encoding()) - { - // fast path, can just write data chunk - writer.write(data, length * sizeof(char_t)); - return; - } - - // need to convert in suitable chunks - while (length > bufcapacity) - { - // get chunk size by selecting such number of characters that are guaranteed to fit into scratch buffer - // and form a complete codepoint sequence (i.e. discard start of last codepoint if necessary) - size_t chunk_size = get_valid_length(data, bufcapacity); - assert(chunk_size); - - // convert chunk and write - flush(data, chunk_size); - - // iterate - data += chunk_size; - length -= chunk_size; - } - - // small tail is copied below - bufsize = 0; - } - - memcpy(buffer + bufsize, data, length * sizeof(char_t)); - bufsize += length; - } - - void write_buffer(const char_t* data, size_t length) - { - size_t offset = bufsize; - - if (offset + length <= bufcapacity) - { - memcpy(buffer + offset, data, length * sizeof(char_t)); - bufsize = offset + length; - } - else - { - write_direct(data, length); - } - } - - void write_string(const char_t* data) - { - // write the part of the string that fits in the buffer - size_t offset = bufsize; - - while (*data && offset < bufcapacity) - buffer[offset++] = *data++; - - // write the rest - if (offset < bufcapacity) - { - bufsize = offset; - } - else - { - // backtrack a bit if we have split the codepoint - size_t length = offset - bufsize; - size_t extra = length - get_valid_length(data - length, length); - - bufsize = offset - extra; - - write_direct(data - extra, strlength(data) + extra); - } - } - - void write(char_t d0) - { - size_t offset = bufsize; - if (offset > bufcapacity - 1) offset = flush(); - - buffer[offset + 0] = d0; - bufsize = offset + 1; - } - - void write(char_t d0, char_t d1) - { - size_t offset = bufsize; - if (offset > bufcapacity - 2) offset = flush(); - - buffer[offset + 0] = d0; - buffer[offset + 1] = d1; - bufsize = offset + 2; - } - - void write(char_t d0, char_t d1, char_t d2) - { - size_t offset = bufsize; - if (offset > bufcapacity - 3) offset = flush(); - - buffer[offset + 0] = d0; - buffer[offset + 1] = d1; - buffer[offset + 2] = d2; - bufsize = offset + 3; - } - - void write(char_t d0, char_t d1, char_t d2, char_t d3) - { - size_t offset = bufsize; - if (offset > bufcapacity - 4) offset = flush(); - - buffer[offset + 0] = d0; - buffer[offset + 1] = d1; - buffer[offset + 2] = d2; - buffer[offset + 3] = d3; - bufsize = offset + 4; - } - - void write(char_t d0, char_t d1, char_t d2, char_t d3, char_t d4) - { - size_t offset = bufsize; - if (offset > bufcapacity - 5) offset = flush(); - - buffer[offset + 0] = d0; - buffer[offset + 1] = d1; - buffer[offset + 2] = d2; - buffer[offset + 3] = d3; - buffer[offset + 4] = d4; - bufsize = offset + 5; - } - - void write(char_t d0, char_t d1, char_t d2, char_t d3, char_t d4, char_t d5) - { - size_t offset = bufsize; - if (offset > bufcapacity - 6) offset = flush(); - - buffer[offset + 0] = d0; - buffer[offset + 1] = d1; - buffer[offset + 2] = d2; - buffer[offset + 3] = d3; - buffer[offset + 4] = d4; - buffer[offset + 5] = d5; - bufsize = offset + 6; - } - - // utf8 maximum expansion: x4 (-> utf32) - // utf16 maximum expansion: x2 (-> utf32) - // utf32 maximum expansion: x1 - enum - { - bufcapacitybytes = - #ifdef PUGIXML_MEMORY_OUTPUT_STACK - PUGIXML_MEMORY_OUTPUT_STACK - #else - 10240 - #endif - , - bufcapacity = bufcapacitybytes / (sizeof(char_t) + 4) - }; - - char_t buffer[bufcapacity]; - - union - { - uint8_t data_u8[4 * bufcapacity]; - uint16_t data_u16[2 * bufcapacity]; - uint32_t data_u32[bufcapacity]; - char_t data_char[bufcapacity]; - } scratch; - - xml_writer& writer; - size_t bufsize; - xml_encoding encoding; - }; - - PUGI__FN void text_output_escaped(xml_buffered_writer& writer, const char_t* s, chartypex_t type) - { - while (*s) - { - const char_t* prev = s; - - // While *s is a usual symbol - PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPEX(ss, type)); - - writer.write_buffer(prev, static_cast(s - prev)); - - switch (*s) - { - case 0: break; - case '&': - writer.write('&', 'a', 'm', 'p', ';'); - ++s; - break; - case '<': - writer.write('&', 'l', 't', ';'); - ++s; - break; - case '>': - writer.write('&', 'g', 't', ';'); - ++s; - break; - case '"': - writer.write('&', 'q', 'u', 'o', 't', ';'); - ++s; - break; - default: // s is not a usual symbol - { - unsigned int ch = static_cast(*s++); - assert(ch < 32); - - writer.write('&', '#', static_cast((ch / 10) + '0'), static_cast((ch % 10) + '0'), ';'); - } - } - } - } - - PUGI__FN void text_output(xml_buffered_writer& writer, const char_t* s, chartypex_t type, unsigned int flags) - { - if (flags & format_no_escapes) - writer.write_string(s); - else - text_output_escaped(writer, s, type); - } - - PUGI__FN void text_output_cdata(xml_buffered_writer& writer, const char_t* s) - { - do - { - writer.write('<', '!', '[', 'C', 'D'); - writer.write('A', 'T', 'A', '['); - - const char_t* prev = s; - - // look for ]]> sequence - we can't output it as is since it terminates CDATA - while (*s && !(s[0] == ']' && s[1] == ']' && s[2] == '>')) ++s; - - // skip ]] if we stopped at ]]>, > will go to the next CDATA section - if (*s) s += 2; - - writer.write_buffer(prev, static_cast(s - prev)); - - writer.write(']', ']', '>'); - } - while (*s); - } - - PUGI__FN void text_output_indent(xml_buffered_writer& writer, const char_t* indent, size_t indent_length, unsigned int depth) - { - switch (indent_length) - { - case 1: - { - for (unsigned int i = 0; i < depth; ++i) - writer.write(indent[0]); - break; - } - - case 2: - { - for (unsigned int i = 0; i < depth; ++i) - writer.write(indent[0], indent[1]); - break; - } - - case 3: - { - for (unsigned int i = 0; i < depth; ++i) - writer.write(indent[0], indent[1], indent[2]); - break; - } - - case 4: - { - for (unsigned int i = 0; i < depth; ++i) - writer.write(indent[0], indent[1], indent[2], indent[3]); - break; - } - - default: - { - for (unsigned int i = 0; i < depth; ++i) - writer.write_buffer(indent, indent_length); - } - } - } - - PUGI__FN void node_output_comment(xml_buffered_writer& writer, const char_t* s) - { - writer.write('<', '!', '-', '-'); - - while (*s) - { - const char_t* prev = s; - - // look for -\0 or -- sequence - we can't output it since -- is illegal in comment body - while (*s && !(s[0] == '-' && (s[1] == '-' || s[1] == 0))) ++s; - - writer.write_buffer(prev, static_cast(s - prev)); - - if (*s) - { - assert(*s == '-'); - - writer.write('-', ' '); - ++s; - } - } - - writer.write('-', '-', '>'); - } - - PUGI__FN void node_output_pi_value(xml_buffered_writer& writer, const char_t* s) - { - while (*s) - { - const char_t* prev = s; - - // look for ?> sequence - we can't output it since ?> terminates PI - while (*s && !(s[0] == '?' && s[1] == '>')) ++s; - - writer.write_buffer(prev, static_cast(s - prev)); - - if (*s) - { - assert(s[0] == '?' && s[1] == '>'); - - writer.write('?', ' ', '>'); - s += 2; - } - } - } - - PUGI__FN void node_output_attributes(xml_buffered_writer& writer, xml_node_struct* node, const char_t* indent, size_t indent_length, unsigned int flags, unsigned int depth) - { - const char_t* default_name = PUGIXML_TEXT(":anonymous"); - - for (xml_attribute_struct* a = node->first_attribute; a; a = a->next_attribute) - { - if ((flags & (format_indent_attributes | format_raw)) == format_indent_attributes) - { - writer.write('\n'); - - text_output_indent(writer, indent, indent_length, depth + 1); - } - else - { - writer.write(' '); - } - - writer.write_string(a->name ? a->name + 0 : default_name); - writer.write('=', '"'); - - if (a->value) - text_output(writer, a->value, ctx_special_attr, flags); - - writer.write('"'); - } - } - - PUGI__FN bool node_output_start(xml_buffered_writer& writer, xml_node_struct* node, const char_t* indent, size_t indent_length, unsigned int flags, unsigned int depth) - { - const char_t* default_name = PUGIXML_TEXT(":anonymous"); - const char_t* name = node->name ? node->name + 0 : default_name; - - writer.write('<'); - writer.write_string(name); - - if (node->first_attribute) - node_output_attributes(writer, node, indent, indent_length, flags, depth); - - // element nodes can have value if parse_embed_pcdata was used - if (!node->value) - { - if (!node->first_child) - { - if (flags & format_no_empty_element_tags) - { - writer.write('>', '<', '/'); - writer.write_string(name); - writer.write('>'); - - return false; - } - else - { - if ((flags & format_raw) == 0) - writer.write(' '); - - writer.write('/', '>'); - - return false; - } - } - else - { - writer.write('>'); - - return true; - } - } - else - { - writer.write('>'); - - text_output(writer, node->value, ctx_special_pcdata, flags); - - if (!node->first_child) - { - writer.write('<', '/'); - writer.write_string(name); - writer.write('>'); - - return false; - } - else - { - return true; - } - } - } - - PUGI__FN void node_output_end(xml_buffered_writer& writer, xml_node_struct* node) - { - const char_t* default_name = PUGIXML_TEXT(":anonymous"); - const char_t* name = node->name ? node->name + 0 : default_name; - - writer.write('<', '/'); - writer.write_string(name); - writer.write('>'); - } - - PUGI__FN void node_output_simple(xml_buffered_writer& writer, xml_node_struct* node, unsigned int flags) - { - const char_t* default_name = PUGIXML_TEXT(":anonymous"); - - switch (PUGI__NODETYPE(node)) - { - case node_pcdata: - text_output(writer, node->value ? node->value + 0 : PUGIXML_TEXT(""), ctx_special_pcdata, flags); - break; - - case node_cdata: - text_output_cdata(writer, node->value ? node->value + 0 : PUGIXML_TEXT("")); - break; - - case node_comment: - node_output_comment(writer, node->value ? node->value + 0 : PUGIXML_TEXT("")); - break; - - case node_pi: - writer.write('<', '?'); - writer.write_string(node->name ? node->name + 0 : default_name); - - if (node->value) - { - writer.write(' '); - node_output_pi_value(writer, node->value); - } - - writer.write('?', '>'); - break; - - case node_declaration: - writer.write('<', '?'); - writer.write_string(node->name ? node->name + 0 : default_name); - node_output_attributes(writer, node, PUGIXML_TEXT(""), 0, flags | format_raw, 0); - writer.write('?', '>'); - break; - - case node_doctype: - writer.write('<', '!', 'D', 'O', 'C'); - writer.write('T', 'Y', 'P', 'E'); - - if (node->value) - { - writer.write(' '); - writer.write_string(node->value); - } - - writer.write('>'); - break; - - default: - assert(false && "Invalid node type"); // unreachable - } - } - - enum indent_flags_t - { - indent_newline = 1, - indent_indent = 2 - }; - - PUGI__FN void node_output(xml_buffered_writer& writer, xml_node_struct* root, const char_t* indent, unsigned int flags, unsigned int depth) - { - size_t indent_length = ((flags & (format_indent | format_indent_attributes)) && (flags & format_raw) == 0) ? strlength(indent) : 0; - unsigned int indent_flags = indent_indent; - - xml_node_struct* node = root; - - do - { - assert(node); - - // begin writing current node - if (PUGI__NODETYPE(node) == node_pcdata || PUGI__NODETYPE(node) == node_cdata) - { - node_output_simple(writer, node, flags); - - indent_flags = 0; - } - else - { - if ((indent_flags & indent_newline) && (flags & format_raw) == 0) - writer.write('\n'); - - if ((indent_flags & indent_indent) && indent_length) - text_output_indent(writer, indent, indent_length, depth); - - if (PUGI__NODETYPE(node) == node_element) - { - indent_flags = indent_newline | indent_indent; - - if (node_output_start(writer, node, indent, indent_length, flags, depth)) - { - // element nodes can have value if parse_embed_pcdata was used - if (node->value) - indent_flags = 0; - - node = node->first_child; - depth++; - continue; - } - } - else if (PUGI__NODETYPE(node) == node_document) - { - indent_flags = indent_indent; - - if (node->first_child) - { - node = node->first_child; - continue; - } - } - else - { - node_output_simple(writer, node, flags); - - indent_flags = indent_newline | indent_indent; - } - } - - // continue to the next node - while (node != root) - { - if (node->next_sibling) - { - node = node->next_sibling; - break; - } - - node = node->parent; - - // write closing node - if (PUGI__NODETYPE(node) == node_element) - { - depth--; - - if ((indent_flags & indent_newline) && (flags & format_raw) == 0) - writer.write('\n'); - - if ((indent_flags & indent_indent) && indent_length) - text_output_indent(writer, indent, indent_length, depth); - - node_output_end(writer, node); - - indent_flags = indent_newline | indent_indent; - } - } - } - while (node != root); - - if ((indent_flags & indent_newline) && (flags & format_raw) == 0) - writer.write('\n'); - } - - PUGI__FN bool has_declaration(xml_node_struct* node) - { - for (xml_node_struct* child = node->first_child; child; child = child->next_sibling) - { - xml_node_type type = PUGI__NODETYPE(child); - - if (type == node_declaration) return true; - if (type == node_element) return false; - } - - return false; - } - - PUGI__FN bool is_attribute_of(xml_attribute_struct* attr, xml_node_struct* node) - { - for (xml_attribute_struct* a = node->first_attribute; a; a = a->next_attribute) - if (a == attr) - return true; - - return false; - } - - PUGI__FN bool allow_insert_attribute(xml_node_type parent) - { - return parent == node_element || parent == node_declaration; - } - - PUGI__FN bool allow_insert_child(xml_node_type parent, xml_node_type child) - { - if (parent != node_document && parent != node_element) return false; - if (child == node_document || child == node_null) return false; - if (parent != node_document && (child == node_declaration || child == node_doctype)) return false; - - return true; - } - - PUGI__FN bool allow_move(xml_node parent, xml_node child) - { - // check that child can be a child of parent - if (!allow_insert_child(parent.type(), child.type())) - return false; - - // check that node is not moved between documents - if (parent.root() != child.root()) - return false; - - // check that new parent is not in the child subtree - xml_node cur = parent; - - while (cur) - { - if (cur == child) - return false; - - cur = cur.parent(); - } - - return true; - } - - template - PUGI__FN void node_copy_string(String& dest, Header& header, uintptr_t header_mask, char_t* source, Header& source_header, xml_allocator* alloc) - { - assert(!dest && (header & header_mask) == 0); - - if (source) - { - if (alloc && (source_header & header_mask) == 0) - { - dest = source; - - // since strcpy_insitu can reuse document buffer memory we need to mark both source and dest as shared - header |= xml_memory_page_contents_shared_mask; - source_header |= xml_memory_page_contents_shared_mask; - } - else - strcpy_insitu(dest, header, header_mask, source, strlength(source)); - } - } - - PUGI__FN void node_copy_contents(xml_node_struct* dn, xml_node_struct* sn, xml_allocator* shared_alloc) - { - node_copy_string(dn->name, dn->header, xml_memory_page_name_allocated_mask, sn->name, sn->header, shared_alloc); - node_copy_string(dn->value, dn->header, xml_memory_page_value_allocated_mask, sn->value, sn->header, shared_alloc); - - for (xml_attribute_struct* sa = sn->first_attribute; sa; sa = sa->next_attribute) - { - xml_attribute_struct* da = append_new_attribute(dn, get_allocator(dn)); - - if (da) - { - node_copy_string(da->name, da->header, xml_memory_page_name_allocated_mask, sa->name, sa->header, shared_alloc); - node_copy_string(da->value, da->header, xml_memory_page_value_allocated_mask, sa->value, sa->header, shared_alloc); - } - } - } - - PUGI__FN void node_copy_tree(xml_node_struct* dn, xml_node_struct* sn) - { - xml_allocator& alloc = get_allocator(dn); - xml_allocator* shared_alloc = (&alloc == &get_allocator(sn)) ? &alloc : 0; - - node_copy_contents(dn, sn, shared_alloc); - - xml_node_struct* dit = dn; - xml_node_struct* sit = sn->first_child; - - while (sit && sit != sn) - { - // when a tree is copied into one of the descendants, we need to skip that subtree to avoid an infinite loop - if (sit != dn) - { - xml_node_struct* copy = append_new_node(dit, alloc, PUGI__NODETYPE(sit)); - - if (copy) - { - node_copy_contents(copy, sit, shared_alloc); - - if (sit->first_child) - { - dit = copy; - sit = sit->first_child; - continue; - } - } - } - - // continue to the next node - do - { - if (sit->next_sibling) - { - sit = sit->next_sibling; - break; - } - - sit = sit->parent; - dit = dit->parent; - } - while (sit != sn); - } - } - - PUGI__FN void node_copy_attribute(xml_attribute_struct* da, xml_attribute_struct* sa) - { - xml_allocator& alloc = get_allocator(da); - xml_allocator* shared_alloc = (&alloc == &get_allocator(sa)) ? &alloc : 0; - - node_copy_string(da->name, da->header, xml_memory_page_name_allocated_mask, sa->name, sa->header, shared_alloc); - node_copy_string(da->value, da->header, xml_memory_page_value_allocated_mask, sa->value, sa->header, shared_alloc); - } - - inline bool is_text_node(xml_node_struct* node) - { - xml_node_type type = PUGI__NODETYPE(node); - - return type == node_pcdata || type == node_cdata; - } - - // get value with conversion functions - template PUGI__FN PUGI__UNSIGNED_OVERFLOW U string_to_integer(const char_t* value, U minv, U maxv) - { - U result = 0; - const char_t* s = value; - - while (PUGI__IS_CHARTYPE(*s, ct_space)) - s++; - - bool negative = (*s == '-'); - - s += (*s == '+' || *s == '-'); - - bool overflow = false; - - if (s[0] == '0' && (s[1] | ' ') == 'x') - { - s += 2; - - // since overflow detection relies on length of the sequence skip leading zeros - while (*s == '0') - s++; - - const char_t* start = s; - - for (;;) - { - if (static_cast(*s - '0') < 10) - result = result * 16 + (*s - '0'); - else if (static_cast((*s | ' ') - 'a') < 6) - result = result * 16 + ((*s | ' ') - 'a' + 10); - else - break; - - s++; - } - - size_t digits = static_cast(s - start); - - overflow = digits > sizeof(U) * 2; - } - else - { - // since overflow detection relies on length of the sequence skip leading zeros - while (*s == '0') - s++; - - const char_t* start = s; - - for (;;) - { - if (static_cast(*s - '0') < 10) - result = result * 10 + (*s - '0'); - else - break; - - s++; - } - - size_t digits = static_cast(s - start); - - PUGI__STATIC_ASSERT(sizeof(U) == 8 || sizeof(U) == 4 || sizeof(U) == 2); - - const size_t max_digits10 = sizeof(U) == 8 ? 20 : sizeof(U) == 4 ? 10 : 5; - const char_t max_lead = sizeof(U) == 8 ? '1' : sizeof(U) == 4 ? '4' : '6'; - const size_t high_bit = sizeof(U) * 8 - 1; - - overflow = digits >= max_digits10 && !(digits == max_digits10 && (*start < max_lead || (*start == max_lead && result >> high_bit))); - } - - if (negative) - { - // Workaround for crayc++ CC-3059: Expected no overflow in routine. - #ifdef _CRAYC - return (overflow || result > ~minv + 1) ? minv : ~result + 1; - #else - return (overflow || result > 0 - minv) ? minv : 0 - result; - #endif - } - else - return (overflow || result > maxv) ? maxv : result; - } - - PUGI__FN int get_value_int(const char_t* value) - { - return string_to_integer(value, static_cast(INT_MIN), INT_MAX); - } - - PUGI__FN unsigned int get_value_uint(const char_t* value) - { - return string_to_integer(value, 0, UINT_MAX); - } - - PUGI__FN double get_value_double(const char_t* value) - { - #ifdef PUGIXML_WCHAR_MODE - return wcstod(value, 0); - #else - return strtod(value, 0); - #endif - } - - PUGI__FN float get_value_float(const char_t* value) - { - #ifdef PUGIXML_WCHAR_MODE - return static_cast(wcstod(value, 0)); - #else - return static_cast(strtod(value, 0)); - #endif - } - - PUGI__FN bool get_value_bool(const char_t* value) - { - // only look at first char - char_t first = *value; - - // 1*, t* (true), T* (True), y* (yes), Y* (YES) - return (first == '1' || first == 't' || first == 'T' || first == 'y' || first == 'Y'); - } - -#ifdef PUGIXML_HAS_LONG_LONG - PUGI__FN long long get_value_llong(const char_t* value) - { - return string_to_integer(value, static_cast(LLONG_MIN), LLONG_MAX); - } - - PUGI__FN unsigned long long get_value_ullong(const char_t* value) - { - return string_to_integer(value, 0, ULLONG_MAX); - } -#endif - - template PUGI__FN PUGI__UNSIGNED_OVERFLOW char_t* integer_to_string(char_t* begin, char_t* end, U value, bool negative) - { - char_t* result = end - 1; - U rest = negative ? 0 - value : value; - - do - { - *result-- = static_cast('0' + (rest % 10)); - rest /= 10; - } - while (rest); - - assert(result >= begin); - (void)begin; - - *result = '-'; - - return result + !negative; - } - - // set value with conversion functions - template - PUGI__FN bool set_value_ascii(String& dest, Header& header, uintptr_t header_mask, char* buf) - { - #ifdef PUGIXML_WCHAR_MODE - char_t wbuf[128]; - assert(strlen(buf) < sizeof(wbuf) / sizeof(wbuf[0])); - - size_t offset = 0; - for (; buf[offset]; ++offset) wbuf[offset] = buf[offset]; - - return strcpy_insitu(dest, header, header_mask, wbuf, offset); - #else - return strcpy_insitu(dest, header, header_mask, buf, strlen(buf)); - #endif - } - - template - PUGI__FN bool set_value_integer(String& dest, Header& header, uintptr_t header_mask, U value, bool negative) - { - char_t buf[64]; - char_t* end = buf + sizeof(buf) / sizeof(buf[0]); - char_t* begin = integer_to_string(buf, end, value, negative); - - return strcpy_insitu(dest, header, header_mask, begin, end - begin); - } - - template - PUGI__FN bool set_value_convert(String& dest, Header& header, uintptr_t header_mask, float value) - { - char buf[128]; - PUGI__SNPRINTF(buf, "%.9g", value); - - return set_value_ascii(dest, header, header_mask, buf); - } - - template - PUGI__FN bool set_value_convert(String& dest, Header& header, uintptr_t header_mask, double value) - { - char buf[128]; - PUGI__SNPRINTF(buf, "%.17g", value); - - return set_value_ascii(dest, header, header_mask, buf); - } - - template - PUGI__FN bool set_value_bool(String& dest, Header& header, uintptr_t header_mask, bool value) - { - return strcpy_insitu(dest, header, header_mask, value ? PUGIXML_TEXT("true") : PUGIXML_TEXT("false"), value ? 4 : 5); - } - - PUGI__FN xml_parse_result load_buffer_impl(xml_document_struct* doc, xml_node_struct* root, void* contents, size_t size, unsigned int options, xml_encoding encoding, bool is_mutable, bool own, char_t** out_buffer) - { - // check input buffer - if (!contents && size) return make_parse_result(status_io_error); - - // get actual encoding - xml_encoding buffer_encoding = impl::get_buffer_encoding(encoding, contents, size); - - // get private buffer - char_t* buffer = 0; - size_t length = 0; - - if (!impl::convert_buffer(buffer, length, buffer_encoding, contents, size, is_mutable)) return impl::make_parse_result(status_out_of_memory); - - // delete original buffer if we performed a conversion - if (own && buffer != contents && contents) impl::xml_memory::deallocate(contents); - - // grab onto buffer if it's our buffer, user is responsible for deallocating contents himself - if (own || buffer != contents) *out_buffer = buffer; - - // store buffer for offset_debug - doc->buffer = buffer; - - // parse - xml_parse_result res = impl::xml_parser::parse(buffer, length, doc, root, options); - - // remember encoding - res.encoding = buffer_encoding; - - return res; - } - - // we need to get length of entire file to load it in memory; the only (relatively) sane way to do it is via seek/tell trick - PUGI__FN xml_parse_status get_file_size(FILE* file, size_t& out_result) - { - #if defined(PUGI__MSVC_CRT_VERSION) && PUGI__MSVC_CRT_VERSION >= 1400 && !defined(_WIN32_WCE) - // there are 64-bit versions of fseek/ftell, let's use them - typedef __int64 length_type; - - _fseeki64(file, 0, SEEK_END); - length_type length = _ftelli64(file); - _fseeki64(file, 0, SEEK_SET); - #elif defined(__MINGW32__) && !defined(__NO_MINGW_LFS) && (!defined(__STRICT_ANSI__) || defined(__MINGW64_VERSION_MAJOR)) - // there are 64-bit versions of fseek/ftell, let's use them - typedef off64_t length_type; - - fseeko64(file, 0, SEEK_END); - length_type length = ftello64(file); - fseeko64(file, 0, SEEK_SET); - #else - // if this is a 32-bit OS, long is enough; if this is a unix system, long is 64-bit, which is enough; otherwise we can't do anything anyway. - typedef long length_type; - - fseek(file, 0, SEEK_END); - length_type length = ftell(file); - fseek(file, 0, SEEK_SET); - #endif - - // check for I/O errors - if (length < 0) return status_io_error; - - // check for overflow - size_t result = static_cast(length); - - if (static_cast(result) != length) return status_out_of_memory; - - // finalize - out_result = result; - - return status_ok; - } - - // This function assumes that buffer has extra sizeof(char_t) writable bytes after size - PUGI__FN size_t zero_terminate_buffer(void* buffer, size_t size, xml_encoding encoding) - { - // We only need to zero-terminate if encoding conversion does not do it for us - #ifdef PUGIXML_WCHAR_MODE - xml_encoding wchar_encoding = get_wchar_encoding(); - - if (encoding == wchar_encoding || need_endian_swap_utf(encoding, wchar_encoding)) - { - size_t length = size / sizeof(char_t); - - static_cast(buffer)[length] = 0; - return (length + 1) * sizeof(char_t); - } - #else - if (encoding == encoding_utf8) - { - static_cast(buffer)[size] = 0; - return size + 1; - } - #endif - - return size; - } - - PUGI__FN xml_parse_result load_file_impl(xml_document_struct* doc, FILE* file, unsigned int options, xml_encoding encoding, char_t** out_buffer) - { - if (!file) return make_parse_result(status_file_not_found); - - // get file size (can result in I/O errors) - size_t size = 0; - xml_parse_status size_status = get_file_size(file, size); - if (size_status != status_ok) return make_parse_result(size_status); - - size_t max_suffix_size = sizeof(char_t); - - // allocate buffer for the whole file - char* contents = static_cast(xml_memory::allocate(size + max_suffix_size)); - if (!contents) return make_parse_result(status_out_of_memory); - - // read file in memory - size_t read_size = fread(contents, 1, size, file); - - if (read_size != size) - { - xml_memory::deallocate(contents); - return make_parse_result(status_io_error); - } - - xml_encoding real_encoding = get_buffer_encoding(encoding, contents, size); - - return load_buffer_impl(doc, doc, contents, zero_terminate_buffer(contents, size, real_encoding), options, real_encoding, true, true, out_buffer); - } - - PUGI__FN void close_file(FILE* file) - { - fclose(file); - } - -#ifndef PUGIXML_NO_STL - template struct xml_stream_chunk - { - static xml_stream_chunk* create() - { - void* memory = xml_memory::allocate(sizeof(xml_stream_chunk)); - if (!memory) return 0; - - return new (memory) xml_stream_chunk(); - } - - static void destroy(xml_stream_chunk* chunk) - { - // free chunk chain - while (chunk) - { - xml_stream_chunk* next_ = chunk->next; - - xml_memory::deallocate(chunk); - - chunk = next_; - } - } - - xml_stream_chunk(): next(0), size(0) - { - } - - xml_stream_chunk* next; - size_t size; - - T data[xml_memory_page_size / sizeof(T)]; - }; - - template PUGI__FN xml_parse_status load_stream_data_noseek(std::basic_istream& stream, void** out_buffer, size_t* out_size) - { - auto_deleter > chunks(0, xml_stream_chunk::destroy); - - // read file to a chunk list - size_t total = 0; - xml_stream_chunk* last = 0; - - while (!stream.eof()) - { - // allocate new chunk - xml_stream_chunk* chunk = xml_stream_chunk::create(); - if (!chunk) return status_out_of_memory; - - // append chunk to list - if (last) last = last->next = chunk; - else chunks.data = last = chunk; - - // read data to chunk - stream.read(chunk->data, static_cast(sizeof(chunk->data) / sizeof(T))); - chunk->size = static_cast(stream.gcount()) * sizeof(T); - - // read may set failbit | eofbit in case gcount() is less than read length, so check for other I/O errors - if (stream.bad() || (!stream.eof() && stream.fail())) return status_io_error; - - // guard against huge files (chunk size is small enough to make this overflow check work) - if (total + chunk->size < total) return status_out_of_memory; - total += chunk->size; - } - - size_t max_suffix_size = sizeof(char_t); - - // copy chunk list to a contiguous buffer - char* buffer = static_cast(xml_memory::allocate(total + max_suffix_size)); - if (!buffer) return status_out_of_memory; - - char* write = buffer; - - for (xml_stream_chunk* chunk = chunks.data; chunk; chunk = chunk->next) - { - assert(write + chunk->size <= buffer + total); - memcpy(write, chunk->data, chunk->size); - write += chunk->size; - } - - assert(write == buffer + total); - - // return buffer - *out_buffer = buffer; - *out_size = total; - - return status_ok; - } - - template PUGI__FN xml_parse_status load_stream_data_seek(std::basic_istream& stream, void** out_buffer, size_t* out_size) - { - // get length of remaining data in stream - typename std::basic_istream::pos_type pos = stream.tellg(); - stream.seekg(0, std::ios::end); - std::streamoff length = stream.tellg() - pos; - stream.seekg(pos); - - if (stream.fail() || pos < 0) return status_io_error; - - // guard against huge files - size_t read_length = static_cast(length); - - if (static_cast(read_length) != length || length < 0) return status_out_of_memory; - - size_t max_suffix_size = sizeof(char_t); - - // read stream data into memory (guard against stream exceptions with buffer holder) - auto_deleter buffer(xml_memory::allocate(read_length * sizeof(T) + max_suffix_size), xml_memory::deallocate); - if (!buffer.data) return status_out_of_memory; - - stream.read(static_cast(buffer.data), static_cast(read_length)); - - // read may set failbit | eofbit in case gcount() is less than read_length (i.e. line ending conversion), so check for other I/O errors - if (stream.bad() || (!stream.eof() && stream.fail())) return status_io_error; - - // return buffer - size_t actual_length = static_cast(stream.gcount()); - assert(actual_length <= read_length); - - *out_buffer = buffer.release(); - *out_size = actual_length * sizeof(T); - - return status_ok; - } - - template PUGI__FN xml_parse_result load_stream_impl(xml_document_struct* doc, std::basic_istream& stream, unsigned int options, xml_encoding encoding, char_t** out_buffer) - { - void* buffer = 0; - size_t size = 0; - xml_parse_status status = status_ok; - - // if stream has an error bit set, bail out (otherwise tellg() can fail and we'll clear error bits) - if (stream.fail()) return make_parse_result(status_io_error); - - // load stream to memory (using seek-based implementation if possible, since it's faster and takes less memory) - if (stream.tellg() < 0) - { - stream.clear(); // clear error flags that could be set by a failing tellg - status = load_stream_data_noseek(stream, &buffer, &size); - } - else - status = load_stream_data_seek(stream, &buffer, &size); - - if (status != status_ok) return make_parse_result(status); - - xml_encoding real_encoding = get_buffer_encoding(encoding, buffer, size); - - return load_buffer_impl(doc, doc, buffer, zero_terminate_buffer(buffer, size, real_encoding), options, real_encoding, true, true, out_buffer); - } -#endif - -#if defined(PUGI__MSVC_CRT_VERSION) || defined(__BORLANDC__) || (defined(__MINGW32__) && (!defined(__STRICT_ANSI__) || defined(__MINGW64_VERSION_MAJOR))) - PUGI__FN FILE* open_file_wide(const wchar_t* path, const wchar_t* mode) - { - return _wfopen(path, mode); - } -#else - PUGI__FN char* convert_path_heap(const wchar_t* str) - { - assert(str); - - // first pass: get length in utf8 characters - size_t length = strlength_wide(str); - size_t size = as_utf8_begin(str, length); - - // allocate resulting string - char* result = static_cast(xml_memory::allocate(size + 1)); - if (!result) return 0; - - // second pass: convert to utf8 - as_utf8_end(result, size, str, length); - - // zero-terminate - result[size] = 0; - - return result; - } - - PUGI__FN FILE* open_file_wide(const wchar_t* path, const wchar_t* mode) - { - // there is no standard function to open wide paths, so our best bet is to try utf8 path - char* path_utf8 = convert_path_heap(path); - if (!path_utf8) return 0; - - // convert mode to ASCII (we mirror _wfopen interface) - char mode_ascii[4] = {0}; - for (size_t i = 0; mode[i]; ++i) mode_ascii[i] = static_cast(mode[i]); - - // try to open the utf8 path - FILE* result = fopen(path_utf8, mode_ascii); - - // free dummy buffer - xml_memory::deallocate(path_utf8); - - return result; - } -#endif - - PUGI__FN bool save_file_impl(const xml_document& doc, FILE* file, const char_t* indent, unsigned int flags, xml_encoding encoding) - { - if (!file) return false; - - xml_writer_file writer(file); - doc.save(writer, indent, flags, encoding); - - return ferror(file) == 0; - } - - struct name_null_sentry - { - xml_node_struct* node; - char_t* name; - - name_null_sentry(xml_node_struct* node_): node(node_), name(node_->name) - { - node->name = 0; - } - - ~name_null_sentry() - { - node->name = name; - } - }; -PUGI__NS_END - -namespace pugi -{ - PUGI__FN xml_writer_file::xml_writer_file(void* file_): file(file_) - { - } - - PUGI__FN void xml_writer_file::write(const void* data, size_t size) - { - size_t result = fwrite(data, 1, size, static_cast(file)); - (void)!result; // unfortunately we can't do proper error handling here - } - -#ifndef PUGIXML_NO_STL - PUGI__FN xml_writer_stream::xml_writer_stream(std::basic_ostream >& stream): narrow_stream(&stream), wide_stream(0) - { - } - - PUGI__FN xml_writer_stream::xml_writer_stream(std::basic_ostream >& stream): narrow_stream(0), wide_stream(&stream) - { - } - - PUGI__FN void xml_writer_stream::write(const void* data, size_t size) - { - if (narrow_stream) - { - assert(!wide_stream); - narrow_stream->write(reinterpret_cast(data), static_cast(size)); - } - else - { - assert(wide_stream); - assert(size % sizeof(wchar_t) == 0); - - wide_stream->write(reinterpret_cast(data), static_cast(size / sizeof(wchar_t))); - } - } -#endif - - PUGI__FN xml_tree_walker::xml_tree_walker(): _depth(0) - { - } - - PUGI__FN xml_tree_walker::~xml_tree_walker() - { - } - - PUGI__FN int xml_tree_walker::depth() const - { - return _depth; - } - - PUGI__FN bool xml_tree_walker::begin(xml_node&) - { - return true; - } - - PUGI__FN bool xml_tree_walker::end(xml_node&) - { - return true; - } - - PUGI__FN xml_attribute::xml_attribute(): _attr(0) - { - } - - PUGI__FN xml_attribute::xml_attribute(xml_attribute_struct* attr): _attr(attr) - { - } - - PUGI__FN static void unspecified_bool_xml_attribute(xml_attribute***) - { - } - - PUGI__FN xml_attribute::operator xml_attribute::unspecified_bool_type() const - { - return _attr ? unspecified_bool_xml_attribute : 0; - } - - PUGI__FN bool xml_attribute::operator!() const - { - return !_attr; - } - - PUGI__FN bool xml_attribute::operator==(const xml_attribute& r) const - { - return (_attr == r._attr); - } - - PUGI__FN bool xml_attribute::operator!=(const xml_attribute& r) const - { - return (_attr != r._attr); - } - - PUGI__FN bool xml_attribute::operator<(const xml_attribute& r) const - { - return (_attr < r._attr); - } - - PUGI__FN bool xml_attribute::operator>(const xml_attribute& r) const - { - return (_attr > r._attr); - } - - PUGI__FN bool xml_attribute::operator<=(const xml_attribute& r) const - { - return (_attr <= r._attr); - } - - PUGI__FN bool xml_attribute::operator>=(const xml_attribute& r) const - { - return (_attr >= r._attr); - } - - PUGI__FN xml_attribute xml_attribute::next_attribute() const - { - return _attr ? xml_attribute(_attr->next_attribute) : xml_attribute(); - } - - PUGI__FN xml_attribute xml_attribute::previous_attribute() const - { - return _attr && _attr->prev_attribute_c->next_attribute ? xml_attribute(_attr->prev_attribute_c) : xml_attribute(); - } - - PUGI__FN const char_t* xml_attribute::as_string(const char_t* def) const - { - return (_attr && _attr->value) ? _attr->value + 0 : def; - } - - PUGI__FN int xml_attribute::as_int(int def) const - { - return (_attr && _attr->value) ? impl::get_value_int(_attr->value) : def; - } - - PUGI__FN unsigned int xml_attribute::as_uint(unsigned int def) const - { - return (_attr && _attr->value) ? impl::get_value_uint(_attr->value) : def; - } - - PUGI__FN double xml_attribute::as_double(double def) const - { - return (_attr && _attr->value) ? impl::get_value_double(_attr->value) : def; - } - - PUGI__FN float xml_attribute::as_float(float def) const - { - return (_attr && _attr->value) ? impl::get_value_float(_attr->value) : def; - } - - PUGI__FN bool xml_attribute::as_bool(bool def) const - { - return (_attr && _attr->value) ? impl::get_value_bool(_attr->value) : def; - } - -#ifdef PUGIXML_HAS_LONG_LONG - PUGI__FN long long xml_attribute::as_llong(long long def) const - { - return (_attr && _attr->value) ? impl::get_value_llong(_attr->value) : def; - } - - PUGI__FN unsigned long long xml_attribute::as_ullong(unsigned long long def) const - { - return (_attr && _attr->value) ? impl::get_value_ullong(_attr->value) : def; - } -#endif - - PUGI__FN bool xml_attribute::empty() const - { - return !_attr; - } - - PUGI__FN const char_t* xml_attribute::name() const - { - return (_attr && _attr->name) ? _attr->name + 0 : PUGIXML_TEXT(""); - } - - PUGI__FN const char_t* xml_attribute::value() const - { - return (_attr && _attr->value) ? _attr->value + 0 : PUGIXML_TEXT(""); - } - - PUGI__FN size_t xml_attribute::hash_value() const - { - return static_cast(reinterpret_cast(_attr) / sizeof(xml_attribute_struct)); - } - - PUGI__FN xml_attribute_struct* xml_attribute::internal_object() const - { - return _attr; - } - - PUGI__FN xml_attribute& xml_attribute::operator=(const char_t* rhs) - { - set_value(rhs); - return *this; - } - - PUGI__FN xml_attribute& xml_attribute::operator=(int rhs) - { - set_value(rhs); - return *this; - } - - PUGI__FN xml_attribute& xml_attribute::operator=(unsigned int rhs) - { - set_value(rhs); - return *this; - } - - PUGI__FN xml_attribute& xml_attribute::operator=(long rhs) - { - set_value(rhs); - return *this; - } - - PUGI__FN xml_attribute& xml_attribute::operator=(unsigned long rhs) - { - set_value(rhs); - return *this; - } - - PUGI__FN xml_attribute& xml_attribute::operator=(double rhs) - { - set_value(rhs); - return *this; - } - - PUGI__FN xml_attribute& xml_attribute::operator=(float rhs) - { - set_value(rhs); - return *this; - } - - PUGI__FN xml_attribute& xml_attribute::operator=(bool rhs) - { - set_value(rhs); - return *this; - } - -#ifdef PUGIXML_HAS_LONG_LONG - PUGI__FN xml_attribute& xml_attribute::operator=(long long rhs) - { - set_value(rhs); - return *this; - } - - PUGI__FN xml_attribute& xml_attribute::operator=(unsigned long long rhs) - { - set_value(rhs); - return *this; - } -#endif - - PUGI__FN bool xml_attribute::set_name(const char_t* rhs) - { - if (!_attr) return false; - - return impl::strcpy_insitu(_attr->name, _attr->header, impl::xml_memory_page_name_allocated_mask, rhs, impl::strlength(rhs)); - } - - PUGI__FN bool xml_attribute::set_value(const char_t* rhs) - { - if (!_attr) return false; - - return impl::strcpy_insitu(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, impl::strlength(rhs)); - } - - PUGI__FN bool xml_attribute::set_value(int rhs) - { - if (!_attr) return false; - - return impl::set_value_integer(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0); - } - - PUGI__FN bool xml_attribute::set_value(unsigned int rhs) - { - if (!_attr) return false; - - return impl::set_value_integer(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, false); - } - - PUGI__FN bool xml_attribute::set_value(long rhs) - { - if (!_attr) return false; - - return impl::set_value_integer(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0); - } - - PUGI__FN bool xml_attribute::set_value(unsigned long rhs) - { - if (!_attr) return false; - - return impl::set_value_integer(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, false); - } - - PUGI__FN bool xml_attribute::set_value(double rhs) - { - if (!_attr) return false; - - return impl::set_value_convert(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs); - } - - PUGI__FN bool xml_attribute::set_value(float rhs) - { - if (!_attr) return false; - - return impl::set_value_convert(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs); - } - - PUGI__FN bool xml_attribute::set_value(bool rhs) - { - if (!_attr) return false; - - return impl::set_value_bool(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs); - } - -#ifdef PUGIXML_HAS_LONG_LONG - PUGI__FN bool xml_attribute::set_value(long long rhs) - { - if (!_attr) return false; - - return impl::set_value_integer(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0); - } - - PUGI__FN bool xml_attribute::set_value(unsigned long long rhs) - { - if (!_attr) return false; - - return impl::set_value_integer(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, false); - } -#endif - -#ifdef __BORLANDC__ - PUGI__FN bool operator&&(const xml_attribute& lhs, bool rhs) - { - return (bool)lhs && rhs; - } - - PUGI__FN bool operator||(const xml_attribute& lhs, bool rhs) - { - return (bool)lhs || rhs; - } -#endif - - PUGI__FN xml_node::xml_node(): _root(0) - { - } - - PUGI__FN xml_node::xml_node(xml_node_struct* p): _root(p) - { - } - - PUGI__FN static void unspecified_bool_xml_node(xml_node***) - { - } - - PUGI__FN xml_node::operator xml_node::unspecified_bool_type() const - { - return _root ? unspecified_bool_xml_node : 0; - } - - PUGI__FN bool xml_node::operator!() const - { - return !_root; - } - - PUGI__FN xml_node::iterator xml_node::begin() const - { - return iterator(_root ? _root->first_child + 0 : 0, _root); - } - - PUGI__FN xml_node::iterator xml_node::end() const - { - return iterator(0, _root); - } - - PUGI__FN xml_node::attribute_iterator xml_node::attributes_begin() const - { - return attribute_iterator(_root ? _root->first_attribute + 0 : 0, _root); - } - - PUGI__FN xml_node::attribute_iterator xml_node::attributes_end() const - { - return attribute_iterator(0, _root); - } - - PUGI__FN xml_object_range xml_node::children() const - { - return xml_object_range(begin(), end()); - } - - PUGI__FN xml_object_range xml_node::children(const char_t* name_) const - { - return xml_object_range(xml_named_node_iterator(child(name_)._root, _root, name_), xml_named_node_iterator(0, _root, name_)); - } - - PUGI__FN xml_object_range xml_node::attributes() const - { - return xml_object_range(attributes_begin(), attributes_end()); - } - - PUGI__FN bool xml_node::operator==(const xml_node& r) const - { - return (_root == r._root); - } - - PUGI__FN bool xml_node::operator!=(const xml_node& r) const - { - return (_root != r._root); - } - - PUGI__FN bool xml_node::operator<(const xml_node& r) const - { - return (_root < r._root); - } - - PUGI__FN bool xml_node::operator>(const xml_node& r) const - { - return (_root > r._root); - } - - PUGI__FN bool xml_node::operator<=(const xml_node& r) const - { - return (_root <= r._root); - } - - PUGI__FN bool xml_node::operator>=(const xml_node& r) const - { - return (_root >= r._root); - } - - PUGI__FN bool xml_node::empty() const - { - return !_root; - } - - PUGI__FN const char_t* xml_node::name() const - { - return (_root && _root->name) ? _root->name + 0 : PUGIXML_TEXT(""); - } - - PUGI__FN xml_node_type xml_node::type() const - { - return _root ? PUGI__NODETYPE(_root) : node_null; - } - - PUGI__FN const char_t* xml_node::value() const - { - return (_root && _root->value) ? _root->value + 0 : PUGIXML_TEXT(""); - } - - PUGI__FN xml_node xml_node::child(const char_t* name_) const - { - if (!_root) return xml_node(); - - for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling) - if (i->name && impl::strequal(name_, i->name)) return xml_node(i); - - return xml_node(); - } - - PUGI__FN xml_attribute xml_node::attribute(const char_t* name_) const - { - if (!_root) return xml_attribute(); - - for (xml_attribute_struct* i = _root->first_attribute; i; i = i->next_attribute) - if (i->name && impl::strequal(name_, i->name)) - return xml_attribute(i); - - return xml_attribute(); - } - - PUGI__FN xml_node xml_node::next_sibling(const char_t* name_) const - { - if (!_root) return xml_node(); - - for (xml_node_struct* i = _root->next_sibling; i; i = i->next_sibling) - if (i->name && impl::strequal(name_, i->name)) return xml_node(i); - - return xml_node(); - } - - PUGI__FN xml_node xml_node::next_sibling() const - { - return _root ? xml_node(_root->next_sibling) : xml_node(); - } - - PUGI__FN xml_node xml_node::previous_sibling(const char_t* name_) const - { - if (!_root) return xml_node(); - - for (xml_node_struct* i = _root->prev_sibling_c; i->next_sibling; i = i->prev_sibling_c) - if (i->name && impl::strequal(name_, i->name)) return xml_node(i); - - return xml_node(); - } - - PUGI__FN xml_attribute xml_node::attribute(const char_t* name_, xml_attribute& hint_) const - { - xml_attribute_struct* hint = hint_._attr; - - // if hint is not an attribute of node, behavior is not defined - assert(!hint || (_root && impl::is_attribute_of(hint, _root))); - - if (!_root) return xml_attribute(); - - // optimistically search from hint up until the end - for (xml_attribute_struct* i = hint; i; i = i->next_attribute) - if (i->name && impl::strequal(name_, i->name)) - { - // update hint to maximize efficiency of searching for consecutive attributes - hint_._attr = i->next_attribute; - - return xml_attribute(i); - } - - // wrap around and search from the first attribute until the hint - // 'j' null pointer check is technically redundant, but it prevents a crash in case the assertion above fails - for (xml_attribute_struct* j = _root->first_attribute; j && j != hint; j = j->next_attribute) - if (j->name && impl::strequal(name_, j->name)) - { - // update hint to maximize efficiency of searching for consecutive attributes - hint_._attr = j->next_attribute; - - return xml_attribute(j); - } - - return xml_attribute(); - } - - PUGI__FN xml_node xml_node::previous_sibling() const - { - if (!_root) return xml_node(); - - if (_root->prev_sibling_c->next_sibling) return xml_node(_root->prev_sibling_c); - else return xml_node(); - } - - PUGI__FN xml_node xml_node::parent() const - { - return _root ? xml_node(_root->parent) : xml_node(); - } - - PUGI__FN xml_node xml_node::root() const - { - return _root ? xml_node(&impl::get_document(_root)) : xml_node(); - } - - PUGI__FN xml_text xml_node::text() const - { - return xml_text(_root); - } - - PUGI__FN const char_t* xml_node::child_value() const - { - if (!_root) return PUGIXML_TEXT(""); - - // element nodes can have value if parse_embed_pcdata was used - if (PUGI__NODETYPE(_root) == node_element && _root->value) - return _root->value; - - for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling) - if (impl::is_text_node(i) && i->value) - return i->value; - - return PUGIXML_TEXT(""); - } - - PUGI__FN const char_t* xml_node::child_value(const char_t* name_) const - { - return child(name_).child_value(); - } - - PUGI__FN xml_attribute xml_node::first_attribute() const - { - return _root ? xml_attribute(_root->first_attribute) : xml_attribute(); - } - - PUGI__FN xml_attribute xml_node::last_attribute() const - { - return _root && _root->first_attribute ? xml_attribute(_root->first_attribute->prev_attribute_c) : xml_attribute(); - } - - PUGI__FN xml_node xml_node::first_child() const - { - return _root ? xml_node(_root->first_child) : xml_node(); - } - - PUGI__FN xml_node xml_node::last_child() const - { - return _root && _root->first_child ? xml_node(_root->first_child->prev_sibling_c) : xml_node(); - } - - PUGI__FN bool xml_node::set_name(const char_t* rhs) - { - xml_node_type type_ = _root ? PUGI__NODETYPE(_root) : node_null; - - if (type_ != node_element && type_ != node_pi && type_ != node_declaration) - return false; - - return impl::strcpy_insitu(_root->name, _root->header, impl::xml_memory_page_name_allocated_mask, rhs, impl::strlength(rhs)); - } - - PUGI__FN bool xml_node::set_value(const char_t* rhs) - { - xml_node_type type_ = _root ? PUGI__NODETYPE(_root) : node_null; - - if (type_ != node_pcdata && type_ != node_cdata && type_ != node_comment && type_ != node_pi && type_ != node_doctype) - return false; - - return impl::strcpy_insitu(_root->value, _root->header, impl::xml_memory_page_value_allocated_mask, rhs, impl::strlength(rhs)); - } - - PUGI__FN xml_attribute xml_node::append_attribute(const char_t* name_) - { - if (!impl::allow_insert_attribute(type())) return xml_attribute(); - - impl::xml_allocator& alloc = impl::get_allocator(_root); - if (!alloc.reserve()) return xml_attribute(); - - xml_attribute a(impl::allocate_attribute(alloc)); - if (!a) return xml_attribute(); - - impl::append_attribute(a._attr, _root); - - a.set_name(name_); - - return a; - } - - PUGI__FN xml_attribute xml_node::prepend_attribute(const char_t* name_) - { - if (!impl::allow_insert_attribute(type())) return xml_attribute(); - - impl::xml_allocator& alloc = impl::get_allocator(_root); - if (!alloc.reserve()) return xml_attribute(); - - xml_attribute a(impl::allocate_attribute(alloc)); - if (!a) return xml_attribute(); - - impl::prepend_attribute(a._attr, _root); - - a.set_name(name_); - - return a; - } - - PUGI__FN xml_attribute xml_node::insert_attribute_after(const char_t* name_, const xml_attribute& attr) - { - if (!impl::allow_insert_attribute(type())) return xml_attribute(); - if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute(); - - impl::xml_allocator& alloc = impl::get_allocator(_root); - if (!alloc.reserve()) return xml_attribute(); - - xml_attribute a(impl::allocate_attribute(alloc)); - if (!a) return xml_attribute(); - - impl::insert_attribute_after(a._attr, attr._attr, _root); - - a.set_name(name_); - - return a; - } - - PUGI__FN xml_attribute xml_node::insert_attribute_before(const char_t* name_, const xml_attribute& attr) - { - if (!impl::allow_insert_attribute(type())) return xml_attribute(); - if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute(); - - impl::xml_allocator& alloc = impl::get_allocator(_root); - if (!alloc.reserve()) return xml_attribute(); - - xml_attribute a(impl::allocate_attribute(alloc)); - if (!a) return xml_attribute(); - - impl::insert_attribute_before(a._attr, attr._attr, _root); - - a.set_name(name_); - - return a; - } - - PUGI__FN xml_attribute xml_node::append_copy(const xml_attribute& proto) - { - if (!proto) return xml_attribute(); - if (!impl::allow_insert_attribute(type())) return xml_attribute(); - - impl::xml_allocator& alloc = impl::get_allocator(_root); - if (!alloc.reserve()) return xml_attribute(); - - xml_attribute a(impl::allocate_attribute(alloc)); - if (!a) return xml_attribute(); - - impl::append_attribute(a._attr, _root); - impl::node_copy_attribute(a._attr, proto._attr); - - return a; - } - - PUGI__FN xml_attribute xml_node::prepend_copy(const xml_attribute& proto) - { - if (!proto) return xml_attribute(); - if (!impl::allow_insert_attribute(type())) return xml_attribute(); - - impl::xml_allocator& alloc = impl::get_allocator(_root); - if (!alloc.reserve()) return xml_attribute(); - - xml_attribute a(impl::allocate_attribute(alloc)); - if (!a) return xml_attribute(); - - impl::prepend_attribute(a._attr, _root); - impl::node_copy_attribute(a._attr, proto._attr); - - return a; - } - - PUGI__FN xml_attribute xml_node::insert_copy_after(const xml_attribute& proto, const xml_attribute& attr) - { - if (!proto) return xml_attribute(); - if (!impl::allow_insert_attribute(type())) return xml_attribute(); - if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute(); - - impl::xml_allocator& alloc = impl::get_allocator(_root); - if (!alloc.reserve()) return xml_attribute(); - - xml_attribute a(impl::allocate_attribute(alloc)); - if (!a) return xml_attribute(); - - impl::insert_attribute_after(a._attr, attr._attr, _root); - impl::node_copy_attribute(a._attr, proto._attr); - - return a; - } - - PUGI__FN xml_attribute xml_node::insert_copy_before(const xml_attribute& proto, const xml_attribute& attr) - { - if (!proto) return xml_attribute(); - if (!impl::allow_insert_attribute(type())) return xml_attribute(); - if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute(); - - impl::xml_allocator& alloc = impl::get_allocator(_root); - if (!alloc.reserve()) return xml_attribute(); - - xml_attribute a(impl::allocate_attribute(alloc)); - if (!a) return xml_attribute(); - - impl::insert_attribute_before(a._attr, attr._attr, _root); - impl::node_copy_attribute(a._attr, proto._attr); - - return a; - } - - PUGI__FN xml_node xml_node::append_child(xml_node_type type_) - { - if (!impl::allow_insert_child(type(), type_)) return xml_node(); - - impl::xml_allocator& alloc = impl::get_allocator(_root); - if (!alloc.reserve()) return xml_node(); - - xml_node n(impl::allocate_node(alloc, type_)); - if (!n) return xml_node(); - - impl::append_node(n._root, _root); - - if (type_ == node_declaration) n.set_name(PUGIXML_TEXT("xml")); - - return n; - } - - PUGI__FN xml_node xml_node::prepend_child(xml_node_type type_) - { - if (!impl::allow_insert_child(type(), type_)) return xml_node(); - - impl::xml_allocator& alloc = impl::get_allocator(_root); - if (!alloc.reserve()) return xml_node(); - - xml_node n(impl::allocate_node(alloc, type_)); - if (!n) return xml_node(); - - impl::prepend_node(n._root, _root); - - if (type_ == node_declaration) n.set_name(PUGIXML_TEXT("xml")); - - return n; - } - - PUGI__FN xml_node xml_node::insert_child_before(xml_node_type type_, const xml_node& node) - { - if (!impl::allow_insert_child(type(), type_)) return xml_node(); - if (!node._root || node._root->parent != _root) return xml_node(); - - impl::xml_allocator& alloc = impl::get_allocator(_root); - if (!alloc.reserve()) return xml_node(); - - xml_node n(impl::allocate_node(alloc, type_)); - if (!n) return xml_node(); - - impl::insert_node_before(n._root, node._root); - - if (type_ == node_declaration) n.set_name(PUGIXML_TEXT("xml")); - - return n; - } - - PUGI__FN xml_node xml_node::insert_child_after(xml_node_type type_, const xml_node& node) - { - if (!impl::allow_insert_child(type(), type_)) return xml_node(); - if (!node._root || node._root->parent != _root) return xml_node(); - - impl::xml_allocator& alloc = impl::get_allocator(_root); - if (!alloc.reserve()) return xml_node(); - - xml_node n(impl::allocate_node(alloc, type_)); - if (!n) return xml_node(); - - impl::insert_node_after(n._root, node._root); - - if (type_ == node_declaration) n.set_name(PUGIXML_TEXT("xml")); - - return n; - } - - PUGI__FN xml_node xml_node::append_child(const char_t* name_) - { - xml_node result = append_child(node_element); - - result.set_name(name_); - - return result; - } - - PUGI__FN xml_node xml_node::prepend_child(const char_t* name_) - { - xml_node result = prepend_child(node_element); - - result.set_name(name_); - - return result; - } - - PUGI__FN xml_node xml_node::insert_child_after(const char_t* name_, const xml_node& node) - { - xml_node result = insert_child_after(node_element, node); - - result.set_name(name_); - - return result; - } - - PUGI__FN xml_node xml_node::insert_child_before(const char_t* name_, const xml_node& node) - { - xml_node result = insert_child_before(node_element, node); - - result.set_name(name_); - - return result; - } - - PUGI__FN xml_node xml_node::append_copy(const xml_node& proto) - { - xml_node_type type_ = proto.type(); - if (!impl::allow_insert_child(type(), type_)) return xml_node(); - - impl::xml_allocator& alloc = impl::get_allocator(_root); - if (!alloc.reserve()) return xml_node(); - - xml_node n(impl::allocate_node(alloc, type_)); - if (!n) return xml_node(); - - impl::append_node(n._root, _root); - impl::node_copy_tree(n._root, proto._root); - - return n; - } - - PUGI__FN xml_node xml_node::prepend_copy(const xml_node& proto) - { - xml_node_type type_ = proto.type(); - if (!impl::allow_insert_child(type(), type_)) return xml_node(); - - impl::xml_allocator& alloc = impl::get_allocator(_root); - if (!alloc.reserve()) return xml_node(); - - xml_node n(impl::allocate_node(alloc, type_)); - if (!n) return xml_node(); - - impl::prepend_node(n._root, _root); - impl::node_copy_tree(n._root, proto._root); - - return n; - } - - PUGI__FN xml_node xml_node::insert_copy_after(const xml_node& proto, const xml_node& node) - { - xml_node_type type_ = proto.type(); - if (!impl::allow_insert_child(type(), type_)) return xml_node(); - if (!node._root || node._root->parent != _root) return xml_node(); - - impl::xml_allocator& alloc = impl::get_allocator(_root); - if (!alloc.reserve()) return xml_node(); - - xml_node n(impl::allocate_node(alloc, type_)); - if (!n) return xml_node(); - - impl::insert_node_after(n._root, node._root); - impl::node_copy_tree(n._root, proto._root); - - return n; - } - - PUGI__FN xml_node xml_node::insert_copy_before(const xml_node& proto, const xml_node& node) - { - xml_node_type type_ = proto.type(); - if (!impl::allow_insert_child(type(), type_)) return xml_node(); - if (!node._root || node._root->parent != _root) return xml_node(); - - impl::xml_allocator& alloc = impl::get_allocator(_root); - if (!alloc.reserve()) return xml_node(); - - xml_node n(impl::allocate_node(alloc, type_)); - if (!n) return xml_node(); - - impl::insert_node_before(n._root, node._root); - impl::node_copy_tree(n._root, proto._root); - - return n; - } - - PUGI__FN xml_node xml_node::append_move(const xml_node& moved) - { - if (!impl::allow_move(*this, moved)) return xml_node(); - - impl::xml_allocator& alloc = impl::get_allocator(_root); - if (!alloc.reserve()) return xml_node(); - - // disable document_buffer_order optimization since moving nodes around changes document order without changing buffer pointers - impl::get_document(_root).header |= impl::xml_memory_page_contents_shared_mask; - - impl::remove_node(moved._root); - impl::append_node(moved._root, _root); - - return moved; - } - - PUGI__FN xml_node xml_node::prepend_move(const xml_node& moved) - { - if (!impl::allow_move(*this, moved)) return xml_node(); - - impl::xml_allocator& alloc = impl::get_allocator(_root); - if (!alloc.reserve()) return xml_node(); - - // disable document_buffer_order optimization since moving nodes around changes document order without changing buffer pointers - impl::get_document(_root).header |= impl::xml_memory_page_contents_shared_mask; - - impl::remove_node(moved._root); - impl::prepend_node(moved._root, _root); - - return moved; - } - - PUGI__FN xml_node xml_node::insert_move_after(const xml_node& moved, const xml_node& node) - { - if (!impl::allow_move(*this, moved)) return xml_node(); - if (!node._root || node._root->parent != _root) return xml_node(); - if (moved._root == node._root) return xml_node(); - - impl::xml_allocator& alloc = impl::get_allocator(_root); - if (!alloc.reserve()) return xml_node(); - - // disable document_buffer_order optimization since moving nodes around changes document order without changing buffer pointers - impl::get_document(_root).header |= impl::xml_memory_page_contents_shared_mask; - - impl::remove_node(moved._root); - impl::insert_node_after(moved._root, node._root); - - return moved; - } - - PUGI__FN xml_node xml_node::insert_move_before(const xml_node& moved, const xml_node& node) - { - if (!impl::allow_move(*this, moved)) return xml_node(); - if (!node._root || node._root->parent != _root) return xml_node(); - if (moved._root == node._root) return xml_node(); - - impl::xml_allocator& alloc = impl::get_allocator(_root); - if (!alloc.reserve()) return xml_node(); - - // disable document_buffer_order optimization since moving nodes around changes document order without changing buffer pointers - impl::get_document(_root).header |= impl::xml_memory_page_contents_shared_mask; - - impl::remove_node(moved._root); - impl::insert_node_before(moved._root, node._root); - - return moved; - } - - PUGI__FN bool xml_node::remove_attribute(const char_t* name_) - { - return remove_attribute(attribute(name_)); - } - - PUGI__FN bool xml_node::remove_attribute(const xml_attribute& a) - { - if (!_root || !a._attr) return false; - if (!impl::is_attribute_of(a._attr, _root)) return false; - - impl::xml_allocator& alloc = impl::get_allocator(_root); - if (!alloc.reserve()) return false; - - impl::remove_attribute(a._attr, _root); - impl::destroy_attribute(a._attr, alloc); - - return true; - } - - PUGI__FN bool xml_node::remove_child(const char_t* name_) - { - return remove_child(child(name_)); - } - - PUGI__FN bool xml_node::remove_child(const xml_node& n) - { - if (!_root || !n._root || n._root->parent != _root) return false; - - impl::xml_allocator& alloc = impl::get_allocator(_root); - if (!alloc.reserve()) return false; - - impl::remove_node(n._root); - impl::destroy_node(n._root, alloc); - - return true; - } - - PUGI__FN xml_parse_result xml_node::append_buffer(const void* contents, size_t size, unsigned int options, xml_encoding encoding) - { - // append_buffer is only valid for elements/documents - if (!impl::allow_insert_child(type(), node_element)) return impl::make_parse_result(status_append_invalid_root); - - // get document node - impl::xml_document_struct* doc = &impl::get_document(_root); - - // disable document_buffer_order optimization since in a document with multiple buffers comparing buffer pointers does not make sense - doc->header |= impl::xml_memory_page_contents_shared_mask; - - // get extra buffer element (we'll store the document fragment buffer there so that we can deallocate it later) - impl::xml_memory_page* page = 0; - impl::xml_extra_buffer* extra = static_cast(doc->allocate_memory(sizeof(impl::xml_extra_buffer) + sizeof(void*), page)); - (void)page; - - if (!extra) return impl::make_parse_result(status_out_of_memory); - - #ifdef PUGIXML_COMPACT - // align the memory block to a pointer boundary; this is required for compact mode where memory allocations are only 4b aligned - // note that this requires up to sizeof(void*)-1 additional memory, which the allocation above takes into account - extra = reinterpret_cast((reinterpret_cast(extra) + (sizeof(void*) - 1)) & ~(sizeof(void*) - 1)); - #endif - - // add extra buffer to the list - extra->buffer = 0; - extra->next = doc->extra_buffers; - doc->extra_buffers = extra; - - // name of the root has to be NULL before parsing - otherwise closing node mismatches will not be detected at the top level - impl::name_null_sentry sentry(_root); - - return impl::load_buffer_impl(doc, _root, const_cast(contents), size, options, encoding, false, false, &extra->buffer); - } - - PUGI__FN xml_node xml_node::find_child_by_attribute(const char_t* name_, const char_t* attr_name, const char_t* attr_value) const - { - if (!_root) return xml_node(); - - for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling) - if (i->name && impl::strequal(name_, i->name)) - { - for (xml_attribute_struct* a = i->first_attribute; a; a = a->next_attribute) - if (a->name && impl::strequal(attr_name, a->name) && impl::strequal(attr_value, a->value ? a->value + 0 : PUGIXML_TEXT(""))) - return xml_node(i); - } - - return xml_node(); - } - - PUGI__FN xml_node xml_node::find_child_by_attribute(const char_t* attr_name, const char_t* attr_value) const - { - if (!_root) return xml_node(); - - for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling) - for (xml_attribute_struct* a = i->first_attribute; a; a = a->next_attribute) - if (a->name && impl::strequal(attr_name, a->name) && impl::strequal(attr_value, a->value ? a->value + 0 : PUGIXML_TEXT(""))) - return xml_node(i); - - return xml_node(); - } - -#ifndef PUGIXML_NO_STL - PUGI__FN string_t xml_node::path(char_t delimiter) const - { - if (!_root) return string_t(); - - size_t offset = 0; - - for (xml_node_struct* i = _root; i; i = i->parent) - { - offset += (i != _root); - offset += i->name ? impl::strlength(i->name) : 0; - } - - string_t result; - result.resize(offset); - - for (xml_node_struct* j = _root; j; j = j->parent) - { - if (j != _root) - result[--offset] = delimiter; - - if (j->name) - { - size_t length = impl::strlength(j->name); - - offset -= length; - memcpy(&result[offset], j->name, length * sizeof(char_t)); - } - } - - assert(offset == 0); - - return result; - } -#endif - - PUGI__FN xml_node xml_node::first_element_by_path(const char_t* path_, char_t delimiter) const - { - xml_node found = *this; // Current search context. - - if (!_root || !path_[0]) return found; - - if (path_[0] == delimiter) - { - // Absolute path; e.g. '/foo/bar' - found = found.root(); - ++path_; - } - - const char_t* path_segment = path_; - - while (*path_segment == delimiter) ++path_segment; - - const char_t* path_segment_end = path_segment; - - while (*path_segment_end && *path_segment_end != delimiter) ++path_segment_end; - - if (path_segment == path_segment_end) return found; - - const char_t* next_segment = path_segment_end; - - while (*next_segment == delimiter) ++next_segment; - - if (*path_segment == '.' && path_segment + 1 == path_segment_end) - return found.first_element_by_path(next_segment, delimiter); - else if (*path_segment == '.' && *(path_segment+1) == '.' && path_segment + 2 == path_segment_end) - return found.parent().first_element_by_path(next_segment, delimiter); - else - { - for (xml_node_struct* j = found._root->first_child; j; j = j->next_sibling) - { - if (j->name && impl::strequalrange(j->name, path_segment, static_cast(path_segment_end - path_segment))) - { - xml_node subsearch = xml_node(j).first_element_by_path(next_segment, delimiter); - - if (subsearch) return subsearch; - } - } - - return xml_node(); - } - } - - PUGI__FN bool xml_node::traverse(xml_tree_walker& walker) - { - walker._depth = -1; - - xml_node arg_begin(_root); - if (!walker.begin(arg_begin)) return false; - - xml_node_struct* cur = _root ? _root->first_child + 0 : 0; - - if (cur) - { - ++walker._depth; - - do - { - xml_node arg_for_each(cur); - if (!walker.for_each(arg_for_each)) - return false; - - if (cur->first_child) - { - ++walker._depth; - cur = cur->first_child; - } - else if (cur->next_sibling) - cur = cur->next_sibling; - else - { - while (!cur->next_sibling && cur != _root && cur->parent) - { - --walker._depth; - cur = cur->parent; - } - - if (cur != _root) - cur = cur->next_sibling; - } - } - while (cur && cur != _root); - } - - assert(walker._depth == -1); - - xml_node arg_end(_root); - return walker.end(arg_end); - } - - PUGI__FN size_t xml_node::hash_value() const - { - return static_cast(reinterpret_cast(_root) / sizeof(xml_node_struct)); - } - - PUGI__FN xml_node_struct* xml_node::internal_object() const - { - return _root; - } - - PUGI__FN void xml_node::print(xml_writer& writer, const char_t* indent, unsigned int flags, xml_encoding encoding, unsigned int depth) const - { - if (!_root) return; - - impl::xml_buffered_writer buffered_writer(writer, encoding); - - impl::node_output(buffered_writer, _root, indent, flags, depth); - - buffered_writer.flush(); - } - -#ifndef PUGIXML_NO_STL - PUGI__FN void xml_node::print(std::basic_ostream >& stream, const char_t* indent, unsigned int flags, xml_encoding encoding, unsigned int depth) const - { - xml_writer_stream writer(stream); - - print(writer, indent, flags, encoding, depth); - } - - PUGI__FN void xml_node::print(std::basic_ostream >& stream, const char_t* indent, unsigned int flags, unsigned int depth) const - { - xml_writer_stream writer(stream); - - print(writer, indent, flags, encoding_wchar, depth); - } -#endif - - PUGI__FN ptrdiff_t xml_node::offset_debug() const - { - if (!_root) return -1; - - impl::xml_document_struct& doc = impl::get_document(_root); - - // we can determine the offset reliably only if there is exactly once parse buffer - if (!doc.buffer || doc.extra_buffers) return -1; - - switch (type()) - { - case node_document: - return 0; - - case node_element: - case node_declaration: - case node_pi: - return _root->name && (_root->header & impl::xml_memory_page_name_allocated_or_shared_mask) == 0 ? _root->name - doc.buffer : -1; - - case node_pcdata: - case node_cdata: - case node_comment: - case node_doctype: - return _root->value && (_root->header & impl::xml_memory_page_value_allocated_or_shared_mask) == 0 ? _root->value - doc.buffer : -1; - - default: - assert(false && "Invalid node type"); // unreachable - return -1; - } - } - -#ifdef __BORLANDC__ - PUGI__FN bool operator&&(const xml_node& lhs, bool rhs) - { - return (bool)lhs && rhs; - } - - PUGI__FN bool operator||(const xml_node& lhs, bool rhs) - { - return (bool)lhs || rhs; - } -#endif - - PUGI__FN xml_text::xml_text(xml_node_struct* root): _root(root) - { - } - - PUGI__FN xml_node_struct* xml_text::_data() const - { - if (!_root || impl::is_text_node(_root)) return _root; - - // element nodes can have value if parse_embed_pcdata was used - if (PUGI__NODETYPE(_root) == node_element && _root->value) - return _root; - - for (xml_node_struct* node = _root->first_child; node; node = node->next_sibling) - if (impl::is_text_node(node)) - return node; - - return 0; - } - - PUGI__FN xml_node_struct* xml_text::_data_new() - { - xml_node_struct* d = _data(); - if (d) return d; - - return xml_node(_root).append_child(node_pcdata).internal_object(); - } - - PUGI__FN xml_text::xml_text(): _root(0) - { - } - - PUGI__FN static void unspecified_bool_xml_text(xml_text***) - { - } - - PUGI__FN xml_text::operator xml_text::unspecified_bool_type() const - { - return _data() ? unspecified_bool_xml_text : 0; - } - - PUGI__FN bool xml_text::operator!() const - { - return !_data(); - } - - PUGI__FN bool xml_text::empty() const - { - return _data() == 0; - } - - PUGI__FN const char_t* xml_text::get() const - { - xml_node_struct* d = _data(); - - return (d && d->value) ? d->value + 0 : PUGIXML_TEXT(""); - } - - PUGI__FN const char_t* xml_text::as_string(const char_t* def) const - { - xml_node_struct* d = _data(); - - return (d && d->value) ? d->value + 0 : def; - } - - PUGI__FN int xml_text::as_int(int def) const - { - xml_node_struct* d = _data(); - - return (d && d->value) ? impl::get_value_int(d->value) : def; - } - - PUGI__FN unsigned int xml_text::as_uint(unsigned int def) const - { - xml_node_struct* d = _data(); - - return (d && d->value) ? impl::get_value_uint(d->value) : def; - } - - PUGI__FN double xml_text::as_double(double def) const - { - xml_node_struct* d = _data(); - - return (d && d->value) ? impl::get_value_double(d->value) : def; - } - - PUGI__FN float xml_text::as_float(float def) const - { - xml_node_struct* d = _data(); - - return (d && d->value) ? impl::get_value_float(d->value) : def; - } - - PUGI__FN bool xml_text::as_bool(bool def) const - { - xml_node_struct* d = _data(); - - return (d && d->value) ? impl::get_value_bool(d->value) : def; - } - -#ifdef PUGIXML_HAS_LONG_LONG - PUGI__FN long long xml_text::as_llong(long long def) const - { - xml_node_struct* d = _data(); - - return (d && d->value) ? impl::get_value_llong(d->value) : def; - } - - PUGI__FN unsigned long long xml_text::as_ullong(unsigned long long def) const - { - xml_node_struct* d = _data(); - - return (d && d->value) ? impl::get_value_ullong(d->value) : def; - } -#endif - - PUGI__FN bool xml_text::set(const char_t* rhs) - { - xml_node_struct* dn = _data_new(); - - return dn ? impl::strcpy_insitu(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, impl::strlength(rhs)) : false; - } - - PUGI__FN bool xml_text::set(int rhs) - { - xml_node_struct* dn = _data_new(); - - return dn ? impl::set_value_integer(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0) : false; - } - - PUGI__FN bool xml_text::set(unsigned int rhs) - { - xml_node_struct* dn = _data_new(); - - return dn ? impl::set_value_integer(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, false) : false; - } - - PUGI__FN bool xml_text::set(long rhs) - { - xml_node_struct* dn = _data_new(); - - return dn ? impl::set_value_integer(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0) : false; - } - - PUGI__FN bool xml_text::set(unsigned long rhs) - { - xml_node_struct* dn = _data_new(); - - return dn ? impl::set_value_integer(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, false) : false; - } - - PUGI__FN bool xml_text::set(float rhs) - { - xml_node_struct* dn = _data_new(); - - return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs) : false; - } - - PUGI__FN bool xml_text::set(double rhs) - { - xml_node_struct* dn = _data_new(); - - return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs) : false; - } - - PUGI__FN bool xml_text::set(bool rhs) - { - xml_node_struct* dn = _data_new(); - - return dn ? impl::set_value_bool(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs) : false; - } - -#ifdef PUGIXML_HAS_LONG_LONG - PUGI__FN bool xml_text::set(long long rhs) - { - xml_node_struct* dn = _data_new(); - - return dn ? impl::set_value_integer(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0) : false; - } - - PUGI__FN bool xml_text::set(unsigned long long rhs) - { - xml_node_struct* dn = _data_new(); - - return dn ? impl::set_value_integer(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, false) : false; - } -#endif - - PUGI__FN xml_text& xml_text::operator=(const char_t* rhs) - { - set(rhs); - return *this; - } - - PUGI__FN xml_text& xml_text::operator=(int rhs) - { - set(rhs); - return *this; - } - - PUGI__FN xml_text& xml_text::operator=(unsigned int rhs) - { - set(rhs); - return *this; - } - - PUGI__FN xml_text& xml_text::operator=(long rhs) - { - set(rhs); - return *this; - } - - PUGI__FN xml_text& xml_text::operator=(unsigned long rhs) - { - set(rhs); - return *this; - } - - PUGI__FN xml_text& xml_text::operator=(double rhs) - { - set(rhs); - return *this; - } - - PUGI__FN xml_text& xml_text::operator=(float rhs) - { - set(rhs); - return *this; - } - - PUGI__FN xml_text& xml_text::operator=(bool rhs) - { - set(rhs); - return *this; - } - -#ifdef PUGIXML_HAS_LONG_LONG - PUGI__FN xml_text& xml_text::operator=(long long rhs) - { - set(rhs); - return *this; - } - - PUGI__FN xml_text& xml_text::operator=(unsigned long long rhs) - { - set(rhs); - return *this; - } -#endif - - PUGI__FN xml_node xml_text::data() const - { - return xml_node(_data()); - } - -#ifdef __BORLANDC__ - PUGI__FN bool operator&&(const xml_text& lhs, bool rhs) - { - return (bool)lhs && rhs; - } - - PUGI__FN bool operator||(const xml_text& lhs, bool rhs) - { - return (bool)lhs || rhs; - } -#endif - - PUGI__FN xml_node_iterator::xml_node_iterator() - { - } - - PUGI__FN xml_node_iterator::xml_node_iterator(const xml_node& node): _wrap(node), _parent(node.parent()) - { - } - - PUGI__FN xml_node_iterator::xml_node_iterator(xml_node_struct* ref, xml_node_struct* parent): _wrap(ref), _parent(parent) - { - } - - PUGI__FN bool xml_node_iterator::operator==(const xml_node_iterator& rhs) const - { - return _wrap._root == rhs._wrap._root && _parent._root == rhs._parent._root; - } - - PUGI__FN bool xml_node_iterator::operator!=(const xml_node_iterator& rhs) const - { - return _wrap._root != rhs._wrap._root || _parent._root != rhs._parent._root; - } - - PUGI__FN xml_node& xml_node_iterator::operator*() const - { - assert(_wrap._root); - return _wrap; - } - - PUGI__FN xml_node* xml_node_iterator::operator->() const - { - assert(_wrap._root); - return const_cast(&_wrap); // BCC5 workaround - } - - PUGI__FN const xml_node_iterator& xml_node_iterator::operator++() - { - assert(_wrap._root); - _wrap._root = _wrap._root->next_sibling; - return *this; - } - - PUGI__FN xml_node_iterator xml_node_iterator::operator++(int) - { - xml_node_iterator temp = *this; - ++*this; - return temp; - } - - PUGI__FN const xml_node_iterator& xml_node_iterator::operator--() - { - _wrap = _wrap._root ? _wrap.previous_sibling() : _parent.last_child(); - return *this; - } - - PUGI__FN xml_node_iterator xml_node_iterator::operator--(int) - { - xml_node_iterator temp = *this; - --*this; - return temp; - } - - PUGI__FN xml_attribute_iterator::xml_attribute_iterator() - { - } - - PUGI__FN xml_attribute_iterator::xml_attribute_iterator(const xml_attribute& attr, const xml_node& parent): _wrap(attr), _parent(parent) - { - } - - PUGI__FN xml_attribute_iterator::xml_attribute_iterator(xml_attribute_struct* ref, xml_node_struct* parent): _wrap(ref), _parent(parent) - { - } - - PUGI__FN bool xml_attribute_iterator::operator==(const xml_attribute_iterator& rhs) const - { - return _wrap._attr == rhs._wrap._attr && _parent._root == rhs._parent._root; - } - - PUGI__FN bool xml_attribute_iterator::operator!=(const xml_attribute_iterator& rhs) const - { - return _wrap._attr != rhs._wrap._attr || _parent._root != rhs._parent._root; - } - - PUGI__FN xml_attribute& xml_attribute_iterator::operator*() const - { - assert(_wrap._attr); - return _wrap; - } - - PUGI__FN xml_attribute* xml_attribute_iterator::operator->() const - { - assert(_wrap._attr); - return const_cast(&_wrap); // BCC5 workaround - } - - PUGI__FN const xml_attribute_iterator& xml_attribute_iterator::operator++() - { - assert(_wrap._attr); - _wrap._attr = _wrap._attr->next_attribute; - return *this; - } - - PUGI__FN xml_attribute_iterator xml_attribute_iterator::operator++(int) - { - xml_attribute_iterator temp = *this; - ++*this; - return temp; - } - - PUGI__FN const xml_attribute_iterator& xml_attribute_iterator::operator--() - { - _wrap = _wrap._attr ? _wrap.previous_attribute() : _parent.last_attribute(); - return *this; - } - - PUGI__FN xml_attribute_iterator xml_attribute_iterator::operator--(int) - { - xml_attribute_iterator temp = *this; - --*this; - return temp; - } - - PUGI__FN xml_named_node_iterator::xml_named_node_iterator(): _name(0) - { - } - - PUGI__FN xml_named_node_iterator::xml_named_node_iterator(const xml_node& node, const char_t* name): _wrap(node), _parent(node.parent()), _name(name) - { - } - - PUGI__FN xml_named_node_iterator::xml_named_node_iterator(xml_node_struct* ref, xml_node_struct* parent, const char_t* name): _wrap(ref), _parent(parent), _name(name) - { - } - - PUGI__FN bool xml_named_node_iterator::operator==(const xml_named_node_iterator& rhs) const - { - return _wrap._root == rhs._wrap._root && _parent._root == rhs._parent._root; - } - - PUGI__FN bool xml_named_node_iterator::operator!=(const xml_named_node_iterator& rhs) const - { - return _wrap._root != rhs._wrap._root || _parent._root != rhs._parent._root; - } - - PUGI__FN xml_node& xml_named_node_iterator::operator*() const - { - assert(_wrap._root); - return _wrap; - } - - PUGI__FN xml_node* xml_named_node_iterator::operator->() const - { - assert(_wrap._root); - return const_cast(&_wrap); // BCC5 workaround - } - - PUGI__FN const xml_named_node_iterator& xml_named_node_iterator::operator++() - { - assert(_wrap._root); - _wrap = _wrap.next_sibling(_name); - return *this; - } - - PUGI__FN xml_named_node_iterator xml_named_node_iterator::operator++(int) - { - xml_named_node_iterator temp = *this; - ++*this; - return temp; - } - - PUGI__FN const xml_named_node_iterator& xml_named_node_iterator::operator--() - { - if (_wrap._root) - _wrap = _wrap.previous_sibling(_name); - else - { - _wrap = _parent.last_child(); - - if (!impl::strequal(_wrap.name(), _name)) - _wrap = _wrap.previous_sibling(_name); - } - - return *this; - } - - PUGI__FN xml_named_node_iterator xml_named_node_iterator::operator--(int) - { - xml_named_node_iterator temp = *this; - --*this; - return temp; - } - - PUGI__FN xml_parse_result::xml_parse_result(): status(status_internal_error), offset(0), encoding(encoding_auto) - { - } - - PUGI__FN xml_parse_result::operator bool() const - { - return status == status_ok; - } - - PUGI__FN const char* xml_parse_result::description() const - { - switch (status) - { - case status_ok: return "No error"; - - case status_file_not_found: return "File was not found"; - case status_io_error: return "Error reading from file/stream"; - case status_out_of_memory: return "Could not allocate memory"; - case status_internal_error: return "Internal error occurred"; - - case status_unrecognized_tag: return "Could not determine tag type"; - - case status_bad_pi: return "Error parsing document declaration/processing instruction"; - case status_bad_comment: return "Error parsing comment"; - case status_bad_cdata: return "Error parsing CDATA section"; - case status_bad_doctype: return "Error parsing document type declaration"; - case status_bad_pcdata: return "Error parsing PCDATA section"; - case status_bad_start_element: return "Error parsing start element tag"; - case status_bad_attribute: return "Error parsing element attribute"; - case status_bad_end_element: return "Error parsing end element tag"; - case status_end_element_mismatch: return "Start-end tags mismatch"; - - case status_append_invalid_root: return "Unable to append nodes: root is not an element or document"; - - case status_no_document_element: return "No document element found"; - - default: return "Unknown error"; - } - } - - PUGI__FN xml_document::xml_document(): _buffer(0) - { - _create(); - } - - PUGI__FN xml_document::~xml_document() - { - _destroy(); - } - -#ifdef PUGIXML_HAS_MOVE - PUGI__FN xml_document::xml_document(xml_document&& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT: _buffer(0) - { - _create(); - _move(rhs); - } - - PUGI__FN xml_document& xml_document::operator=(xml_document&& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT - { - if (this == &rhs) return *this; - - _destroy(); - _create(); - _move(rhs); - - return *this; - } -#endif - - PUGI__FN void xml_document::reset() - { - _destroy(); - _create(); - } - - PUGI__FN void xml_document::reset(const xml_document& proto) - { - reset(); - - for (xml_node cur = proto.first_child(); cur; cur = cur.next_sibling()) - append_copy(cur); - } - - PUGI__FN void xml_document::_create() - { - assert(!_root); - - #ifdef PUGIXML_COMPACT - // space for page marker for the first page (uint32_t), rounded up to pointer size; assumes pointers are at least 32-bit - const size_t page_offset = sizeof(void*); - #else - const size_t page_offset = 0; - #endif - - // initialize sentinel page - PUGI__STATIC_ASSERT(sizeof(impl::xml_memory_page) + sizeof(impl::xml_document_struct) + page_offset <= sizeof(_memory)); - - // prepare page structure - impl::xml_memory_page* page = impl::xml_memory_page::construct(_memory); - assert(page); - - page->busy_size = impl::xml_memory_page_size; - - // setup first page marker - #ifdef PUGIXML_COMPACT - // round-trip through void* to avoid 'cast increases required alignment of target type' warning - page->compact_page_marker = reinterpret_cast(static_cast(reinterpret_cast(page) + sizeof(impl::xml_memory_page))); - *page->compact_page_marker = sizeof(impl::xml_memory_page); - #endif - - // allocate new root - _root = new (reinterpret_cast(page) + sizeof(impl::xml_memory_page) + page_offset) impl::xml_document_struct(page); - _root->prev_sibling_c = _root; - - // setup sentinel page - page->allocator = static_cast(_root); - - // setup hash table pointer in allocator - #ifdef PUGIXML_COMPACT - page->allocator->_hash = &static_cast(_root)->hash; - #endif - - // verify the document allocation - assert(reinterpret_cast(_root) + sizeof(impl::xml_document_struct) <= _memory + sizeof(_memory)); - } - - PUGI__FN void xml_document::_destroy() - { - assert(_root); - - // destroy static storage - if (_buffer) - { - impl::xml_memory::deallocate(_buffer); - _buffer = 0; - } - - // destroy extra buffers (note: no need to destroy linked list nodes, they're allocated using document allocator) - for (impl::xml_extra_buffer* extra = static_cast(_root)->extra_buffers; extra; extra = extra->next) - { - if (extra->buffer) impl::xml_memory::deallocate(extra->buffer); - } - - // destroy dynamic storage, leave sentinel page (it's in static memory) - impl::xml_memory_page* root_page = PUGI__GETPAGE(_root); - assert(root_page && !root_page->prev); - assert(reinterpret_cast(root_page) >= _memory && reinterpret_cast(root_page) < _memory + sizeof(_memory)); - - for (impl::xml_memory_page* page = root_page->next; page; ) - { - impl::xml_memory_page* next = page->next; - - impl::xml_allocator::deallocate_page(page); - - page = next; - } - - #ifdef PUGIXML_COMPACT - // destroy hash table - static_cast(_root)->hash.clear(); - #endif - - _root = 0; - } - -#ifdef PUGIXML_HAS_MOVE - PUGI__FN void xml_document::_move(xml_document& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT - { - impl::xml_document_struct* doc = static_cast(_root); - impl::xml_document_struct* other = static_cast(rhs._root); - - // save first child pointer for later; this needs hash access - xml_node_struct* other_first_child = other->first_child; - - #ifdef PUGIXML_COMPACT - // reserve space for the hash table up front; this is the only operation that can fail - // if it does, we have no choice but to throw (if we have exceptions) - if (other_first_child) - { - size_t other_children = 0; - for (xml_node_struct* node = other_first_child; node; node = node->next_sibling) - other_children++; - - // in compact mode, each pointer assignment could result in a hash table request - // during move, we have to relocate document first_child and parents of all children - // normally there's just one child and its parent has a pointerless encoding but - // we assume the worst here - if (!other->_hash->reserve(other_children + 1)) - { - #ifdef PUGIXML_NO_EXCEPTIONS - return; - #else - throw std::bad_alloc(); - #endif - } - } - #endif - - // move allocation state - doc->_root = other->_root; - doc->_busy_size = other->_busy_size; - - // move buffer state - doc->buffer = other->buffer; - doc->extra_buffers = other->extra_buffers; - _buffer = rhs._buffer; - - #ifdef PUGIXML_COMPACT - // move compact hash; note that the hash table can have pointers to other but they will be "inactive", similarly to nodes removed with remove_child - doc->hash = other->hash; - doc->_hash = &doc->hash; - - // make sure we don't access other hash up until the end when we reinitialize other document - other->_hash = 0; - #endif - - // move page structure - impl::xml_memory_page* doc_page = PUGI__GETPAGE(doc); - assert(doc_page && !doc_page->prev && !doc_page->next); - - impl::xml_memory_page* other_page = PUGI__GETPAGE(other); - assert(other_page && !other_page->prev); - - // relink pages since root page is embedded into xml_document - if (impl::xml_memory_page* page = other_page->next) - { - assert(page->prev == other_page); - - page->prev = doc_page; - - doc_page->next = page; - other_page->next = 0; - } - - // make sure pages point to the correct document state - for (impl::xml_memory_page* page = doc_page->next; page; page = page->next) - { - assert(page->allocator == other); - - page->allocator = doc; - - #ifdef PUGIXML_COMPACT - // this automatically migrates most children between documents and prevents ->parent assignment from allocating - if (page->compact_shared_parent == other) - page->compact_shared_parent = doc; - #endif - } - - // move tree structure - assert(!doc->first_child); - - doc->first_child = other_first_child; - - for (xml_node_struct* node = other_first_child; node; node = node->next_sibling) - { - #ifdef PUGIXML_COMPACT - // most children will have migrated when we reassigned compact_shared_parent - assert(node->parent == other || node->parent == doc); - - node->parent = doc; - #else - assert(node->parent == other); - node->parent = doc; - #endif - } - - // reset other document - new (other) impl::xml_document_struct(PUGI__GETPAGE(other)); - rhs._buffer = 0; - } -#endif - -#ifndef PUGIXML_NO_STL - PUGI__FN xml_parse_result xml_document::load(std::basic_istream >& stream, unsigned int options, xml_encoding encoding) - { - reset(); - - return impl::load_stream_impl(static_cast(_root), stream, options, encoding, &_buffer); - } - - PUGI__FN xml_parse_result xml_document::load(std::basic_istream >& stream, unsigned int options) - { - reset(); - - return impl::load_stream_impl(static_cast(_root), stream, options, encoding_wchar, &_buffer); - } -#endif - - PUGI__FN xml_parse_result xml_document::load_string(const char_t* contents, unsigned int options) - { - // Force native encoding (skip autodetection) - #ifdef PUGIXML_WCHAR_MODE - xml_encoding encoding = encoding_wchar; - #else - xml_encoding encoding = encoding_utf8; - #endif - - return load_buffer(contents, impl::strlength(contents) * sizeof(char_t), options, encoding); - } - - PUGI__FN xml_parse_result xml_document::load(const char_t* contents, unsigned int options) - { - return load_string(contents, options); - } - - PUGI__FN xml_parse_result xml_document::load_file(const char* path_, unsigned int options, xml_encoding encoding) - { - reset(); - - using impl::auto_deleter; // MSVC7 workaround - auto_deleter file(fopen(path_, "rb"), impl::close_file); - - return impl::load_file_impl(static_cast(_root), file.data, options, encoding, &_buffer); - } - - PUGI__FN xml_parse_result xml_document::load_file(const wchar_t* path_, unsigned int options, xml_encoding encoding) - { - reset(); - - using impl::auto_deleter; // MSVC7 workaround - auto_deleter file(impl::open_file_wide(path_, L"rb"), impl::close_file); - - return impl::load_file_impl(static_cast(_root), file.data, options, encoding, &_buffer); - } - - PUGI__FN xml_parse_result xml_document::load_buffer(const void* contents, size_t size, unsigned int options, xml_encoding encoding) - { - reset(); - - return impl::load_buffer_impl(static_cast(_root), _root, const_cast(contents), size, options, encoding, false, false, &_buffer); - } - - PUGI__FN xml_parse_result xml_document::load_buffer_inplace(void* contents, size_t size, unsigned int options, xml_encoding encoding) - { - reset(); - - return impl::load_buffer_impl(static_cast(_root), _root, contents, size, options, encoding, true, false, &_buffer); - } - - PUGI__FN xml_parse_result xml_document::load_buffer_inplace_own(void* contents, size_t size, unsigned int options, xml_encoding encoding) - { - reset(); - - return impl::load_buffer_impl(static_cast(_root), _root, contents, size, options, encoding, true, true, &_buffer); - } - - PUGI__FN void xml_document::save(xml_writer& writer, const char_t* indent, unsigned int flags, xml_encoding encoding) const - { - impl::xml_buffered_writer buffered_writer(writer, encoding); - - if ((flags & format_write_bom) && encoding != encoding_latin1) - { - // BOM always represents the codepoint U+FEFF, so just write it in native encoding - #ifdef PUGIXML_WCHAR_MODE - unsigned int bom = 0xfeff; - buffered_writer.write(static_cast(bom)); - #else - buffered_writer.write('\xef', '\xbb', '\xbf'); - #endif - } - - if (!(flags & format_no_declaration) && !impl::has_declaration(_root)) - { - buffered_writer.write_string(PUGIXML_TEXT("'); - if (!(flags & format_raw)) buffered_writer.write('\n'); - } - - impl::node_output(buffered_writer, _root, indent, flags, 0); - - buffered_writer.flush(); - } - -#ifndef PUGIXML_NO_STL - PUGI__FN void xml_document::save(std::basic_ostream >& stream, const char_t* indent, unsigned int flags, xml_encoding encoding) const - { - xml_writer_stream writer(stream); - - save(writer, indent, flags, encoding); - } - - PUGI__FN void xml_document::save(std::basic_ostream >& stream, const char_t* indent, unsigned int flags) const - { - xml_writer_stream writer(stream); - - save(writer, indent, flags, encoding_wchar); - } -#endif - - PUGI__FN bool xml_document::save_file(const char* path_, const char_t* indent, unsigned int flags, xml_encoding encoding) const - { - using impl::auto_deleter; // MSVC7 workaround - auto_deleter file(fopen(path_, (flags & format_save_file_text) ? "w" : "wb"), impl::close_file); - - return impl::save_file_impl(*this, file.data, indent, flags, encoding); - } - - PUGI__FN bool xml_document::save_file(const wchar_t* path_, const char_t* indent, unsigned int flags, xml_encoding encoding) const - { - using impl::auto_deleter; // MSVC7 workaround - auto_deleter file(impl::open_file_wide(path_, (flags & format_save_file_text) ? L"w" : L"wb"), impl::close_file); - - return impl::save_file_impl(*this, file.data, indent, flags, encoding); - } - - PUGI__FN xml_node xml_document::document_element() const - { - assert(_root); - - for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling) - if (PUGI__NODETYPE(i) == node_element) - return xml_node(i); - - return xml_node(); - } - -#ifndef PUGIXML_NO_STL - PUGI__FN std::string PUGIXML_FUNCTION as_utf8(const wchar_t* str) - { - assert(str); - - return impl::as_utf8_impl(str, impl::strlength_wide(str)); - } - - PUGI__FN std::string PUGIXML_FUNCTION as_utf8(const std::basic_string& str) - { - return impl::as_utf8_impl(str.c_str(), str.size()); - } - - PUGI__FN std::basic_string PUGIXML_FUNCTION as_wide(const char* str) - { - assert(str); - - return impl::as_wide_impl(str, strlen(str)); - } - - PUGI__FN std::basic_string PUGIXML_FUNCTION as_wide(const std::string& str) - { - return impl::as_wide_impl(str.c_str(), str.size()); - } -#endif - - PUGI__FN void PUGIXML_FUNCTION set_memory_management_functions(allocation_function allocate, deallocation_function deallocate) - { - impl::xml_memory::allocate = allocate; - impl::xml_memory::deallocate = deallocate; - } - - PUGI__FN allocation_function PUGIXML_FUNCTION get_memory_allocation_function() - { - return impl::xml_memory::allocate; - } - - PUGI__FN deallocation_function PUGIXML_FUNCTION get_memory_deallocation_function() - { - return impl::xml_memory::deallocate; - } -} - -#if !defined(PUGIXML_NO_STL) && (defined(_MSC_VER) || defined(__ICC)) -namespace std -{ - // Workarounds for (non-standard) iterator category detection for older versions (MSVC7/IC8 and earlier) - PUGI__FN std::bidirectional_iterator_tag _Iter_cat(const pugi::xml_node_iterator&) - { - return std::bidirectional_iterator_tag(); - } - - PUGI__FN std::bidirectional_iterator_tag _Iter_cat(const pugi::xml_attribute_iterator&) - { - return std::bidirectional_iterator_tag(); - } - - PUGI__FN std::bidirectional_iterator_tag _Iter_cat(const pugi::xml_named_node_iterator&) - { - return std::bidirectional_iterator_tag(); - } -} -#endif - -#if !defined(PUGIXML_NO_STL) && defined(__SUNPRO_CC) -namespace std -{ - // Workarounds for (non-standard) iterator category detection - PUGI__FN std::bidirectional_iterator_tag __iterator_category(const pugi::xml_node_iterator&) - { - return std::bidirectional_iterator_tag(); - } - - PUGI__FN std::bidirectional_iterator_tag __iterator_category(const pugi::xml_attribute_iterator&) - { - return std::bidirectional_iterator_tag(); - } - - PUGI__FN std::bidirectional_iterator_tag __iterator_category(const pugi::xml_named_node_iterator&) - { - return std::bidirectional_iterator_tag(); - } -} -#endif - -#ifndef PUGIXML_NO_XPATH -// STL replacements -PUGI__NS_BEGIN - struct equal_to - { - template bool operator()(const T& lhs, const T& rhs) const - { - return lhs == rhs; - } - }; - - struct not_equal_to - { - template bool operator()(const T& lhs, const T& rhs) const - { - return lhs != rhs; - } - }; - - struct less - { - template bool operator()(const T& lhs, const T& rhs) const - { - return lhs < rhs; - } - }; - - struct less_equal - { - template bool operator()(const T& lhs, const T& rhs) const - { - return lhs <= rhs; - } - }; - - template void swap(T& lhs, T& rhs) - { - T temp = lhs; - lhs = rhs; - rhs = temp; - } - - template I min_element(I begin, I end, const Pred& pred) - { - I result = begin; - - for (I it = begin + 1; it != end; ++it) - if (pred(*it, *result)) - result = it; - - return result; - } - - template void reverse(I begin, I end) - { - while (end - begin > 1) swap(*begin++, *--end); - } - - template I unique(I begin, I end) - { - // fast skip head - while (end - begin > 1 && *begin != *(begin + 1)) begin++; - - if (begin == end) return begin; - - // last written element - I write = begin++; - - // merge unique elements - while (begin != end) - { - if (*begin != *write) - *++write = *begin++; - else - begin++; - } - - // past-the-end (write points to live element) - return write + 1; - } - - template void insertion_sort(T* begin, T* end, const Pred& pred) - { - if (begin == end) - return; - - for (T* it = begin + 1; it != end; ++it) - { - T val = *it; - T* hole = it; - - // move hole backwards - while (hole > begin && pred(val, *(hole - 1))) - { - *hole = *(hole - 1); - hole--; - } - - // fill hole with element - *hole = val; - } - } - - template I median3(I first, I middle, I last, const Pred& pred) - { - if (pred(*middle, *first)) swap(middle, first); - if (pred(*last, *middle)) swap(last, middle); - if (pred(*middle, *first)) swap(middle, first); - - return middle; - } - - template void partition3(T* begin, T* end, T pivot, const Pred& pred, T** out_eqbeg, T** out_eqend) - { - // invariant: array is split into 4 groups: = < ? > (each variable denotes the boundary between the groups) - T* eq = begin; - T* lt = begin; - T* gt = end; - - while (lt < gt) - { - if (pred(*lt, pivot)) - lt++; - else if (*lt == pivot) - swap(*eq++, *lt++); - else - swap(*lt, *--gt); - } - - // we now have just 4 groups: = < >; move equal elements to the middle - T* eqbeg = gt; - - for (T* it = begin; it != eq; ++it) - swap(*it, *--eqbeg); - - *out_eqbeg = eqbeg; - *out_eqend = gt; - } - - template void sort(I begin, I end, const Pred& pred) - { - // sort large chunks - while (end - begin > 16) - { - // find median element - I middle = begin + (end - begin) / 2; - I median = median3(begin, middle, end - 1, pred); - - // partition in three chunks (< = >) - I eqbeg, eqend; - partition3(begin, end, *median, pred, &eqbeg, &eqend); - - // loop on larger half - if (eqbeg - begin > end - eqend) - { - sort(eqend, end, pred); - end = eqbeg; - } - else - { - sort(begin, eqbeg, pred); - begin = eqend; - } - } - - // insertion sort small chunk - insertion_sort(begin, end, pred); - } -PUGI__NS_END - -// Allocator used for AST and evaluation stacks -PUGI__NS_BEGIN - static const size_t xpath_memory_page_size = - #ifdef PUGIXML_MEMORY_XPATH_PAGE_SIZE - PUGIXML_MEMORY_XPATH_PAGE_SIZE - #else - 4096 - #endif - ; - - static const uintptr_t xpath_memory_block_alignment = sizeof(double) > sizeof(void*) ? sizeof(double) : sizeof(void*); - - struct xpath_memory_block - { - xpath_memory_block* next; - size_t capacity; - - union - { - char data[xpath_memory_page_size]; - double alignment; - }; - }; - - struct xpath_allocator - { - xpath_memory_block* _root; - size_t _root_size; - bool* _error; - - xpath_allocator(xpath_memory_block* root, bool* error = 0): _root(root), _root_size(0), _error(error) - { - } - - void* allocate(size_t size) - { - // round size up to block alignment boundary - size = (size + xpath_memory_block_alignment - 1) & ~(xpath_memory_block_alignment - 1); - - if (_root_size + size <= _root->capacity) - { - void* buf = &_root->data[0] + _root_size; - _root_size += size; - return buf; - } - else - { - // make sure we have at least 1/4th of the page free after allocation to satisfy subsequent allocation requests - size_t block_capacity_base = sizeof(_root->data); - size_t block_capacity_req = size + block_capacity_base / 4; - size_t block_capacity = (block_capacity_base > block_capacity_req) ? block_capacity_base : block_capacity_req; - - size_t block_size = block_capacity + offsetof(xpath_memory_block, data); - - xpath_memory_block* block = static_cast(xml_memory::allocate(block_size)); - if (!block) - { - if (_error) *_error = true; - return 0; - } - - block->next = _root; - block->capacity = block_capacity; - - _root = block; - _root_size = size; - - return block->data; - } - } - - void* reallocate(void* ptr, size_t old_size, size_t new_size) - { - // round size up to block alignment boundary - old_size = (old_size + xpath_memory_block_alignment - 1) & ~(xpath_memory_block_alignment - 1); - new_size = (new_size + xpath_memory_block_alignment - 1) & ~(xpath_memory_block_alignment - 1); - - // we can only reallocate the last object - assert(ptr == 0 || static_cast(ptr) + old_size == &_root->data[0] + _root_size); - - // try to reallocate the object inplace - if (ptr && _root_size - old_size + new_size <= _root->capacity) - { - _root_size = _root_size - old_size + new_size; - return ptr; - } - - // allocate a new block - void* result = allocate(new_size); - if (!result) return 0; - - // we have a new block - if (ptr) - { - // copy old data (we only support growing) - assert(new_size >= old_size); - memcpy(result, ptr, old_size); - - // free the previous page if it had no other objects - assert(_root->data == result); - assert(_root->next); - - if (_root->next->data == ptr) - { - // deallocate the whole page, unless it was the first one - xpath_memory_block* next = _root->next->next; - - if (next) - { - xml_memory::deallocate(_root->next); - _root->next = next; - } - } - } - - return result; - } - - void revert(const xpath_allocator& state) - { - // free all new pages - xpath_memory_block* cur = _root; - - while (cur != state._root) - { - xpath_memory_block* next = cur->next; - - xml_memory::deallocate(cur); - - cur = next; - } - - // restore state - _root = state._root; - _root_size = state._root_size; - } - - void release() - { - xpath_memory_block* cur = _root; - assert(cur); - - while (cur->next) - { - xpath_memory_block* next = cur->next; - - xml_memory::deallocate(cur); - - cur = next; - } - } - }; - - struct xpath_allocator_capture - { - xpath_allocator_capture(xpath_allocator* alloc): _target(alloc), _state(*alloc) - { - } - - ~xpath_allocator_capture() - { - _target->revert(_state); - } - - xpath_allocator* _target; - xpath_allocator _state; - }; - - struct xpath_stack - { - xpath_allocator* result; - xpath_allocator* temp; - }; - - struct xpath_stack_data - { - xpath_memory_block blocks[2]; - xpath_allocator result; - xpath_allocator temp; - xpath_stack stack; - bool oom; - - xpath_stack_data(): result(blocks + 0, &oom), temp(blocks + 1, &oom), oom(false) - { - blocks[0].next = blocks[1].next = 0; - blocks[0].capacity = blocks[1].capacity = sizeof(blocks[0].data); - - stack.result = &result; - stack.temp = &temp; - } - - ~xpath_stack_data() - { - result.release(); - temp.release(); - } - }; -PUGI__NS_END - -// String class -PUGI__NS_BEGIN - class xpath_string - { - const char_t* _buffer; - bool _uses_heap; - size_t _length_heap; - - static char_t* duplicate_string(const char_t* string, size_t length, xpath_allocator* alloc) - { - char_t* result = static_cast(alloc->allocate((length + 1) * sizeof(char_t))); - if (!result) return 0; - - memcpy(result, string, length * sizeof(char_t)); - result[length] = 0; - - return result; - } - - xpath_string(const char_t* buffer, bool uses_heap_, size_t length_heap): _buffer(buffer), _uses_heap(uses_heap_), _length_heap(length_heap) - { - } - - public: - static xpath_string from_const(const char_t* str) - { - return xpath_string(str, false, 0); - } - - static xpath_string from_heap_preallocated(const char_t* begin, const char_t* end) - { - assert(begin <= end && *end == 0); - - return xpath_string(begin, true, static_cast(end - begin)); - } - - static xpath_string from_heap(const char_t* begin, const char_t* end, xpath_allocator* alloc) - { - assert(begin <= end); - - if (begin == end) - return xpath_string(); - - size_t length = static_cast(end - begin); - const char_t* data = duplicate_string(begin, length, alloc); - - return data ? xpath_string(data, true, length) : xpath_string(); - } - - xpath_string(): _buffer(PUGIXML_TEXT("")), _uses_heap(false), _length_heap(0) - { - } - - void append(const xpath_string& o, xpath_allocator* alloc) - { - // skip empty sources - if (!*o._buffer) return; - - // fast append for constant empty target and constant source - if (!*_buffer && !_uses_heap && !o._uses_heap) - { - _buffer = o._buffer; - } - else - { - // need to make heap copy - size_t target_length = length(); - size_t source_length = o.length(); - size_t result_length = target_length + source_length; - - // allocate new buffer - char_t* result = static_cast(alloc->reallocate(_uses_heap ? const_cast(_buffer) : 0, (target_length + 1) * sizeof(char_t), (result_length + 1) * sizeof(char_t))); - if (!result) return; - - // append first string to the new buffer in case there was no reallocation - if (!_uses_heap) memcpy(result, _buffer, target_length * sizeof(char_t)); - - // append second string to the new buffer - memcpy(result + target_length, o._buffer, source_length * sizeof(char_t)); - result[result_length] = 0; - - // finalize - _buffer = result; - _uses_heap = true; - _length_heap = result_length; - } - } - - const char_t* c_str() const - { - return _buffer; - } - - size_t length() const - { - return _uses_heap ? _length_heap : strlength(_buffer); - } - - char_t* data(xpath_allocator* alloc) - { - // make private heap copy - if (!_uses_heap) - { - size_t length_ = strlength(_buffer); - const char_t* data_ = duplicate_string(_buffer, length_, alloc); - - if (!data_) return 0; - - _buffer = data_; - _uses_heap = true; - _length_heap = length_; - } - - return const_cast(_buffer); - } - - bool empty() const - { - return *_buffer == 0; - } - - bool operator==(const xpath_string& o) const - { - return strequal(_buffer, o._buffer); - } - - bool operator!=(const xpath_string& o) const - { - return !strequal(_buffer, o._buffer); - } - - bool uses_heap() const - { - return _uses_heap; - } - }; -PUGI__NS_END - -PUGI__NS_BEGIN - PUGI__FN bool starts_with(const char_t* string, const char_t* pattern) - { - while (*pattern && *string == *pattern) - { - string++; - pattern++; - } - - return *pattern == 0; - } - - PUGI__FN const char_t* find_char(const char_t* s, char_t c) - { - #ifdef PUGIXML_WCHAR_MODE - return wcschr(s, c); - #else - return strchr(s, c); - #endif - } - - PUGI__FN const char_t* find_substring(const char_t* s, const char_t* p) - { - #ifdef PUGIXML_WCHAR_MODE - // MSVC6 wcsstr bug workaround (if s is empty it always returns 0) - return (*p == 0) ? s : wcsstr(s, p); - #else - return strstr(s, p); - #endif - } - - // Converts symbol to lower case, if it is an ASCII one - PUGI__FN char_t tolower_ascii(char_t ch) - { - return static_cast(ch - 'A') < 26 ? static_cast(ch | ' ') : ch; - } - - PUGI__FN xpath_string string_value(const xpath_node& na, xpath_allocator* alloc) - { - if (na.attribute()) - return xpath_string::from_const(na.attribute().value()); - else - { - xml_node n = na.node(); - - switch (n.type()) - { - case node_pcdata: - case node_cdata: - case node_comment: - case node_pi: - return xpath_string::from_const(n.value()); - - case node_document: - case node_element: - { - xpath_string result; - - // element nodes can have value if parse_embed_pcdata was used - if (n.value()[0]) - result.append(xpath_string::from_const(n.value()), alloc); - - xml_node cur = n.first_child(); - - while (cur && cur != n) - { - if (cur.type() == node_pcdata || cur.type() == node_cdata) - result.append(xpath_string::from_const(cur.value()), alloc); - - if (cur.first_child()) - cur = cur.first_child(); - else if (cur.next_sibling()) - cur = cur.next_sibling(); - else - { - while (!cur.next_sibling() && cur != n) - cur = cur.parent(); - - if (cur != n) cur = cur.next_sibling(); - } - } - - return result; - } - - default: - return xpath_string(); - } - } - } - - PUGI__FN bool node_is_before_sibling(xml_node_struct* ln, xml_node_struct* rn) - { - assert(ln->parent == rn->parent); - - // there is no common ancestor (the shared parent is null), nodes are from different documents - if (!ln->parent) return ln < rn; - - // determine sibling order - xml_node_struct* ls = ln; - xml_node_struct* rs = rn; - - while (ls && rs) - { - if (ls == rn) return true; - if (rs == ln) return false; - - ls = ls->next_sibling; - rs = rs->next_sibling; - } - - // if rn sibling chain ended ln must be before rn - return !rs; - } - - PUGI__FN bool node_is_before(xml_node_struct* ln, xml_node_struct* rn) - { - // find common ancestor at the same depth, if any - xml_node_struct* lp = ln; - xml_node_struct* rp = rn; - - while (lp && rp && lp->parent != rp->parent) - { - lp = lp->parent; - rp = rp->parent; - } - - // parents are the same! - if (lp && rp) return node_is_before_sibling(lp, rp); - - // nodes are at different depths, need to normalize heights - bool left_higher = !lp; - - while (lp) - { - lp = lp->parent; - ln = ln->parent; - } - - while (rp) - { - rp = rp->parent; - rn = rn->parent; - } - - // one node is the ancestor of the other - if (ln == rn) return left_higher; - - // find common ancestor... again - while (ln->parent != rn->parent) - { - ln = ln->parent; - rn = rn->parent; - } - - return node_is_before_sibling(ln, rn); - } - - PUGI__FN bool node_is_ancestor(xml_node_struct* parent, xml_node_struct* node) - { - while (node && node != parent) node = node->parent; - - return parent && node == parent; - } - - PUGI__FN const void* document_buffer_order(const xpath_node& xnode) - { - xml_node_struct* node = xnode.node().internal_object(); - - if (node) - { - if ((get_document(node).header & xml_memory_page_contents_shared_mask) == 0) - { - if (node->name && (node->header & impl::xml_memory_page_name_allocated_or_shared_mask) == 0) return node->name; - if (node->value && (node->header & impl::xml_memory_page_value_allocated_or_shared_mask) == 0) return node->value; - } - - return 0; - } - - xml_attribute_struct* attr = xnode.attribute().internal_object(); - - if (attr) - { - if ((get_document(attr).header & xml_memory_page_contents_shared_mask) == 0) - { - if ((attr->header & impl::xml_memory_page_name_allocated_or_shared_mask) == 0) return attr->name; - if ((attr->header & impl::xml_memory_page_value_allocated_or_shared_mask) == 0) return attr->value; - } - - return 0; - } - - return 0; - } - - struct document_order_comparator - { - bool operator()(const xpath_node& lhs, const xpath_node& rhs) const - { - // optimized document order based check - const void* lo = document_buffer_order(lhs); - const void* ro = document_buffer_order(rhs); - - if (lo && ro) return lo < ro; - - // slow comparison - xml_node ln = lhs.node(), rn = rhs.node(); - - // compare attributes - if (lhs.attribute() && rhs.attribute()) - { - // shared parent - if (lhs.parent() == rhs.parent()) - { - // determine sibling order - for (xml_attribute a = lhs.attribute(); a; a = a.next_attribute()) - if (a == rhs.attribute()) - return true; - - return false; - } - - // compare attribute parents - ln = lhs.parent(); - rn = rhs.parent(); - } - else if (lhs.attribute()) - { - // attributes go after the parent element - if (lhs.parent() == rhs.node()) return false; - - ln = lhs.parent(); - } - else if (rhs.attribute()) - { - // attributes go after the parent element - if (rhs.parent() == lhs.node()) return true; - - rn = rhs.parent(); - } - - if (ln == rn) return false; - - if (!ln || !rn) return ln < rn; - - return node_is_before(ln.internal_object(), rn.internal_object()); - } - }; - - struct duplicate_comparator - { - bool operator()(const xpath_node& lhs, const xpath_node& rhs) const - { - if (lhs.attribute()) return rhs.attribute() ? lhs.attribute() < rhs.attribute() : true; - else return rhs.attribute() ? false : lhs.node() < rhs.node(); - } - }; - - PUGI__FN double gen_nan() - { - #if defined(__STDC_IEC_559__) || ((FLT_RADIX - 0 == 2) && (FLT_MAX_EXP - 0 == 128) && (FLT_MANT_DIG - 0 == 24)) - PUGI__STATIC_ASSERT(sizeof(float) == sizeof(uint32_t)); - typedef uint32_t UI; // BCC5 workaround - union { float f; UI i; } u; - u.i = 0x7fc00000; - return u.f; - #else - // fallback - const volatile double zero = 0.0; - return zero / zero; - #endif - } - - PUGI__FN bool is_nan(double value) - { - #if defined(PUGI__MSVC_CRT_VERSION) || defined(__BORLANDC__) - return !!_isnan(value); - #elif defined(fpclassify) && defined(FP_NAN) - return fpclassify(value) == FP_NAN; - #else - // fallback - const volatile double v = value; - return v != v; - #endif - } - - PUGI__FN const char_t* convert_number_to_string_special(double value) - { - #if defined(PUGI__MSVC_CRT_VERSION) || defined(__BORLANDC__) - if (_finite(value)) return (value == 0) ? PUGIXML_TEXT("0") : 0; - if (_isnan(value)) return PUGIXML_TEXT("NaN"); - return value > 0 ? PUGIXML_TEXT("Infinity") : PUGIXML_TEXT("-Infinity"); - #elif defined(fpclassify) && defined(FP_NAN) && defined(FP_INFINITE) && defined(FP_ZERO) - switch (fpclassify(value)) - { - case FP_NAN: - return PUGIXML_TEXT("NaN"); - - case FP_INFINITE: - return value > 0 ? PUGIXML_TEXT("Infinity") : PUGIXML_TEXT("-Infinity"); - - case FP_ZERO: - return PUGIXML_TEXT("0"); - - default: - return 0; - } - #else - // fallback - const volatile double v = value; - - if (v == 0) return PUGIXML_TEXT("0"); - if (v != v) return PUGIXML_TEXT("NaN"); - if (v * 2 == v) return value > 0 ? PUGIXML_TEXT("Infinity") : PUGIXML_TEXT("-Infinity"); - return 0; - #endif - } - - PUGI__FN bool convert_number_to_boolean(double value) - { - return (value != 0 && !is_nan(value)); - } - - PUGI__FN void truncate_zeros(char* begin, char* end) - { - while (begin != end && end[-1] == '0') end--; - - *end = 0; - } - - // gets mantissa digits in the form of 0.xxxxx with 0. implied and the exponent -#if defined(PUGI__MSVC_CRT_VERSION) && PUGI__MSVC_CRT_VERSION >= 1400 && !defined(_WIN32_WCE) - PUGI__FN void convert_number_to_mantissa_exponent(double value, char (&buffer)[32], char** out_mantissa, int* out_exponent) - { - // get base values - int sign, exponent; - _ecvt_s(buffer, sizeof(buffer), value, DBL_DIG + 1, &exponent, &sign); - - // truncate redundant zeros - truncate_zeros(buffer, buffer + strlen(buffer)); - - // fill results - *out_mantissa = buffer; - *out_exponent = exponent; - } -#else - PUGI__FN void convert_number_to_mantissa_exponent(double value, char (&buffer)[32], char** out_mantissa, int* out_exponent) - { - // get a scientific notation value with IEEE DBL_DIG decimals - PUGI__SNPRINTF(buffer, "%.*e", DBL_DIG, value); - - // get the exponent (possibly negative) - char* exponent_string = strchr(buffer, 'e'); - assert(exponent_string); - - int exponent = atoi(exponent_string + 1); - - // extract mantissa string: skip sign - char* mantissa = buffer[0] == '-' ? buffer + 1 : buffer; - assert(mantissa[0] != '0' && mantissa[1] == '.'); - - // divide mantissa by 10 to eliminate integer part - mantissa[1] = mantissa[0]; - mantissa++; - exponent++; - - // remove extra mantissa digits and zero-terminate mantissa - truncate_zeros(mantissa, exponent_string); - - // fill results - *out_mantissa = mantissa; - *out_exponent = exponent; - } -#endif - - PUGI__FN xpath_string convert_number_to_string(double value, xpath_allocator* alloc) - { - // try special number conversion - const char_t* special = convert_number_to_string_special(value); - if (special) return xpath_string::from_const(special); - - // get mantissa + exponent form - char mantissa_buffer[32]; - - char* mantissa; - int exponent; - convert_number_to_mantissa_exponent(value, mantissa_buffer, &mantissa, &exponent); - - // allocate a buffer of suitable length for the number - size_t result_size = strlen(mantissa_buffer) + (exponent > 0 ? exponent : -exponent) + 4; - char_t* result = static_cast(alloc->allocate(sizeof(char_t) * result_size)); - if (!result) return xpath_string(); - - // make the number! - char_t* s = result; - - // sign - if (value < 0) *s++ = '-'; - - // integer part - if (exponent <= 0) - { - *s++ = '0'; - } - else - { - while (exponent > 0) - { - assert(*mantissa == 0 || static_cast(*mantissa - '0') <= 9); - *s++ = *mantissa ? *mantissa++ : '0'; - exponent--; - } - } - - // fractional part - if (*mantissa) - { - // decimal point - *s++ = '.'; - - // extra zeroes from negative exponent - while (exponent < 0) - { - *s++ = '0'; - exponent++; - } - - // extra mantissa digits - while (*mantissa) - { - assert(static_cast(*mantissa - '0') <= 9); - *s++ = *mantissa++; - } - } - - // zero-terminate - assert(s < result + result_size); - *s = 0; - - return xpath_string::from_heap_preallocated(result, s); - } - - PUGI__FN bool check_string_to_number_format(const char_t* string) - { - // parse leading whitespace - while (PUGI__IS_CHARTYPE(*string, ct_space)) ++string; - - // parse sign - if (*string == '-') ++string; - - if (!*string) return false; - - // if there is no integer part, there should be a decimal part with at least one digit - if (!PUGI__IS_CHARTYPEX(string[0], ctx_digit) && (string[0] != '.' || !PUGI__IS_CHARTYPEX(string[1], ctx_digit))) return false; - - // parse integer part - while (PUGI__IS_CHARTYPEX(*string, ctx_digit)) ++string; - - // parse decimal part - if (*string == '.') - { - ++string; - - while (PUGI__IS_CHARTYPEX(*string, ctx_digit)) ++string; - } - - // parse trailing whitespace - while (PUGI__IS_CHARTYPE(*string, ct_space)) ++string; - - return *string == 0; - } - - PUGI__FN double convert_string_to_number(const char_t* string) - { - // check string format - if (!check_string_to_number_format(string)) return gen_nan(); - - // parse string - #ifdef PUGIXML_WCHAR_MODE - return wcstod(string, 0); - #else - return strtod(string, 0); - #endif - } - - PUGI__FN bool convert_string_to_number_scratch(char_t (&buffer)[32], const char_t* begin, const char_t* end, double* out_result) - { - size_t length = static_cast(end - begin); - char_t* scratch = buffer; - - if (length >= sizeof(buffer) / sizeof(buffer[0])) - { - // need to make dummy on-heap copy - scratch = static_cast(xml_memory::allocate((length + 1) * sizeof(char_t))); - if (!scratch) return false; - } - - // copy string to zero-terminated buffer and perform conversion - memcpy(scratch, begin, length * sizeof(char_t)); - scratch[length] = 0; - - *out_result = convert_string_to_number(scratch); - - // free dummy buffer - if (scratch != buffer) xml_memory::deallocate(scratch); - - return true; - } - - PUGI__FN double round_nearest(double value) - { - return floor(value + 0.5); - } - - PUGI__FN double round_nearest_nzero(double value) - { - // same as round_nearest, but returns -0 for [-0.5, -0] - // ceil is used to differentiate between +0 and -0 (we return -0 for [-0.5, -0] and +0 for +0) - return (value >= -0.5 && value <= 0) ? ceil(value) : floor(value + 0.5); - } - - PUGI__FN const char_t* qualified_name(const xpath_node& node) - { - return node.attribute() ? node.attribute().name() : node.node().name(); - } - - PUGI__FN const char_t* local_name(const xpath_node& node) - { - const char_t* name = qualified_name(node); - const char_t* p = find_char(name, ':'); - - return p ? p + 1 : name; - } - - struct namespace_uri_predicate - { - const char_t* prefix; - size_t prefix_length; - - namespace_uri_predicate(const char_t* name) - { - const char_t* pos = find_char(name, ':'); - - prefix = pos ? name : 0; - prefix_length = pos ? static_cast(pos - name) : 0; - } - - bool operator()(xml_attribute a) const - { - const char_t* name = a.name(); - - if (!starts_with(name, PUGIXML_TEXT("xmlns"))) return false; - - return prefix ? name[5] == ':' && strequalrange(name + 6, prefix, prefix_length) : name[5] == 0; - } - }; - - PUGI__FN const char_t* namespace_uri(xml_node node) - { - namespace_uri_predicate pred = node.name(); - - xml_node p = node; - - while (p) - { - xml_attribute a = p.find_attribute(pred); - - if (a) return a.value(); - - p = p.parent(); - } - - return PUGIXML_TEXT(""); - } - - PUGI__FN const char_t* namespace_uri(xml_attribute attr, xml_node parent) - { - namespace_uri_predicate pred = attr.name(); - - // Default namespace does not apply to attributes - if (!pred.prefix) return PUGIXML_TEXT(""); - - xml_node p = parent; - - while (p) - { - xml_attribute a = p.find_attribute(pred); - - if (a) return a.value(); - - p = p.parent(); - } - - return PUGIXML_TEXT(""); - } - - PUGI__FN const char_t* namespace_uri(const xpath_node& node) - { - return node.attribute() ? namespace_uri(node.attribute(), node.parent()) : namespace_uri(node.node()); - } - - PUGI__FN char_t* normalize_space(char_t* buffer) - { - char_t* write = buffer; - - for (char_t* it = buffer; *it; ) - { - char_t ch = *it++; - - if (PUGI__IS_CHARTYPE(ch, ct_space)) - { - // replace whitespace sequence with single space - while (PUGI__IS_CHARTYPE(*it, ct_space)) it++; - - // avoid leading spaces - if (write != buffer) *write++ = ' '; - } - else *write++ = ch; - } - - // remove trailing space - if (write != buffer && PUGI__IS_CHARTYPE(write[-1], ct_space)) write--; - - // zero-terminate - *write = 0; - - return write; - } - - PUGI__FN char_t* translate(char_t* buffer, const char_t* from, const char_t* to, size_t to_length) - { - char_t* write = buffer; - - while (*buffer) - { - PUGI__DMC_VOLATILE char_t ch = *buffer++; - - const char_t* pos = find_char(from, ch); - - if (!pos) - *write++ = ch; // do not process - else if (static_cast(pos - from) < to_length) - *write++ = to[pos - from]; // replace - } - - // zero-terminate - *write = 0; - - return write; - } - - PUGI__FN unsigned char* translate_table_generate(xpath_allocator* alloc, const char_t* from, const char_t* to) - { - unsigned char table[128] = {0}; - - while (*from) - { - unsigned int fc = static_cast(*from); - unsigned int tc = static_cast(*to); - - if (fc >= 128 || tc >= 128) - return 0; - - // code=128 means "skip character" - if (!table[fc]) - table[fc] = static_cast(tc ? tc : 128); - - from++; - if (tc) to++; - } - - for (int i = 0; i < 128; ++i) - if (!table[i]) - table[i] = static_cast(i); - - void* result = alloc->allocate(sizeof(table)); - if (!result) return 0; - - memcpy(result, table, sizeof(table)); - - return static_cast(result); - } - - PUGI__FN char_t* translate_table(char_t* buffer, const unsigned char* table) - { - char_t* write = buffer; - - while (*buffer) - { - char_t ch = *buffer++; - unsigned int index = static_cast(ch); - - if (index < 128) - { - unsigned char code = table[index]; - - // code=128 means "skip character" (table size is 128 so 128 can be a special value) - // this code skips these characters without extra branches - *write = static_cast(code); - write += 1 - (code >> 7); - } - else - { - *write++ = ch; - } - } - - // zero-terminate - *write = 0; - - return write; - } - - inline bool is_xpath_attribute(const char_t* name) - { - return !(starts_with(name, PUGIXML_TEXT("xmlns")) && (name[5] == 0 || name[5] == ':')); - } - - struct xpath_variable_boolean: xpath_variable - { - xpath_variable_boolean(): xpath_variable(xpath_type_boolean), value(false) - { - } - - bool value; - char_t name[1]; - }; - - struct xpath_variable_number: xpath_variable - { - xpath_variable_number(): xpath_variable(xpath_type_number), value(0) - { - } - - double value; - char_t name[1]; - }; - - struct xpath_variable_string: xpath_variable - { - xpath_variable_string(): xpath_variable(xpath_type_string), value(0) - { - } - - ~xpath_variable_string() - { - if (value) xml_memory::deallocate(value); - } - - char_t* value; - char_t name[1]; - }; - - struct xpath_variable_node_set: xpath_variable - { - xpath_variable_node_set(): xpath_variable(xpath_type_node_set) - { - } - - xpath_node_set value; - char_t name[1]; - }; - - static const xpath_node_set dummy_node_set; - - PUGI__FN PUGI__UNSIGNED_OVERFLOW unsigned int hash_string(const char_t* str) - { - // Jenkins one-at-a-time hash (http://en.wikipedia.org/wiki/Jenkins_hash_function#one-at-a-time) - unsigned int result = 0; - - while (*str) - { - result += static_cast(*str++); - result += result << 10; - result ^= result >> 6; - } - - result += result << 3; - result ^= result >> 11; - result += result << 15; - - return result; - } - - template PUGI__FN T* new_xpath_variable(const char_t* name) - { - size_t length = strlength(name); - if (length == 0) return 0; // empty variable names are invalid - - // $$ we can't use offsetof(T, name) because T is non-POD, so we just allocate additional length characters - void* memory = xml_memory::allocate(sizeof(T) + length * sizeof(char_t)); - if (!memory) return 0; - - T* result = new (memory) T(); - - memcpy(result->name, name, (length + 1) * sizeof(char_t)); - - return result; - } - - PUGI__FN xpath_variable* new_xpath_variable(xpath_value_type type, const char_t* name) - { - switch (type) - { - case xpath_type_node_set: - return new_xpath_variable(name); - - case xpath_type_number: - return new_xpath_variable(name); - - case xpath_type_string: - return new_xpath_variable(name); - - case xpath_type_boolean: - return new_xpath_variable(name); - - default: - return 0; - } - } - - template PUGI__FN void delete_xpath_variable(T* var) - { - var->~T(); - xml_memory::deallocate(var); - } - - PUGI__FN void delete_xpath_variable(xpath_value_type type, xpath_variable* var) - { - switch (type) - { - case xpath_type_node_set: - delete_xpath_variable(static_cast(var)); - break; - - case xpath_type_number: - delete_xpath_variable(static_cast(var)); - break; - - case xpath_type_string: - delete_xpath_variable(static_cast(var)); - break; - - case xpath_type_boolean: - delete_xpath_variable(static_cast(var)); - break; - - default: - assert(false && "Invalid variable type"); // unreachable - } - } - - PUGI__FN bool copy_xpath_variable(xpath_variable* lhs, const xpath_variable* rhs) - { - switch (rhs->type()) - { - case xpath_type_node_set: - return lhs->set(static_cast(rhs)->value); - - case xpath_type_number: - return lhs->set(static_cast(rhs)->value); - - case xpath_type_string: - return lhs->set(static_cast(rhs)->value); - - case xpath_type_boolean: - return lhs->set(static_cast(rhs)->value); - - default: - assert(false && "Invalid variable type"); // unreachable - return false; - } - } - - PUGI__FN bool get_variable_scratch(char_t (&buffer)[32], xpath_variable_set* set, const char_t* begin, const char_t* end, xpath_variable** out_result) - { - size_t length = static_cast(end - begin); - char_t* scratch = buffer; - - if (length >= sizeof(buffer) / sizeof(buffer[0])) - { - // need to make dummy on-heap copy - scratch = static_cast(xml_memory::allocate((length + 1) * sizeof(char_t))); - if (!scratch) return false; - } - - // copy string to zero-terminated buffer and perform lookup - memcpy(scratch, begin, length * sizeof(char_t)); - scratch[length] = 0; - - *out_result = set->get(scratch); - - // free dummy buffer - if (scratch != buffer) xml_memory::deallocate(scratch); - - return true; - } -PUGI__NS_END - -// Internal node set class -PUGI__NS_BEGIN - PUGI__FN xpath_node_set::type_t xpath_get_order(const xpath_node* begin, const xpath_node* end) - { - if (end - begin < 2) - return xpath_node_set::type_sorted; - - document_order_comparator cmp; - - bool first = cmp(begin[0], begin[1]); - - for (const xpath_node* it = begin + 1; it + 1 < end; ++it) - if (cmp(it[0], it[1]) != first) - return xpath_node_set::type_unsorted; - - return first ? xpath_node_set::type_sorted : xpath_node_set::type_sorted_reverse; - } - - PUGI__FN xpath_node_set::type_t xpath_sort(xpath_node* begin, xpath_node* end, xpath_node_set::type_t type, bool rev) - { - xpath_node_set::type_t order = rev ? xpath_node_set::type_sorted_reverse : xpath_node_set::type_sorted; - - if (type == xpath_node_set::type_unsorted) - { - xpath_node_set::type_t sorted = xpath_get_order(begin, end); - - if (sorted == xpath_node_set::type_unsorted) - { - sort(begin, end, document_order_comparator()); - - type = xpath_node_set::type_sorted; - } - else - type = sorted; - } - - if (type != order) reverse(begin, end); - - return order; - } - - PUGI__FN xpath_node xpath_first(const xpath_node* begin, const xpath_node* end, xpath_node_set::type_t type) - { - if (begin == end) return xpath_node(); - - switch (type) - { - case xpath_node_set::type_sorted: - return *begin; - - case xpath_node_set::type_sorted_reverse: - return *(end - 1); - - case xpath_node_set::type_unsorted: - return *min_element(begin, end, document_order_comparator()); - - default: - assert(false && "Invalid node set type"); // unreachable - return xpath_node(); - } - } - - class xpath_node_set_raw - { - xpath_node_set::type_t _type; - - xpath_node* _begin; - xpath_node* _end; - xpath_node* _eos; - - public: - xpath_node_set_raw(): _type(xpath_node_set::type_unsorted), _begin(0), _end(0), _eos(0) - { - } - - xpath_node* begin() const - { - return _begin; - } - - xpath_node* end() const - { - return _end; - } - - bool empty() const - { - return _begin == _end; - } - - size_t size() const - { - return static_cast(_end - _begin); - } - - xpath_node first() const - { - return xpath_first(_begin, _end, _type); - } - - void push_back_grow(const xpath_node& node, xpath_allocator* alloc); - - void push_back(const xpath_node& node, xpath_allocator* alloc) - { - if (_end != _eos) - *_end++ = node; - else - push_back_grow(node, alloc); - } - - void append(const xpath_node* begin_, const xpath_node* end_, xpath_allocator* alloc) - { - if (begin_ == end_) return; - - size_t size_ = static_cast(_end - _begin); - size_t capacity = static_cast(_eos - _begin); - size_t count = static_cast(end_ - begin_); - - if (size_ + count > capacity) - { - // reallocate the old array or allocate a new one - xpath_node* data = static_cast(alloc->reallocate(_begin, capacity * sizeof(xpath_node), (size_ + count) * sizeof(xpath_node))); - if (!data) return; - - // finalize - _begin = data; - _end = data + size_; - _eos = data + size_ + count; - } - - memcpy(_end, begin_, count * sizeof(xpath_node)); - _end += count; - } - - void sort_do() - { - _type = xpath_sort(_begin, _end, _type, false); - } - - void truncate(xpath_node* pos) - { - assert(_begin <= pos && pos <= _end); - - _end = pos; - } - - void remove_duplicates() - { - if (_type == xpath_node_set::type_unsorted) - sort(_begin, _end, duplicate_comparator()); - - _end = unique(_begin, _end); - } - - xpath_node_set::type_t type() const - { - return _type; - } - - void set_type(xpath_node_set::type_t value) - { - _type = value; - } - }; - - PUGI__FN_NO_INLINE void xpath_node_set_raw::push_back_grow(const xpath_node& node, xpath_allocator* alloc) - { - size_t capacity = static_cast(_eos - _begin); - - // get new capacity (1.5x rule) - size_t new_capacity = capacity + capacity / 2 + 1; - - // reallocate the old array or allocate a new one - xpath_node* data = static_cast(alloc->reallocate(_begin, capacity * sizeof(xpath_node), new_capacity * sizeof(xpath_node))); - if (!data) return; - - // finalize - _begin = data; - _end = data + capacity; - _eos = data + new_capacity; - - // push - *_end++ = node; - } -PUGI__NS_END - -PUGI__NS_BEGIN - struct xpath_context - { - xpath_node n; - size_t position, size; - - xpath_context(const xpath_node& n_, size_t position_, size_t size_): n(n_), position(position_), size(size_) - { - } - }; - - enum lexeme_t - { - lex_none = 0, - lex_equal, - lex_not_equal, - lex_less, - lex_greater, - lex_less_or_equal, - lex_greater_or_equal, - lex_plus, - lex_minus, - lex_multiply, - lex_union, - lex_var_ref, - lex_open_brace, - lex_close_brace, - lex_quoted_string, - lex_number, - lex_slash, - lex_double_slash, - lex_open_square_brace, - lex_close_square_brace, - lex_string, - lex_comma, - lex_axis_attribute, - lex_dot, - lex_double_dot, - lex_double_colon, - lex_eof - }; - - struct xpath_lexer_string - { - const char_t* begin; - const char_t* end; - - xpath_lexer_string(): begin(0), end(0) - { - } - - bool operator==(const char_t* other) const - { - size_t length = static_cast(end - begin); - - return strequalrange(other, begin, length); - } - }; - - class xpath_lexer - { - const char_t* _cur; - const char_t* _cur_lexeme_pos; - xpath_lexer_string _cur_lexeme_contents; - - lexeme_t _cur_lexeme; - - public: - explicit xpath_lexer(const char_t* query): _cur(query) - { - next(); - } - - const char_t* state() const - { - return _cur; - } - - void next() - { - const char_t* cur = _cur; - - while (PUGI__IS_CHARTYPE(*cur, ct_space)) ++cur; - - // save lexeme position for error reporting - _cur_lexeme_pos = cur; - - switch (*cur) - { - case 0: - _cur_lexeme = lex_eof; - break; - - case '>': - if (*(cur+1) == '=') - { - cur += 2; - _cur_lexeme = lex_greater_or_equal; - } - else - { - cur += 1; - _cur_lexeme = lex_greater; - } - break; - - case '<': - if (*(cur+1) == '=') - { - cur += 2; - _cur_lexeme = lex_less_or_equal; - } - else - { - cur += 1; - _cur_lexeme = lex_less; - } - break; - - case '!': - if (*(cur+1) == '=') - { - cur += 2; - _cur_lexeme = lex_not_equal; - } - else - { - _cur_lexeme = lex_none; - } - break; - - case '=': - cur += 1; - _cur_lexeme = lex_equal; - - break; - - case '+': - cur += 1; - _cur_lexeme = lex_plus; - - break; - - case '-': - cur += 1; - _cur_lexeme = lex_minus; - - break; - - case '*': - cur += 1; - _cur_lexeme = lex_multiply; - - break; - - case '|': - cur += 1; - _cur_lexeme = lex_union; - - break; - - case '$': - cur += 1; - - if (PUGI__IS_CHARTYPEX(*cur, ctx_start_symbol)) - { - _cur_lexeme_contents.begin = cur; - - while (PUGI__IS_CHARTYPEX(*cur, ctx_symbol)) cur++; - - if (cur[0] == ':' && PUGI__IS_CHARTYPEX(cur[1], ctx_symbol)) // qname - { - cur++; // : - - while (PUGI__IS_CHARTYPEX(*cur, ctx_symbol)) cur++; - } - - _cur_lexeme_contents.end = cur; - - _cur_lexeme = lex_var_ref; - } - else - { - _cur_lexeme = lex_none; - } - - break; - - case '(': - cur += 1; - _cur_lexeme = lex_open_brace; - - break; - - case ')': - cur += 1; - _cur_lexeme = lex_close_brace; - - break; - - case '[': - cur += 1; - _cur_lexeme = lex_open_square_brace; - - break; - - case ']': - cur += 1; - _cur_lexeme = lex_close_square_brace; - - break; - - case ',': - cur += 1; - _cur_lexeme = lex_comma; - - break; - - case '/': - if (*(cur+1) == '/') - { - cur += 2; - _cur_lexeme = lex_double_slash; - } - else - { - cur += 1; - _cur_lexeme = lex_slash; - } - break; - - case '.': - if (*(cur+1) == '.') - { - cur += 2; - _cur_lexeme = lex_double_dot; - } - else if (PUGI__IS_CHARTYPEX(*(cur+1), ctx_digit)) - { - _cur_lexeme_contents.begin = cur; // . - - ++cur; - - while (PUGI__IS_CHARTYPEX(*cur, ctx_digit)) cur++; - - _cur_lexeme_contents.end = cur; - - _cur_lexeme = lex_number; - } - else - { - cur += 1; - _cur_lexeme = lex_dot; - } - break; - - case '@': - cur += 1; - _cur_lexeme = lex_axis_attribute; - - break; - - case '"': - case '\'': - { - char_t terminator = *cur; - - ++cur; - - _cur_lexeme_contents.begin = cur; - while (*cur && *cur != terminator) cur++; - _cur_lexeme_contents.end = cur; - - if (!*cur) - _cur_lexeme = lex_none; - else - { - cur += 1; - _cur_lexeme = lex_quoted_string; - } - - break; - } - - case ':': - if (*(cur+1) == ':') - { - cur += 2; - _cur_lexeme = lex_double_colon; - } - else - { - _cur_lexeme = lex_none; - } - break; - - default: - if (PUGI__IS_CHARTYPEX(*cur, ctx_digit)) - { - _cur_lexeme_contents.begin = cur; - - while (PUGI__IS_CHARTYPEX(*cur, ctx_digit)) cur++; - - if (*cur == '.') - { - cur++; - - while (PUGI__IS_CHARTYPEX(*cur, ctx_digit)) cur++; - } - - _cur_lexeme_contents.end = cur; - - _cur_lexeme = lex_number; - } - else if (PUGI__IS_CHARTYPEX(*cur, ctx_start_symbol)) - { - _cur_lexeme_contents.begin = cur; - - while (PUGI__IS_CHARTYPEX(*cur, ctx_symbol)) cur++; - - if (cur[0] == ':') - { - if (cur[1] == '*') // namespace test ncname:* - { - cur += 2; // :* - } - else if (PUGI__IS_CHARTYPEX(cur[1], ctx_symbol)) // namespace test qname - { - cur++; // : - - while (PUGI__IS_CHARTYPEX(*cur, ctx_symbol)) cur++; - } - } - - _cur_lexeme_contents.end = cur; - - _cur_lexeme = lex_string; - } - else - { - _cur_lexeme = lex_none; - } - } - - _cur = cur; - } - - lexeme_t current() const - { - return _cur_lexeme; - } - - const char_t* current_pos() const - { - return _cur_lexeme_pos; - } - - const xpath_lexer_string& contents() const - { - assert(_cur_lexeme == lex_var_ref || _cur_lexeme == lex_number || _cur_lexeme == lex_string || _cur_lexeme == lex_quoted_string); - - return _cur_lexeme_contents; - } - }; - - enum ast_type_t - { - ast_unknown, - ast_op_or, // left or right - ast_op_and, // left and right - ast_op_equal, // left = right - ast_op_not_equal, // left != right - ast_op_less, // left < right - ast_op_greater, // left > right - ast_op_less_or_equal, // left <= right - ast_op_greater_or_equal, // left >= right - ast_op_add, // left + right - ast_op_subtract, // left - right - ast_op_multiply, // left * right - ast_op_divide, // left / right - ast_op_mod, // left % right - ast_op_negate, // left - right - ast_op_union, // left | right - ast_predicate, // apply predicate to set; next points to next predicate - ast_filter, // select * from left where right - ast_string_constant, // string constant - ast_number_constant, // number constant - ast_variable, // variable - ast_func_last, // last() - ast_func_position, // position() - ast_func_count, // count(left) - ast_func_id, // id(left) - ast_func_local_name_0, // local-name() - ast_func_local_name_1, // local-name(left) - ast_func_namespace_uri_0, // namespace-uri() - ast_func_namespace_uri_1, // namespace-uri(left) - ast_func_name_0, // name() - ast_func_name_1, // name(left) - ast_func_string_0, // string() - ast_func_string_1, // string(left) - ast_func_concat, // concat(left, right, siblings) - ast_func_starts_with, // starts_with(left, right) - ast_func_contains, // contains(left, right) - ast_func_substring_before, // substring-before(left, right) - ast_func_substring_after, // substring-after(left, right) - ast_func_substring_2, // substring(left, right) - ast_func_substring_3, // substring(left, right, third) - ast_func_string_length_0, // string-length() - ast_func_string_length_1, // string-length(left) - ast_func_normalize_space_0, // normalize-space() - ast_func_normalize_space_1, // normalize-space(left) - ast_func_translate, // translate(left, right, third) - ast_func_boolean, // boolean(left) - ast_func_not, // not(left) - ast_func_true, // true() - ast_func_false, // false() - ast_func_lang, // lang(left) - ast_func_number_0, // number() - ast_func_number_1, // number(left) - ast_func_sum, // sum(left) - ast_func_floor, // floor(left) - ast_func_ceiling, // ceiling(left) - ast_func_round, // round(left) - ast_step, // process set left with step - ast_step_root, // select root node - - ast_opt_translate_table, // translate(left, right, third) where right/third are constants - ast_opt_compare_attribute // @name = 'string' - }; - - enum axis_t - { - axis_ancestor, - axis_ancestor_or_self, - axis_attribute, - axis_child, - axis_descendant, - axis_descendant_or_self, - axis_following, - axis_following_sibling, - axis_namespace, - axis_parent, - axis_preceding, - axis_preceding_sibling, - axis_self - }; - - enum nodetest_t - { - nodetest_none, - nodetest_name, - nodetest_type_node, - nodetest_type_comment, - nodetest_type_pi, - nodetest_type_text, - nodetest_pi, - nodetest_all, - nodetest_all_in_namespace - }; - - enum predicate_t - { - predicate_default, - predicate_posinv, - predicate_constant, - predicate_constant_one - }; - - enum nodeset_eval_t - { - nodeset_eval_all, - nodeset_eval_any, - nodeset_eval_first - }; - - template struct axis_to_type - { - static const axis_t axis; - }; - - template const axis_t axis_to_type::axis = N; - - class xpath_ast_node - { - private: - // node type - char _type; - char _rettype; - - // for ast_step - char _axis; - - // for ast_step/ast_predicate/ast_filter - char _test; - - // tree node structure - xpath_ast_node* _left; - xpath_ast_node* _right; - xpath_ast_node* _next; - - union - { - // value for ast_string_constant - const char_t* string; - // value for ast_number_constant - double number; - // variable for ast_variable - xpath_variable* variable; - // node test for ast_step (node name/namespace/node type/pi target) - const char_t* nodetest; - // table for ast_opt_translate_table - const unsigned char* table; - } _data; - - xpath_ast_node(const xpath_ast_node&); - xpath_ast_node& operator=(const xpath_ast_node&); - - template static bool compare_eq(xpath_ast_node* lhs, xpath_ast_node* rhs, const xpath_context& c, const xpath_stack& stack, const Comp& comp) - { - xpath_value_type lt = lhs->rettype(), rt = rhs->rettype(); - - if (lt != xpath_type_node_set && rt != xpath_type_node_set) - { - if (lt == xpath_type_boolean || rt == xpath_type_boolean) - return comp(lhs->eval_boolean(c, stack), rhs->eval_boolean(c, stack)); - else if (lt == xpath_type_number || rt == xpath_type_number) - return comp(lhs->eval_number(c, stack), rhs->eval_number(c, stack)); - else if (lt == xpath_type_string || rt == xpath_type_string) - { - xpath_allocator_capture cr(stack.result); - - xpath_string ls = lhs->eval_string(c, stack); - xpath_string rs = rhs->eval_string(c, stack); - - return comp(ls, rs); - } - } - else if (lt == xpath_type_node_set && rt == xpath_type_node_set) - { - xpath_allocator_capture cr(stack.result); - - xpath_node_set_raw ls = lhs->eval_node_set(c, stack, nodeset_eval_all); - xpath_node_set_raw rs = rhs->eval_node_set(c, stack, nodeset_eval_all); - - for (const xpath_node* li = ls.begin(); li != ls.end(); ++li) - for (const xpath_node* ri = rs.begin(); ri != rs.end(); ++ri) - { - xpath_allocator_capture cri(stack.result); - - if (comp(string_value(*li, stack.result), string_value(*ri, stack.result))) - return true; - } - - return false; - } - else - { - if (lt == xpath_type_node_set) - { - swap(lhs, rhs); - swap(lt, rt); - } - - if (lt == xpath_type_boolean) - return comp(lhs->eval_boolean(c, stack), rhs->eval_boolean(c, stack)); - else if (lt == xpath_type_number) - { - xpath_allocator_capture cr(stack.result); - - double l = lhs->eval_number(c, stack); - xpath_node_set_raw rs = rhs->eval_node_set(c, stack, nodeset_eval_all); - - for (const xpath_node* ri = rs.begin(); ri != rs.end(); ++ri) - { - xpath_allocator_capture cri(stack.result); - - if (comp(l, convert_string_to_number(string_value(*ri, stack.result).c_str()))) - return true; - } - - return false; - } - else if (lt == xpath_type_string) - { - xpath_allocator_capture cr(stack.result); - - xpath_string l = lhs->eval_string(c, stack); - xpath_node_set_raw rs = rhs->eval_node_set(c, stack, nodeset_eval_all); - - for (const xpath_node* ri = rs.begin(); ri != rs.end(); ++ri) - { - xpath_allocator_capture cri(stack.result); - - if (comp(l, string_value(*ri, stack.result))) - return true; - } - - return false; - } - } - - assert(false && "Wrong types"); // unreachable - return false; - } - - static bool eval_once(xpath_node_set::type_t type, nodeset_eval_t eval) - { - return type == xpath_node_set::type_sorted ? eval != nodeset_eval_all : eval == nodeset_eval_any; - } - - template static bool compare_rel(xpath_ast_node* lhs, xpath_ast_node* rhs, const xpath_context& c, const xpath_stack& stack, const Comp& comp) - { - xpath_value_type lt = lhs->rettype(), rt = rhs->rettype(); - - if (lt != xpath_type_node_set && rt != xpath_type_node_set) - return comp(lhs->eval_number(c, stack), rhs->eval_number(c, stack)); - else if (lt == xpath_type_node_set && rt == xpath_type_node_set) - { - xpath_allocator_capture cr(stack.result); - - xpath_node_set_raw ls = lhs->eval_node_set(c, stack, nodeset_eval_all); - xpath_node_set_raw rs = rhs->eval_node_set(c, stack, nodeset_eval_all); - - for (const xpath_node* li = ls.begin(); li != ls.end(); ++li) - { - xpath_allocator_capture cri(stack.result); - - double l = convert_string_to_number(string_value(*li, stack.result).c_str()); - - for (const xpath_node* ri = rs.begin(); ri != rs.end(); ++ri) - { - xpath_allocator_capture crii(stack.result); - - if (comp(l, convert_string_to_number(string_value(*ri, stack.result).c_str()))) - return true; - } - } - - return false; - } - else if (lt != xpath_type_node_set && rt == xpath_type_node_set) - { - xpath_allocator_capture cr(stack.result); - - double l = lhs->eval_number(c, stack); - xpath_node_set_raw rs = rhs->eval_node_set(c, stack, nodeset_eval_all); - - for (const xpath_node* ri = rs.begin(); ri != rs.end(); ++ri) - { - xpath_allocator_capture cri(stack.result); - - if (comp(l, convert_string_to_number(string_value(*ri, stack.result).c_str()))) - return true; - } - - return false; - } - else if (lt == xpath_type_node_set && rt != xpath_type_node_set) - { - xpath_allocator_capture cr(stack.result); - - xpath_node_set_raw ls = lhs->eval_node_set(c, stack, nodeset_eval_all); - double r = rhs->eval_number(c, stack); - - for (const xpath_node* li = ls.begin(); li != ls.end(); ++li) - { - xpath_allocator_capture cri(stack.result); - - if (comp(convert_string_to_number(string_value(*li, stack.result).c_str()), r)) - return true; - } - - return false; - } - else - { - assert(false && "Wrong types"); // unreachable - return false; - } - } - - static void apply_predicate_boolean(xpath_node_set_raw& ns, size_t first, xpath_ast_node* expr, const xpath_stack& stack, bool once) - { - assert(ns.size() >= first); - assert(expr->rettype() != xpath_type_number); - - size_t i = 1; - size_t size = ns.size() - first; - - xpath_node* last = ns.begin() + first; - - // remove_if... or well, sort of - for (xpath_node* it = last; it != ns.end(); ++it, ++i) - { - xpath_context c(*it, i, size); - - if (expr->eval_boolean(c, stack)) - { - *last++ = *it; - - if (once) break; - } - } - - ns.truncate(last); - } - - static void apply_predicate_number(xpath_node_set_raw& ns, size_t first, xpath_ast_node* expr, const xpath_stack& stack, bool once) - { - assert(ns.size() >= first); - assert(expr->rettype() == xpath_type_number); - - size_t i = 1; - size_t size = ns.size() - first; - - xpath_node* last = ns.begin() + first; - - // remove_if... or well, sort of - for (xpath_node* it = last; it != ns.end(); ++it, ++i) - { - xpath_context c(*it, i, size); - - if (expr->eval_number(c, stack) == i) - { - *last++ = *it; - - if (once) break; - } - } - - ns.truncate(last); - } - - static void apply_predicate_number_const(xpath_node_set_raw& ns, size_t first, xpath_ast_node* expr, const xpath_stack& stack) - { - assert(ns.size() >= first); - assert(expr->rettype() == xpath_type_number); - - size_t size = ns.size() - first; - - xpath_node* last = ns.begin() + first; - - xpath_context c(xpath_node(), 1, size); - - double er = expr->eval_number(c, stack); - - if (er >= 1.0 && er <= size) - { - size_t eri = static_cast(er); - - if (er == eri) - { - xpath_node r = last[eri - 1]; - - *last++ = r; - } - } - - ns.truncate(last); - } - - void apply_predicate(xpath_node_set_raw& ns, size_t first, const xpath_stack& stack, bool once) - { - if (ns.size() == first) return; - - assert(_type == ast_filter || _type == ast_predicate); - - if (_test == predicate_constant || _test == predicate_constant_one) - apply_predicate_number_const(ns, first, _right, stack); - else if (_right->rettype() == xpath_type_number) - apply_predicate_number(ns, first, _right, stack, once); - else - apply_predicate_boolean(ns, first, _right, stack, once); - } - - void apply_predicates(xpath_node_set_raw& ns, size_t first, const xpath_stack& stack, nodeset_eval_t eval) - { - if (ns.size() == first) return; - - bool last_once = eval_once(ns.type(), eval); - - for (xpath_ast_node* pred = _right; pred; pred = pred->_next) - pred->apply_predicate(ns, first, stack, !pred->_next && last_once); - } - - bool step_push(xpath_node_set_raw& ns, xml_attribute_struct* a, xml_node_struct* parent, xpath_allocator* alloc) - { - assert(a); - - const char_t* name = a->name ? a->name + 0 : PUGIXML_TEXT(""); - - switch (_test) - { - case nodetest_name: - if (strequal(name, _data.nodetest) && is_xpath_attribute(name)) - { - ns.push_back(xpath_node(xml_attribute(a), xml_node(parent)), alloc); - return true; - } - break; - - case nodetest_type_node: - case nodetest_all: - if (is_xpath_attribute(name)) - { - ns.push_back(xpath_node(xml_attribute(a), xml_node(parent)), alloc); - return true; - } - break; - - case nodetest_all_in_namespace: - if (starts_with(name, _data.nodetest) && is_xpath_attribute(name)) - { - ns.push_back(xpath_node(xml_attribute(a), xml_node(parent)), alloc); - return true; - } - break; - - default: - ; - } - - return false; - } - - bool step_push(xpath_node_set_raw& ns, xml_node_struct* n, xpath_allocator* alloc) - { - assert(n); - - xml_node_type type = PUGI__NODETYPE(n); - - switch (_test) - { - case nodetest_name: - if (type == node_element && n->name && strequal(n->name, _data.nodetest)) - { - ns.push_back(xml_node(n), alloc); - return true; - } - break; - - case nodetest_type_node: - ns.push_back(xml_node(n), alloc); - return true; - - case nodetest_type_comment: - if (type == node_comment) - { - ns.push_back(xml_node(n), alloc); - return true; - } - break; - - case nodetest_type_text: - if (type == node_pcdata || type == node_cdata) - { - ns.push_back(xml_node(n), alloc); - return true; - } - break; - - case nodetest_type_pi: - if (type == node_pi) - { - ns.push_back(xml_node(n), alloc); - return true; - } - break; - - case nodetest_pi: - if (type == node_pi && n->name && strequal(n->name, _data.nodetest)) - { - ns.push_back(xml_node(n), alloc); - return true; - } - break; - - case nodetest_all: - if (type == node_element) - { - ns.push_back(xml_node(n), alloc); - return true; - } - break; - - case nodetest_all_in_namespace: - if (type == node_element && n->name && starts_with(n->name, _data.nodetest)) - { - ns.push_back(xml_node(n), alloc); - return true; - } - break; - - default: - assert(false && "Unknown axis"); // unreachable - } - - return false; - } - - template void step_fill(xpath_node_set_raw& ns, xml_node_struct* n, xpath_allocator* alloc, bool once, T) - { - const axis_t axis = T::axis; - - switch (axis) - { - case axis_attribute: - { - for (xml_attribute_struct* a = n->first_attribute; a; a = a->next_attribute) - if (step_push(ns, a, n, alloc) & once) - return; - - break; - } - - case axis_child: - { - for (xml_node_struct* c = n->first_child; c; c = c->next_sibling) - if (step_push(ns, c, alloc) & once) - return; - - break; - } - - case axis_descendant: - case axis_descendant_or_self: - { - if (axis == axis_descendant_or_self) - if (step_push(ns, n, alloc) & once) - return; - - xml_node_struct* cur = n->first_child; - - while (cur) - { - if (step_push(ns, cur, alloc) & once) - return; - - if (cur->first_child) - cur = cur->first_child; - else - { - while (!cur->next_sibling) - { - cur = cur->parent; - - if (cur == n) return; - } - - cur = cur->next_sibling; - } - } - - break; - } - - case axis_following_sibling: - { - for (xml_node_struct* c = n->next_sibling; c; c = c->next_sibling) - if (step_push(ns, c, alloc) & once) - return; - - break; - } - - case axis_preceding_sibling: - { - for (xml_node_struct* c = n->prev_sibling_c; c->next_sibling; c = c->prev_sibling_c) - if (step_push(ns, c, alloc) & once) - return; - - break; - } - - case axis_following: - { - xml_node_struct* cur = n; - - // exit from this node so that we don't include descendants - while (!cur->next_sibling) - { - cur = cur->parent; - - if (!cur) return; - } - - cur = cur->next_sibling; - - while (cur) - { - if (step_push(ns, cur, alloc) & once) - return; - - if (cur->first_child) - cur = cur->first_child; - else - { - while (!cur->next_sibling) - { - cur = cur->parent; - - if (!cur) return; - } - - cur = cur->next_sibling; - } - } - - break; - } - - case axis_preceding: - { - xml_node_struct* cur = n; - - // exit from this node so that we don't include descendants - while (!cur->prev_sibling_c->next_sibling) - { - cur = cur->parent; - - if (!cur) return; - } - - cur = cur->prev_sibling_c; - - while (cur) - { - if (cur->first_child) - cur = cur->first_child->prev_sibling_c; - else - { - // leaf node, can't be ancestor - if (step_push(ns, cur, alloc) & once) - return; - - while (!cur->prev_sibling_c->next_sibling) - { - cur = cur->parent; - - if (!cur) return; - - if (!node_is_ancestor(cur, n)) - if (step_push(ns, cur, alloc) & once) - return; - } - - cur = cur->prev_sibling_c; - } - } - - break; - } - - case axis_ancestor: - case axis_ancestor_or_self: - { - if (axis == axis_ancestor_or_self) - if (step_push(ns, n, alloc) & once) - return; - - xml_node_struct* cur = n->parent; - - while (cur) - { - if (step_push(ns, cur, alloc) & once) - return; - - cur = cur->parent; - } - - break; - } - - case axis_self: - { - step_push(ns, n, alloc); - - break; - } - - case axis_parent: - { - if (n->parent) - step_push(ns, n->parent, alloc); - - break; - } - - default: - assert(false && "Unimplemented axis"); // unreachable - } - } - - template void step_fill(xpath_node_set_raw& ns, xml_attribute_struct* a, xml_node_struct* p, xpath_allocator* alloc, bool once, T v) - { - const axis_t axis = T::axis; - - switch (axis) - { - case axis_ancestor: - case axis_ancestor_or_self: - { - if (axis == axis_ancestor_or_self && _test == nodetest_type_node) // reject attributes based on principal node type test - if (step_push(ns, a, p, alloc) & once) - return; - - xml_node_struct* cur = p; - - while (cur) - { - if (step_push(ns, cur, alloc) & once) - return; - - cur = cur->parent; - } - - break; - } - - case axis_descendant_or_self: - case axis_self: - { - if (_test == nodetest_type_node) // reject attributes based on principal node type test - step_push(ns, a, p, alloc); - - break; - } - - case axis_following: - { - xml_node_struct* cur = p; - - while (cur) - { - if (cur->first_child) - cur = cur->first_child; - else - { - while (!cur->next_sibling) - { - cur = cur->parent; - - if (!cur) return; - } - - cur = cur->next_sibling; - } - - if (step_push(ns, cur, alloc) & once) - return; - } - - break; - } - - case axis_parent: - { - step_push(ns, p, alloc); - - break; - } - - case axis_preceding: - { - // preceding:: axis does not include attribute nodes and attribute ancestors (they are the same as parent's ancestors), so we can reuse node preceding - step_fill(ns, p, alloc, once, v); - break; - } - - default: - assert(false && "Unimplemented axis"); // unreachable - } - } - - template void step_fill(xpath_node_set_raw& ns, const xpath_node& xn, xpath_allocator* alloc, bool once, T v) - { - const axis_t axis = T::axis; - const bool axis_has_attributes = (axis == axis_ancestor || axis == axis_ancestor_or_self || axis == axis_descendant_or_self || axis == axis_following || axis == axis_parent || axis == axis_preceding || axis == axis_self); - - if (xn.node()) - step_fill(ns, xn.node().internal_object(), alloc, once, v); - else if (axis_has_attributes && xn.attribute() && xn.parent()) - step_fill(ns, xn.attribute().internal_object(), xn.parent().internal_object(), alloc, once, v); - } - - template xpath_node_set_raw step_do(const xpath_context& c, const xpath_stack& stack, nodeset_eval_t eval, T v) - { - const axis_t axis = T::axis; - const bool axis_reverse = (axis == axis_ancestor || axis == axis_ancestor_or_self || axis == axis_preceding || axis == axis_preceding_sibling); - const xpath_node_set::type_t axis_type = axis_reverse ? xpath_node_set::type_sorted_reverse : xpath_node_set::type_sorted; - - bool once = - (axis == axis_attribute && _test == nodetest_name) || - (!_right && eval_once(axis_type, eval)) || - (_right && !_right->_next && _right->_test == predicate_constant_one); - - xpath_node_set_raw ns; - ns.set_type(axis_type); - - if (_left) - { - xpath_node_set_raw s = _left->eval_node_set(c, stack, nodeset_eval_all); - - // self axis preserves the original order - if (axis == axis_self) ns.set_type(s.type()); - - for (const xpath_node* it = s.begin(); it != s.end(); ++it) - { - size_t size = ns.size(); - - // in general, all axes generate elements in a particular order, but there is no order guarantee if axis is applied to two nodes - if (axis != axis_self && size != 0) ns.set_type(xpath_node_set::type_unsorted); - - step_fill(ns, *it, stack.result, once, v); - if (_right) apply_predicates(ns, size, stack, eval); - } - } - else - { - step_fill(ns, c.n, stack.result, once, v); - if (_right) apply_predicates(ns, 0, stack, eval); - } - - // child, attribute and self axes always generate unique set of nodes - // for other axis, if the set stayed sorted, it stayed unique because the traversal algorithms do not visit the same node twice - if (axis != axis_child && axis != axis_attribute && axis != axis_self && ns.type() == xpath_node_set::type_unsorted) - ns.remove_duplicates(); - - return ns; - } - - public: - xpath_ast_node(ast_type_t type, xpath_value_type rettype_, const char_t* value): - _type(static_cast(type)), _rettype(static_cast(rettype_)), _axis(0), _test(0), _left(0), _right(0), _next(0) - { - assert(type == ast_string_constant); - _data.string = value; - } - - xpath_ast_node(ast_type_t type, xpath_value_type rettype_, double value): - _type(static_cast(type)), _rettype(static_cast(rettype_)), _axis(0), _test(0), _left(0), _right(0), _next(0) - { - assert(type == ast_number_constant); - _data.number = value; - } - - xpath_ast_node(ast_type_t type, xpath_value_type rettype_, xpath_variable* value): - _type(static_cast(type)), _rettype(static_cast(rettype_)), _axis(0), _test(0), _left(0), _right(0), _next(0) - { - assert(type == ast_variable); - _data.variable = value; - } - - xpath_ast_node(ast_type_t type, xpath_value_type rettype_, xpath_ast_node* left = 0, xpath_ast_node* right = 0): - _type(static_cast(type)), _rettype(static_cast(rettype_)), _axis(0), _test(0), _left(left), _right(right), _next(0) - { - } - - xpath_ast_node(ast_type_t type, xpath_ast_node* left, axis_t axis, nodetest_t test, const char_t* contents): - _type(static_cast(type)), _rettype(xpath_type_node_set), _axis(static_cast(axis)), _test(static_cast(test)), _left(left), _right(0), _next(0) - { - assert(type == ast_step); - _data.nodetest = contents; - } - - xpath_ast_node(ast_type_t type, xpath_ast_node* left, xpath_ast_node* right, predicate_t test): - _type(static_cast(type)), _rettype(xpath_type_node_set), _axis(0), _test(static_cast(test)), _left(left), _right(right), _next(0) - { - assert(type == ast_filter || type == ast_predicate); - } - - void set_next(xpath_ast_node* value) - { - _next = value; - } - - void set_right(xpath_ast_node* value) - { - _right = value; - } - - bool eval_boolean(const xpath_context& c, const xpath_stack& stack) - { - switch (_type) - { - case ast_op_or: - return _left->eval_boolean(c, stack) || _right->eval_boolean(c, stack); - - case ast_op_and: - return _left->eval_boolean(c, stack) && _right->eval_boolean(c, stack); - - case ast_op_equal: - return compare_eq(_left, _right, c, stack, equal_to()); - - case ast_op_not_equal: - return compare_eq(_left, _right, c, stack, not_equal_to()); - - case ast_op_less: - return compare_rel(_left, _right, c, stack, less()); - - case ast_op_greater: - return compare_rel(_right, _left, c, stack, less()); - - case ast_op_less_or_equal: - return compare_rel(_left, _right, c, stack, less_equal()); - - case ast_op_greater_or_equal: - return compare_rel(_right, _left, c, stack, less_equal()); - - case ast_func_starts_with: - { - xpath_allocator_capture cr(stack.result); - - xpath_string lr = _left->eval_string(c, stack); - xpath_string rr = _right->eval_string(c, stack); - - return starts_with(lr.c_str(), rr.c_str()); - } - - case ast_func_contains: - { - xpath_allocator_capture cr(stack.result); - - xpath_string lr = _left->eval_string(c, stack); - xpath_string rr = _right->eval_string(c, stack); - - return find_substring(lr.c_str(), rr.c_str()) != 0; - } - - case ast_func_boolean: - return _left->eval_boolean(c, stack); - - case ast_func_not: - return !_left->eval_boolean(c, stack); - - case ast_func_true: - return true; - - case ast_func_false: - return false; - - case ast_func_lang: - { - if (c.n.attribute()) return false; - - xpath_allocator_capture cr(stack.result); - - xpath_string lang = _left->eval_string(c, stack); - - for (xml_node n = c.n.node(); n; n = n.parent()) - { - xml_attribute a = n.attribute(PUGIXML_TEXT("xml:lang")); - - if (a) - { - const char_t* value = a.value(); - - // strnicmp / strncasecmp is not portable - for (const char_t* lit = lang.c_str(); *lit; ++lit) - { - if (tolower_ascii(*lit) != tolower_ascii(*value)) return false; - ++value; - } - - return *value == 0 || *value == '-'; - } - } - - return false; - } - - case ast_opt_compare_attribute: - { - const char_t* value = (_right->_type == ast_string_constant) ? _right->_data.string : _right->_data.variable->get_string(); - - xml_attribute attr = c.n.node().attribute(_left->_data.nodetest); - - return attr && strequal(attr.value(), value) && is_xpath_attribute(attr.name()); - } - - case ast_variable: - { - assert(_rettype == _data.variable->type()); - - if (_rettype == xpath_type_boolean) - return _data.variable->get_boolean(); - } - - // fallthrough - default: - { - switch (_rettype) - { - case xpath_type_number: - return convert_number_to_boolean(eval_number(c, stack)); - - case xpath_type_string: - { - xpath_allocator_capture cr(stack.result); - - return !eval_string(c, stack).empty(); - } - - case xpath_type_node_set: - { - xpath_allocator_capture cr(stack.result); - - return !eval_node_set(c, stack, nodeset_eval_any).empty(); - } - - default: - assert(false && "Wrong expression for return type boolean"); // unreachable - return false; - } - } - } - } - - double eval_number(const xpath_context& c, const xpath_stack& stack) - { - switch (_type) - { - case ast_op_add: - return _left->eval_number(c, stack) + _right->eval_number(c, stack); - - case ast_op_subtract: - return _left->eval_number(c, stack) - _right->eval_number(c, stack); - - case ast_op_multiply: - return _left->eval_number(c, stack) * _right->eval_number(c, stack); - - case ast_op_divide: - return _left->eval_number(c, stack) / _right->eval_number(c, stack); - - case ast_op_mod: - return fmod(_left->eval_number(c, stack), _right->eval_number(c, stack)); - - case ast_op_negate: - return -_left->eval_number(c, stack); - - case ast_number_constant: - return _data.number; - - case ast_func_last: - return static_cast(c.size); - - case ast_func_position: - return static_cast(c.position); - - case ast_func_count: - { - xpath_allocator_capture cr(stack.result); - - return static_cast(_left->eval_node_set(c, stack, nodeset_eval_all).size()); - } - - case ast_func_string_length_0: - { - xpath_allocator_capture cr(stack.result); - - return static_cast(string_value(c.n, stack.result).length()); - } - - case ast_func_string_length_1: - { - xpath_allocator_capture cr(stack.result); - - return static_cast(_left->eval_string(c, stack).length()); - } - - case ast_func_number_0: - { - xpath_allocator_capture cr(stack.result); - - return convert_string_to_number(string_value(c.n, stack.result).c_str()); - } - - case ast_func_number_1: - return _left->eval_number(c, stack); - - case ast_func_sum: - { - xpath_allocator_capture cr(stack.result); - - double r = 0; - - xpath_node_set_raw ns = _left->eval_node_set(c, stack, nodeset_eval_all); - - for (const xpath_node* it = ns.begin(); it != ns.end(); ++it) - { - xpath_allocator_capture cri(stack.result); - - r += convert_string_to_number(string_value(*it, stack.result).c_str()); - } - - return r; - } - - case ast_func_floor: - { - double r = _left->eval_number(c, stack); - - return r == r ? floor(r) : r; - } - - case ast_func_ceiling: - { - double r = _left->eval_number(c, stack); - - return r == r ? ceil(r) : r; - } - - case ast_func_round: - return round_nearest_nzero(_left->eval_number(c, stack)); - - case ast_variable: - { - assert(_rettype == _data.variable->type()); - - if (_rettype == xpath_type_number) - return _data.variable->get_number(); - } - - // fallthrough - default: - { - switch (_rettype) - { - case xpath_type_boolean: - return eval_boolean(c, stack) ? 1 : 0; - - case xpath_type_string: - { - xpath_allocator_capture cr(stack.result); - - return convert_string_to_number(eval_string(c, stack).c_str()); - } - - case xpath_type_node_set: - { - xpath_allocator_capture cr(stack.result); - - return convert_string_to_number(eval_string(c, stack).c_str()); - } - - default: - assert(false && "Wrong expression for return type number"); // unreachable - return 0; - } - - } - } - } - - xpath_string eval_string_concat(const xpath_context& c, const xpath_stack& stack) - { - assert(_type == ast_func_concat); - - xpath_allocator_capture ct(stack.temp); - - // count the string number - size_t count = 1; - for (xpath_ast_node* nc = _right; nc; nc = nc->_next) count++; - - // allocate a buffer for temporary string objects - xpath_string* buffer = static_cast(stack.temp->allocate(count * sizeof(xpath_string))); - if (!buffer) return xpath_string(); - - // evaluate all strings to temporary stack - xpath_stack swapped_stack = {stack.temp, stack.result}; - - buffer[0] = _left->eval_string(c, swapped_stack); - - size_t pos = 1; - for (xpath_ast_node* n = _right; n; n = n->_next, ++pos) buffer[pos] = n->eval_string(c, swapped_stack); - assert(pos == count); - - // get total length - size_t length = 0; - for (size_t i = 0; i < count; ++i) length += buffer[i].length(); - - // create final string - char_t* result = static_cast(stack.result->allocate((length + 1) * sizeof(char_t))); - if (!result) return xpath_string(); - - char_t* ri = result; - - for (size_t j = 0; j < count; ++j) - for (const char_t* bi = buffer[j].c_str(); *bi; ++bi) - *ri++ = *bi; - - *ri = 0; - - return xpath_string::from_heap_preallocated(result, ri); - } - - xpath_string eval_string(const xpath_context& c, const xpath_stack& stack) - { - switch (_type) - { - case ast_string_constant: - return xpath_string::from_const(_data.string); - - case ast_func_local_name_0: - { - xpath_node na = c.n; - - return xpath_string::from_const(local_name(na)); - } - - case ast_func_local_name_1: - { - xpath_allocator_capture cr(stack.result); - - xpath_node_set_raw ns = _left->eval_node_set(c, stack, nodeset_eval_first); - xpath_node na = ns.first(); - - return xpath_string::from_const(local_name(na)); - } - - case ast_func_name_0: - { - xpath_node na = c.n; - - return xpath_string::from_const(qualified_name(na)); - } - - case ast_func_name_1: - { - xpath_allocator_capture cr(stack.result); - - xpath_node_set_raw ns = _left->eval_node_set(c, stack, nodeset_eval_first); - xpath_node na = ns.first(); - - return xpath_string::from_const(qualified_name(na)); - } - - case ast_func_namespace_uri_0: - { - xpath_node na = c.n; - - return xpath_string::from_const(namespace_uri(na)); - } - - case ast_func_namespace_uri_1: - { - xpath_allocator_capture cr(stack.result); - - xpath_node_set_raw ns = _left->eval_node_set(c, stack, nodeset_eval_first); - xpath_node na = ns.first(); - - return xpath_string::from_const(namespace_uri(na)); - } - - case ast_func_string_0: - return string_value(c.n, stack.result); - - case ast_func_string_1: - return _left->eval_string(c, stack); - - case ast_func_concat: - return eval_string_concat(c, stack); - - case ast_func_substring_before: - { - xpath_allocator_capture cr(stack.temp); - - xpath_stack swapped_stack = {stack.temp, stack.result}; - - xpath_string s = _left->eval_string(c, swapped_stack); - xpath_string p = _right->eval_string(c, swapped_stack); - - const char_t* pos = find_substring(s.c_str(), p.c_str()); - - return pos ? xpath_string::from_heap(s.c_str(), pos, stack.result) : xpath_string(); - } - - case ast_func_substring_after: - { - xpath_allocator_capture cr(stack.temp); - - xpath_stack swapped_stack = {stack.temp, stack.result}; - - xpath_string s = _left->eval_string(c, swapped_stack); - xpath_string p = _right->eval_string(c, swapped_stack); - - const char_t* pos = find_substring(s.c_str(), p.c_str()); - if (!pos) return xpath_string(); - - const char_t* rbegin = pos + p.length(); - const char_t* rend = s.c_str() + s.length(); - - return s.uses_heap() ? xpath_string::from_heap(rbegin, rend, stack.result) : xpath_string::from_const(rbegin); - } - - case ast_func_substring_2: - { - xpath_allocator_capture cr(stack.temp); - - xpath_stack swapped_stack = {stack.temp, stack.result}; - - xpath_string s = _left->eval_string(c, swapped_stack); - size_t s_length = s.length(); - - double first = round_nearest(_right->eval_number(c, stack)); - - if (is_nan(first)) return xpath_string(); // NaN - else if (first >= s_length + 1) return xpath_string(); - - size_t pos = first < 1 ? 1 : static_cast(first); - assert(1 <= pos && pos <= s_length + 1); - - const char_t* rbegin = s.c_str() + (pos - 1); - const char_t* rend = s.c_str() + s.length(); - - return s.uses_heap() ? xpath_string::from_heap(rbegin, rend, stack.result) : xpath_string::from_const(rbegin); - } - - case ast_func_substring_3: - { - xpath_allocator_capture cr(stack.temp); - - xpath_stack swapped_stack = {stack.temp, stack.result}; - - xpath_string s = _left->eval_string(c, swapped_stack); - size_t s_length = s.length(); - - double first = round_nearest(_right->eval_number(c, stack)); - double last = first + round_nearest(_right->_next->eval_number(c, stack)); - - if (is_nan(first) || is_nan(last)) return xpath_string(); - else if (first >= s_length + 1) return xpath_string(); - else if (first >= last) return xpath_string(); - else if (last < 1) return xpath_string(); - - size_t pos = first < 1 ? 1 : static_cast(first); - size_t end = last >= s_length + 1 ? s_length + 1 : static_cast(last); - - assert(1 <= pos && pos <= end && end <= s_length + 1); - const char_t* rbegin = s.c_str() + (pos - 1); - const char_t* rend = s.c_str() + (end - 1); - - return (end == s_length + 1 && !s.uses_heap()) ? xpath_string::from_const(rbegin) : xpath_string::from_heap(rbegin, rend, stack.result); - } - - case ast_func_normalize_space_0: - { - xpath_string s = string_value(c.n, stack.result); - - char_t* begin = s.data(stack.result); - if (!begin) return xpath_string(); - - char_t* end = normalize_space(begin); - - return xpath_string::from_heap_preallocated(begin, end); - } - - case ast_func_normalize_space_1: - { - xpath_string s = _left->eval_string(c, stack); - - char_t* begin = s.data(stack.result); - if (!begin) return xpath_string(); - - char_t* end = normalize_space(begin); - - return xpath_string::from_heap_preallocated(begin, end); - } - - case ast_func_translate: - { - xpath_allocator_capture cr(stack.temp); - - xpath_stack swapped_stack = {stack.temp, stack.result}; - - xpath_string s = _left->eval_string(c, stack); - xpath_string from = _right->eval_string(c, swapped_stack); - xpath_string to = _right->_next->eval_string(c, swapped_stack); - - char_t* begin = s.data(stack.result); - if (!begin) return xpath_string(); - - char_t* end = translate(begin, from.c_str(), to.c_str(), to.length()); - - return xpath_string::from_heap_preallocated(begin, end); - } - - case ast_opt_translate_table: - { - xpath_string s = _left->eval_string(c, stack); - - char_t* begin = s.data(stack.result); - if (!begin) return xpath_string(); - - char_t* end = translate_table(begin, _data.table); - - return xpath_string::from_heap_preallocated(begin, end); - } - - case ast_variable: - { - assert(_rettype == _data.variable->type()); - - if (_rettype == xpath_type_string) - return xpath_string::from_const(_data.variable->get_string()); - } - - // fallthrough - default: - { - switch (_rettype) - { - case xpath_type_boolean: - return xpath_string::from_const(eval_boolean(c, stack) ? PUGIXML_TEXT("true") : PUGIXML_TEXT("false")); - - case xpath_type_number: - return convert_number_to_string(eval_number(c, stack), stack.result); - - case xpath_type_node_set: - { - xpath_allocator_capture cr(stack.temp); - - xpath_stack swapped_stack = {stack.temp, stack.result}; - - xpath_node_set_raw ns = eval_node_set(c, swapped_stack, nodeset_eval_first); - return ns.empty() ? xpath_string() : string_value(ns.first(), stack.result); - } - - default: - assert(false && "Wrong expression for return type string"); // unreachable - return xpath_string(); - } - } - } - } - - xpath_node_set_raw eval_node_set(const xpath_context& c, const xpath_stack& stack, nodeset_eval_t eval) - { - switch (_type) - { - case ast_op_union: - { - xpath_allocator_capture cr(stack.temp); - - xpath_stack swapped_stack = {stack.temp, stack.result}; - - xpath_node_set_raw ls = _left->eval_node_set(c, swapped_stack, eval); - xpath_node_set_raw rs = _right->eval_node_set(c, stack, eval); - - // we can optimize merging two sorted sets, but this is a very rare operation, so don't bother - rs.set_type(xpath_node_set::type_unsorted); - - rs.append(ls.begin(), ls.end(), stack.result); - rs.remove_duplicates(); - - return rs; - } - - case ast_filter: - { - xpath_node_set_raw set = _left->eval_node_set(c, stack, _test == predicate_constant_one ? nodeset_eval_first : nodeset_eval_all); - - // either expression is a number or it contains position() call; sort by document order - if (_test != predicate_posinv) set.sort_do(); - - bool once = eval_once(set.type(), eval); - - apply_predicate(set, 0, stack, once); - - return set; - } - - case ast_func_id: - return xpath_node_set_raw(); - - case ast_step: - { - switch (_axis) - { - case axis_ancestor: - return step_do(c, stack, eval, axis_to_type()); - - case axis_ancestor_or_self: - return step_do(c, stack, eval, axis_to_type()); - - case axis_attribute: - return step_do(c, stack, eval, axis_to_type()); - - case axis_child: - return step_do(c, stack, eval, axis_to_type()); - - case axis_descendant: - return step_do(c, stack, eval, axis_to_type()); - - case axis_descendant_or_self: - return step_do(c, stack, eval, axis_to_type()); - - case axis_following: - return step_do(c, stack, eval, axis_to_type()); - - case axis_following_sibling: - return step_do(c, stack, eval, axis_to_type()); - - case axis_namespace: - // namespaced axis is not supported - return xpath_node_set_raw(); - - case axis_parent: - return step_do(c, stack, eval, axis_to_type()); - - case axis_preceding: - return step_do(c, stack, eval, axis_to_type()); - - case axis_preceding_sibling: - return step_do(c, stack, eval, axis_to_type()); - - case axis_self: - return step_do(c, stack, eval, axis_to_type()); - - default: - assert(false && "Unknown axis"); // unreachable - return xpath_node_set_raw(); - } - } - - case ast_step_root: - { - assert(!_right); // root step can't have any predicates - - xpath_node_set_raw ns; - - ns.set_type(xpath_node_set::type_sorted); - - if (c.n.node()) ns.push_back(c.n.node().root(), stack.result); - else if (c.n.attribute()) ns.push_back(c.n.parent().root(), stack.result); - - return ns; - } - - case ast_variable: - { - assert(_rettype == _data.variable->type()); - - if (_rettype == xpath_type_node_set) - { - const xpath_node_set& s = _data.variable->get_node_set(); - - xpath_node_set_raw ns; - - ns.set_type(s.type()); - ns.append(s.begin(), s.end(), stack.result); - - return ns; - } - } - - // fallthrough - default: - assert(false && "Wrong expression for return type node set"); // unreachable - return xpath_node_set_raw(); - } - } - - void optimize(xpath_allocator* alloc) - { - if (_left) - _left->optimize(alloc); - - if (_right) - _right->optimize(alloc); - - if (_next) - _next->optimize(alloc); - - optimize_self(alloc); - } - - void optimize_self(xpath_allocator* alloc) - { - // Rewrite [position()=expr] with [expr] - // Note that this step has to go before classification to recognize [position()=1] - if ((_type == ast_filter || _type == ast_predicate) && - _right->_type == ast_op_equal && _right->_left->_type == ast_func_position && _right->_right->_rettype == xpath_type_number) - { - _right = _right->_right; - } - - // Classify filter/predicate ops to perform various optimizations during evaluation - if (_type == ast_filter || _type == ast_predicate) - { - assert(_test == predicate_default); - - if (_right->_type == ast_number_constant && _right->_data.number == 1.0) - _test = predicate_constant_one; - else if (_right->_rettype == xpath_type_number && (_right->_type == ast_number_constant || _right->_type == ast_variable || _right->_type == ast_func_last)) - _test = predicate_constant; - else if (_right->_rettype != xpath_type_number && _right->is_posinv_expr()) - _test = predicate_posinv; - } - - // Rewrite descendant-or-self::node()/child::foo with descendant::foo - // The former is a full form of //foo, the latter is much faster since it executes the node test immediately - // Do a similar kind of rewrite for self/descendant/descendant-or-self axes - // Note that we only rewrite positionally invariant steps (//foo[1] != /descendant::foo[1]) - if (_type == ast_step && (_axis == axis_child || _axis == axis_self || _axis == axis_descendant || _axis == axis_descendant_or_self) && _left && - _left->_type == ast_step && _left->_axis == axis_descendant_or_self && _left->_test == nodetest_type_node && !_left->_right && - is_posinv_step()) - { - if (_axis == axis_child || _axis == axis_descendant) - _axis = axis_descendant; - else - _axis = axis_descendant_or_self; - - _left = _left->_left; - } - - // Use optimized lookup table implementation for translate() with constant arguments - if (_type == ast_func_translate && _right->_type == ast_string_constant && _right->_next->_type == ast_string_constant) - { - unsigned char* table = translate_table_generate(alloc, _right->_data.string, _right->_next->_data.string); - - if (table) - { - _type = ast_opt_translate_table; - _data.table = table; - } - } - - // Use optimized path for @attr = 'value' or @attr = $value - if (_type == ast_op_equal && - _left->_type == ast_step && _left->_axis == axis_attribute && _left->_test == nodetest_name && !_left->_left && !_left->_right && - (_right->_type == ast_string_constant || (_right->_type == ast_variable && _right->_rettype == xpath_type_string))) - { - _type = ast_opt_compare_attribute; - } - } - - bool is_posinv_expr() const - { - switch (_type) - { - case ast_func_position: - case ast_func_last: - return false; - - case ast_string_constant: - case ast_number_constant: - case ast_variable: - return true; - - case ast_step: - case ast_step_root: - return true; - - case ast_predicate: - case ast_filter: - return true; - - default: - if (_left && !_left->is_posinv_expr()) return false; - - for (xpath_ast_node* n = _right; n; n = n->_next) - if (!n->is_posinv_expr()) return false; - - return true; - } - } - - bool is_posinv_step() const - { - assert(_type == ast_step); - - for (xpath_ast_node* n = _right; n; n = n->_next) - { - assert(n->_type == ast_predicate); - - if (n->_test != predicate_posinv) - return false; - } - - return true; - } - - xpath_value_type rettype() const - { - return static_cast(_rettype); - } - }; - - struct xpath_parser - { - xpath_allocator* _alloc; - xpath_lexer _lexer; - - const char_t* _query; - xpath_variable_set* _variables; - - xpath_parse_result* _result; - - char_t _scratch[32]; - - xpath_ast_node* error(const char* message) - { - _result->error = message; - _result->offset = _lexer.current_pos() - _query; - - return 0; - } - - xpath_ast_node* error_oom() - { - assert(_alloc->_error); - *_alloc->_error = true; - - return 0; - } - - void* alloc_node() - { - return _alloc->allocate(sizeof(xpath_ast_node)); - } - - xpath_ast_node* alloc_node(ast_type_t type, xpath_value_type rettype, const char_t* value) - { - void* memory = alloc_node(); - return memory ? new (memory) xpath_ast_node(type, rettype, value) : 0; - } - - xpath_ast_node* alloc_node(ast_type_t type, xpath_value_type rettype, double value) - { - void* memory = alloc_node(); - return memory ? new (memory) xpath_ast_node(type, rettype, value) : 0; - } - - xpath_ast_node* alloc_node(ast_type_t type, xpath_value_type rettype, xpath_variable* value) - { - void* memory = alloc_node(); - return memory ? new (memory) xpath_ast_node(type, rettype, value) : 0; - } - - xpath_ast_node* alloc_node(ast_type_t type, xpath_value_type rettype, xpath_ast_node* left = 0, xpath_ast_node* right = 0) - { - void* memory = alloc_node(); - return memory ? new (memory) xpath_ast_node(type, rettype, left, right) : 0; - } - - xpath_ast_node* alloc_node(ast_type_t type, xpath_ast_node* left, axis_t axis, nodetest_t test, const char_t* contents) - { - void* memory = alloc_node(); - return memory ? new (memory) xpath_ast_node(type, left, axis, test, contents) : 0; - } - - xpath_ast_node* alloc_node(ast_type_t type, xpath_ast_node* left, xpath_ast_node* right, predicate_t test) - { - void* memory = alloc_node(); - return memory ? new (memory) xpath_ast_node(type, left, right, test) : 0; - } - - const char_t* alloc_string(const xpath_lexer_string& value) - { - if (!value.begin) - return PUGIXML_TEXT(""); - - size_t length = static_cast(value.end - value.begin); - - char_t* c = static_cast(_alloc->allocate((length + 1) * sizeof(char_t))); - if (!c) return 0; - - memcpy(c, value.begin, length * sizeof(char_t)); - c[length] = 0; - - return c; - } - - xpath_ast_node* parse_function(const xpath_lexer_string& name, size_t argc, xpath_ast_node* args[2]) - { - switch (name.begin[0]) - { - case 'b': - if (name == PUGIXML_TEXT("boolean") && argc == 1) - return alloc_node(ast_func_boolean, xpath_type_boolean, args[0]); - - break; - - case 'c': - if (name == PUGIXML_TEXT("count") && argc == 1) - { - if (args[0]->rettype() != xpath_type_node_set) return error("Function has to be applied to node set"); - return alloc_node(ast_func_count, xpath_type_number, args[0]); - } - else if (name == PUGIXML_TEXT("contains") && argc == 2) - return alloc_node(ast_func_contains, xpath_type_boolean, args[0], args[1]); - else if (name == PUGIXML_TEXT("concat") && argc >= 2) - return alloc_node(ast_func_concat, xpath_type_string, args[0], args[1]); - else if (name == PUGIXML_TEXT("ceiling") && argc == 1) - return alloc_node(ast_func_ceiling, xpath_type_number, args[0]); - - break; - - case 'f': - if (name == PUGIXML_TEXT("false") && argc == 0) - return alloc_node(ast_func_false, xpath_type_boolean); - else if (name == PUGIXML_TEXT("floor") && argc == 1) - return alloc_node(ast_func_floor, xpath_type_number, args[0]); - - break; - - case 'i': - if (name == PUGIXML_TEXT("id") && argc == 1) - return alloc_node(ast_func_id, xpath_type_node_set, args[0]); - - break; - - case 'l': - if (name == PUGIXML_TEXT("last") && argc == 0) - return alloc_node(ast_func_last, xpath_type_number); - else if (name == PUGIXML_TEXT("lang") && argc == 1) - return alloc_node(ast_func_lang, xpath_type_boolean, args[0]); - else if (name == PUGIXML_TEXT("local-name") && argc <= 1) - { - if (argc == 1 && args[0]->rettype() != xpath_type_node_set) return error("Function has to be applied to node set"); - return alloc_node(argc == 0 ? ast_func_local_name_0 : ast_func_local_name_1, xpath_type_string, args[0]); - } - - break; - - case 'n': - if (name == PUGIXML_TEXT("name") && argc <= 1) - { - if (argc == 1 && args[0]->rettype() != xpath_type_node_set) return error("Function has to be applied to node set"); - return alloc_node(argc == 0 ? ast_func_name_0 : ast_func_name_1, xpath_type_string, args[0]); - } - else if (name == PUGIXML_TEXT("namespace-uri") && argc <= 1) - { - if (argc == 1 && args[0]->rettype() != xpath_type_node_set) return error("Function has to be applied to node set"); - return alloc_node(argc == 0 ? ast_func_namespace_uri_0 : ast_func_namespace_uri_1, xpath_type_string, args[0]); - } - else if (name == PUGIXML_TEXT("normalize-space") && argc <= 1) - return alloc_node(argc == 0 ? ast_func_normalize_space_0 : ast_func_normalize_space_1, xpath_type_string, args[0], args[1]); - else if (name == PUGIXML_TEXT("not") && argc == 1) - return alloc_node(ast_func_not, xpath_type_boolean, args[0]); - else if (name == PUGIXML_TEXT("number") && argc <= 1) - return alloc_node(argc == 0 ? ast_func_number_0 : ast_func_number_1, xpath_type_number, args[0]); - - break; - - case 'p': - if (name == PUGIXML_TEXT("position") && argc == 0) - return alloc_node(ast_func_position, xpath_type_number); - - break; - - case 'r': - if (name == PUGIXML_TEXT("round") && argc == 1) - return alloc_node(ast_func_round, xpath_type_number, args[0]); - - break; - - case 's': - if (name == PUGIXML_TEXT("string") && argc <= 1) - return alloc_node(argc == 0 ? ast_func_string_0 : ast_func_string_1, xpath_type_string, args[0]); - else if (name == PUGIXML_TEXT("string-length") && argc <= 1) - return alloc_node(argc == 0 ? ast_func_string_length_0 : ast_func_string_length_1, xpath_type_number, args[0]); - else if (name == PUGIXML_TEXT("starts-with") && argc == 2) - return alloc_node(ast_func_starts_with, xpath_type_boolean, args[0], args[1]); - else if (name == PUGIXML_TEXT("substring-before") && argc == 2) - return alloc_node(ast_func_substring_before, xpath_type_string, args[0], args[1]); - else if (name == PUGIXML_TEXT("substring-after") && argc == 2) - return alloc_node(ast_func_substring_after, xpath_type_string, args[0], args[1]); - else if (name == PUGIXML_TEXT("substring") && (argc == 2 || argc == 3)) - return alloc_node(argc == 2 ? ast_func_substring_2 : ast_func_substring_3, xpath_type_string, args[0], args[1]); - else if (name == PUGIXML_TEXT("sum") && argc == 1) - { - if (args[0]->rettype() != xpath_type_node_set) return error("Function has to be applied to node set"); - return alloc_node(ast_func_sum, xpath_type_number, args[0]); - } - - break; - - case 't': - if (name == PUGIXML_TEXT("translate") && argc == 3) - return alloc_node(ast_func_translate, xpath_type_string, args[0], args[1]); - else if (name == PUGIXML_TEXT("true") && argc == 0) - return alloc_node(ast_func_true, xpath_type_boolean); - - break; - - default: - break; - } - - return error("Unrecognized function or wrong parameter count"); - } - - axis_t parse_axis_name(const xpath_lexer_string& name, bool& specified) - { - specified = true; - - switch (name.begin[0]) - { - case 'a': - if (name == PUGIXML_TEXT("ancestor")) - return axis_ancestor; - else if (name == PUGIXML_TEXT("ancestor-or-self")) - return axis_ancestor_or_self; - else if (name == PUGIXML_TEXT("attribute")) - return axis_attribute; - - break; - - case 'c': - if (name == PUGIXML_TEXT("child")) - return axis_child; - - break; - - case 'd': - if (name == PUGIXML_TEXT("descendant")) - return axis_descendant; - else if (name == PUGIXML_TEXT("descendant-or-self")) - return axis_descendant_or_self; - - break; - - case 'f': - if (name == PUGIXML_TEXT("following")) - return axis_following; - else if (name == PUGIXML_TEXT("following-sibling")) - return axis_following_sibling; - - break; - - case 'n': - if (name == PUGIXML_TEXT("namespace")) - return axis_namespace; - - break; - - case 'p': - if (name == PUGIXML_TEXT("parent")) - return axis_parent; - else if (name == PUGIXML_TEXT("preceding")) - return axis_preceding; - else if (name == PUGIXML_TEXT("preceding-sibling")) - return axis_preceding_sibling; - - break; - - case 's': - if (name == PUGIXML_TEXT("self")) - return axis_self; - - break; - - default: - break; - } - - specified = false; - return axis_child; - } - - nodetest_t parse_node_test_type(const xpath_lexer_string& name) - { - switch (name.begin[0]) - { - case 'c': - if (name == PUGIXML_TEXT("comment")) - return nodetest_type_comment; - - break; - - case 'n': - if (name == PUGIXML_TEXT("node")) - return nodetest_type_node; - - break; - - case 'p': - if (name == PUGIXML_TEXT("processing-instruction")) - return nodetest_type_pi; - - break; - - case 't': - if (name == PUGIXML_TEXT("text")) - return nodetest_type_text; - - break; - - default: - break; - } - - return nodetest_none; - } - - // PrimaryExpr ::= VariableReference | '(' Expr ')' | Literal | Number | FunctionCall - xpath_ast_node* parse_primary_expression() - { - switch (_lexer.current()) - { - case lex_var_ref: - { - xpath_lexer_string name = _lexer.contents(); - - if (!_variables) - return error("Unknown variable: variable set is not provided"); - - xpath_variable* var = 0; - if (!get_variable_scratch(_scratch, _variables, name.begin, name.end, &var)) - return error_oom(); - - if (!var) - return error("Unknown variable: variable set does not contain the given name"); - - _lexer.next(); - - return alloc_node(ast_variable, var->type(), var); - } - - case lex_open_brace: - { - _lexer.next(); - - xpath_ast_node* n = parse_expression(); - if (!n) return 0; - - if (_lexer.current() != lex_close_brace) - return error("Expected ')' to match an opening '('"); - - _lexer.next(); - - return n; - } - - case lex_quoted_string: - { - const char_t* value = alloc_string(_lexer.contents()); - if (!value) return 0; - - _lexer.next(); - - return alloc_node(ast_string_constant, xpath_type_string, value); - } - - case lex_number: - { - double value = 0; - - if (!convert_string_to_number_scratch(_scratch, _lexer.contents().begin, _lexer.contents().end, &value)) - return error_oom(); - - _lexer.next(); - - return alloc_node(ast_number_constant, xpath_type_number, value); - } - - case lex_string: - { - xpath_ast_node* args[2] = {0}; - size_t argc = 0; - - xpath_lexer_string function = _lexer.contents(); - _lexer.next(); - - xpath_ast_node* last_arg = 0; - - if (_lexer.current() != lex_open_brace) - return error("Unrecognized function call"); - _lexer.next(); - - while (_lexer.current() != lex_close_brace) - { - if (argc > 0) - { - if (_lexer.current() != lex_comma) - return error("No comma between function arguments"); - _lexer.next(); - } - - xpath_ast_node* n = parse_expression(); - if (!n) return 0; - - if (argc < 2) args[argc] = n; - else last_arg->set_next(n); - - argc++; - last_arg = n; - } - - _lexer.next(); - - return parse_function(function, argc, args); - } - - default: - return error("Unrecognizable primary expression"); - } - } - - // FilterExpr ::= PrimaryExpr | FilterExpr Predicate - // Predicate ::= '[' PredicateExpr ']' - // PredicateExpr ::= Expr - xpath_ast_node* parse_filter_expression() - { - xpath_ast_node* n = parse_primary_expression(); - if (!n) return 0; - - while (_lexer.current() == lex_open_square_brace) - { - _lexer.next(); - - if (n->rettype() != xpath_type_node_set) - return error("Predicate has to be applied to node set"); - - xpath_ast_node* expr = parse_expression(); - if (!expr) return 0; - - n = alloc_node(ast_filter, n, expr, predicate_default); - if (!n) return 0; - - if (_lexer.current() != lex_close_square_brace) - return error("Expected ']' to match an opening '['"); - - _lexer.next(); - } - - return n; - } - - // Step ::= AxisSpecifier NodeTest Predicate* | AbbreviatedStep - // AxisSpecifier ::= AxisName '::' | '@'? - // NodeTest ::= NameTest | NodeType '(' ')' | 'processing-instruction' '(' Literal ')' - // NameTest ::= '*' | NCName ':' '*' | QName - // AbbreviatedStep ::= '.' | '..' - xpath_ast_node* parse_step(xpath_ast_node* set) - { - if (set && set->rettype() != xpath_type_node_set) - return error("Step has to be applied to node set"); - - bool axis_specified = false; - axis_t axis = axis_child; // implied child axis - - if (_lexer.current() == lex_axis_attribute) - { - axis = axis_attribute; - axis_specified = true; - - _lexer.next(); - } - else if (_lexer.current() == lex_dot) - { - _lexer.next(); - - if (_lexer.current() == lex_open_square_brace) - return error("Predicates are not allowed after an abbreviated step"); - - return alloc_node(ast_step, set, axis_self, nodetest_type_node, 0); - } - else if (_lexer.current() == lex_double_dot) - { - _lexer.next(); - - if (_lexer.current() == lex_open_square_brace) - return error("Predicates are not allowed after an abbreviated step"); - - return alloc_node(ast_step, set, axis_parent, nodetest_type_node, 0); - } - - nodetest_t nt_type = nodetest_none; - xpath_lexer_string nt_name; - - if (_lexer.current() == lex_string) - { - // node name test - nt_name = _lexer.contents(); - _lexer.next(); - - // was it an axis name? - if (_lexer.current() == lex_double_colon) - { - // parse axis name - if (axis_specified) - return error("Two axis specifiers in one step"); - - axis = parse_axis_name(nt_name, axis_specified); - - if (!axis_specified) - return error("Unknown axis"); - - // read actual node test - _lexer.next(); - - if (_lexer.current() == lex_multiply) - { - nt_type = nodetest_all; - nt_name = xpath_lexer_string(); - _lexer.next(); - } - else if (_lexer.current() == lex_string) - { - nt_name = _lexer.contents(); - _lexer.next(); - } - else - { - return error("Unrecognized node test"); - } - } - - if (nt_type == nodetest_none) - { - // node type test or processing-instruction - if (_lexer.current() == lex_open_brace) - { - _lexer.next(); - - if (_lexer.current() == lex_close_brace) - { - _lexer.next(); - - nt_type = parse_node_test_type(nt_name); - - if (nt_type == nodetest_none) - return error("Unrecognized node type"); - - nt_name = xpath_lexer_string(); - } - else if (nt_name == PUGIXML_TEXT("processing-instruction")) - { - if (_lexer.current() != lex_quoted_string) - return error("Only literals are allowed as arguments to processing-instruction()"); - - nt_type = nodetest_pi; - nt_name = _lexer.contents(); - _lexer.next(); - - if (_lexer.current() != lex_close_brace) - return error("Unmatched brace near processing-instruction()"); - _lexer.next(); - } - else - { - return error("Unmatched brace near node type test"); - } - } - // QName or NCName:* - else - { - if (nt_name.end - nt_name.begin > 2 && nt_name.end[-2] == ':' && nt_name.end[-1] == '*') // NCName:* - { - nt_name.end--; // erase * - - nt_type = nodetest_all_in_namespace; - } - else - { - nt_type = nodetest_name; - } - } - } - } - else if (_lexer.current() == lex_multiply) - { - nt_type = nodetest_all; - _lexer.next(); - } - else - { - return error("Unrecognized node test"); - } - - const char_t* nt_name_copy = alloc_string(nt_name); - if (!nt_name_copy) return 0; - - xpath_ast_node* n = alloc_node(ast_step, set, axis, nt_type, nt_name_copy); - if (!n) return 0; - - xpath_ast_node* last = 0; - - while (_lexer.current() == lex_open_square_brace) - { - _lexer.next(); - - xpath_ast_node* expr = parse_expression(); - if (!expr) return 0; - - xpath_ast_node* pred = alloc_node(ast_predicate, 0, expr, predicate_default); - if (!pred) return 0; - - if (_lexer.current() != lex_close_square_brace) - return error("Expected ']' to match an opening '['"); - _lexer.next(); - - if (last) last->set_next(pred); - else n->set_right(pred); - - last = pred; - } - - return n; - } - - // RelativeLocationPath ::= Step | RelativeLocationPath '/' Step | RelativeLocationPath '//' Step - xpath_ast_node* parse_relative_location_path(xpath_ast_node* set) - { - xpath_ast_node* n = parse_step(set); - if (!n) return 0; - - while (_lexer.current() == lex_slash || _lexer.current() == lex_double_slash) - { - lexeme_t l = _lexer.current(); - _lexer.next(); - - if (l == lex_double_slash) - { - n = alloc_node(ast_step, n, axis_descendant_or_self, nodetest_type_node, 0); - if (!n) return 0; - } - - n = parse_step(n); - if (!n) return 0; - } - - return n; - } - - // LocationPath ::= RelativeLocationPath | AbsoluteLocationPath - // AbsoluteLocationPath ::= '/' RelativeLocationPath? | '//' RelativeLocationPath - xpath_ast_node* parse_location_path() - { - if (_lexer.current() == lex_slash) - { - _lexer.next(); - - xpath_ast_node* n = alloc_node(ast_step_root, xpath_type_node_set); - if (!n) return 0; - - // relative location path can start from axis_attribute, dot, double_dot, multiply and string lexemes; any other lexeme means standalone root path - lexeme_t l = _lexer.current(); - - if (l == lex_string || l == lex_axis_attribute || l == lex_dot || l == lex_double_dot || l == lex_multiply) - return parse_relative_location_path(n); - else - return n; - } - else if (_lexer.current() == lex_double_slash) - { - _lexer.next(); - - xpath_ast_node* n = alloc_node(ast_step_root, xpath_type_node_set); - if (!n) return 0; - - n = alloc_node(ast_step, n, axis_descendant_or_self, nodetest_type_node, 0); - if (!n) return 0; - - return parse_relative_location_path(n); - } - - // else clause moved outside of if because of bogus warning 'control may reach end of non-void function being inlined' in gcc 4.0.1 - return parse_relative_location_path(0); - } - - // PathExpr ::= LocationPath - // | FilterExpr - // | FilterExpr '/' RelativeLocationPath - // | FilterExpr '//' RelativeLocationPath - // UnionExpr ::= PathExpr | UnionExpr '|' PathExpr - // UnaryExpr ::= UnionExpr | '-' UnaryExpr - xpath_ast_node* parse_path_or_unary_expression() - { - // Clarification. - // PathExpr begins with either LocationPath or FilterExpr. - // FilterExpr begins with PrimaryExpr - // PrimaryExpr begins with '$' in case of it being a variable reference, - // '(' in case of it being an expression, string literal, number constant or - // function call. - if (_lexer.current() == lex_var_ref || _lexer.current() == lex_open_brace || - _lexer.current() == lex_quoted_string || _lexer.current() == lex_number || - _lexer.current() == lex_string) - { - if (_lexer.current() == lex_string) - { - // This is either a function call, or not - if not, we shall proceed with location path - const char_t* state = _lexer.state(); - - while (PUGI__IS_CHARTYPE(*state, ct_space)) ++state; - - if (*state != '(') - return parse_location_path(); - - // This looks like a function call; however this still can be a node-test. Check it. - if (parse_node_test_type(_lexer.contents()) != nodetest_none) - return parse_location_path(); - } - - xpath_ast_node* n = parse_filter_expression(); - if (!n) return 0; - - if (_lexer.current() == lex_slash || _lexer.current() == lex_double_slash) - { - lexeme_t l = _lexer.current(); - _lexer.next(); - - if (l == lex_double_slash) - { - if (n->rettype() != xpath_type_node_set) - return error("Step has to be applied to node set"); - - n = alloc_node(ast_step, n, axis_descendant_or_self, nodetest_type_node, 0); - if (!n) return 0; - } - - // select from location path - return parse_relative_location_path(n); - } - - return n; - } - else if (_lexer.current() == lex_minus) - { - _lexer.next(); - - // precedence 7+ - only parses union expressions - xpath_ast_node* n = parse_expression(7); - if (!n) return 0; - - return alloc_node(ast_op_negate, xpath_type_number, n); - } - else - { - return parse_location_path(); - } - } - - struct binary_op_t - { - ast_type_t asttype; - xpath_value_type rettype; - int precedence; - - binary_op_t(): asttype(ast_unknown), rettype(xpath_type_none), precedence(0) - { - } - - binary_op_t(ast_type_t asttype_, xpath_value_type rettype_, int precedence_): asttype(asttype_), rettype(rettype_), precedence(precedence_) - { - } - - static binary_op_t parse(xpath_lexer& lexer) - { - switch (lexer.current()) - { - case lex_string: - if (lexer.contents() == PUGIXML_TEXT("or")) - return binary_op_t(ast_op_or, xpath_type_boolean, 1); - else if (lexer.contents() == PUGIXML_TEXT("and")) - return binary_op_t(ast_op_and, xpath_type_boolean, 2); - else if (lexer.contents() == PUGIXML_TEXT("div")) - return binary_op_t(ast_op_divide, xpath_type_number, 6); - else if (lexer.contents() == PUGIXML_TEXT("mod")) - return binary_op_t(ast_op_mod, xpath_type_number, 6); - else - return binary_op_t(); - - case lex_equal: - return binary_op_t(ast_op_equal, xpath_type_boolean, 3); - - case lex_not_equal: - return binary_op_t(ast_op_not_equal, xpath_type_boolean, 3); - - case lex_less: - return binary_op_t(ast_op_less, xpath_type_boolean, 4); - - case lex_greater: - return binary_op_t(ast_op_greater, xpath_type_boolean, 4); - - case lex_less_or_equal: - return binary_op_t(ast_op_less_or_equal, xpath_type_boolean, 4); - - case lex_greater_or_equal: - return binary_op_t(ast_op_greater_or_equal, xpath_type_boolean, 4); - - case lex_plus: - return binary_op_t(ast_op_add, xpath_type_number, 5); - - case lex_minus: - return binary_op_t(ast_op_subtract, xpath_type_number, 5); - - case lex_multiply: - return binary_op_t(ast_op_multiply, xpath_type_number, 6); - - case lex_union: - return binary_op_t(ast_op_union, xpath_type_node_set, 7); - - default: - return binary_op_t(); - } - } - }; - - xpath_ast_node* parse_expression_rec(xpath_ast_node* lhs, int limit) - { - binary_op_t op = binary_op_t::parse(_lexer); - - while (op.asttype != ast_unknown && op.precedence >= limit) - { - _lexer.next(); - - xpath_ast_node* rhs = parse_path_or_unary_expression(); - if (!rhs) return 0; - - binary_op_t nextop = binary_op_t::parse(_lexer); - - while (nextop.asttype != ast_unknown && nextop.precedence > op.precedence) - { - rhs = parse_expression_rec(rhs, nextop.precedence); - if (!rhs) return 0; - - nextop = binary_op_t::parse(_lexer); - } - - if (op.asttype == ast_op_union && (lhs->rettype() != xpath_type_node_set || rhs->rettype() != xpath_type_node_set)) - return error("Union operator has to be applied to node sets"); - - lhs = alloc_node(op.asttype, op.rettype, lhs, rhs); - if (!lhs) return 0; - - op = binary_op_t::parse(_lexer); - } - - return lhs; - } - - // Expr ::= OrExpr - // OrExpr ::= AndExpr | OrExpr 'or' AndExpr - // AndExpr ::= EqualityExpr | AndExpr 'and' EqualityExpr - // EqualityExpr ::= RelationalExpr - // | EqualityExpr '=' RelationalExpr - // | EqualityExpr '!=' RelationalExpr - // RelationalExpr ::= AdditiveExpr - // | RelationalExpr '<' AdditiveExpr - // | RelationalExpr '>' AdditiveExpr - // | RelationalExpr '<=' AdditiveExpr - // | RelationalExpr '>=' AdditiveExpr - // AdditiveExpr ::= MultiplicativeExpr - // | AdditiveExpr '+' MultiplicativeExpr - // | AdditiveExpr '-' MultiplicativeExpr - // MultiplicativeExpr ::= UnaryExpr - // | MultiplicativeExpr '*' UnaryExpr - // | MultiplicativeExpr 'div' UnaryExpr - // | MultiplicativeExpr 'mod' UnaryExpr - xpath_ast_node* parse_expression(int limit = 0) - { - xpath_ast_node* n = parse_path_or_unary_expression(); - if (!n) return 0; - - return parse_expression_rec(n, limit); - } - - xpath_parser(const char_t* query, xpath_variable_set* variables, xpath_allocator* alloc, xpath_parse_result* result): _alloc(alloc), _lexer(query), _query(query), _variables(variables), _result(result) - { - } - - xpath_ast_node* parse() - { - xpath_ast_node* n = parse_expression(); - if (!n) return 0; - - // check if there are unparsed tokens left - if (_lexer.current() != lex_eof) - return error("Incorrect query"); - - return n; - } - - static xpath_ast_node* parse(const char_t* query, xpath_variable_set* variables, xpath_allocator* alloc, xpath_parse_result* result) - { - xpath_parser parser(query, variables, alloc, result); - - return parser.parse(); - } - }; - - struct xpath_query_impl - { - static xpath_query_impl* create() - { - void* memory = xml_memory::allocate(sizeof(xpath_query_impl)); - if (!memory) return 0; - - return new (memory) xpath_query_impl(); - } - - static void destroy(xpath_query_impl* impl) - { - // free all allocated pages - impl->alloc.release(); - - // free allocator memory (with the first page) - xml_memory::deallocate(impl); - } - - xpath_query_impl(): root(0), alloc(&block, &oom), oom(false) - { - block.next = 0; - block.capacity = sizeof(block.data); - } - - xpath_ast_node* root; - xpath_allocator alloc; - xpath_memory_block block; - bool oom; - }; - - PUGI__FN impl::xpath_ast_node* evaluate_node_set_prepare(xpath_query_impl* impl) - { - if (!impl) return 0; - - if (impl->root->rettype() != xpath_type_node_set) - { - #ifdef PUGIXML_NO_EXCEPTIONS - return 0; - #else - xpath_parse_result res; - res.error = "Expression does not evaluate to node set"; - - throw xpath_exception(res); - #endif - } - - return impl->root; - } -PUGI__NS_END - -namespace pugi -{ -#ifndef PUGIXML_NO_EXCEPTIONS - PUGI__FN xpath_exception::xpath_exception(const xpath_parse_result& result_): _result(result_) - { - assert(_result.error); - } - - PUGI__FN const char* xpath_exception::what() const throw() - { - return _result.error; - } - - PUGI__FN const xpath_parse_result& xpath_exception::result() const - { - return _result; - } -#endif - - PUGI__FN xpath_node::xpath_node() - { - } - - PUGI__FN xpath_node::xpath_node(const xml_node& node_): _node(node_) - { - } - - PUGI__FN xpath_node::xpath_node(const xml_attribute& attribute_, const xml_node& parent_): _node(attribute_ ? parent_ : xml_node()), _attribute(attribute_) - { - } - - PUGI__FN xml_node xpath_node::node() const - { - return _attribute ? xml_node() : _node; - } - - PUGI__FN xml_attribute xpath_node::attribute() const - { - return _attribute; - } - - PUGI__FN xml_node xpath_node::parent() const - { - return _attribute ? _node : _node.parent(); - } - - PUGI__FN static void unspecified_bool_xpath_node(xpath_node***) - { - } - - PUGI__FN xpath_node::operator xpath_node::unspecified_bool_type() const - { - return (_node || _attribute) ? unspecified_bool_xpath_node : 0; - } - - PUGI__FN bool xpath_node::operator!() const - { - return !(_node || _attribute); - } - - PUGI__FN bool xpath_node::operator==(const xpath_node& n) const - { - return _node == n._node && _attribute == n._attribute; - } - - PUGI__FN bool xpath_node::operator!=(const xpath_node& n) const - { - return _node != n._node || _attribute != n._attribute; - } - -#ifdef __BORLANDC__ - PUGI__FN bool operator&&(const xpath_node& lhs, bool rhs) - { - return (bool)lhs && rhs; - } - - PUGI__FN bool operator||(const xpath_node& lhs, bool rhs) - { - return (bool)lhs || rhs; - } -#endif - - PUGI__FN void xpath_node_set::_assign(const_iterator begin_, const_iterator end_, type_t type_) - { - assert(begin_ <= end_); - - size_t size_ = static_cast(end_ - begin_); - - if (size_ <= 1) - { - // deallocate old buffer - if (_begin != &_storage) impl::xml_memory::deallocate(_begin); - - // use internal buffer - if (begin_ != end_) _storage = *begin_; - - _begin = &_storage; - _end = &_storage + size_; - _type = type_; - } - else - { - // make heap copy - xpath_node* storage = static_cast(impl::xml_memory::allocate(size_ * sizeof(xpath_node))); - - if (!storage) - { - #ifdef PUGIXML_NO_EXCEPTIONS - return; - #else - throw std::bad_alloc(); - #endif - } - - memcpy(storage, begin_, size_ * sizeof(xpath_node)); - - // deallocate old buffer - if (_begin != &_storage) impl::xml_memory::deallocate(_begin); - - // finalize - _begin = storage; - _end = storage + size_; - _type = type_; - } - } - -#ifdef PUGIXML_HAS_MOVE - PUGI__FN void xpath_node_set::_move(xpath_node_set& rhs) PUGIXML_NOEXCEPT - { - _type = rhs._type; - _storage = rhs._storage; - _begin = (rhs._begin == &rhs._storage) ? &_storage : rhs._begin; - _end = _begin + (rhs._end - rhs._begin); - - rhs._type = type_unsorted; - rhs._begin = &rhs._storage; - rhs._end = rhs._begin; - } -#endif - - PUGI__FN xpath_node_set::xpath_node_set(): _type(type_unsorted), _begin(&_storage), _end(&_storage) - { - } - - PUGI__FN xpath_node_set::xpath_node_set(const_iterator begin_, const_iterator end_, type_t type_): _type(type_unsorted), _begin(&_storage), _end(&_storage) - { - _assign(begin_, end_, type_); - } - - PUGI__FN xpath_node_set::~xpath_node_set() - { - if (_begin != &_storage) - impl::xml_memory::deallocate(_begin); - } - - PUGI__FN xpath_node_set::xpath_node_set(const xpath_node_set& ns): _type(type_unsorted), _begin(&_storage), _end(&_storage) - { - _assign(ns._begin, ns._end, ns._type); - } - - PUGI__FN xpath_node_set& xpath_node_set::operator=(const xpath_node_set& ns) - { - if (this == &ns) return *this; - - _assign(ns._begin, ns._end, ns._type); - - return *this; - } - -#ifdef PUGIXML_HAS_MOVE - PUGI__FN xpath_node_set::xpath_node_set(xpath_node_set&& rhs) PUGIXML_NOEXCEPT: _type(type_unsorted), _begin(&_storage), _end(&_storage) - { - _move(rhs); - } - - PUGI__FN xpath_node_set& xpath_node_set::operator=(xpath_node_set&& rhs) PUGIXML_NOEXCEPT - { - if (this == &rhs) return *this; - - if (_begin != &_storage) - impl::xml_memory::deallocate(_begin); - - _move(rhs); - - return *this; - } -#endif - - PUGI__FN xpath_node_set::type_t xpath_node_set::type() const - { - return _type; - } - - PUGI__FN size_t xpath_node_set::size() const - { - return _end - _begin; - } - - PUGI__FN bool xpath_node_set::empty() const - { - return _begin == _end; - } - - PUGI__FN const xpath_node& xpath_node_set::operator[](size_t index) const - { - assert(index < size()); - return _begin[index]; - } - - PUGI__FN xpath_node_set::const_iterator xpath_node_set::begin() const - { - return _begin; - } - - PUGI__FN xpath_node_set::const_iterator xpath_node_set::end() const - { - return _end; - } - - PUGI__FN void xpath_node_set::sort(bool reverse) - { - _type = impl::xpath_sort(_begin, _end, _type, reverse); - } - - PUGI__FN xpath_node xpath_node_set::first() const - { - return impl::xpath_first(_begin, _end, _type); - } - - PUGI__FN xpath_parse_result::xpath_parse_result(): error("Internal error"), offset(0) - { - } - - PUGI__FN xpath_parse_result::operator bool() const - { - return error == 0; - } - - PUGI__FN const char* xpath_parse_result::description() const - { - return error ? error : "No error"; - } - - PUGI__FN xpath_variable::xpath_variable(xpath_value_type type_): _type(type_), _next(0) - { - } - - PUGI__FN const char_t* xpath_variable::name() const - { - switch (_type) - { - case xpath_type_node_set: - return static_cast(this)->name; - - case xpath_type_number: - return static_cast(this)->name; - - case xpath_type_string: - return static_cast(this)->name; - - case xpath_type_boolean: - return static_cast(this)->name; - - default: - assert(false && "Invalid variable type"); // unreachable - return 0; - } - } - - PUGI__FN xpath_value_type xpath_variable::type() const - { - return _type; - } - - PUGI__FN bool xpath_variable::get_boolean() const - { - return (_type == xpath_type_boolean) ? static_cast(this)->value : false; - } - - PUGI__FN double xpath_variable::get_number() const - { - return (_type == xpath_type_number) ? static_cast(this)->value : impl::gen_nan(); - } - - PUGI__FN const char_t* xpath_variable::get_string() const - { - const char_t* value = (_type == xpath_type_string) ? static_cast(this)->value : 0; - return value ? value : PUGIXML_TEXT(""); - } - - PUGI__FN const xpath_node_set& xpath_variable::get_node_set() const - { - return (_type == xpath_type_node_set) ? static_cast(this)->value : impl::dummy_node_set; - } - - PUGI__FN bool xpath_variable::set(bool value) - { - if (_type != xpath_type_boolean) return false; - - static_cast(this)->value = value; - return true; - } - - PUGI__FN bool xpath_variable::set(double value) - { - if (_type != xpath_type_number) return false; - - static_cast(this)->value = value; - return true; - } - - PUGI__FN bool xpath_variable::set(const char_t* value) - { - if (_type != xpath_type_string) return false; - - impl::xpath_variable_string* var = static_cast(this); - - // duplicate string - size_t size = (impl::strlength(value) + 1) * sizeof(char_t); - - char_t* copy = static_cast(impl::xml_memory::allocate(size)); - if (!copy) return false; - - memcpy(copy, value, size); - - // replace old string - if (var->value) impl::xml_memory::deallocate(var->value); - var->value = copy; - - return true; - } - - PUGI__FN bool xpath_variable::set(const xpath_node_set& value) - { - if (_type != xpath_type_node_set) return false; - - static_cast(this)->value = value; - return true; - } - - PUGI__FN xpath_variable_set::xpath_variable_set() - { - for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i) - _data[i] = 0; - } - - PUGI__FN xpath_variable_set::~xpath_variable_set() - { - for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i) - _destroy(_data[i]); - } - - PUGI__FN xpath_variable_set::xpath_variable_set(const xpath_variable_set& rhs) - { - for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i) - _data[i] = 0; - - _assign(rhs); - } - - PUGI__FN xpath_variable_set& xpath_variable_set::operator=(const xpath_variable_set& rhs) - { - if (this == &rhs) return *this; - - _assign(rhs); - - return *this; - } - -#ifdef PUGIXML_HAS_MOVE - PUGI__FN xpath_variable_set::xpath_variable_set(xpath_variable_set&& rhs) PUGIXML_NOEXCEPT - { - for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i) - { - _data[i] = rhs._data[i]; - rhs._data[i] = 0; - } - } - - PUGI__FN xpath_variable_set& xpath_variable_set::operator=(xpath_variable_set&& rhs) PUGIXML_NOEXCEPT - { - for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i) - { - _destroy(_data[i]); - - _data[i] = rhs._data[i]; - rhs._data[i] = 0; - } - - return *this; - } -#endif - - PUGI__FN void xpath_variable_set::_assign(const xpath_variable_set& rhs) - { - xpath_variable_set temp; - - for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i) - if (rhs._data[i] && !_clone(rhs._data[i], &temp._data[i])) - return; - - _swap(temp); - } - - PUGI__FN void xpath_variable_set::_swap(xpath_variable_set& rhs) - { - for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i) - { - xpath_variable* chain = _data[i]; - - _data[i] = rhs._data[i]; - rhs._data[i] = chain; - } - } - - PUGI__FN xpath_variable* xpath_variable_set::_find(const char_t* name) const - { - const size_t hash_size = sizeof(_data) / sizeof(_data[0]); - size_t hash = impl::hash_string(name) % hash_size; - - // look for existing variable - for (xpath_variable* var = _data[hash]; var; var = var->_next) - if (impl::strequal(var->name(), name)) - return var; - - return 0; - } - - PUGI__FN bool xpath_variable_set::_clone(xpath_variable* var, xpath_variable** out_result) - { - xpath_variable* last = 0; - - while (var) - { - // allocate storage for new variable - xpath_variable* nvar = impl::new_xpath_variable(var->_type, var->name()); - if (!nvar) return false; - - // link the variable to the result immediately to handle failures gracefully - if (last) - last->_next = nvar; - else - *out_result = nvar; - - last = nvar; - - // copy the value; this can fail due to out-of-memory conditions - if (!impl::copy_xpath_variable(nvar, var)) return false; - - var = var->_next; - } - - return true; - } - - PUGI__FN void xpath_variable_set::_destroy(xpath_variable* var) - { - while (var) - { - xpath_variable* next = var->_next; - - impl::delete_xpath_variable(var->_type, var); - - var = next; - } - } - - PUGI__FN xpath_variable* xpath_variable_set::add(const char_t* name, xpath_value_type type) - { - const size_t hash_size = sizeof(_data) / sizeof(_data[0]); - size_t hash = impl::hash_string(name) % hash_size; - - // look for existing variable - for (xpath_variable* var = _data[hash]; var; var = var->_next) - if (impl::strequal(var->name(), name)) - return var->type() == type ? var : 0; - - // add new variable - xpath_variable* result = impl::new_xpath_variable(type, name); - - if (result) - { - result->_next = _data[hash]; - - _data[hash] = result; - } - - return result; - } - - PUGI__FN bool xpath_variable_set::set(const char_t* name, bool value) - { - xpath_variable* var = add(name, xpath_type_boolean); - return var ? var->set(value) : false; - } - - PUGI__FN bool xpath_variable_set::set(const char_t* name, double value) - { - xpath_variable* var = add(name, xpath_type_number); - return var ? var->set(value) : false; - } - - PUGI__FN bool xpath_variable_set::set(const char_t* name, const char_t* value) - { - xpath_variable* var = add(name, xpath_type_string); - return var ? var->set(value) : false; - } - - PUGI__FN bool xpath_variable_set::set(const char_t* name, const xpath_node_set& value) - { - xpath_variable* var = add(name, xpath_type_node_set); - return var ? var->set(value) : false; - } - - PUGI__FN xpath_variable* xpath_variable_set::get(const char_t* name) - { - return _find(name); - } - - PUGI__FN const xpath_variable* xpath_variable_set::get(const char_t* name) const - { - return _find(name); - } - - PUGI__FN xpath_query::xpath_query(const char_t* query, xpath_variable_set* variables): _impl(0) - { - impl::xpath_query_impl* qimpl = impl::xpath_query_impl::create(); - - if (!qimpl) - { - #ifdef PUGIXML_NO_EXCEPTIONS - _result.error = "Out of memory"; - #else - throw std::bad_alloc(); - #endif - } - else - { - using impl::auto_deleter; // MSVC7 workaround - auto_deleter impl(qimpl, impl::xpath_query_impl::destroy); - - qimpl->root = impl::xpath_parser::parse(query, variables, &qimpl->alloc, &_result); - - if (qimpl->root) - { - qimpl->root->optimize(&qimpl->alloc); - - _impl = impl.release(); - _result.error = 0; - } - else - { - #ifdef PUGIXML_NO_EXCEPTIONS - if (qimpl->oom) _result.error = "Out of memory"; - #else - if (qimpl->oom) throw std::bad_alloc(); - throw xpath_exception(_result); - #endif - } - } - } - - PUGI__FN xpath_query::xpath_query(): _impl(0) - { - } - - PUGI__FN xpath_query::~xpath_query() - { - if (_impl) - impl::xpath_query_impl::destroy(static_cast(_impl)); - } - -#ifdef PUGIXML_HAS_MOVE - PUGI__FN xpath_query::xpath_query(xpath_query&& rhs) PUGIXML_NOEXCEPT - { - _impl = rhs._impl; - _result = rhs._result; - rhs._impl = 0; - rhs._result = xpath_parse_result(); - } - - PUGI__FN xpath_query& xpath_query::operator=(xpath_query&& rhs) PUGIXML_NOEXCEPT - { - if (this == &rhs) return *this; - - if (_impl) - impl::xpath_query_impl::destroy(static_cast(_impl)); - - _impl = rhs._impl; - _result = rhs._result; - rhs._impl = 0; - rhs._result = xpath_parse_result(); - - return *this; - } -#endif - - PUGI__FN xpath_value_type xpath_query::return_type() const - { - if (!_impl) return xpath_type_none; - - return static_cast(_impl)->root->rettype(); - } - - PUGI__FN bool xpath_query::evaluate_boolean(const xpath_node& n) const - { - if (!_impl) return false; - - impl::xpath_context c(n, 1, 1); - impl::xpath_stack_data sd; - - bool r = static_cast(_impl)->root->eval_boolean(c, sd.stack); - - if (sd.oom) - { - #ifdef PUGIXML_NO_EXCEPTIONS - return false; - #else - throw std::bad_alloc(); - #endif - } - - return r; - } - - PUGI__FN double xpath_query::evaluate_number(const xpath_node& n) const - { - if (!_impl) return impl::gen_nan(); - - impl::xpath_context c(n, 1, 1); - impl::xpath_stack_data sd; - - double r = static_cast(_impl)->root->eval_number(c, sd.stack); - - if (sd.oom) - { - #ifdef PUGIXML_NO_EXCEPTIONS - return impl::gen_nan(); - #else - throw std::bad_alloc(); - #endif - } - - return r; - } - -#ifndef PUGIXML_NO_STL - PUGI__FN string_t xpath_query::evaluate_string(const xpath_node& n) const - { - if (!_impl) return string_t(); - - impl::xpath_context c(n, 1, 1); - impl::xpath_stack_data sd; - - impl::xpath_string r = static_cast(_impl)->root->eval_string(c, sd.stack); - - if (sd.oom) - { - #ifdef PUGIXML_NO_EXCEPTIONS - return string_t(); - #else - throw std::bad_alloc(); - #endif - } - - return string_t(r.c_str(), r.length()); - } -#endif - - PUGI__FN size_t xpath_query::evaluate_string(char_t* buffer, size_t capacity, const xpath_node& n) const - { - impl::xpath_context c(n, 1, 1); - impl::xpath_stack_data sd; - - impl::xpath_string r = _impl ? static_cast(_impl)->root->eval_string(c, sd.stack) : impl::xpath_string(); - - if (sd.oom) - { - #ifdef PUGIXML_NO_EXCEPTIONS - r = impl::xpath_string(); - #else - throw std::bad_alloc(); - #endif - } - - size_t full_size = r.length() + 1; - - if (capacity > 0) - { - size_t size = (full_size < capacity) ? full_size : capacity; - assert(size > 0); - - memcpy(buffer, r.c_str(), (size - 1) * sizeof(char_t)); - buffer[size - 1] = 0; - } - - return full_size; - } - - PUGI__FN xpath_node_set xpath_query::evaluate_node_set(const xpath_node& n) const - { - impl::xpath_ast_node* root = impl::evaluate_node_set_prepare(static_cast(_impl)); - if (!root) return xpath_node_set(); - - impl::xpath_context c(n, 1, 1); - impl::xpath_stack_data sd; - - impl::xpath_node_set_raw r = root->eval_node_set(c, sd.stack, impl::nodeset_eval_all); - - if (sd.oom) - { - #ifdef PUGIXML_NO_EXCEPTIONS - return xpath_node_set(); - #else - throw std::bad_alloc(); - #endif - } - - return xpath_node_set(r.begin(), r.end(), r.type()); - } - - PUGI__FN xpath_node xpath_query::evaluate_node(const xpath_node& n) const - { - impl::xpath_ast_node* root = impl::evaluate_node_set_prepare(static_cast(_impl)); - if (!root) return xpath_node(); - - impl::xpath_context c(n, 1, 1); - impl::xpath_stack_data sd; - - impl::xpath_node_set_raw r = root->eval_node_set(c, sd.stack, impl::nodeset_eval_first); - - if (sd.oom) - { - #ifdef PUGIXML_NO_EXCEPTIONS - return xpath_node(); - #else - throw std::bad_alloc(); - #endif - } - - return r.first(); - } - - PUGI__FN const xpath_parse_result& xpath_query::result() const - { - return _result; - } - - PUGI__FN static void unspecified_bool_xpath_query(xpath_query***) - { - } - - PUGI__FN xpath_query::operator xpath_query::unspecified_bool_type() const - { - return _impl ? unspecified_bool_xpath_query : 0; - } - - PUGI__FN bool xpath_query::operator!() const - { - return !_impl; - } - - PUGI__FN xpath_node xml_node::select_node(const char_t* query, xpath_variable_set* variables) const - { - xpath_query q(query, variables); - return q.evaluate_node(*this); - } - - PUGI__FN xpath_node xml_node::select_node(const xpath_query& query) const - { - return query.evaluate_node(*this); - } - - PUGI__FN xpath_node_set xml_node::select_nodes(const char_t* query, xpath_variable_set* variables) const - { - xpath_query q(query, variables); - return q.evaluate_node_set(*this); - } - - PUGI__FN xpath_node_set xml_node::select_nodes(const xpath_query& query) const - { - return query.evaluate_node_set(*this); - } - - PUGI__FN xpath_node xml_node::select_single_node(const char_t* query, xpath_variable_set* variables) const - { - xpath_query q(query, variables); - return q.evaluate_node(*this); - } - - PUGI__FN xpath_node xml_node::select_single_node(const xpath_query& query) const - { - return query.evaluate_node(*this); - } -} - -#endif - -#ifdef __BORLANDC__ -# pragma option pop -#endif - -// Intel C++ does not properly keep warning state for function templates, -// so popping warning state at the end of translation unit leads to warnings in the middle. -#if defined(_MSC_VER) && !defined(__INTEL_COMPILER) -# pragma warning(pop) -#endif - -#if defined(_MSC_VER) && defined(__c2__) -# pragma clang diagnostic pop -#endif - -// Undefine all local macros (makes sure we're not leaking macros in header-only mode) -#undef PUGI__NO_INLINE -#undef PUGI__UNLIKELY -#undef PUGI__STATIC_ASSERT -#undef PUGI__DMC_VOLATILE -#undef PUGI__UNSIGNED_OVERFLOW -#undef PUGI__MSVC_CRT_VERSION -#undef PUGI__SNPRINTF -#undef PUGI__NS_BEGIN -#undef PUGI__NS_END -#undef PUGI__FN -#undef PUGI__FN_NO_INLINE -#undef PUGI__GETHEADER_IMPL -#undef PUGI__GETPAGE_IMPL -#undef PUGI__GETPAGE -#undef PUGI__NODETYPE -#undef PUGI__IS_CHARTYPE_IMPL -#undef PUGI__IS_CHARTYPE -#undef PUGI__IS_CHARTYPEX -#undef PUGI__ENDSWITH -#undef PUGI__SKIPWS -#undef PUGI__OPTSET -#undef PUGI__PUSHNODE -#undef PUGI__POPNODE -#undef PUGI__SCANFOR -#undef PUGI__SCANWHILE -#undef PUGI__SCANWHILE_UNROLL -#undef PUGI__ENDSEG -#undef PUGI__THROW_ERROR -#undef PUGI__CHECK_ERROR - -#endif - -/** - * Copyright (c) 2006-2018 Arseny Kapoulkine - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ diff --git a/source/common/pugixml.hpp b/source/common/pugixml.hpp deleted file mode 100644 index 86403be3..00000000 --- a/source/common/pugixml.hpp +++ /dev/null @@ -1,1461 +0,0 @@ -/** - * pugixml parser - version 1.9 - * -------------------------------------------------------- - * Copyright (C) 2006-2018, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com) - * Report bugs and download new versions at http://pugixml.org/ - * - * This library is distributed under the MIT License. See notice at the end - * of this file. - * - * This work is based on the pugxml parser, which is: - * Copyright (C) 2003, by Kristen Wegner (kristen@tima.net) - */ - -#ifndef PUGIXML_VERSION -// Define version macro; evaluates to major * 100 + minor so that it's safe to use in less-than comparisons -# define PUGIXML_VERSION 190 -#endif - -// Include user configuration file (this can define various configuration macros) -#include "pugiconfig.hpp" - -#ifndef HEADER_PUGIXML_HPP -#define HEADER_PUGIXML_HPP - -// Include stddef.h for size_t and ptrdiff_t -#include - -// Include exception header for XPath -#if !defined(PUGIXML_NO_XPATH) && !defined(PUGIXML_NO_EXCEPTIONS) -# include -#endif - -// Include STL headers -#ifndef PUGIXML_NO_STL -# include -# include -# include -#endif - -// Macro for deprecated features -#ifndef PUGIXML_DEPRECATED -# if defined(__GNUC__) -# define PUGIXML_DEPRECATED __attribute__((deprecated)) -# elif defined(_MSC_VER) && _MSC_VER >= 1300 -# define PUGIXML_DEPRECATED __declspec(deprecated) -# else -# define PUGIXML_DEPRECATED -# endif -#endif - -// If no API is defined, assume default -#ifndef PUGIXML_API -# define PUGIXML_API -#endif - -// If no API for classes is defined, assume default -#ifndef PUGIXML_CLASS -# define PUGIXML_CLASS PUGIXML_API -#endif - -// If no API for functions is defined, assume default -#ifndef PUGIXML_FUNCTION -# define PUGIXML_FUNCTION PUGIXML_API -#endif - -// If the platform is known to have long long support, enable long long functions -#ifndef PUGIXML_HAS_LONG_LONG -# if __cplusplus >= 201103 -# define PUGIXML_HAS_LONG_LONG -# elif defined(_MSC_VER) && _MSC_VER >= 1400 -# define PUGIXML_HAS_LONG_LONG -# endif -#endif - -// If the platform is known to have move semantics support, compile move ctor/operator implementation -#ifndef PUGIXML_HAS_MOVE -# if __cplusplus >= 201103 -# define PUGIXML_HAS_MOVE -# elif defined(_MSC_VER) && _MSC_VER >= 1600 -# define PUGIXML_HAS_MOVE -# endif -#endif - -// If C++ is 2011 or higher, add 'noexcept' specifiers -#ifndef PUGIXML_NOEXCEPT -# if __cplusplus >= 201103 -# define PUGIXML_NOEXCEPT noexcept -# elif defined(_MSC_VER) && _MSC_VER >= 1900 -# define PUGIXML_NOEXCEPT noexcept -# else -# define PUGIXML_NOEXCEPT -# endif -#endif - -// Some functions can not be noexcept in compact mode -#ifdef PUGIXML_COMPACT -# define PUGIXML_NOEXCEPT_IF_NOT_COMPACT -#else -# define PUGIXML_NOEXCEPT_IF_NOT_COMPACT PUGIXML_NOEXCEPT -#endif - -// If C++ is 2011 or higher, add 'override' qualifiers -#ifndef PUGIXML_OVERRIDE -# if __cplusplus >= 201103 -# define PUGIXML_OVERRIDE override -# elif defined(_MSC_VER) && _MSC_VER >= 1700 -# define PUGIXML_OVERRIDE override -# else -# define PUGIXML_OVERRIDE -# endif -#endif - -// Character interface macros -#ifdef PUGIXML_WCHAR_MODE -# define PUGIXML_TEXT(t) L ## t -# define PUGIXML_CHAR wchar_t -#else -# define PUGIXML_TEXT(t) t -# define PUGIXML_CHAR char -#endif - -namespace pugi -{ - // Character type used for all internal storage and operations; depends on PUGIXML_WCHAR_MODE - typedef PUGIXML_CHAR char_t; - -#ifndef PUGIXML_NO_STL - // String type used for operations that work with STL string; depends on PUGIXML_WCHAR_MODE - typedef std::basic_string, std::allocator > string_t; -#endif -} - -// The PugiXML namespace -namespace pugi -{ - // Tree node types - enum xml_node_type - { - node_null, // Empty (null) node handle - node_document, // A document tree's absolute root - node_element, // Element tag, i.e. '' - node_pcdata, // Plain character data, i.e. 'text' - node_cdata, // Character data, i.e. '' - node_comment, // Comment tag, i.e. '' - node_pi, // Processing instruction, i.e. '' - node_declaration, // Document declaration, i.e. '' - node_doctype // Document type declaration, i.e. '' - }; - - // Parsing options - - // Minimal parsing mode (equivalent to turning all other flags off). - // Only elements and PCDATA sections are added to the DOM tree, no text conversions are performed. - const unsigned int parse_minimal = 0x0000; - - // This flag determines if processing instructions (node_pi) are added to the DOM tree. This flag is off by default. - const unsigned int parse_pi = 0x0001; - - // This flag determines if comments (node_comment) are added to the DOM tree. This flag is off by default. - const unsigned int parse_comments = 0x0002; - - // This flag determines if CDATA sections (node_cdata) are added to the DOM tree. This flag is on by default. - const unsigned int parse_cdata = 0x0004; - - // This flag determines if plain character data (node_pcdata) that consist only of whitespace are added to the DOM tree. - // This flag is off by default; turning it on usually results in slower parsing and more memory consumption. - const unsigned int parse_ws_pcdata = 0x0008; - - // This flag determines if character and entity references are expanded during parsing. This flag is on by default. - const unsigned int parse_escapes = 0x0010; - - // This flag determines if EOL characters are normalized (converted to #xA) during parsing. This flag is on by default. - const unsigned int parse_eol = 0x0020; - - // This flag determines if attribute values are normalized using CDATA normalization rules during parsing. This flag is on by default. - const unsigned int parse_wconv_attribute = 0x0040; - - // This flag determines if attribute values are normalized using NMTOKENS normalization rules during parsing. This flag is off by default. - const unsigned int parse_wnorm_attribute = 0x0080; - - // This flag determines if document declaration (node_declaration) is added to the DOM tree. This flag is off by default. - const unsigned int parse_declaration = 0x0100; - - // This flag determines if document type declaration (node_doctype) is added to the DOM tree. This flag is off by default. - const unsigned int parse_doctype = 0x0200; - - // This flag determines if plain character data (node_pcdata) that is the only child of the parent node and that consists only - // of whitespace is added to the DOM tree. - // This flag is off by default; turning it on may result in slower parsing and more memory consumption. - const unsigned int parse_ws_pcdata_single = 0x0400; - - // This flag determines if leading and trailing whitespace is to be removed from plain character data. This flag is off by default. - const unsigned int parse_trim_pcdata = 0x0800; - - // This flag determines if plain character data that does not have a parent node is added to the DOM tree, and if an empty document - // is a valid document. This flag is off by default. - const unsigned int parse_fragment = 0x1000; - - // This flag determines if plain character data is be stored in the parent element's value. This significantly changes the structure of - // the document; this flag is only recommended for parsing documents with many PCDATA nodes in memory-constrained environments. - // This flag is off by default. - const unsigned int parse_embed_pcdata = 0x2000; - - // The default parsing mode. - // Elements, PCDATA and CDATA sections are added to the DOM tree, character/reference entities are expanded, - // End-of-Line characters are normalized, attribute values are normalized using CDATA normalization rules. - const unsigned int parse_default = parse_cdata | parse_escapes | parse_wconv_attribute | parse_eol; - - // The full parsing mode. - // Nodes of all types are added to the DOM tree, character/reference entities are expanded, - // End-of-Line characters are normalized, attribute values are normalized using CDATA normalization rules. - const unsigned int parse_full = parse_default | parse_pi | parse_comments | parse_declaration | parse_doctype; - - // These flags determine the encoding of input data for XML document - enum xml_encoding - { - encoding_auto, // Auto-detect input encoding using BOM or < / class xml_object_range - { - public: - typedef It const_iterator; - typedef It iterator; - - xml_object_range(It b, It e): _begin(b), _end(e) - { - } - - It begin() const { return _begin; } - It end() const { return _end; } - - private: - It _begin, _end; - }; - - // Writer interface for node printing (see xml_node::print) - class PUGIXML_CLASS xml_writer - { - public: - virtual ~xml_writer() {} - - // Write memory chunk into stream/file/whatever - virtual void write(const void* data, size_t size) = 0; - }; - - // xml_writer implementation for FILE* - class PUGIXML_CLASS xml_writer_file: public xml_writer - { - public: - // Construct writer from a FILE* object; void* is used to avoid header dependencies on stdio - xml_writer_file(void* file); - - virtual void write(const void* data, size_t size) PUGIXML_OVERRIDE; - - private: - void* file; - }; - - #ifndef PUGIXML_NO_STL - // xml_writer implementation for streams - class PUGIXML_CLASS xml_writer_stream: public xml_writer - { - public: - // Construct writer from an output stream object - xml_writer_stream(std::basic_ostream >& stream); - xml_writer_stream(std::basic_ostream >& stream); - - virtual void write(const void* data, size_t size) PUGIXML_OVERRIDE; - - private: - std::basic_ostream >* narrow_stream; - std::basic_ostream >* wide_stream; - }; - #endif - - // A light-weight handle for manipulating attributes in DOM tree - class PUGIXML_CLASS xml_attribute - { - friend class xml_attribute_iterator; - friend class xml_node; - - private: - xml_attribute_struct* _attr; - - typedef void (*unspecified_bool_type)(xml_attribute***); - - public: - // Default constructor. Constructs an empty attribute. - xml_attribute(); - - // Constructs attribute from internal pointer - explicit xml_attribute(xml_attribute_struct* attr); - - // Safe bool conversion operator - operator unspecified_bool_type() const; - - // Borland C++ workaround - bool operator!() const; - - // Comparison operators (compares wrapped attribute pointers) - bool operator==(const xml_attribute& r) const; - bool operator!=(const xml_attribute& r) const; - bool operator<(const xml_attribute& r) const; - bool operator>(const xml_attribute& r) const; - bool operator<=(const xml_attribute& r) const; - bool operator>=(const xml_attribute& r) const; - - // Check if attribute is empty - bool empty() const; - - // Get attribute name/value, or "" if attribute is empty - const char_t* name() const; - const char_t* value() const; - - // Get attribute value, or the default value if attribute is empty - const char_t* as_string(const char_t* def = PUGIXML_TEXT("")) const; - - // Get attribute value as a number, or the default value if conversion did not succeed or attribute is empty - int as_int(int def = 0) const; - unsigned int as_uint(unsigned int def = 0) const; - double as_double(double def = 0) const; - float as_float(float def = 0) const; - - #ifdef PUGIXML_HAS_LONG_LONG - long long as_llong(long long def = 0) const; - unsigned long long as_ullong(unsigned long long def = 0) const; - #endif - - // Get attribute value as bool (returns true if first character is in '1tTyY' set), or the default value if attribute is empty - bool as_bool(bool def = false) const; - - // Set attribute name/value (returns false if attribute is empty or there is not enough memory) - bool set_name(const char_t* rhs); - bool set_value(const char_t* rhs); - - // Set attribute value with type conversion (numbers are converted to strings, boolean is converted to "true"/"false") - bool set_value(int rhs); - bool set_value(unsigned int rhs); - bool set_value(long rhs); - bool set_value(unsigned long rhs); - bool set_value(double rhs); - bool set_value(float rhs); - bool set_value(bool rhs); - - #ifdef PUGIXML_HAS_LONG_LONG - bool set_value(long long rhs); - bool set_value(unsigned long long rhs); - #endif - - // Set attribute value (equivalent to set_value without error checking) - xml_attribute& operator=(const char_t* rhs); - xml_attribute& operator=(int rhs); - xml_attribute& operator=(unsigned int rhs); - xml_attribute& operator=(long rhs); - xml_attribute& operator=(unsigned long rhs); - xml_attribute& operator=(double rhs); - xml_attribute& operator=(float rhs); - xml_attribute& operator=(bool rhs); - - #ifdef PUGIXML_HAS_LONG_LONG - xml_attribute& operator=(long long rhs); - xml_attribute& operator=(unsigned long long rhs); - #endif - - // Get next/previous attribute in the attribute list of the parent node - xml_attribute next_attribute() const; - xml_attribute previous_attribute() const; - - // Get hash value (unique for handles to the same object) - size_t hash_value() const; - - // Get internal pointer - xml_attribute_struct* internal_object() const; - }; - -#ifdef __BORLANDC__ - // Borland C++ workaround - bool PUGIXML_FUNCTION operator&&(const xml_attribute& lhs, bool rhs); - bool PUGIXML_FUNCTION operator||(const xml_attribute& lhs, bool rhs); -#endif - - // A light-weight handle for manipulating nodes in DOM tree - class PUGIXML_CLASS xml_node - { - friend class xml_attribute_iterator; - friend class xml_node_iterator; - friend class xml_named_node_iterator; - - protected: - xml_node_struct* _root; - - typedef void (*unspecified_bool_type)(xml_node***); - - public: - // Default constructor. Constructs an empty node. - xml_node(); - - // Constructs node from internal pointer - explicit xml_node(xml_node_struct* p); - - // Safe bool conversion operator - operator unspecified_bool_type() const; - - // Borland C++ workaround - bool operator!() const; - - // Comparison operators (compares wrapped node pointers) - bool operator==(const xml_node& r) const; - bool operator!=(const xml_node& r) const; - bool operator<(const xml_node& r) const; - bool operator>(const xml_node& r) const; - bool operator<=(const xml_node& r) const; - bool operator>=(const xml_node& r) const; - - // Check if node is empty. - bool empty() const; - - // Get node type - xml_node_type type() const; - - // Get node name, or "" if node is empty or it has no name - const char_t* name() const; - - // Get node value, or "" if node is empty or it has no value - // Note: For text node.value() does not return "text"! Use child_value() or text() methods to access text inside nodes. - const char_t* value() const; - - // Get attribute list - xml_attribute first_attribute() const; - xml_attribute last_attribute() const; - - // Get children list - xml_node first_child() const; - xml_node last_child() const; - - // Get next/previous sibling in the children list of the parent node - xml_node next_sibling() const; - xml_node previous_sibling() const; - - // Get parent node - xml_node parent() const; - - // Get root of DOM tree this node belongs to - xml_node root() const; - - // Get text object for the current node - xml_text text() const; - - // Get child, attribute or next/previous sibling with the specified name - xml_node child(const char_t* name) const; - xml_attribute attribute(const char_t* name) const; - xml_node next_sibling(const char_t* name) const; - xml_node previous_sibling(const char_t* name) const; - - // Get attribute, starting the search from a hint (and updating hint so that searching for a sequence of attributes is fast) - xml_attribute attribute(const char_t* name, xml_attribute& hint) const; - - // Get child value of current node; that is, value of the first child node of type PCDATA/CDATA - const char_t* child_value() const; - - // Get child value of child with specified name. Equivalent to child(name).child_value(). - const char_t* child_value(const char_t* name) const; - - // Set node name/value (returns false if node is empty, there is not enough memory, or node can not have name/value) - bool set_name(const char_t* rhs); - bool set_value(const char_t* rhs); - - // Add attribute with specified name. Returns added attribute, or empty attribute on errors. - xml_attribute append_attribute(const char_t* name); - xml_attribute prepend_attribute(const char_t* name); - xml_attribute insert_attribute_after(const char_t* name, const xml_attribute& attr); - xml_attribute insert_attribute_before(const char_t* name, const xml_attribute& attr); - - // Add a copy of the specified attribute. Returns added attribute, or empty attribute on errors. - xml_attribute append_copy(const xml_attribute& proto); - xml_attribute prepend_copy(const xml_attribute& proto); - xml_attribute insert_copy_after(const xml_attribute& proto, const xml_attribute& attr); - xml_attribute insert_copy_before(const xml_attribute& proto, const xml_attribute& attr); - - // Add child node with specified type. Returns added node, or empty node on errors. - xml_node append_child(xml_node_type type = node_element); - xml_node prepend_child(xml_node_type type = node_element); - xml_node insert_child_after(xml_node_type type, const xml_node& node); - xml_node insert_child_before(xml_node_type type, const xml_node& node); - - // Add child element with specified name. Returns added node, or empty node on errors. - xml_node append_child(const char_t* name); - xml_node prepend_child(const char_t* name); - xml_node insert_child_after(const char_t* name, const xml_node& node); - xml_node insert_child_before(const char_t* name, const xml_node& node); - - // Add a copy of the specified node as a child. Returns added node, or empty node on errors. - xml_node append_copy(const xml_node& proto); - xml_node prepend_copy(const xml_node& proto); - xml_node insert_copy_after(const xml_node& proto, const xml_node& node); - xml_node insert_copy_before(const xml_node& proto, const xml_node& node); - - // Move the specified node to become a child of this node. Returns moved node, or empty node on errors. - xml_node append_move(const xml_node& moved); - xml_node prepend_move(const xml_node& moved); - xml_node insert_move_after(const xml_node& moved, const xml_node& node); - xml_node insert_move_before(const xml_node& moved, const xml_node& node); - - // Remove specified attribute - bool remove_attribute(const xml_attribute& a); - bool remove_attribute(const char_t* name); - - // Remove specified child - bool remove_child(const xml_node& n); - bool remove_child(const char_t* name); - - // Parses buffer as an XML document fragment and appends all nodes as children of the current node. - // Copies/converts the buffer, so it may be deleted or changed after the function returns. - // Note: append_buffer allocates memory that has the lifetime of the owning document; removing the appended nodes does not immediately reclaim that memory. - xml_parse_result append_buffer(const void* contents, size_t size, unsigned int options = parse_default, xml_encoding encoding = encoding_auto); - - // Find attribute using predicate. Returns first attribute for which predicate returned true. - template xml_attribute find_attribute(Predicate pred) const - { - if (!_root) return xml_attribute(); - - for (xml_attribute attrib = first_attribute(); attrib; attrib = attrib.next_attribute()) - if (pred(attrib)) - return attrib; - - return xml_attribute(); - } - - // Find child node using predicate. Returns first child for which predicate returned true. - template xml_node find_child(Predicate pred) const - { - if (!_root) return xml_node(); - - for (xml_node node = first_child(); node; node = node.next_sibling()) - if (pred(node)) - return node; - - return xml_node(); - } - - // Find node from subtree using predicate. Returns first node from subtree (depth-first), for which predicate returned true. - template xml_node find_node(Predicate pred) const - { - if (!_root) return xml_node(); - - xml_node cur = first_child(); - - while (cur._root && cur._root != _root) - { - if (pred(cur)) return cur; - - if (cur.first_child()) cur = cur.first_child(); - else if (cur.next_sibling()) cur = cur.next_sibling(); - else - { - while (!cur.next_sibling() && cur._root != _root) cur = cur.parent(); - - if (cur._root != _root) cur = cur.next_sibling(); - } - } - - return xml_node(); - } - - // Find child node by attribute name/value - xml_node find_child_by_attribute(const char_t* name, const char_t* attr_name, const char_t* attr_value) const; - xml_node find_child_by_attribute(const char_t* attr_name, const char_t* attr_value) const; - - #ifndef PUGIXML_NO_STL - // Get the absolute node path from root as a text string. - string_t path(char_t delimiter = '/') const; - #endif - - // Search for a node by path consisting of node names and . or .. elements. - xml_node first_element_by_path(const char_t* path, char_t delimiter = '/') const; - - // Recursively traverse subtree with xml_tree_walker - bool traverse(xml_tree_walker& walker); - - #ifndef PUGIXML_NO_XPATH - // Select single node by evaluating XPath query. Returns first node from the resulting node set. - xpath_node select_node(const char_t* query, xpath_variable_set* variables = 0) const; - xpath_node select_node(const xpath_query& query) const; - - // Select node set by evaluating XPath query - xpath_node_set select_nodes(const char_t* query, xpath_variable_set* variables = 0) const; - xpath_node_set select_nodes(const xpath_query& query) const; - - // (deprecated: use select_node instead) Select single node by evaluating XPath query. - PUGIXML_DEPRECATED xpath_node select_single_node(const char_t* query, xpath_variable_set* variables = 0) const; - PUGIXML_DEPRECATED xpath_node select_single_node(const xpath_query& query) const; - - #endif - - // Print subtree using a writer object - void print(xml_writer& writer, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto, unsigned int depth = 0) const; - - #ifndef PUGIXML_NO_STL - // Print subtree to stream - void print(std::basic_ostream >& os, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto, unsigned int depth = 0) const; - void print(std::basic_ostream >& os, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, unsigned int depth = 0) const; - #endif - - // Child nodes iterators - typedef xml_node_iterator iterator; - - iterator begin() const; - iterator end() const; - - // Attribute iterators - typedef xml_attribute_iterator attribute_iterator; - - attribute_iterator attributes_begin() const; - attribute_iterator attributes_end() const; - - // Range-based for support - xml_object_range children() const; - xml_object_range children(const char_t* name) const; - xml_object_range attributes() const; - - // Get node offset in parsed file/string (in char_t units) for debugging purposes - ptrdiff_t offset_debug() const; - - // Get hash value (unique for handles to the same object) - size_t hash_value() const; - - // Get internal pointer - xml_node_struct* internal_object() const; - }; - -#ifdef __BORLANDC__ - // Borland C++ workaround - bool PUGIXML_FUNCTION operator&&(const xml_node& lhs, bool rhs); - bool PUGIXML_FUNCTION operator||(const xml_node& lhs, bool rhs); -#endif - - // A helper for working with text inside PCDATA nodes - class PUGIXML_CLASS xml_text - { - friend class xml_node; - - xml_node_struct* _root; - - typedef void (*unspecified_bool_type)(xml_text***); - - explicit xml_text(xml_node_struct* root); - - xml_node_struct* _data_new(); - xml_node_struct* _data() const; - - public: - // Default constructor. Constructs an empty object. - xml_text(); - - // Safe bool conversion operator - operator unspecified_bool_type() const; - - // Borland C++ workaround - bool operator!() const; - - // Check if text object is empty - bool empty() const; - - // Get text, or "" if object is empty - const char_t* get() const; - - // Get text, or the default value if object is empty - const char_t* as_string(const char_t* def = PUGIXML_TEXT("")) const; - - // Get text as a number, or the default value if conversion did not succeed or object is empty - int as_int(int def = 0) const; - unsigned int as_uint(unsigned int def = 0) const; - double as_double(double def = 0) const; - float as_float(float def = 0) const; - - #ifdef PUGIXML_HAS_LONG_LONG - long long as_llong(long long def = 0) const; - unsigned long long as_ullong(unsigned long long def = 0) const; - #endif - - // Get text as bool (returns true if first character is in '1tTyY' set), or the default value if object is empty - bool as_bool(bool def = false) const; - - // Set text (returns false if object is empty or there is not enough memory) - bool set(const char_t* rhs); - - // Set text with type conversion (numbers are converted to strings, boolean is converted to "true"/"false") - bool set(int rhs); - bool set(unsigned int rhs); - bool set(long rhs); - bool set(unsigned long rhs); - bool set(double rhs); - bool set(float rhs); - bool set(bool rhs); - - #ifdef PUGIXML_HAS_LONG_LONG - bool set(long long rhs); - bool set(unsigned long long rhs); - #endif - - // Set text (equivalent to set without error checking) - xml_text& operator=(const char_t* rhs); - xml_text& operator=(int rhs); - xml_text& operator=(unsigned int rhs); - xml_text& operator=(long rhs); - xml_text& operator=(unsigned long rhs); - xml_text& operator=(double rhs); - xml_text& operator=(float rhs); - xml_text& operator=(bool rhs); - - #ifdef PUGIXML_HAS_LONG_LONG - xml_text& operator=(long long rhs); - xml_text& operator=(unsigned long long rhs); - #endif - - // Get the data node (node_pcdata or node_cdata) for this object - xml_node data() const; - }; - -#ifdef __BORLANDC__ - // Borland C++ workaround - bool PUGIXML_FUNCTION operator&&(const xml_text& lhs, bool rhs); - bool PUGIXML_FUNCTION operator||(const xml_text& lhs, bool rhs); -#endif - - // Child node iterator (a bidirectional iterator over a collection of xml_node) - class PUGIXML_CLASS xml_node_iterator - { - friend class xml_node; - - private: - mutable xml_node _wrap; - xml_node _parent; - - xml_node_iterator(xml_node_struct* ref, xml_node_struct* parent); - - public: - // Iterator traits - typedef ptrdiff_t difference_type; - typedef xml_node value_type; - typedef xml_node* pointer; - typedef xml_node& reference; - - #ifndef PUGIXML_NO_STL - typedef std::bidirectional_iterator_tag iterator_category; - #endif - - // Default constructor - xml_node_iterator(); - - // Construct an iterator which points to the specified node - xml_node_iterator(const xml_node& node); - - // Iterator operators - bool operator==(const xml_node_iterator& rhs) const; - bool operator!=(const xml_node_iterator& rhs) const; - - xml_node& operator*() const; - xml_node* operator->() const; - - const xml_node_iterator& operator++(); - xml_node_iterator operator++(int); - - const xml_node_iterator& operator--(); - xml_node_iterator operator--(int); - }; - - // Attribute iterator (a bidirectional iterator over a collection of xml_attribute) - class PUGIXML_CLASS xml_attribute_iterator - { - friend class xml_node; - - private: - mutable xml_attribute _wrap; - xml_node _parent; - - xml_attribute_iterator(xml_attribute_struct* ref, xml_node_struct* parent); - - public: - // Iterator traits - typedef ptrdiff_t difference_type; - typedef xml_attribute value_type; - typedef xml_attribute* pointer; - typedef xml_attribute& reference; - - #ifndef PUGIXML_NO_STL - typedef std::bidirectional_iterator_tag iterator_category; - #endif - - // Default constructor - xml_attribute_iterator(); - - // Construct an iterator which points to the specified attribute - xml_attribute_iterator(const xml_attribute& attr, const xml_node& parent); - - // Iterator operators - bool operator==(const xml_attribute_iterator& rhs) const; - bool operator!=(const xml_attribute_iterator& rhs) const; - - xml_attribute& operator*() const; - xml_attribute* operator->() const; - - const xml_attribute_iterator& operator++(); - xml_attribute_iterator operator++(int); - - const xml_attribute_iterator& operator--(); - xml_attribute_iterator operator--(int); - }; - - // Named node range helper - class PUGIXML_CLASS xml_named_node_iterator - { - friend class xml_node; - - public: - // Iterator traits - typedef ptrdiff_t difference_type; - typedef xml_node value_type; - typedef xml_node* pointer; - typedef xml_node& reference; - - #ifndef PUGIXML_NO_STL - typedef std::bidirectional_iterator_tag iterator_category; - #endif - - // Default constructor - xml_named_node_iterator(); - - // Construct an iterator which points to the specified node - xml_named_node_iterator(const xml_node& node, const char_t* name); - - // Iterator operators - bool operator==(const xml_named_node_iterator& rhs) const; - bool operator!=(const xml_named_node_iterator& rhs) const; - - xml_node& operator*() const; - xml_node* operator->() const; - - const xml_named_node_iterator& operator++(); - xml_named_node_iterator operator++(int); - - const xml_named_node_iterator& operator--(); - xml_named_node_iterator operator--(int); - - private: - mutable xml_node _wrap; - xml_node _parent; - const char_t* _name; - - xml_named_node_iterator(xml_node_struct* ref, xml_node_struct* parent, const char_t* name); - }; - - // Abstract tree walker class (see xml_node::traverse) - class PUGIXML_CLASS xml_tree_walker - { - friend class xml_node; - - private: - int _depth; - - protected: - // Get current traversal depth - int depth() const; - - public: - xml_tree_walker(); - virtual ~xml_tree_walker(); - - // Callback that is called when traversal begins - virtual bool begin(xml_node& node); - - // Callback that is called for each node traversed - virtual bool for_each(xml_node& node) = 0; - - // Callback that is called when traversal ends - virtual bool end(xml_node& node); - }; - - // Parsing status, returned as part of xml_parse_result object - enum xml_parse_status - { - status_ok = 0, // No error - - status_file_not_found, // File was not found during load_file() - status_io_error, // Error reading from file/stream - status_out_of_memory, // Could not allocate memory - status_internal_error, // Internal error occurred - - status_unrecognized_tag, // Parser could not determine tag type - - status_bad_pi, // Parsing error occurred while parsing document declaration/processing instruction - status_bad_comment, // Parsing error occurred while parsing comment - status_bad_cdata, // Parsing error occurred while parsing CDATA section - status_bad_doctype, // Parsing error occurred while parsing document type declaration - status_bad_pcdata, // Parsing error occurred while parsing PCDATA section - status_bad_start_element, // Parsing error occurred while parsing start element tag - status_bad_attribute, // Parsing error occurred while parsing element attribute - status_bad_end_element, // Parsing error occurred while parsing end element tag - status_end_element_mismatch,// There was a mismatch of start-end tags (closing tag had incorrect name, some tag was not closed or there was an excessive closing tag) - - status_append_invalid_root, // Unable to append nodes since root type is not node_element or node_document (exclusive to xml_node::append_buffer) - - status_no_document_element // Parsing resulted in a document without element nodes - }; - - // Parsing result - struct PUGIXML_CLASS xml_parse_result - { - // Parsing status (see xml_parse_status) - xml_parse_status status; - - // Last parsed offset (in char_t units from start of input data) - ptrdiff_t offset; - - // Source document encoding - xml_encoding encoding; - - // Default constructor, initializes object to failed state - xml_parse_result(); - - // Cast to bool operator - operator bool() const; - - // Get error description - const char* description() const; - }; - - // Document class (DOM tree root) - class PUGIXML_CLASS xml_document: public xml_node - { - private: - char_t* _buffer; - - char _memory[192]; - - // Non-copyable semantics - xml_document(const xml_document&); - xml_document& operator=(const xml_document&); - - void _create(); - void _destroy(); - void _move(xml_document& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT; - - public: - // Default constructor, makes empty document - xml_document(); - - // Destructor, invalidates all node/attribute handles to this document - ~xml_document(); - - #ifdef PUGIXML_HAS_MOVE - // Move semantics support - xml_document(xml_document&& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT; - xml_document& operator=(xml_document&& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT; - #endif - - // Removes all nodes, leaving the empty document - void reset(); - - // Removes all nodes, then copies the entire contents of the specified document - void reset(const xml_document& proto); - - #ifndef PUGIXML_NO_STL - // Load document from stream. - xml_parse_result load(std::basic_istream >& stream, unsigned int options = parse_default, xml_encoding encoding = encoding_auto); - xml_parse_result load(std::basic_istream >& stream, unsigned int options = parse_default); - #endif - - // (deprecated: use load_string instead) Load document from zero-terminated string. No encoding conversions are applied. - PUGIXML_DEPRECATED xml_parse_result load(const char_t* contents, unsigned int options = parse_default); - - // Load document from zero-terminated string. No encoding conversions are applied. - xml_parse_result load_string(const char_t* contents, unsigned int options = parse_default); - - // Load document from file - xml_parse_result load_file(const char* path, unsigned int options = parse_default, xml_encoding encoding = encoding_auto); - xml_parse_result load_file(const wchar_t* path, unsigned int options = parse_default, xml_encoding encoding = encoding_auto); - - // Load document from buffer. Copies/converts the buffer, so it may be deleted or changed after the function returns. - xml_parse_result load_buffer(const void* contents, size_t size, unsigned int options = parse_default, xml_encoding encoding = encoding_auto); - - // Load document from buffer, using the buffer for in-place parsing (the buffer is modified and used for storage of document data). - // You should ensure that buffer data will persist throughout the document's lifetime, and free the buffer memory manually once document is destroyed. - xml_parse_result load_buffer_inplace(void* contents, size_t size, unsigned int options = parse_default, xml_encoding encoding = encoding_auto); - - // Load document from buffer, using the buffer for in-place parsing (the buffer is modified and used for storage of document data). - // You should allocate the buffer with pugixml allocation function; document will free the buffer when it is no longer needed (you can't use it anymore). - xml_parse_result load_buffer_inplace_own(void* contents, size_t size, unsigned int options = parse_default, xml_encoding encoding = encoding_auto); - - // Save XML document to writer (semantics is slightly different from xml_node::print, see documentation for details). - void save(xml_writer& writer, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto) const; - - #ifndef PUGIXML_NO_STL - // Save XML document to stream (semantics is slightly different from xml_node::print, see documentation for details). - void save(std::basic_ostream >& stream, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto) const; - void save(std::basic_ostream >& stream, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default) const; - #endif - - // Save XML to file - bool save_file(const char* path, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto) const; - bool save_file(const wchar_t* path, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto) const; - - // Get document element - xml_node document_element() const; - }; - -#ifndef PUGIXML_NO_XPATH - // XPath query return type - enum xpath_value_type - { - xpath_type_none, // Unknown type (query failed to compile) - xpath_type_node_set, // Node set (xpath_node_set) - xpath_type_number, // Number - xpath_type_string, // String - xpath_type_boolean // Boolean - }; - - // XPath parsing result - struct PUGIXML_CLASS xpath_parse_result - { - // Error message (0 if no error) - const char* error; - - // Last parsed offset (in char_t units from string start) - ptrdiff_t offset; - - // Default constructor, initializes object to failed state - xpath_parse_result(); - - // Cast to bool operator - operator bool() const; - - // Get error description - const char* description() const; - }; - - // A single XPath variable - class PUGIXML_CLASS xpath_variable - { - friend class xpath_variable_set; - - protected: - xpath_value_type _type; - xpath_variable* _next; - - xpath_variable(xpath_value_type type); - - // Non-copyable semantics - xpath_variable(const xpath_variable&); - xpath_variable& operator=(const xpath_variable&); - - public: - // Get variable name - const char_t* name() const; - - // Get variable type - xpath_value_type type() const; - - // Get variable value; no type conversion is performed, default value (false, NaN, empty string, empty node set) is returned on type mismatch error - bool get_boolean() const; - double get_number() const; - const char_t* get_string() const; - const xpath_node_set& get_node_set() const; - - // Set variable value; no type conversion is performed, false is returned on type mismatch error - bool set(bool value); - bool set(double value); - bool set(const char_t* value); - bool set(const xpath_node_set& value); - }; - - // A set of XPath variables - class PUGIXML_CLASS xpath_variable_set - { - private: - xpath_variable* _data[64]; - - void _assign(const xpath_variable_set& rhs); - void _swap(xpath_variable_set& rhs); - - xpath_variable* _find(const char_t* name) const; - - static bool _clone(xpath_variable* var, xpath_variable** out_result); - static void _destroy(xpath_variable* var); - - public: - // Default constructor/destructor - xpath_variable_set(); - ~xpath_variable_set(); - - // Copy constructor/assignment operator - xpath_variable_set(const xpath_variable_set& rhs); - xpath_variable_set& operator=(const xpath_variable_set& rhs); - - #ifdef PUGIXML_HAS_MOVE - // Move semantics support - xpath_variable_set(xpath_variable_set&& rhs) PUGIXML_NOEXCEPT; - xpath_variable_set& operator=(xpath_variable_set&& rhs) PUGIXML_NOEXCEPT; - #endif - - // Add a new variable or get the existing one, if the types match - xpath_variable* add(const char_t* name, xpath_value_type type); - - // Set value of an existing variable; no type conversion is performed, false is returned if there is no such variable or if types mismatch - bool set(const char_t* name, bool value); - bool set(const char_t* name, double value); - bool set(const char_t* name, const char_t* value); - bool set(const char_t* name, const xpath_node_set& value); - - // Get existing variable by name - xpath_variable* get(const char_t* name); - const xpath_variable* get(const char_t* name) const; - }; - - // A compiled XPath query object - class PUGIXML_CLASS xpath_query - { - private: - void* _impl; - xpath_parse_result _result; - - typedef void (*unspecified_bool_type)(xpath_query***); - - // Non-copyable semantics - xpath_query(const xpath_query&); - xpath_query& operator=(const xpath_query&); - - public: - // Construct a compiled object from XPath expression. - // If PUGIXML_NO_EXCEPTIONS is not defined, throws xpath_exception on compilation errors. - explicit xpath_query(const char_t* query, xpath_variable_set* variables = 0); - - // Constructor - xpath_query(); - - // Destructor - ~xpath_query(); - - #ifdef PUGIXML_HAS_MOVE - // Move semantics support - xpath_query(xpath_query&& rhs) PUGIXML_NOEXCEPT; - xpath_query& operator=(xpath_query&& rhs) PUGIXML_NOEXCEPT; - #endif - - // Get query expression return type - xpath_value_type return_type() const; - - // Evaluate expression as boolean value in the specified context; performs type conversion if necessary. - // If PUGIXML_NO_EXCEPTIONS is not defined, throws std::bad_alloc on out of memory errors. - bool evaluate_boolean(const xpath_node& n) const; - - // Evaluate expression as double value in the specified context; performs type conversion if necessary. - // If PUGIXML_NO_EXCEPTIONS is not defined, throws std::bad_alloc on out of memory errors. - double evaluate_number(const xpath_node& n) const; - - #ifndef PUGIXML_NO_STL - // Evaluate expression as string value in the specified context; performs type conversion if necessary. - // If PUGIXML_NO_EXCEPTIONS is not defined, throws std::bad_alloc on out of memory errors. - string_t evaluate_string(const xpath_node& n) const; - #endif - - // Evaluate expression as string value in the specified context; performs type conversion if necessary. - // At most capacity characters are written to the destination buffer, full result size is returned (includes terminating zero). - // If PUGIXML_NO_EXCEPTIONS is not defined, throws std::bad_alloc on out of memory errors. - // If PUGIXML_NO_EXCEPTIONS is defined, returns empty set instead. - size_t evaluate_string(char_t* buffer, size_t capacity, const xpath_node& n) const; - - // Evaluate expression as node set in the specified context. - // If PUGIXML_NO_EXCEPTIONS is not defined, throws xpath_exception on type mismatch and std::bad_alloc on out of memory errors. - // If PUGIXML_NO_EXCEPTIONS is defined, returns empty node set instead. - xpath_node_set evaluate_node_set(const xpath_node& n) const; - - // Evaluate expression as node set in the specified context. - // Return first node in document order, or empty node if node set is empty. - // If PUGIXML_NO_EXCEPTIONS is not defined, throws xpath_exception on type mismatch and std::bad_alloc on out of memory errors. - // If PUGIXML_NO_EXCEPTIONS is defined, returns empty node instead. - xpath_node evaluate_node(const xpath_node& n) const; - - // Get parsing result (used to get compilation errors in PUGIXML_NO_EXCEPTIONS mode) - const xpath_parse_result& result() const; - - // Safe bool conversion operator - operator unspecified_bool_type() const; - - // Borland C++ workaround - bool operator!() const; - }; - - #ifndef PUGIXML_NO_EXCEPTIONS - // XPath exception class - class PUGIXML_CLASS xpath_exception: public std::exception - { - private: - xpath_parse_result _result; - - public: - // Construct exception from parse result - explicit xpath_exception(const xpath_parse_result& result); - - // Get error message - virtual const char* what() const throw() PUGIXML_OVERRIDE; - - // Get parse result - const xpath_parse_result& result() const; - }; - #endif - - // XPath node class (either xml_node or xml_attribute) - class PUGIXML_CLASS xpath_node - { - private: - xml_node _node; - xml_attribute _attribute; - - typedef void (*unspecified_bool_type)(xpath_node***); - - public: - // Default constructor; constructs empty XPath node - xpath_node(); - - // Construct XPath node from XML node/attribute - xpath_node(const xml_node& node); - xpath_node(const xml_attribute& attribute, const xml_node& parent); - - // Get node/attribute, if any - xml_node node() const; - xml_attribute attribute() const; - - // Get parent of contained node/attribute - xml_node parent() const; - - // Safe bool conversion operator - operator unspecified_bool_type() const; - - // Borland C++ workaround - bool operator!() const; - - // Comparison operators - bool operator==(const xpath_node& n) const; - bool operator!=(const xpath_node& n) const; - }; - -#ifdef __BORLANDC__ - // Borland C++ workaround - bool PUGIXML_FUNCTION operator&&(const xpath_node& lhs, bool rhs); - bool PUGIXML_FUNCTION operator||(const xpath_node& lhs, bool rhs); -#endif - - // A fixed-size collection of XPath nodes - class PUGIXML_CLASS xpath_node_set - { - public: - // Collection type - enum type_t - { - type_unsorted, // Not ordered - type_sorted, // Sorted by document order (ascending) - type_sorted_reverse // Sorted by document order (descending) - }; - - // Constant iterator type - typedef const xpath_node* const_iterator; - - // We define non-constant iterator to be the same as constant iterator so that various generic algorithms (i.e. boost foreach) work - typedef const xpath_node* iterator; - - // Default constructor. Constructs empty set. - xpath_node_set(); - - // Constructs a set from iterator range; data is not checked for duplicates and is not sorted according to provided type, so be careful - xpath_node_set(const_iterator begin, const_iterator end, type_t type = type_unsorted); - - // Destructor - ~xpath_node_set(); - - // Copy constructor/assignment operator - xpath_node_set(const xpath_node_set& ns); - xpath_node_set& operator=(const xpath_node_set& ns); - - #ifdef PUGIXML_HAS_MOVE - // Move semantics support - xpath_node_set(xpath_node_set&& rhs) PUGIXML_NOEXCEPT; - xpath_node_set& operator=(xpath_node_set&& rhs) PUGIXML_NOEXCEPT; - #endif - - // Get collection type - type_t type() const; - - // Get collection size - size_t size() const; - - // Indexing operator - const xpath_node& operator[](size_t index) const; - - // Collection iterators - const_iterator begin() const; - const_iterator end() const; - - // Sort the collection in ascending/descending order by document order - void sort(bool reverse = false); - - // Get first node in the collection by document order - xpath_node first() const; - - // Check if collection is empty - bool empty() const; - - private: - type_t _type; - - xpath_node _storage; - - xpath_node* _begin; - xpath_node* _end; - - void _assign(const_iterator begin, const_iterator end, type_t type); - void _move(xpath_node_set& rhs) PUGIXML_NOEXCEPT; - }; -#endif - -#ifndef PUGIXML_NO_STL - // Convert wide string to UTF8 - std::basic_string, std::allocator > PUGIXML_FUNCTION as_utf8(const wchar_t* str); - std::basic_string, std::allocator > PUGIXML_FUNCTION as_utf8(const std::basic_string, std::allocator >& str); - - // Convert UTF8 to wide string - std::basic_string, std::allocator > PUGIXML_FUNCTION as_wide(const char* str); - std::basic_string, std::allocator > PUGIXML_FUNCTION as_wide(const std::basic_string, std::allocator >& str); -#endif - - // Memory allocation function interface; returns pointer to allocated memory or NULL on failure - typedef void* (*allocation_function)(size_t size); - - // Memory deallocation function interface - typedef void (*deallocation_function)(void* ptr); - - // Override default memory management functions. All subsequent allocations/deallocations will be performed via supplied functions. - void PUGIXML_FUNCTION set_memory_management_functions(allocation_function allocate, deallocation_function deallocate); - - // Get current memory management functions - allocation_function PUGIXML_FUNCTION get_memory_allocation_function(); - deallocation_function PUGIXML_FUNCTION get_memory_deallocation_function(); -} - -#if !defined(PUGIXML_NO_STL) && (defined(_MSC_VER) || defined(__ICC)) -namespace std -{ - // Workarounds for (non-standard) iterator category detection for older versions (MSVC7/IC8 and earlier) - std::bidirectional_iterator_tag PUGIXML_FUNCTION _Iter_cat(const pugi::xml_node_iterator&); - std::bidirectional_iterator_tag PUGIXML_FUNCTION _Iter_cat(const pugi::xml_attribute_iterator&); - std::bidirectional_iterator_tag PUGIXML_FUNCTION _Iter_cat(const pugi::xml_named_node_iterator&); -} -#endif - -#if !defined(PUGIXML_NO_STL) && defined(__SUNPRO_CC) -namespace std -{ - // Workarounds for (non-standard) iterator category detection - std::bidirectional_iterator_tag PUGIXML_FUNCTION __iterator_category(const pugi::xml_node_iterator&); - std::bidirectional_iterator_tag PUGIXML_FUNCTION __iterator_category(const pugi::xml_attribute_iterator&); - std::bidirectional_iterator_tag PUGIXML_FUNCTION __iterator_category(const pugi::xml_named_node_iterator&); -} -#endif - -#endif - -// Make sure implementation is included in header-only mode -// Use macro expansion in #include to work around QMake (QTBUG-11923) -#if defined(PUGIXML_HEADER_ONLY) && !defined(PUGIXML_SOURCE) -# define PUGIXML_SOURCE "pugixml.cpp" -# include PUGIXML_SOURCE -#endif - -/** - * Copyright (c) 2006-2018 Arseny Kapoulkine - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ diff --git a/source/dynamic_value/CMakeLists.txt b/source/dynamic_value/CMakeLists.txt index 2afb4909..bc839c75 100644 --- a/source/dynamic_value/CMakeLists.txt +++ b/source/dynamic_value/CMakeLists.txt @@ -74,7 +74,7 @@ target_include_directories( $ $ ${Boost_INCLUDE_DIRS} - ${SELSCRIPT_INCLUDE_DIR} + ${PGSCRIPT_INCLUDE_DIR} ) target_compile_features( diff --git a/source/geometry_core/CMakeLists.txt b/source/geometry_core/CMakeLists.txt index 41cadb98..5db48091 100644 --- a/source/geometry_core/CMakeLists.txt +++ b/source/geometry_core/CMakeLists.txt @@ -30,7 +30,7 @@ target_include_directories( $ $ ${Boost_INCLUDE_DIRS} - ${SELSCRIPT_INCLUDE_DIR} + ${PGSCRIPT_INCLUDE_DIR} ) target_compile_features( diff --git a/source/geometry_operations/CMakeLists.txt b/source/geometry_operations/CMakeLists.txt index 64c090c2..b43cfa87 100644 --- a/source/geometry_operations/CMakeLists.txt +++ b/source/geometry_operations/CMakeLists.txt @@ -32,7 +32,7 @@ target_include_directories( $ $ ${Boost_INCLUDE_DIRS} - ${SELSCRIPT_INCLUDE_DIR} + ${PGSCRIPT_INCLUDE_DIR} ) target_compile_features( diff --git a/source/math_lib/CMakeLists.txt b/source/math_lib/CMakeLists.txt index 83750f5a..cc828140 100644 --- a/source/math_lib/CMakeLists.txt +++ b/source/math_lib/CMakeLists.txt @@ -42,7 +42,7 @@ target_include_directories( $ $ ${Boost_INCLUDE_DIRS} - ${SELSCRIPT_INCLUDE_DIR} + ${PGSCRIPT_INCLUDE_DIR} ) target_compile_features( diff --git a/source/pagoda.h b/source/pagoda.h index 90b3616d..ac674ca9 100644 --- a/source/pagoda.h +++ b/source/pagoda.h @@ -1,5 +1,5 @@ -#ifndef SELECTOR_SELECTOR_H_ -#define SELECTOR_SELECTOR_H_ +#ifndef PAGODA_PAGODA_H_ +#define PAGODA_PAGODA_H_ #include "procedural_graph/node_factory.h" #include "procedural_objects/operation_factory.h" diff --git a/source/procedural_graph/CMakeLists.txt b/source/procedural_graph/CMakeLists.txt index 5f1693b0..07cc975f 100644 --- a/source/procedural_graph/CMakeLists.txt +++ b/source/procedural_graph/CMakeLists.txt @@ -72,7 +72,7 @@ target_include_directories( $ $ ${Boost_INCLUDE_DIRS} - ${SELSCRIPT_INCLUDE_DIR} + ${PGSCRIPT_INCLUDE_DIR} ) target_compile_features( diff --git a/source/procedural_graph/reader/CMakeLists.txt b/source/procedural_graph/reader/CMakeLists.txt index 4f6f39e0..85d7c83f 100644 --- a/source/procedural_graph/reader/CMakeLists.txt +++ b/source/procedural_graph/reader/CMakeLists.txt @@ -39,7 +39,7 @@ target_include_directories( $ $ ${Boost_INCLUDE_DIRS} - ${SELSCRIPT_INCLUDE_DIR} + ${PGSCRIPT_INCLUDE_DIR} ) target_compile_features( diff --git a/source/procedural_objects/CMakeLists.txt b/source/procedural_objects/CMakeLists.txt index 735033f4..75f345bc 100644 --- a/source/procedural_objects/CMakeLists.txt +++ b/source/procedural_objects/CMakeLists.txt @@ -106,7 +106,7 @@ target_include_directories( $ $ ${Boost_INCLUDE_DIRS} - ${SELSCRIPT_INCLUDE_DIR} + ${PGSCRIPT_INCLUDE_DIR} ) target_compile_features( diff --git a/tests/unit_tests/CMakeLists.txt b/tests/unit_tests/CMakeLists.txt index a381f7cf..3094db0b 100644 --- a/tests/unit_tests/CMakeLists.txt +++ b/tests/unit_tests/CMakeLists.txt @@ -79,7 +79,7 @@ target_include_directories( PRIVATE ${CMAKE_SOURCE_DIR}/source ${Boost_INCLUDE_DIRS} - ${SELSCRIPT_INCLUDE_DIR} + ${PGSCRIPT_INCLUDE_DIR} ) target_compile_definitions( diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index bb733640..a2608723 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -26,7 +26,7 @@ target_include_directories( PRIVATE ${CMAKE_SOURCE_DIR}/source ${Boost_INCLUDE_DIRS} - ${SELSCRIPT_INCLUDE_DIR} + ${PGSCRIPT_INCLUDE_DIR} ) target_compile_definitions( From a61eedb33f932d0838f6eb80a97c7a17655a8246 Mon Sep 17 00:00:00 2001 From: Diego Jesus Date: Fri, 1 May 2020 17:53:48 +0100 Subject: [PATCH 11/14] Remove pugi from cmake file. --- source/common/CMakeLists.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/source/common/CMakeLists.txt b/source/common/CMakeLists.txt index 2282452b..f55957b4 100644 --- a/source/common/CMakeLists.txt +++ b/source/common/CMakeLists.txt @@ -10,9 +10,6 @@ set(COMMON_SRCS "logger.h" "profiler.cpp" "profiler.h" - "pugiconfig.hpp" - "pugixml.cpp" - "pugixml.hpp" "range.h" "statistics.cpp" "statistics.h" @@ -32,8 +29,6 @@ set(COMMON_PUBLIC_HEADERS "file_util.h" "logger.h" "profiler.h" - "pugiconfig.hpp" - "pugixml.hpp" "range.h" "statistics.h" "unimplemented.h" From ecab1d4bd126f1d5eb39ecd3a59df066ce9b9415 Mon Sep 17 00:00:00 2001 From: Diego Jesus Date: Fri, 1 May 2020 18:19:11 +0100 Subject: [PATCH 12/14] Add release handling to actions. --- .github/workflows/build.yaml | 76 ++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 925f3ce4..1a80e476 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -108,3 +108,79 @@ jobs: with: path: ./${{ matrix.config.name }}.tar.xz name: ${{ matrix.config.name }}.tar.xz + + release: + if: contains(github.ref, 'tags/v') + runs-on: ubuntu-latest + needs: build + + steps: + - name: Create Release + id: create_release + uses: actions/create-release@v1.0.0 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ github.ref }} + release_name: Release ${{ github.ref }} + draft: false + prerelease: false + + - name: Store Release url + run: | + echo "${{ steps.create_release.outputs.upload_url }}" > ./upload_url + + - uses: actions/upload-artifact@v1 + with: + path: ./upload_url + name: upload_url + + publish: + if: contains(github.ref, 'tags/v') + name: ${{ matrix.config.name }} + runs-on: ${{ matrix.config.os }} + strategy: + fail-fast: false + matrix: + config: + - { + name: "Ubuntu Latest GCC", + os: ubuntu-latest, + } + - { + name: "Ubuntu Latest clang", + os: ubuntu-latest, + } + - { + name: "macOs Latest clang", + os: ubuntu-latest, + } + needs: release + + steps: + - name: Download artifact + uses: actions/download-artifact@v1 + with: + name: ${{ matrix.config.name }}-regression_results.tar.xz + path: ./ + + - name: Download URL + uses: actions/download-artifact@v1 + with: + name: upload_url + path: ./ + - id: set_upload_url + run: | + upload_url=`cat ./upload_url` + echo ::set-output name=upload_url::$upload_url + + - name: Upload to Release + id: upload_to_release + uses: actions/upload-release-asset@v1.0.1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.set_upload_url.outputs.upload_url }} + asset_path: ./${{ matrix.config.name }}-regression_results.tar.xz + asset_name: ${{ matrix.config.name }}-regression_results.tar.xz + asset_content_type: application/x-gtar From 1b6e3c24e4154b6e4bf87a7cb3619ce6f0239455 Mon Sep 17 00:00:00 2001 From: Diego Jesus Date: Fri, 1 May 2020 18:21:14 +0100 Subject: [PATCH 13/14] Fixes bad alignment --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 1a80e476..d5dcae26 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -139,6 +139,7 @@ jobs: if: contains(github.ref, 'tags/v') name: ${{ matrix.config.name }} runs-on: ${{ matrix.config.os }} + needs: release strategy: fail-fast: false matrix: @@ -155,7 +156,6 @@ jobs: name: "macOs Latest clang", os: ubuntu-latest, } - needs: release steps: - name: Download artifact From 3bc8f92d15752bd17c40c6c7b365eae28a4e2fc7 Mon Sep 17 00:00:00 2001 From: Diego Jesus Date: Fri, 1 May 2020 18:52:57 +0100 Subject: [PATCH 14/14] Fix build.yaml. --- .github/workflows/build.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d5dcae26..5d94a2cc 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -161,7 +161,7 @@ jobs: - name: Download artifact uses: actions/download-artifact@v1 with: - name: ${{ matrix.config.name }}-regression_results.tar.xz + name: ${{ matrix.config.name }}.tar.xz path: ./ - name: Download URL @@ -181,6 +181,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.set_upload_url.outputs.upload_url }} - asset_path: ./${{ matrix.config.name }}-regression_results.tar.xz - asset_name: ${{ matrix.config.name }}-regression_results.tar.xz + asset_path: ./${{ matrix.config.name }}.tar.xz + asset_name: ${{ matrix.config.name }}.tar.xz asset_content_type: application/x-gtar