texlive[70212] Build/source/utils/asymptote: asy 2.87 sources
commits+karl at tug.org
commits+karl at tug.org
Tue Feb 27 21:51:04 CET 2024
Revision: 70212
https://tug.org/svn/texlive?view=revision&revision=70212
Author: karl
Date: 2024-02-27 21:51:03 +0100 (Tue, 27 Feb 2024)
Log Message:
-----------
asy 2.87 sources
Modified Paths:
--------------
trunk/Build/source/utils/asymptote/ChangeLog
trunk/Build/source/utils/asymptote/GUI/Window1.py
trunk/Build/source/utils/asymptote/GUI/icons_rc.py
trunk/Build/source/utils/asymptote/GUI/pyUIClass/custMatTransform.py
trunk/Build/source/utils/asymptote/GUI/pyUIClass/labelTextEditor.py
trunk/Build/source/utils/asymptote/GUI/pyUIClass/setCustomAnchor.py
trunk/Build/source/utils/asymptote/GUI/pyUIClass/widg_addLabel.py
trunk/Build/source/utils/asymptote/GUI/pyUIClass/widg_addPolyOpt.py
trunk/Build/source/utils/asymptote/GUI/pyUIClass/widg_editBezier.py
trunk/Build/source/utils/asymptote/GUI/pyUIClass/widgetPointEditor.py
trunk/Build/source/utils/asymptote/GUI/pyUIClass/window1.py
trunk/Build/source/utils/asymptote/GUI/xasy2asy.py
trunk/Build/source/utils/asymptote/LspCpp/CMakeLists.txt
trunk/Build/source/utils/asymptote/LspCpp/examples/StdIOClientExample.cpp
trunk/Build/source/utils/asymptote/LspCpp/examples/StdIOServerExample.cpp
trunk/Build/source/utils/asymptote/LspCpp/examples/TcpServerExample.cpp
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/GCThreadContext.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/MessageProducer.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/RemoteEndPoint.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/StreamMessageProducer.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/serializer.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/threaded_queue.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/ClientPreferences.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/CodeActionParams.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/ExecuteCommandParams.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/ResourceOperation.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/extention/jdtls/getMoveDestinations.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/extention/jdtls/getRefactorEdit.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/extention/jdtls/searchSymbols.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/extention/sonarlint/protocol.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/InitializeParams.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/exit.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/lsClientCapabilities.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/lsServerCapabilities.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/lsTextDocumentClientCapabilities.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/lsWorkspaceClientCapabilites.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/progress.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/shutdown.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/language/language.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/location_type.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsAny.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsCodeAction.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsCommand.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsFormattingOptions.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsMarkedString.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsResponseError.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsTextDocumentPositionParams.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsTextEdit.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsVersionedTextDocumentIdentifier.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsWorkspaceEdit.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsp_completion.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsp_diagnostic.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/out_list.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/symbol.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/SemanticTokens.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/callHierarchy.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/code_lens.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/completion.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/didRenameFiles.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/did_change.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/did_open.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/did_save.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/document_link.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/document_symbol.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/hover.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/linkedEditingRange.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/prepareRename.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/references.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/resolveTypeHierarchy.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/selectionRange.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/signature_help.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/typeHierarchy.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/willSave.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/utils.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/workspace/applyEdit.h
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/workspace/workspaceFolders.h
trunk/Build/source/utils/asymptote/LspCpp/src/jsonrpc/GCThreadContext.cpp
trunk/Build/source/utils/asymptote/LspCpp/src/jsonrpc/RemoteEndPoint.cpp
trunk/Build/source/utils/asymptote/LspCpp/src/jsonrpc/StreamMessageProducer.cpp
trunk/Build/source/utils/asymptote/LspCpp/src/jsonrpc/TcpServer.cpp
trunk/Build/source/utils/asymptote/LspCpp/src/jsonrpc/WebSocketServer.cpp
trunk/Build/source/utils/asymptote/LspCpp/src/lsp/ParentProcessWatcher.cpp
trunk/Build/source/utils/asymptote/LspCpp/src/lsp/initialize.cpp
trunk/Build/source/utils/asymptote/LspCpp/src/lsp/lsp.cpp
trunk/Build/source/utils/asymptote/LspCpp/src/lsp/textDocument.cpp
trunk/Build/source/utils/asymptote/LspCpp/src/lsp/utils.cpp
trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/CMakeLists.txt
trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/bin/unittestschema/address.json
trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/contrib/natvis/rapidjson.natvis
trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/doc/features.md
trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/doc/schema.md
trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/example/schemavalidator/schemavalidator.cpp
trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/allocators.h
trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/document.h
trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/error/en.h
trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/error/error.h
trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/internal/biginteger.h
trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/internal/diyfp.h
trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/internal/dtoa.h
trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/pointer.h
trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/rapidjson.h
trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/reader.h
trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/schema.h
trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/cursorstreamwrappertest.cpp
trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/encodedstreamtest.cpp
trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/ostreamwrappertest.cpp
trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/pointertest.cpp
trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/schematest.cpp
trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/simdtest.cpp
trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/uritest.cpp
trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/valuetest.cpp
trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/valgrind.supp
trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/CMakeFiles/CMakeDirectoryInformation.cmake
trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/CMakeFiles/doc.dir/DependInfo.cmake
trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/CMakeFiles/doc.dir/build.make
trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/Doxyfile
trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/Makefile
trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/cmake_install.cmake
trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/CMakeDirectoryInformation.cmake
trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/DependInfo.cmake
trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/build.make
trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.internal
trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.make
trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/flags.make
trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/src/Makefile
trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/src/cmake_install.cmake
trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/CMakeLists.txt
trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/README.md
trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/checked.h
trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/core.h
trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/cpp11.h
trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/cpp17.h
trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/unchecked.h
trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/CMakeLists.txt
trunk/Build/source/utils/asymptote/Makefile.in
trunk/Build/source/utils/asymptote/ReleaseNotes
trunk/Build/source/utils/asymptote/asy-keywords.el
trunk/Build/source/utils/asymptote/asy.list
trunk/Build/source/utils/asymptote/asymptote.spec
trunk/Build/source/utils/asymptote/base/geometry.asy
trunk/Build/source/utils/asymptote/base/graph3.asy
trunk/Build/source/utils/asymptote/base/plain.asy
trunk/Build/source/utils/asymptote/base/plain_shipout.asy
trunk/Build/source/utils/asymptote/base/shaders/fragment.glsl
trunk/Build/source/utils/asymptote/base/three.asy
trunk/Build/source/utils/asymptote/base/three_surface.asy
trunk/Build/source/utils/asymptote/base/three_tube.asy
trunk/Build/source/utils/asymptote/base/v3d.asy
trunk/Build/source/utils/asymptote/base/v3dheadertypes.asy
trunk/Build/source/utils/asymptote/base/v3dtypes.asy
trunk/Build/source/utils/asymptote/build-scripts/HOWTO-MSWindows
trunk/Build/source/utils/asymptote/build-scripts/build-asymptote
trunk/Build/source/utils/asymptote/camp.l
trunk/Build/source/utils/asymptote/camp.tab.cc
trunk/Build/source/utils/asymptote/camp.tab.h
trunk/Build/source/utils/asymptote/camp.y
trunk/Build/source/utils/asymptote/common.h
trunk/Build/source/utils/asymptote/config.guess
trunk/Build/source/utils/asymptote/config.sub
trunk/Build/source/utils/asymptote/configure
trunk/Build/source/utils/asymptote/configure.ac
trunk/Build/source/utils/asymptote/cudareflect/tinyexr/tinyexr.h
trunk/Build/source/utils/asymptote/dec.cc
trunk/Build/source/utils/asymptote/dec.h
trunk/Build/source/utils/asymptote/doc/CAD.pdf
trunk/Build/source/utils/asymptote/doc/FAQ/asy-faq.info
trunk/Build/source/utils/asymptote/doc/FAQ/install-sh
trunk/Build/source/utils/asymptote/doc/TeXShopAndAsymptote.pdf
trunk/Build/source/utils/asymptote/doc/asy-latex.dtx
trunk/Build/source/utils/asymptote/doc/asy-latex.pdf
trunk/Build/source/utils/asymptote/doc/asy.1
trunk/Build/source/utils/asymptote/doc/asyRefCard.pdf
trunk/Build/source/utils/asymptote/doc/asymptote.pdf
trunk/Build/source/utils/asymptote/doc/asymptote.sty
trunk/Build/source/utils/asymptote/doc/asymptote.texi
trunk/Build/source/utils/asymptote/doc/install-sh
trunk/Build/source/utils/asymptote/doc/latexmkrc
trunk/Build/source/utils/asymptote/doc/png/asymptote.info
trunk/Build/source/utils/asymptote/env.cc
trunk/Build/source/utils/asymptote/env.h
trunk/Build/source/utils/asymptote/errormsg.cc
trunk/Build/source/utils/asymptote/errors
trunk/Build/source/utils/asymptote/errortest.asy
trunk/Build/source/utils/asymptote/examples/filesurface.asy
trunk/Build/source/utils/asymptote/examples/triads.asy
trunk/Build/source/utils/asymptote/fftw++.h
trunk/Build/source/utils/asymptote/fileio.cc
trunk/Build/source/utils/asymptote/fileio.h
trunk/Build/source/utils/asymptote/fundec.cc
trunk/Build/source/utils/asymptote/fundec.h
trunk/Build/source/utils/asymptote/genv.cc
trunk/Build/source/utils/asymptote/genv.h
trunk/Build/source/utils/asymptote/glrender.cc
trunk/Build/source/utils/asymptote/install-sh
trunk/Build/source/utils/asymptote/lex.yy.cc
trunk/Build/source/utils/asymptote/lspserv.cc
trunk/Build/source/utils/asymptote/lspserv.h
trunk/Build/source/utils/asymptote/main.cc
trunk/Build/source/utils/asymptote/memory.h
trunk/Build/source/utils/asymptote/parser.cc
trunk/Build/source/utils/asymptote/picture.cc
trunk/Build/source/utils/asymptote/process.h
trunk/Build/source/utils/asymptote/profiler.h
trunk/Build/source/utils/asymptote/psfile.cc
trunk/Build/source/utils/asymptote/revision.cc
trunk/Build/source/utils/asymptote/runlabel.cc
trunk/Build/source/utils/asymptote/runlabel.in
trunk/Build/source/utils/asymptote/runpicture.cc
trunk/Build/source/utils/asymptote/runpicture.in
trunk/Build/source/utils/asymptote/runstring.cc
trunk/Build/source/utils/asymptote/runstring.in
trunk/Build/source/utils/asymptote/runtime.cc
trunk/Build/source/utils/asymptote/runtime.in
trunk/Build/source/utils/asymptote/seconds.h
trunk/Build/source/utils/asymptote/settings.cc
trunk/Build/source/utils/asymptote/stack.cc
trunk/Build/source/utils/asymptote/stack.h
trunk/Build/source/utils/asymptote/symbolmaps.cc
trunk/Build/source/utils/asymptote/symbolmaps.h
trunk/Build/source/utils/asymptote/tests/Makefile
trunk/Build/source/utils/asymptote/texfile.cc
trunk/Build/source/utils/asymptote/texfile.h
trunk/Build/source/utils/asymptote/types.cc
trunk/Build/source/utils/asymptote/types.h
trunk/Build/source/utils/asymptote/util.cc
trunk/Build/source/utils/asymptote/v3dfile.h
trunk/Build/source/utils/asymptote/v3dheadertypes.h
trunk/Build/source/utils/asymptote/v3dheadertypes.py
trunk/Build/source/utils/asymptote/v3dtypes.h
trunk/Build/source/utils/asymptote/v3dtypes.py
Added Paths:
-----------
trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/optionalVersion.h
trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/apitests.cpp
trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/noexceptionstests.cpp
trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_checked_api.h
trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_checked_iterator.h
trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_unchecked_api.h
trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_unchecked_iterator.h
trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/utf8cppConfig.cmake.in
trunk/Build/source/utils/asymptote/base/mapArray.asy
trunk/Build/source/utils/asymptote/errortestTemplate.asy
trunk/Build/source/utils/asymptote/gc-8.2.4.tar.gz
trunk/Build/source/utils/asymptote/tests/io/
trunk/Build/source/utils/asymptote/tests/io/csv.asy
trunk/Build/source/utils/asymptote/tests/io/input_with_nan.csv
trunk/Build/source/utils/asymptote/tests/template/
trunk/Build/source/utils/asymptote/tests/template/imports/
trunk/Build/source/utils/asymptote/tests/template/imports/wrapper.asy
trunk/Build/source/utils/asymptote/tests/template/imports/wrapperWithEquals.asy
trunk/Build/source/utils/asymptote/tests/template/mapArrayTest.asy
trunk/Build/source/utils/asymptote/tests/template/singletype.asy
Removed Paths:
-------------
trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_checked_api.cpp
trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_checked_iterator.cpp
trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_unchecked_api.cpp
trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_unchecked_iterator.cpp
trunk/Build/source/utils/asymptote/doc/latexmkrc_asydir
trunk/Build/source/utils/asymptote/gc-8.2.0.tar.gz
Modified: trunk/Build/source/utils/asymptote/ChangeLog
===================================================================
--- trunk/Build/source/utils/asymptote/ChangeLog 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/ChangeLog 2024-02-27 20:51:03 UTC (rev 70212)
@@ -1,3 +1,1011 @@
+commit 1826b3b38064170d2484af6d9a5e5ac2abce9b77
+Author: John Bowman <bowman at ualberta.ca>
+Date: Mon Feb 26 16:35:57 2024 -0800
+
+ Mark mapArray(string,string) as deprecated.
+
+commit 4ec87566c1204c55248ce57e38127fe583ab3337
+Author: John Bowman <bowman at ualberta.ca>
+Date: Mon Feb 26 15:50:12 2024 -0800
+
+ Improve compiler diagnosic.
+
+commit a89edb5736e69186339d1b799eb50a98d13fc7b2
+Author: John Bowman <bowman at ualberta.ca>
+Date: Mon Feb 26 15:42:41 2024 -0800
+
+ Address issue #421: reduce redundant latexmk runs.
+
+commit 3b02ca59cd8f482f42c89d508795879a643d6195
+Author: John Bowman <bowman at ualberta.ca>
+Date: Mon Feb 26 15:33:30 2024 -0800
+
+ Address issue #424: Add support for latexmk -c.
+
+commit 7551b9e67293d2038a6e5d9c75d389a4cd28822a
+Author: John Bowman <bowman at ualberta.ca>
+Date: Mon Feb 26 11:51:11 2024 -0800
+
+ Address issue #422: update .gitignore.
+
+commit 27d7d04d2ac279443249465b7090fdb8aea1ee1b
+Author: John Bowman <bowman at ualberta.ca>
+Date: Mon Feb 26 11:40:56 2024 -0800
+
+ Address issue #423: give the temporary rendering window a distinctive name.
+
+commit 961f88aa6f754fdb57166cf121b4d707b54d6bcd
+Author: John Bowman <bowman at ualberta.ca>
+Date: Sun Feb 25 23:19:48 2024 -0800
+
+ Add settings.v3d option to embed V3D content within a PDF file.
+
+commit 215f32fbf68ed4a2626e37a62552e2c0606744c9
+Author: John Bowman <bowman at ualberta.ca>
+Date: Wed Feb 21 00:49:39 2024 -0800
+
+ Delete trailing whitespace.
+
+commit 80d5e62455a2ad2a20b27acf66a141149f4c1a59
+Author: John Bowman <bowman at ualberta.ca>
+Date: Wed Feb 21 00:10:10 2024 -0800
+
+ Improve error messages and documentation.
+
+commit 542d92da66d913edc425dab33beb3c187cf419f9
+Merge: c60f3b51 c551fa24
+Author: John Bowman <bowman at ualberta.ca>
+Date: Sun Feb 18 23:50:08 2024 -0800
+
+ Merge branch 'master' into template.
+
+commit c551fa24a910dad4c456d8970f9a32ea1ebb632f
+Author: John Bowman <bowman at ualberta.ca>
+Date: Fri Feb 16 22:09:44 2024 -0800
+
+ Open context menu only for GUI-drawn items.
+
+commit c60f3b513670f266a33c55dd0e11255d1ebaac8d
+Author: John Bowman <bowman at ualberta.ca>
+Date: Mon Feb 12 21:24:21 2024 -0800
+
+ Rename index to sigHandle.
+
+commit b2c27b9c1a71b0b85b27624d33585dbd598810ed
+Author: John Bowman <bowman at ualberta.ca>
+Date: Mon Feb 12 21:11:37 2024 -0800
+
+ Implement and use mem::pair instead of std::pair for importIndex_t.
+
+commit 4c731ad2b18686a7e046529a1f3aa26c06cd99b4
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Mon Feb 12 20:28:29 2024 -0800
+
+ Address some comments.
+
+commit 124722665617a004985dd3a59baaa41a49109611
+Merge: 167db8b8 d8fed60a
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Mon Feb 12 19:43:53 2024 -0800
+
+ Merge branch 'master' of https://github.com/vectorgraphics/asymptote into template
+
+commit 167db8b845afd10640316d87b893e37ea0bc8617
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Mon Feb 12 16:26:24 2024 -0800
+
+ No longer make typeParam copyable.
+
+commit be652a26a41501ccb7857d89993f67830302041c
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Mon Feb 12 16:10:08 2024 -0800
+
+ deduplicate intSymbol and templatedSymbol lookup
+
+commit 8a87711cc92c4e0d40f24b7066c4c8c3ddb9df49
+Merge: 24c9d634 df776148
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Mon Feb 12 13:09:32 2024 -0800
+
+ Merge branch 'templateVar' into template
+
+commit df77614820d4072a0070d6dbf5e84b84ce92d8e2
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Mon Feb 12 13:05:16 2024 -0800
+
+ In debug mode, do not stop trying to parse template file at the first error.
+
+commit 24c9d6340f924bd13a6a2700edf61729c90d51f4
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Mon Feb 12 09:52:17 2024 -0800
+
+ reword error message
+
+commit fa7da7c87ee397795becde4c3024ad7d7606d67f
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Mon Feb 12 09:46:19 2024 -0800
+
+ Rename getType to getAbsyntaxType
+
+commit 363353f4c816c1828e6bb83634604e82c7509ee3
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Mon Feb 12 09:24:58 2024 -0800
+
+ Use for(;;) rather than while(true) in C++ for consistency.
+
+commit 35c79ac9b513c39a42400b1a5646865b808ea284
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Mon Feb 12 09:10:55 2024 -0800
+
+ checkpoint
+
+commit dca44de27ef3aad88bae6bf760938e060bb33dc6
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Sun Feb 11 19:22:45 2024 -0800
+
+ Switch use of namedTyEntry to pointers
+
+commit 566207d2c701114b7b1a71813e7dc4ae69ca70da
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Sun Feb 11 18:45:07 2024 -0800
+
+ Replace use of std::pair with a new gc-enabled struct.
+
+commit 1b9b8ed09b0315284d9cbea0da4dd3050e198623
+Merge: 8463465a 034891bd
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Sun Feb 11 18:20:57 2024 -0800
+
+ Merge branch 'template' of https://github.com/vectorgraphics/asymptote into template
+
+commit 8463465a5f8c7e93f72d17e51649a3fee0793a8d
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Sun Feb 11 18:20:27 2024 -0800
+
+ fix errors from previous commit
+
+commit 1c2b6dc6d0dbf517f53f48bb1ccd95c95f954969
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Sun Feb 11 18:08:56 2024 -0800
+
+ Shorten lines longer than 79 columns.
+
+commit 034891bdb505ac9c7ee6c7a668c994110cb81ac3
+Author: John Bowman <bowman at ualberta.ca>
+Date: Sat Feb 10 08:56:33 2024 -0800
+
+ Ignore map.asy when building asy-keywords.el.
+
+commit e58211a522e856a4f93d2ff29da25c00db35feca
+Author: John Bowman <bowman at ualberta.ca>
+Date: Thu Jan 18 13:14:09 2024 -0800
+
+ Address issue #392.
+
+commit 91a5acbd6ac78ce44712cb486d5e97cf36077a24
+Author: John Bowman <bowman at ualberta.ca>
+Date: Thu Jan 18 12:46:41 2024 -0800
+
+ Fix issue #419: suppress duplicate error message.
+
+commit bec734026b6af2fe3724cbc3104df9076c07c5ae
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Sat Feb 10 13:28:39 2024 -0800
+
+ Document templated imports
+
+commit 5c811376a71496c2325f31e5aab12eb0b2cc6f16
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Sat Feb 10 13:28:26 2024 -0800
+
+ Add wrapperWithEquals.asy (left out of previous commit)
+
+commit d8fed60a48d98cd290b14cba614c8d30ad4743ee
+Author: John Bowman <bowman at ualberta.ca>
+Date: Sat Feb 10 08:56:33 2024 -0800
+
+ Ignore map.asy when building asy-keywords.el.
+
+commit 647b6c5732ec94a48f0f0b2446f02c86888fe7e7
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Thu Feb 8 15:26:41 2024 -0800
+
+ Add TODO comments
+
+commit 9498f157a44bd9e96ffcefdde709da20110c2cca
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Thu Feb 8 15:22:12 2024 -0800
+
+ tests with wrapper
+
+commit ee98d7193f93ace9ea168192ec32d31838e34025
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Mon Feb 5 16:48:11 2024 -0800
+
+ template-based mapArray (with test but no doc yet)
+
+commit ea1f62e404b439528c4c25e390b7438bf4fb81cd
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Sun Feb 4 16:39:34 2024 -0800
+
+ Add two tests for templates (one of which fails).
+
+commit 6c84defa29e4e48e55e39fc75aec83dd746c687f
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Sun Jan 21 09:05:09 2024 -0800
+
+ More natural error from camp.y.
+
+commit 9810e8b2d175837fd86d2e9051f1b9ab0644b85d
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Sat Jan 20 14:33:18 2024 -0800
+
+ Added errortest cases to incorrectly import correct template.
+
+commit c6e405563c4cabcb6343e483b5fa20824bd4de05
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Sat Jan 20 14:18:00 2024 -0800
+
+ Catch 'typedef import' in wrong order; add test for this.
+
+commit b627a2f427402d528a96e505222fd09db847d1a7
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Fri Jan 19 15:51:12 2024 -0800
+
+ Added some template-related tests to errortest.asy
+
+commit 484b430df6edc6d3f2410f840391b7b0172e1164
+Author: John Bowman <bowman at ualberta.ca>
+Date: Thu Jan 18 16:10:32 2024 -0800
+
+ Respect debug flag.
+
+commit dd702e6db7411b65e0265734b563bc56e634e04f
+Author: John Bowman <bowman at ualberta.ca>
+Date: Thu Jan 18 14:21:04 2024 -0800
+
+ Add missing semicolon.
+
+commit 45126f4b984492c90ca11a4a93346ce2fe135cbc
+Author: John Bowman <bowman at ualberta.ca>
+Date: Thu Jan 18 13:14:09 2024 -0800
+
+ Address issue #392.
+
+commit b96786e3014f6b3f0154e1ccb536cce823702965
+Author: John Bowman <bowman at ualberta.ca>
+Date: Thu Jan 18 12:46:41 2024 -0800
+
+ Fix issue #419: suppress duplicate error message.
+
+commit e7fc3aef8d0715408c95f0e2e6e4bb4da8ab71fb
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Wed Jan 17 21:50:52 2024 -0800
+
+ better error message for positional template arg
+
+commit db40b20dd93c78a1441a4a7d6acd4a4b24888c7a
+Merge: d34926df 5650e015
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Wed Jan 17 21:27:10 2024 -0800
+
+ Merge branch 'template' of https://github.com/vectorgraphics/asymptote into template
+
+commit 5650e0155f9b3411483dcc09dc72993f95768281
+Author: John Bowman <bowman at ualberta.ca>
+Date: Wed Jan 17 20:15:22 2024 -0800
+
+ Use a unique signature hash for identifying templated imports.
+
+commit d34926dfc945b03d1c1e8a950597ff2e8d18fa5e
+Merge: b5d3eb12 c66deaf2
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Wed Jan 17 18:04:05 2024 -0800
+
+ Merge remote-tracking branch 'origin/template' into template
+
+commit b5d3eb1212ab52edbdc75395cb2ba07ac6cee989
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Wed Jan 17 17:58:17 2024 -0800
+
+ Make 'from template access' work; a few changes regarding scopes and error handling
+
+commit c66deaf27e846314649f696418cd4cb6d6ba977b
+Author: John Bowman <bowman at ualberta.ca>
+Date: Wed Jan 17 17:36:17 2024 -0800
+
+ Don't process templated imports with mismatched parameters.
+
+commit 492506c6009829ef64f738f0ed287c4042865fed
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Wed Jan 17 14:57:11 2024 -0800
+
+ checkpoint; extraneous errors fixed?
+
+commit 50961c069288547c1ca3431a225b274ad34154f2
+Merge: 3f55d6eb dd4b63cc
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Tue Jan 16 18:52:03 2024 -0800
+
+ Merge branch 'master' into template
+ Incorporate fix to "from module access (type & method)".
+
+commit 3f55d6eba90de078fcdcd1b314a251c5aff48df2
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Tue Jan 16 18:38:13 2024 -0800
+
+ checkpoint
+
+commit dd4b63cc1f7cf0c9bdb716db9963b4a0de8e7d27
+Author: John Bowman <bowman at ualberta.ca>
+Date: Tue Jan 16 17:27:00 2024 -0800
+
+ Suppress warning message regarding boolean operator.
+
+commit 8652763972c48b7675d7a8707499311c1d1a5030
+Author: John Bowman <bowman at ualberta.ca>
+Date: Tue Jan 16 17:23:33 2024 -0800
+
+ Revert "Fix boolean operator."
+
+ This reverts commit fffdb62031f4f68007b2721bdd8ef86ef37d8e3d.
+
+commit 23ab319cc4d6a9b2c58ded0e44201a49744031c5
+Author: John Bowman <bowman at ualberta.ca>
+Date: Mon Jan 15 20:29:12 2024 -0800
+
+ Use signature hash for indexing templated imports.
+
+commit 386da6bf46d8f05ba51425a66814dcd2bda0cd65
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Mon Jan 15 19:24:05 2024 -0800
+
+ Seemingly working template declaration for the module to receive template parameters.
+
+commit 40d262ade847a245fe844733bd55f865d3e55556
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Mon Jan 15 16:11:37 2024 -0800
+
+ Syntax to receive template params or supply header
+
+commit 6f04389e02b8eae711f200d942b15a05c42b38c1
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Mon Jan 15 14:43:40 2024 -0800
+
+ Move 'add symbol' logic closer to module execution
+
+commit 3339ac1fe6ac80d4bb3f56c11b3bdd753275b934
+Author: John Bowman <bowman at ualberta.ca>
+Date: Sun Jan 14 23:57:41 2024 -0800
+
+ Allow multiple templated imports.
+
+commit 74ae11c4ff563a9ecc43f39f332f4399c939a44e
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Sun Jan 14 13:47:05 2024 -0800
+
+ Template params are used on the first import only
+
+commit 4afba32597347b225164d284f2985e62c350dcba
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Sat Jan 13 16:03:37 2024 -0800
+
+ Notation parses but always maps T to pair.
+
+commit 0c7fa4112d7ba8eb61ac0b3d83820136fc649af9
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Sat Jan 13 15:41:25 2024 -0800
+
+ checkpoint
+
+commit 82c24dc684f7250a5e9a290e4459537ee1edc628
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Thu Jan 11 14:32:16 2024 -0800
+
+ checkpoint
+
+commit 272274b2474264a1f6ba4fa84d6fb94305d71500
+Author: John Bowman <bowman at ualberta.ca>
+Date: Mon Jan 8 17:56:46 2024 -0800
+
+ Update fftw++.h and seconds.h.
+
+commit aa1cb4d1084c2eb54fccb89e1626d3340e948568
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Mon Jan 8 14:35:52 2024 -0800
+
+ checkpoint
+
+commit df359f5d9a382f48caef4c0dc22c67165a7e182e
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Thu Jan 4 15:47:18 2024 -0800
+
+ translate decdec to formal
+
+commit a9850d7d94a2b65ad3c38d1607d5d3850242a050
+Author: Charles Staats III <charles.staats.iii at gmail.com>
+Date: Fri Dec 29 10:12:33 2023 -0800
+
+ dummy parse from Andy
+
+commit 98d66af9f0a7d942ffcf81a21d2d6aa9961bf12d
+Author: John Bowman <bowman at ualberta.ca>
+Date: Tue Jan 2 17:06:05 2024 -0800
+
+ Improve diagnostic.
+
+commit 8c83a8e8710f245bab9833850fd8381c612ea1b9
+Author: John Bowman <bowman at ualberta.ca>
+Date: Mon Jan 1 13:17:56 2024 -0800
+
+ Address issue #410: Support latexmk --output-directory.
+
+commit 112654bcf832c49ef7b24df4fe0c55d7362174cc
+Author: John Bowman <bowman at ualberta.ca>
+Date: Sun Dec 31 22:20:22 2023 -0800
+
+ Fix issue #414: restore missing outpath.
+
+commit 4f4a3276fce7dab6b4ee2199fc90157fe91f9d92
+Author: John Bowman <bowman at ualberta.ca>
+Date: Sun Dec 31 06:56:58 2023 -0800
+
+ Fix issue #412: prevent inferred assignment of void type.
+
+commit 8428d007fb9ea47f9531c679acf6bd8f58dcbba5
+Author: John Bowman <bowman at ualberta.ca>
+Date: Thu Dec 28 23:55:02 2023 -0800
+
+ Fix typo (issue #411).
+
+commit 2b4140b09ecf2df7312f93c59dff128b1a39c222
+Author: John Bowman <bowman at ualberta.ca>
+Date: Wed Dec 20 00:10:13 2023 -0800
+
+ Fix outname.
+
+commit f25a3a9627adb94eef4d1fbe1c97c4702d8d282f
+Author: John Bowman <bowman at ualberta.ca>
+Date: Tue Dec 19 23:45:03 2023 -0800
+
+ Fix bug #373: avoid repeated stripping of file extensions.
+
+commit 3cc421585211a3a55bc9ca90e3eab5db8ee18508
+Author: John Bowman <bowman at ualberta.ca>
+Date: Tue Dec 19 23:14:21 2023 -0800
+
+ Only output v3d format for 3D files.
+
+commit 35c261216d6e45593ccd13155ca0ab31652adaf6
+Author: John Bowman <bowman at ualberta.ca>
+Date: Tue Dec 19 19:20:56 2023 -0800
+
+ git subrepo pull --force LspCpp
+
+ subrepo:
+ subdir: "LspCpp"
+ merged: "1f397e56"
+ upstream:
+ origin: "git at github.com:vectorgraphics/LspCpp"
+ branch: "master"
+ commit: "1f397e56"
+ git-subrepo:
+ version: "0.4.6"
+ origin: "???"
+ commit: "???"
+
+commit 081db9d0865403a5d82a749e58f035479193ca8a
+Author: John Bowman <bowman at ualberta.ca>
+Date: Tue Dec 19 19:17:52 2023 -0800
+
+ Fix LSP segmentation fault.
+
+commit 488d80962c76cc60629f590e34b350459ea59621
+Author: John Bowman <bowman at ualberta.ca>
+Date: Mon Dec 18 22:33:47 2023 -0800
+
+ Fix bug #405: implicitly format integers with full precision.
+
+commit 6868ca1a66611d72f716e57617d1c9c6031d3fe7
+Author: Supakorn 'Jamie' Rassameemasmuang <jamievlin at outlook.com>
+Date: Sat Dec 9 00:00:49 2023 -0700
+
+ Add LSPCPP_USEGC macro flag in case of gc.
+
+commit 4f0b79391800424a729ccd393f31d01cbb86bbb4
+Author: John Bowman <bowman at ualberta.ca>
+Date: Sat Nov 18 19:38:00 2023 -0800
+
+ Fix fitscreen.
+
+commit fb0c259606b8323e8b5d223f2fe66a485fbe17ac
+Author: John Bowman <bowman at ualberta.ca>
+Date: Sat Nov 18 16:21:56 2023 -0800
+
+ Fix warning message.
+
+commit 1007bd5d1e92e9d41577cf28f1d81fbd3de04fbf
+Author: John Bowman <bowman at ualberta.ca>
+Date: Sat Nov 18 12:29:00 2023 -0800
+
+ Remove unused include.
+
+commit b6e9a2c4ab8d06720bd28930b0c12589d7da19d5
+Author: John Bowman <bowman at ualberta.ca>
+Date: Wed Nov 15 15:42:37 2023 -0800
+
+ Fix URL.
+
+commit b706a4fd6718e1aa1b3ce06ca657b60fc54ea4c2
+Author: John Bowman <bowman at ualberta.ca>
+Date: Mon Nov 6 23:44:14 2023 -0800
+
+ Implement mapArray via mapArrayString.
+
+commit e991c19bbb4318201be9e6d8fa11e58ff93c1183
+Author: John Bowman <bowman at ualberta.ca>
+Date: Fri Nov 3 23:49:52 2023 -0700
+
+ git subrepo pull (merge) --force LspCpp
+
+ subrepo:
+ subdir: "LspCpp"
+ merged: "3bd6c6dc"
+ upstream:
+ origin: "git at github.com:vectorgraphics/LspCpp"
+ branch: "master"
+ commit: "3bd6c6dc"
+ git-subrepo:
+ version: "0.4.6"
+ origin: "???"
+ commit: "???"
+
+commit 97af5c4c4d318c8c8642bf596506b79936312c36
+Author: John Bowman <bowman at ualberta.ca>
+Date: Fri Nov 3 23:42:04 2023 -0700
+
+ git subrepo pull --force LspCpp
+
+ subrepo:
+ subdir: "LspCpp"
+ merged: "5f4a5990"
+ upstream:
+ origin: "git at github.com:vectorgraphics/LspCpp"
+ branch: "master"
+ commit: "5f4a5990"
+ git-subrepo:
+ version: "0.4.6"
+ origin: "???"
+ commit: "???"
+
+commit 2cb894653a74235788ce33575f9a1af1ea15796b
+Author: John Bowman <bowman at ualberta.ca>
+Date: Tue Oct 10 23:14:04 2023 -0700
+
+ Fix SVG gradient shading offsets (issue #389).
+
+commit 75b1ffb846ef59051875147460815f6fab9dfad3
+Author: John Bowman <bowman at ualberta.ca>
+Date: Mon Oct 9 23:50:57 2023 -0700
+
+ Fix issue #391: Workaround libc++ parsing bug under MacOS.
+
+commit 87195dbbf5fd698d7e07a148ff44473336fa141c
+Author: John Bowman <bowman at ualberta.ca>
+Date: Mon Oct 2 22:58:36 2023 -0700
+
+ Simplify bilinear interpolation of surfaces.
+
+commit cc79cc5253f4e9963c731f131ea00a3fea6cbc29
+Merge: 90bc314c 25be300d
+Author: Supakorn 'Jamie' Rassameemasmuang <jamievlin at outlook.com>
+Date: Mon Sep 25 16:12:50 2023 -0600
+
+ Merge pull request #390 from vectorgraphics/gitattribs
+
+ Add .gitattributes file to help with windows/wsl build process.
+
+commit 90bc314c26833477c871adcebc817ef911190b91
+Author: John Bowman <bowman at ualberta.ca>
+Date: Sun Sep 24 10:22:36 2023 -0700
+
+ Simplify examples.
+
+commit fa97fc830a6f76c8da820981ca7728e54b76f1db
+Author: John Bowman <bowman at ualberta.ca>
+Date: Sat Sep 23 20:48:06 2023 -0700
+
+ Fix documentation of shipout (issue #396).
+
+commit 25be300d82227d14b5671241c3b9819c1a874f6e
+Author: Supakorn Rassameemasmuang <jamievlin at outlook.com>
+Date: Wed Aug 9 11:36:44 2023 -0600
+
+ Add .gitattributes file to help with windows/wsl build process.
+
+commit aa9f81bad9478bfe8b2ab5fc5376c19c6c79c708
+Author: John Bowman <bowman at ualberta.ca>
+Date: Sat Jul 29 23:25:54 2023 -0600
+
+ Fix bug 388: Avoid broken dvisvgm reassign-clippaths optimization.
+
+commit b069d8158e7921298b38874b4b2600de0fddf497
+Merge: 29caaed5 2a242c54
+Author: John Bowman <bowman at ualberta.ca>
+Date: Tue Jun 27 16:31:53 2023 -0600
+
+ Merge pull request #383 from cyrilled76/patch-1
+
+ Fix doc
+
+commit 2a242c545a7c6bf8dc59bcb0bce4cbf66ba8695e
+Author: cyrilled76 <122608369+cyrilled76 at users.noreply.github.com>
+Date: Tue Jun 27 22:52:30 2023 +0200
+
+ Fix doc
+
+commit 29caaed5ead5a62787475286afd22e40585b8bb8
+Author: John Bowman <bowman at ualberta.ca>
+Date: Wed Jun 14 22:36:35 2023 -0600
+
+ Fix --without-lsp (issue #379).
+
+commit e9e376538bf3899cd3dbd4ed9bd77ae04460baa9
+Author: John Bowman <bowman at ualberta.ca>
+Date: Mon Jun 12 18:25:15 2023 -0600
+
+ Increment version to 2.87.
+
+commit 6c49014d0055d9dfdeb5dca5fb23a37a3ce1c9e3
+Author: John Bowman <bowman at ualberta.ca>
+Date: Tue Jun 6 22:12:03 2023 -0600
+
+ Update HOWTO.
+
+commit 4d5224cf59d75f08c7360382bf7e7c12167ce35f
+Author: John Bowman <bowman at ualberta.ca>
+Date: Tue Jun 6 19:59:30 2023 -0600
+
+ Update build script.
+
+commit 3c359d89cc4bfba685d5c29794af934e08c5329f
+Author: John Bowman <bowman at ualberta.ca>
+Date: Tue Jun 6 17:15:36 2023 -0600
+
+ Fix type.
+
+commit 0104aea26bf8f76dc15f717a5ea78e0ff46b659f
+Author: John Bowman <bowman at ualberta.ca>
+Date: Tue Jun 6 16:26:53 2023 -0600
+
+ Fix compilation under MSDOS.
+
+commit 13fac7197d9f62f890f3c78d40eda8f5b819c99c
+Author: John Bowman <bowman at ualberta.ca>
+Date: Tue Jun 6 00:17:26 2023 -0600
+
+ Fix boost issues.
+
+commit fbe3f431adc74ff6ac307fd4868da8f8b363efaa
+Author: John Bowman <bowman at ualberta.ca>
+Date: Tue Jun 6 00:00:47 2023 -0600
+
+ git subrepo pull --force LspCpp
+
+ subrepo:
+ subdir: "LspCpp"
+ merged: "9b0d99d1"
+ upstream:
+ origin: "git at github.com:vectorgraphics/LspCpp"
+ branch: "master"
+ commit: "9b0d99d1"
+ git-subrepo:
+ version: "0.4.6"
+ origin: "???"
+ commit: "???"
+
+commit 728e00fa9dcc9d13f9fa5da82c2f901420485c61
+Author: John Bowman <bowman at ualberta.ca>
+Date: Mon Jun 5 22:47:35 2023 -0600
+
+ Fix std::optional compilation issues.
+
+commit c18c01677cfbeb3d956633df86a79e984a8f8255
+Author: John Bowman <bowman at ualberta.ca>
+Date: Mon Jun 5 22:47:05 2023 -0600
+
+ git subrepo pull --force LspCpp
+
+ subrepo:
+ subdir: "LspCpp"
+ merged: "1a04514e"
+ upstream:
+ origin: "git at github.com:vectorgraphics/LspCpp"
+ branch: "master"
+ commit: "1a04514e"
+ git-subrepo:
+ version: "0.4.6"
+ origin: "???"
+ commit: "???"
+
+commit b24fba5df113d4a5e7af41d01011b912916b2a06
+Author: John Bowman <bowman at ualberta.ca>
+Date: Mon Jun 5 01:36:17 2023 -0600
+
+ git subrepo pull --force LspCpp
+
+ subrepo:
+ subdir: "LspCpp"
+ merged: "97ccf8e9"
+ upstream:
+ origin: "git at github.com:vectorgraphics/LspCpp"
+ branch: "master"
+ commit: "97ccf8e9"
+ git-subrepo:
+ version: "0.4.6"
+ origin: "???"
+ commit: "???"
+
+commit 346ec934bd279beaf1d1605d657fd8e15378022b
+Author: John Bowman <bowman at ualberta.ca>
+Date: Mon Jun 5 01:10:41 2023 -0600
+
+ Work around unavailable clock_gettime under old versions of MacOS.
+
+commit 1d7caee225a5fe892c9ba2f7ffff1e63335352fa
+Author: John Bowman <bowman at ualberta.ca>
+Date: Mon Jun 5 01:10:06 2023 -0600
+
+ Fix portability issue with GLSL_VERSION.
+
+commit e49ed605f0e13ff75ae21f5b653f3c4b319a33f6
+Author: John Bowman <bowman at ualberta.ca>
+Date: Sun Jun 4 22:49:48 2023 -0600
+
+ Initialize spin counter; remove remaining gettimeofday calls.
+
+commit 59bb7930b9a08c530f66957c5c60f64b07a59374
+Author: John Bowman <bowman at ualberta.ca>
+Date: Sun Jun 4 15:53:40 2023 -0600
+
+ Update Boehm GC to 8.2.4.
+
+commit 4080bee015b099acd933bf40a89d2933c1edbdc2
+Author: John Bowman <bowman at ualberta.ca>
+Date: Sun Jun 4 11:58:51 2023 -0600
+
+ git subrepo pull --force LspCpp
+
+ subrepo:
+ subdir: "LspCpp"
+ merged: "018aaca5"
+ upstream:
+ origin: "git at github.com:vectorgraphics/LspCpp"
+ branch: "master"
+ commit: "018aaca5"
+ git-subrepo:
+ version: "0.4.6"
+ origin: "???"
+ commit: "???"
+
+commit 267922a9d8d7f9077d6d5bd7260e176cf200d010
+Author: John Bowman <bowman at ualberta.ca>
+Date: Sun Jun 4 11:36:51 2023 -0600
+
+ git subrepo pull --force LspCpp
+
+ subrepo:
+ subdir: "LspCpp"
+ merged: "6874d444"
+ upstream:
+ origin: "git at github.com:vectorgraphics/LspCpp"
+ branch: "master"
+ commit: "6874d444"
+ git-subrepo:
+ version: "0.4.6"
+ origin: "???"
+ commit: "???"
+
+commit 2d541360013d7357be3258c1ba6ea7ed98ae1e45
+Author: John Bowman <bowman at ualberta.ca>
+Date: Sun Jun 4 11:35:18 2023 -0600
+
+ git subrepo pull --force LspCpp
+
+ subrepo:
+ subdir: "LspCpp"
+ merged: "530bd22e"
+ upstream:
+ origin: "git at github.com:vectorgraphics/LspCpp"
+ branch: "master"
+ commit: "530bd22e"
+ git-subrepo:
+ version: "0.4.6"
+ origin: "???"
+ commit: "???"
+
+commit bd3813ca7592cc3dba43fa4007ff4f129d668f24
+Author: John Bowman <bowman at ualberta.ca>
+Date: Sun Jun 4 10:52:31 2023 -0600
+
+ git subrepo pull --force LspCpp
+
+ subrepo:
+ subdir: "LspCpp"
+ merged: "6c723f47"
+ upstream:
+ origin: "git at github.com:vectorgraphics/LspCpp"
+ branch: "master"
+ commit: "6c723f47"
+ git-subrepo:
+ version: "0.4.6"
+ origin: "???"
+ commit: "???"
+
+commit a3f45abc54caf855167b662ffd3717e2ab733289
+Author: John Bowman <bowman at ualberta.ca>
+Date: Sun Jun 4 10:51:34 2023 -0600
+
+ Revert "Revert "Change boost::optional to std::optional"."
+
+ This reverts commit d6ddd54262b7bf61830572988e2f4bd953802a28.
+
+commit 6cb475a540d695b3fcee20252e2ffac2c8f1adb5
+Author: John Bowman <bowman at ualberta.ca>
+Date: Sat Jun 3 15:06:24 2023 -0600
+
+ git subrepo pull (merge) LspCpp
+
+ subrepo:
+ subdir: "LspCpp"
+ merged: "acde1180"
+ upstream:
+ origin: "git at github.com:vectorgraphics/LspCpp"
+ branch: "master"
+ commit: "936b427d"
+ git-subrepo:
+ version: "0.4.6"
+ origin: "???"
+ commit: "???"
+
+commit d6ddd54262b7bf61830572988e2f4bd953802a28
+Author: John Bowman <bowman at ualberta.ca>
+Date: Sat Jun 3 14:55:20 2023 -0600
+
+ Revert "Change boost::optional to std::optional".
+
+ This reverts commit 0de3cfdb930d53d9ea2c03674e8ab228bf31b0d1.
+
+commit 5a4f72184e494aafaf5298b0b51f7338d7fb97f0
+Author: John Bowman <bowman at ualberta.ca>
+Date: Sat Jun 3 14:42:17 2023 -0600
+
+ git subrepo pull --force LspCpp
+
+ subrepo:
+ subdir: "LspCpp"
+ merged: "f96a1ac0"
+ upstream:
+ origin: "git at github.com:vectorgraphics/LspCpp"
+ branch: "master"
+ commit: "f96a1ac0"
+ git-subrepo:
+ version: "0.4.6"
+ origin: "???"
+ commit: "???"
+
+commit b3345619ab5aad88fcf229591c5a20f0d0864eaa
+Merge: 5c40136f 7366fe26
+Author: John Bowman <bowman at ualberta.ca>
+Date: Sat Jun 3 12:21:01 2023 -0600
+
+ Merge pull request #356 from yarusome/master
+
+ Fixing bugs in the inversion section of the `geometry` module
+
+commit 5c40136f60cbeab6924626085c68cc161d0dae45
+Author: John Bowman <bowman at ualberta.ca>
+Date: Sat Jun 3 12:11:23 2023 -0600
+
+ Reformat code.
+
+commit 4709f6e6956d3f455c127fa5d44debf6f70d027e
+Merge: 456ae992 7f5cdf0b
+Author: John Bowman <bowman at ualberta.ca>
+Date: Sat Jun 3 11:59:50 2023 -0600
+
+ Merge pull request #377 from LemonBoy/fix-io-read
+
+ io: Fix reading of NaN and inf values
+
+commit 456ae99203a291f9c50128ec55965ad948e11971
+Author: John Bowman <bowman at ualberta.ca>
+Date: Fri Jun 2 21:42:12 2023 -0600
+
+ Remove lsp option when disabled.
+
+commit 214b8969a66af0dde0168ac17e2a343debb7d047
+Author: John Bowman <bowman at ualberta.ca>
+Date: Mon May 29 10:33:28 2023 -0600
+
+ Remove unused cast.
+
+commit 7f5cdf0b2c6aed2e26ff7310aa3d181419a6eea8
+Author: LemonBoy <thatlemon at gmail.com>
+Date: Sun May 28 19:09:57 2023 +0200
+
+ io: Fix reading of NaN and inf values
+
+ Previously asymptote would silently stop while trying to read a textual
+ dataset containing inf or nan values, while the language itself is
+ perfectly capable of handling such values.
+
+commit 43cf506b5bce0957205650246c8616b97e143133
+Author: John Bowman <bowman at ualberta.ca>
+Date: Sun May 14 13:54:15 2023 -0600
+
+ Remove unused variables.
+
+commit 494e8120ee967aa9c71ae26e2476b5632211b6e2
+Author: John Bowman <bowman at ualberta.ca>
+Date: Mon Apr 17 21:23:57 2023 -0600
+
+ Fix compilation when configured with --disable-gl.
+
+commit 4715fea108852e25cd38a6a74079985f5fe91e7f
+Author: John Bowman <bowman at ualberta.ca>
+Date: Sat Apr 15 16:31:59 2023 -0600
+
+ Suppress .setblendmode for EPS output.
+
+commit 700aaec3a6d1fd3a78f04537a61bad82a5f07057
+Author: John Bowman <bowman at ualberta.ca>
+Date: Sun Mar 12 00:03:46 2023 -0700
+
+ Fix portability issues.
+
+commit fffdb62031f4f68007b2721bdd8ef86ef37d8e3d
+Author: John Bowman <bowman at ualberta.ca>
+Date: Sat Mar 11 23:42:20 2023 -0700
+
+ Fix boolean operator.
+
+commit da81bd59f89ba8be1131243f680f06ed57fee571
+Author: John Bowman <bowman at ualberta.ca>
+Date: Sat Mar 11 23:33:28 2023 -0700
+
+ Update config.guess.
+
+commit 65165fe1528692980fd52c7f1c3735c7ac5bd2c0
+Author: John Bowman <bowman at ualberta.ca>
+Date: Sun Mar 5 20:48:00 2023 -0700
+
+ Fix bug #370: automatically apply PDF transfer functions.
+
+commit 11c8cc57a4b66e5f04f3ab2f1cfd6f33d2c8d43d
+Author: John Bowman <bowman at ualberta.ca>
+Date: Mon Feb 20 13:41:10 2023 -0700
+
+ Clear initial index buffer.
+
+commit 7623f325b1a370851db9559a5a058e552b71a2f6
+Author: John Bowman <bowman at ualberta.ca>
+Date: Sun Feb 19 01:32:10 2023 -0700
+
+ Fix last revision.
+
+commit 0a248a219e44d2945bcc31c5424153ec1ace41bb
+Author: John Bowman <bowman at ualberta.ca>
+Date: Sun Feb 19 01:28:30 2023 -0700
+
+ Only output unscaled primitives.
+
+commit e8e88fb4412ce92acf222ceafe18e3be26984b90
+Author: John Bowman <bowman at ualberta.ca>
+Date: Wed Feb 8 23:39:44 2023 -0700
+
+ Increment version to 2.86.
+
commit 9e242d4e7d6d79656c09d4f6c7c385dd7ea61bb3
Author: John Bowman <bowman at ualberta.ca>
Date: Wed Feb 8 21:30:27 2023 -0700
@@ -166,6 +1174,12 @@
Increment version to 2.85.
+commit 7366fe26314370241c949921389492a4cb862f33
+Author: yarusome <97945148+yarusome at users.noreply.github.com>
+Date: Mon Jan 23 12:15:54 2023 +0800
+
+ Fixing the use of `inverse()`
+
commit 430c7a661c060568720f6d65e611a2087ea1dde6
Author: John Bowman <bowman at ualberta.ca>
Date: Sat Jan 21 22:48:26 2023 -0700
@@ -218,6 +1232,22 @@
Avoid division by zero.
+commit 58af9b461ff373ec32e6d1db869c80cf3b6dd137
+Author: yarusome <97945148+yarusome at users.noreply.github.com>
+Date: Sun Dec 11 13:59:36 2022 +0800
+
+ Simplifying the internal use of `inversion`
+
+ This commit replaces `(real, point, ...)` with `(inversion, ...)` in the parameter list of internally-used functions in the inversion section, and simplifies the initializer definitions of `inversion` using `operator init`.
+
+commit 1fcc742a8e372b8280e92573a31542ed3cdc9117
+Author: yarusome <97945148+yarusome at users.noreply.github.com>
+Date: Sun Dec 11 13:19:55 2022 +0800
+
+ Fixing the inversion section of the `geometry` module
+
+ This commit fixes bugs related to coordinate systems in the inversion section, and all the returned `point`s are in `currentcoordsys` now.
+
commit 46d6ea7351699bbed0418ec6d7f2195011178e5a
Author: John Bowman <bowman at ualberta.ca>
Date: Mon Nov 28 20:20:35 2022 -0700
Modified: trunk/Build/source/utils/asymptote/GUI/Window1.py
===================================================================
--- trunk/Build/source/utils/asymptote/GUI/Window1.py 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/GUI/Window1.py 2024-02-27 20:51:03 UTC (rev 70212)
@@ -2460,9 +2460,10 @@
except:
return
- if self.fileItems[maj] is not None:
- self.contextWindowObject = self.fileItems[maj] #For arrowifying
- self.contextWindow = ContextWindow.AnotherWindow(self.fileItems[maj],self)
+ item=self.fileItems[maj]
+ if item is not None and isinstance(item, x2a.xasyDrawnItem):
+ self.contextWindowObject = item #For arrowifying
+ self.contextWindow = ContextWindow.AnotherWindow(item,self)
self.contextWindow.setMinimumWidth(420)
#self.setCentralWidget(self.contextWindow) #I don't know what this does tbh.
self.contextWindow.show()
Modified: trunk/Build/source/utils/asymptote/GUI/icons_rc.py
===================================================================
--- trunk/Build/source/utils/asymptote/GUI/icons_rc.py 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/GUI/icons_rc.py 2024-02-27 20:51:03 UTC (rev 70212)
@@ -2,7 +2,7 @@
# Resource object code
#
-# Created by: The Resource Compiler for PyQt5 (Qt v5.15.8)
+# Created by: The Resource Compiler for PyQt5 (Qt v5.15.11)
#
# WARNING! All changes made in this file will be lost!
@@ -9,7 +9,7 @@
from PyQt5 import QtCore
qt_resource_data = b"\
-\x00\x00\x02\xf0\
+\x00\x00\x05\xbb\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
@@ -40,66 +40,69 @@
\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
-\x76\x65\x22\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x22\x49\x63\x6f\x6e\
-\x5f\x32\x30\x5f\x22\x3e\x0a\x09\x3c\x67\x3e\x0a\x09\x09\x3c\x70\
-\x61\x74\x68\x20\x64\x3d\x22\x4d\x32\x35\x36\x2c\x34\x38\x43\x31\
-\x34\x31\x2e\x36\x30\x31\x2c\x34\x38\x2c\x34\x38\x2c\x31\x34\x31\
-\x2e\x36\x30\x31\x2c\x34\x38\x2c\x32\x35\x36\x73\x39\x33\x2e\x36\
-\x30\x31\x2c\x32\x30\x38\x2c\x32\x30\x38\x2c\x32\x30\x38\x73\x32\
-\x30\x38\x2d\x39\x33\x2e\x36\x30\x31\x2c\x32\x30\x38\x2d\x32\x30\
-\x38\x53\x33\x37\x30\x2e\x33\x39\x39\x2c\x34\x38\x2c\x32\x35\x36\
-\x2c\x34\x38\x7a\x20\x4d\x32\x35\x36\x2c\x34\x32\x32\x2e\x33\x39\
-\x39\x0a\x09\x09\x09\x63\x2d\x39\x31\x2e\x35\x31\x38\x2c\x30\x2d\
-\x31\x36\x36\x2e\x33\x39\x39\x2d\x37\x34\x2e\x38\x38\x32\x2d\x31\
-\x36\x36\x2e\x33\x39\x39\x2d\x31\x36\x36\x2e\x33\x39\x39\x53\x31\
-\x36\x34\x2e\x34\x38\x32\x2c\x38\x39\x2e\x36\x2c\x32\x35\x36\x2c\
-\x38\x39\x2e\x36\x53\x34\x32\x32\x2e\x34\x2c\x31\x36\x34\x2e\x34\
-\x38\x32\x2c\x34\x32\x32\x2e\x34\x2c\x32\x35\x36\x53\x33\x34\x37\
-\x2e\x35\x31\x38\x2c\x34\x32\x32\x2e\x33\x39\x39\x2c\x32\x35\x36\
-\x2c\x34\x32\x32\x2e\x33\x39\x39\x7a\x22\x2f\x3e\x0a\x09\x3c\x2f\
-\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x02\x77\
-\x3c\
-\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
-\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
-\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
-\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
-\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\x20\
-\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
-\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
-\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
-\x20\x2d\x2d\x3e\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x73\
-\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\x57\x33\
-\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\x2f\x2f\
-\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
-\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
-\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
-\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
-\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4c\
-\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\
-\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\
-\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\
-\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
-\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\
-\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
-\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
-\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
-\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
-\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x73\x74\x79\x6c\x65\
-\x3d\x22\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\
-\x75\x6e\x64\x3a\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\
-\x35\x31\x32\x3b\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\
-\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0a\x3c\x70\x6f\x6c\
-\x79\x67\x6f\x6e\x20\x70\x6f\x69\x6e\x74\x73\x3d\x22\x32\x38\x38\
-\x2c\x39\x36\x20\x33\x33\x37\x2e\x39\x2c\x31\x34\x35\x2e\x39\x20\
-\x32\x37\x34\x2c\x32\x30\x39\x2e\x37\x20\x32\x37\x34\x2c\x32\x30\
-\x39\x2e\x37\x20\x31\x34\x35\x2e\x39\x2c\x33\x33\x37\x2e\x39\x20\
-\x39\x36\x2c\x32\x38\x38\x20\x39\x36\x2c\x34\x31\x36\x20\x32\x32\
-\x34\x2c\x34\x31\x36\x20\x31\x37\x34\x2e\x31\x2c\x33\x36\x36\x2e\
-\x31\x20\x33\x35\x37\x2e\x34\x2c\x31\x38\x32\x2e\x39\x20\x33\x36\
-\x36\x2e\x31\x2c\x31\x37\x34\x2e\x31\x20\x0a\x09\x34\x31\x36\x2c\
-\x32\x32\x34\x20\x34\x31\x36\x2c\x39\x36\x20\x22\x2f\x3e\x0a\x3c\
-\x2f\x73\x76\x67\x3e\x0a\
+\x76\x65\x22\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x34\
+\x35\x30\x2e\x36\x37\x39\x2c\x32\x37\x33\x2e\x35\x63\x2d\x31\x34\
+\x2e\x35\x38\x35\x2d\x31\x34\x2e\x35\x37\x37\x2d\x33\x36\x2e\x30\
+\x35\x34\x2d\x31\x35\x2e\x38\x39\x2d\x35\x30\x2e\x36\x33\x39\x2d\
+\x31\x2e\x33\x31\x32\x6c\x2d\x34\x31\x2e\x36\x38\x37\x2c\x34\x31\
+\x2e\x36\x36\x34\x63\x2d\x31\x30\x2e\x38\x35\x32\x2c\x31\x30\x2e\
+\x38\x33\x36\x2d\x32\x33\x2e\x39\x33\x2c\x31\x30\x2e\x38\x35\x39\
+\x2d\x33\x31\x2e\x35\x36\x34\x2c\x31\x2e\x38\x35\x32\x0a\x09\x63\
+\x2d\x35\x2e\x30\x35\x37\x2d\x35\x2e\x39\x36\x38\x2d\x33\x2e\x30\
+\x36\x31\x2d\x32\x34\x2e\x33\x37\x34\x2d\x31\x2e\x36\x34\x34\x2d\
+\x33\x36\x2e\x30\x34\x39\x6c\x32\x30\x2e\x39\x30\x37\x2d\x31\x37\
+\x31\x2e\x38\x34\x39\x63\x31\x2e\x38\x36\x37\x2d\x31\x35\x2e\x33\
+\x35\x33\x2d\x39\x2e\x30\x37\x2d\x33\x30\x2e\x31\x38\x35\x2d\x32\
+\x34\x2e\x34\x33\x2d\x33\x32\x2e\x30\x35\x31\x0a\x09\x63\x2d\x31\
+\x35\x2e\x33\x35\x38\x2d\x31\x2e\x38\x36\x37\x2d\x32\x39\x2e\x33\
+\x32\x32\x2c\x39\x2e\x39\x33\x39\x2d\x33\x31\x2e\x31\x39\x31\x2c\
+\x32\x35\x2e\x32\x38\x39\x4c\x32\x36\x37\x2e\x33\x37\x2c\x32\x33\
+\x36\x2e\x30\x32\x31\x63\x2d\x31\x2e\x32\x30\x35\x2c\x33\x2e\x33\
+\x35\x38\x2d\x33\x2e\x37\x39\x2c\x33\x2e\x39\x33\x38\x2d\x34\x2e\
+\x30\x38\x31\x2d\x30\x2e\x35\x38\x32\x4c\x32\x35\x35\x2e\x34\x34\
+\x2c\x36\x30\x0a\x09\x63\x30\x2d\x31\x35\x2e\x34\x36\x35\x2d\x31\
+\x32\x2e\x35\x34\x32\x2d\x32\x38\x2d\x32\x38\x2e\x30\x31\x34\x2d\
+\x32\x38\x63\x2d\x31\x35\x2e\x34\x37\x33\x2c\x30\x2d\x32\x38\x2e\
+\x30\x31\x35\x2c\x31\x32\x2e\x35\x33\x35\x2d\x32\x38\x2e\x30\x31\
+\x35\x2c\x32\x38\x6c\x2d\x30\x2e\x35\x35\x32\x2c\x31\x37\x36\x2e\
+\x37\x35\x32\x63\x30\x2e\x31\x34\x36\x2c\x32\x2e\x30\x34\x2d\x31\
+\x2e\x36\x30\x34\x2c\x32\x2e\x36\x32\x34\x2d\x31\x2e\x39\x32\x2c\
+\x30\x2e\x32\x39\x34\x4c\x31\x37\x32\x2e\x30\x31\x36\x2c\x39\x39\
+\x2e\x30\x37\x37\x0a\x09\x63\x2d\x32\x2e\x37\x35\x2d\x31\x35\x2e\
+\x32\x31\x39\x2d\x31\x37\x2e\x33\x32\x33\x2d\x32\x36\x2e\x32\x30\
+\x33\x2d\x33\x32\x2e\x35\x34\x38\x2d\x32\x33\x2e\x34\x35\x33\x63\
+\x2d\x31\x35\x2e\x32\x32\x37\x2c\x32\x2e\x37\x34\x38\x2d\x32\x35\
+\x2e\x33\x33\x39\x2c\x31\x38\x2e\x31\x38\x37\x2d\x32\x32\x2e\x35\
+\x39\x31\x2c\x33\x33\x2e\x34\x30\x33\x6c\x32\x32\x2e\x31\x39\x33\
+\x2c\x31\x36\x31\x2e\x34\x35\x35\x0a\x09\x63\x30\x2e\x30\x32\x33\
+\x2c\x32\x2e\x38\x37\x32\x2d\x30\x2e\x39\x34\x31\x2c\x34\x2e\x35\
+\x31\x33\x2d\x32\x2e\x33\x30\x38\x2c\x30\x2e\x38\x33\x31\x6c\x2d\
+\x33\x33\x2e\x31\x30\x39\x2d\x38\x38\x2e\x35\x31\x37\x63\x2d\x35\
+\x2e\x31\x38\x2d\x31\x34\x2e\x35\x37\x32\x2d\x32\x31\x2e\x31\x39\
+\x36\x2d\x32\x33\x2e\x30\x36\x35\x2d\x33\x35\x2e\x37\x37\x36\x2d\
+\x31\x37\x2e\x38\x38\x39\x0a\x09\x63\x2d\x31\x34\x2e\x35\x37\x39\
+\x2c\x35\x2e\x31\x37\x37\x2d\x32\x32\x2e\x32\x30\x31\x2c\x32\x32\
+\x2e\x30\x36\x31\x2d\x31\x37\x2e\x30\x32\x33\x2c\x33\x36\x2e\x36\
+\x33\x31\x6c\x35\x38\x2e\x30\x34\x32\x2c\x31\x38\x39\x2e\x36\x32\
+\x35\x63\x30\x2e\x33\x30\x33\x2c\x31\x2e\x30\x34\x36\x2c\x30\x2e\
+\x36\x32\x34\x2c\x32\x2e\x30\x38\x35\x2c\x30\x2e\x39\x35\x33\x2c\
+\x33\x2e\x31\x31\x38\x6c\x30\x2e\x31\x32\x31\x2c\x30\x2e\x33\x39\
+\x0a\x09\x63\x30\x2e\x30\x31\x31\x2c\x30\x2e\x30\x33\x31\x2c\x30\
+\x2e\x30\x32\x35\x2c\x30\x2e\x30\x35\x38\x2c\x30\x2e\x30\x33\x35\
+\x2c\x30\x2e\x30\x38\x38\x43\x31\x32\x36\x2e\x30\x37\x39\x2c\x34\
+\x34\x34\x2e\x32\x33\x33\x2c\x31\x37\x32\x2e\x35\x37\x2c\x34\x38\
+\x30\x2c\x32\x32\x37\x2e\x34\x32\x37\x2c\x34\x38\x30\x63\x33\x35\
+\x2e\x31\x31\x36\x2c\x30\x2c\x37\x31\x2e\x35\x39\x31\x2d\x31\x32\
+\x2e\x33\x37\x38\x2c\x39\x39\x2e\x33\x35\x37\x2d\x33\x33\x2e\x36\
+\x37\x32\x0a\x09\x63\x30\x2e\x30\x30\x31\x2c\x30\x2c\x30\x2e\x30\
+\x30\x33\x2d\x30\x2e\x30\x30\x32\x2c\x30\x2e\x30\x30\x33\x2d\x30\
+\x2e\x30\x30\x32\x63\x32\x39\x2e\x39\x39\x2d\x31\x38\x2e\x30\x35\
+\x31\x2c\x31\x32\x36\x2e\x30\x37\x31\x2d\x31\x32\x31\x2e\x33\x34\
+\x37\x2c\x31\x32\x36\x2e\x30\x37\x31\x2d\x31\x32\x31\x2e\x33\x34\
+\x37\x43\x34\x36\x37\x2e\x34\x34\x35\x2c\x33\x31\x30\x2e\x34\x30\
+\x32\x2c\x34\x36\x35\x2e\x32\x36\x36\x2c\x32\x38\x38\x2e\x30\x38\
+\x2c\x34\x35\x30\x2e\x36\x37\x39\x2c\x32\x37\x33\x2e\x35\x7a\x22\
+\x2f\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
\x00\x00\x03\xfe\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x27\x31\x2e\
@@ -166,153 +169,101 @@
\x30\x33\x37\x35\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x77\x69\x64\
\x74\x68\x3d\x27\x34\x2e\x30\x31\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\
\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\
-\x00\x00\x04\x9c\
+\x00\x00\x05\x9c\
\x3c\
-\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
-\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
-\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
-\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
-\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x38\x2e\x31\x2e\x30\x2c\x20\
-\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
-\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
-\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
-\x20\x2d\x2d\x3e\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x73\
-\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\x57\x33\
-\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\x2f\x2f\
-\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
-\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
-\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
-\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
-\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x43\
-\x6f\x64\x65\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\
-\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\
-\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x78\x6c\
-\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
-\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\x6c\x69\x6e\
-\x6b\x22\x20\x78\x3d\x22\x32\x34\x70\x78\x22\x20\x79\x3d\x22\x32\
-\x34\x70\x78\x22\x0a\x09\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\
-\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\
-\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\
-\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\
-\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\
-\x65\x72\x76\x65\x22\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\
-\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x32\x34\x20\x30\
-\x20\x30\x20\x32\x34\x20\x30\x20\x30\x29\x27\x3e\x3c\x70\x61\x74\
-\x68\x20\x64\x3d\x22\x4d\x35\x2e\x37\x31\x39\x2c\x31\x34\x2e\x37\
-\x35\x63\x2d\x30\x2e\x32\x33\x36\x2c\x30\x2d\x30\x2e\x34\x37\x34\
-\x2d\x30\x2e\x30\x38\x33\x2d\x30\x2e\x36\x36\x34\x2d\x30\x2e\x32\
-\x35\x32\x4c\x2d\x30\x2e\x30\x30\x35\x2c\x31\x30\x6c\x35\x2e\x33\
-\x34\x31\x2d\x34\x2e\x37\x34\x38\x43\x35\x2e\x37\x34\x38\x2c\x34\
-\x2e\x38\x38\x37\x2c\x36\x2e\x33\x38\x2c\x34\x2e\x39\x32\x32\x2c\
-\x36\x2e\x37\x34\x37\x2c\x35\x2e\x33\x33\x35\x0a\x09\x63\x30\x2e\
-\x33\x36\x37\x2c\x30\x2e\x34\x31\x33\x2c\x30\x2e\x33\x33\x2c\x31\
-\x2e\x30\x34\x35\x2d\x30\x2e\x30\x38\x33\x2c\x31\x2e\x34\x31\x32\
-\x4c\x33\x2e\x30\x30\x35\x2c\x31\x30\x6c\x33\x2e\x33\x37\x38\x2c\
-\x33\x2e\x30\x30\x32\x63\x30\x2e\x34\x31\x33\x2c\x30\x2e\x33\x36\
-\x37\x2c\x30\x2e\x34\x35\x2c\x30\x2e\x39\x39\x39\x2c\x30\x2e\x30\
-\x38\x33\x2c\x31\x2e\x34\x31\x32\x0a\x09\x43\x36\x2e\x32\x36\x39\
-\x2c\x31\x34\x2e\x36\x33\x37\x2c\x35\x2e\x39\x39\x34\x2c\x31\x34\
-\x2e\x37\x35\x2c\x35\x2e\x37\x31\x39\x2c\x31\x34\x2e\x37\x35\x7a\
-\x20\x4d\x31\x34\x2e\x36\x36\x34\x2c\x31\x34\x2e\x37\x34\x38\x4c\
-\x32\x30\x2e\x30\x30\x35\x2c\x31\x30\x6c\x2d\x35\x2e\x30\x36\x2d\
-\x34\x2e\x34\x39\x38\x63\x2d\x30\x2e\x34\x31\x33\x2d\x30\x2e\x33\
-\x36\x37\x2d\x31\x2e\x30\x34\x35\x2d\x30\x2e\x33\x33\x2d\x31\x2e\
-\x34\x31\x31\x2c\x30\x2e\x30\x38\x33\x0a\x09\x63\x2d\x30\x2e\x33\
-\x36\x37\x2c\x30\x2e\x34\x31\x33\x2d\x30\x2e\x33\x33\x2c\x31\x2e\
-\x30\x34\x35\x2c\x30\x2e\x30\x38\x33\x2c\x31\x2e\x34\x31\x32\x4c\
-\x31\x36\x2e\x39\x39\x35\x2c\x31\x30\x6c\x2d\x33\x2e\x36\x35\x39\
-\x2c\x33\x2e\x32\x35\x32\x63\x2d\x30\x2e\x34\x31\x33\x2c\x30\x2e\
-\x33\x36\x37\x2d\x30\x2e\x34\x35\x2c\x30\x2e\x39\x39\x39\x2d\x30\
-\x2e\x30\x38\x33\x2c\x31\x2e\x34\x31\x32\x43\x31\x33\x2e\x34\x35\
-\x2c\x31\x34\x2e\x38\x38\x37\x2c\x31\x33\x2e\x37\x32\x35\x2c\x31\
-\x35\x2c\x31\x34\x2c\x31\x35\x0a\x09\x43\x31\x34\x2e\x32\x33\x36\
-\x2c\x31\x35\x2c\x31\x34\x2e\x34\x37\x34\x2c\x31\x34\x2e\x39\x31\
-\x37\x2c\x31\x34\x2e\x36\x36\x34\x2c\x31\x34\x2e\x37\x34\x38\x7a\
-\x20\x4d\x39\x2e\x39\x38\x36\x2c\x31\x36\x2e\x31\x36\x35\x6c\x32\
-\x2d\x31\x32\x63\x30\x2e\x30\x39\x31\x2d\x30\x2e\x35\x34\x35\x2d\
-\x30\x2e\x32\x37\x37\x2d\x31\x2e\x30\x36\x2d\x30\x2e\x38\x32\x32\
-\x2d\x31\x2e\x31\x35\x31\x0a\x09\x63\x2d\x30\x2e\x35\x34\x37\x2d\
-\x30\x2e\x30\x39\x32\x2d\x31\x2e\x30\x36\x31\x2c\x30\x2e\x32\x37\
-\x37\x2d\x31\x2e\x31\x35\x2c\x30\x2e\x38\x32\x32\x6c\x2d\x32\x2c\
-\x31\x32\x63\x2d\x30\x2e\x30\x39\x31\x2c\x30\x2e\x35\x34\x35\x2c\
-\x30\x2e\x32\x37\x37\x2c\x31\x2e\x30\x36\x2c\x30\x2e\x38\x32\x32\
-\x2c\x31\x2e\x31\x35\x31\x43\x38\x2e\x38\x39\x32\x2c\x31\x36\x2e\
-\x39\x39\x36\x2c\x38\x2e\x39\x34\x36\x2c\x31\x37\x2c\x39\x2e\x30\
-\x30\x31\x2c\x31\x37\x0a\x09\x43\x39\x2e\x34\x38\x31\x2c\x31\x37\
-\x2c\x39\x2e\x39\x30\x35\x2c\x31\x36\x2e\x36\x35\x33\x2c\x39\x2e\
-\x39\x38\x36\x2c\x31\x36\x2e\x31\x36\x35\x7a\x22\x2f\x3e\x0a\x3c\
-\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x04\x17\
+\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x27\x31\x2e\
+\x30\x27\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x27\x55\x54\x46\
+\x2d\x38\x27\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x54\x68\x69\x73\x20\
+\x66\x69\x6c\x65\x20\x77\x61\x73\x20\x67\x65\x6e\x65\x72\x61\x74\
+\x65\x64\x20\x62\x79\x20\x64\x76\x69\x73\x76\x67\x6d\x20\x32\x2e\
+\x31\x31\x2e\x31\x20\x2d\x2d\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\
+\x72\x73\x69\x6f\x6e\x3d\x27\x31\x2e\x31\x27\x20\x78\x6d\x6c\x6e\
+\x73\x3d\x27\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\
+\x2e\x6f\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x27\x20\x78\
+\x6d\x6c\x6e\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x27\x68\x74\x74\x70\
+\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\
+\x39\x39\x2f\x78\x6c\x69\x6e\x6b\x27\x20\x77\x69\x64\x74\x68\x3d\
+\x27\x36\x33\x2e\x39\x39\x39\x36\x70\x74\x27\x20\x68\x65\x69\x67\
+\x68\x74\x3d\x27\x36\x34\x70\x74\x27\x20\x76\x69\x65\x77\x42\x6f\
+\x78\x3d\x27\x35\x36\x2e\x34\x30\x39\x34\x20\x31\x31\x37\x2e\x38\
+\x35\x38\x20\x36\x33\x2e\x39\x39\x39\x36\x20\x36\x34\x27\x3e\x0a\
+\x3c\x67\x20\x69\x64\x3d\x27\x70\x61\x67\x65\x31\x27\x3e\x0a\x3c\
+\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\
+\x6e\x73\x6c\x61\x74\x65\x28\x35\x36\x2e\x34\x30\x39\x34\x20\x31\
+\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\
+\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\
+\x27\x4d\x20\x35\x34\x2e\x38\x39\x32\x36\x20\x32\x34\x2e\x35\x32\
+\x39\x31\x43\x20\x35\x34\x2e\x38\x39\x32\x36\x20\x32\x30\x2e\x33\
+\x33\x36\x38\x20\x34\x34\x2e\x36\x39\x36\x39\x20\x31\x36\x2e\x39\
+\x33\x38\x33\x20\x33\x32\x2e\x31\x32\x20\x31\x36\x2e\x39\x33\x38\
+\x33\x43\x20\x31\x39\x2e\x35\x34\x33\x31\x20\x31\x36\x2e\x39\x33\
+\x38\x33\x20\x39\x2e\x33\x34\x37\x34\x32\x20\x32\x30\x2e\x33\x33\
+\x36\x38\x20\x39\x2e\x33\x34\x37\x34\x32\x20\x32\x34\x2e\x35\x32\
+\x39\x31\x43\x20\x39\x2e\x33\x34\x37\x34\x32\x20\x32\x38\x2e\x37\
+\x32\x31\x35\x20\x31\x39\x2e\x35\x34\x33\x31\x20\x33\x32\x2e\x31\
+\x32\x20\x33\x32\x2e\x31\x32\x20\x33\x32\x2e\x31\x32\x43\x20\x34\
+\x34\x2e\x36\x39\x36\x39\x20\x33\x32\x2e\x31\x32\x20\x35\x34\x2e\
+\x38\x39\x32\x36\x20\x32\x38\x2e\x37\x32\x31\x35\x20\x35\x34\x2e\
+\x38\x39\x32\x36\x20\x32\x34\x2e\x35\x32\x39\x31\x5a\x27\x20\x66\
+\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\x73\x74\x72\x6f\x6b\
+\x65\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\x20\x73\x74\x72\x6f\
+\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\x3d\x27\x72\x6f\x75\x6e\
+\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x6a\x6f\
+\x69\x6e\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\
+\x65\x2d\x6d\x69\x74\x65\x72\x6c\x69\x6d\x69\x74\x3d\x27\x31\x30\
+\x2e\x30\x33\x37\x35\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x77\x69\
+\x64\x74\x68\x3d\x27\x33\x2e\x35\x31\x33\x31\x32\x27\x2f\x3e\x0a\
+\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\
+\x6d\x3d\x27\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x35\x36\x2e\
+\x34\x30\x39\x34\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\
+\x6c\x65\x28\x2e\x39\x39\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x70\
+\x61\x74\x68\x20\x64\x3d\x27\x4d\x20\x39\x2e\x33\x34\x37\x34\x32\
+\x20\x32\x34\x2e\x35\x32\x39\x31\x4c\x20\x39\x2e\x33\x34\x37\x34\
+\x32\x20\x35\x34\x2e\x38\x39\x32\x36\x4c\x20\x39\x2e\x33\x34\x37\
+\x34\x32\x20\x35\x34\x2e\x38\x39\x32\x36\x43\x20\x39\x2e\x33\x34\
+\x37\x34\x32\x20\x35\x34\x2e\x38\x39\x32\x36\x20\x39\x2e\x33\x34\
+\x37\x34\x32\x20\x35\x34\x2e\x38\x39\x32\x36\x20\x39\x2e\x33\x34\
+\x37\x34\x32\x20\x35\x34\x2e\x38\x39\x32\x36\x43\x20\x39\x2e\x33\
+\x34\x37\x34\x32\x20\x35\x39\x2e\x30\x38\x34\x39\x20\x31\x39\x2e\
+\x35\x34\x33\x31\x20\x36\x32\x2e\x34\x38\x33\x34\x20\x33\x32\x2e\
+\x31\x32\x20\x36\x32\x2e\x34\x38\x33\x34\x43\x20\x34\x34\x2e\x36\
+\x39\x36\x39\x20\x36\x32\x2e\x34\x38\x33\x34\x20\x35\x34\x2e\x38\
+\x39\x32\x36\x20\x35\x39\x2e\x30\x38\x34\x39\x20\x35\x34\x2e\x38\
+\x39\x32\x36\x20\x35\x34\x2e\x38\x39\x32\x36\x4c\x20\x35\x34\x2e\
+\x38\x39\x32\x36\x20\x35\x34\x2e\x38\x39\x32\x36\x4c\x20\x35\x34\
+\x2e\x38\x39\x32\x36\x20\x32\x34\x2e\x35\x32\x39\x31\x27\x20\x66\
+\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\x73\x74\x72\x6f\x6b\
+\x65\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\x20\x73\x74\x72\x6f\
+\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\x3d\x27\x72\x6f\x75\x6e\
+\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x6a\x6f\
+\x69\x6e\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\
+\x65\x2d\x6d\x69\x74\x65\x72\x6c\x69\x6d\x69\x74\x3d\x27\x31\x30\
+\x2e\x30\x33\x37\x35\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x77\x69\
+\x64\x74\x68\x3d\x27\x33\x2e\x35\x31\x33\x31\x32\x27\x2f\x3e\x0a\
+\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\
+\x6d\x3d\x27\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x35\x36\x2e\
+\x34\x30\x39\x34\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\
+\x6c\x65\x28\x2e\x39\x39\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x70\
+\x61\x74\x68\x20\x64\x3d\x27\x4d\x20\x35\x34\x2e\x38\x39\x32\x36\
+\x20\x32\x34\x2e\x35\x32\x39\x31\x43\x20\x35\x34\x2e\x38\x39\x32\
+\x36\x20\x31\x31\x2e\x39\x35\x32\x32\x20\x34\x34\x2e\x36\x39\x36\
+\x39\x20\x31\x2e\x37\x35\x36\x35\x36\x20\x33\x32\x2e\x31\x32\x20\
+\x31\x2e\x37\x35\x36\x35\x36\x43\x20\x31\x39\x2e\x35\x34\x33\x31\
+\x20\x31\x2e\x37\x35\x36\x35\x36\x20\x39\x2e\x33\x34\x37\x34\x32\
+\x20\x31\x31\x2e\x39\x35\x32\x32\x20\x39\x2e\x33\x34\x37\x34\x32\
+\x20\x32\x34\x2e\x35\x32\x39\x31\x27\x20\x66\x69\x6c\x6c\x3d\x27\
+\x6e\x6f\x6e\x65\x27\x20\x73\x74\x72\x6f\x6b\x65\x3d\x27\x23\x30\
+\x30\x30\x30\x30\x30\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\
+\x6e\x65\x63\x61\x70\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\
+\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x6a\x6f\x69\x6e\x3d\x27\x72\
+\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6d\x69\x74\
+\x65\x72\x6c\x69\x6d\x69\x74\x3d\x27\x31\x30\x2e\x30\x33\x37\x35\
+\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x77\x69\x64\x74\x68\x3d\x27\
+\x33\x2e\x35\x31\x33\x31\x32\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\
+\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\
+\x00\x00\x02\xab\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
-\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x69\x73\x6f\
-\x2d\x38\x38\x35\x39\x2d\x31\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\
-\x47\x65\x6e\x65\x72\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\
-\x20\x49\x6c\x6c\x75\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x39\x2e\
-\x30\x2e\x30\x2c\x20\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\
-\x50\x6c\x75\x67\x2d\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\
-\x72\x73\x69\x6f\x6e\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\
-\x64\x20\x30\x29\x20\x20\x2d\x2d\x3e\x0a\x3c\x73\x76\x67\x20\x76\
-\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\
-\x22\x4c\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\
-\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\
-\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\
-\x6e\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\
-\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\
-\x2f\x78\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\
-\x79\x3d\x22\x30\x70\x78\x22\x0a\x09\x20\x76\x69\x65\x77\x42\x6f\
-\x78\x3d\x22\x30\x20\x30\x20\x34\x32\x33\x2e\x37\x35\x34\x20\x34\
-\x32\x33\x2e\x37\x35\x34\x22\x20\x73\x74\x79\x6c\x65\x3d\x22\x65\
-\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\
-\x3a\x6e\x65\x77\x20\x30\x20\x30\x20\x34\x32\x33\x2e\x37\x35\x34\
-\x20\x34\x32\x33\x2e\x37\x35\x34\x3b\x22\x20\x78\x6d\x6c\x3a\x73\
-\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\
-\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x33\x35\x34\x2e\x32\
-\x34\x2c\x34\x37\x2e\x34\x6c\x33\x39\x2e\x38\x37\x39\x2d\x33\x39\
-\x2e\x38\x37\x39\x48\x32\x37\x32\x2e\x31\x39\x36\x76\x31\x32\x31\
-\x2e\x39\x32\x34\x6c\x36\x30\x2e\x38\x30\x31\x2d\x36\x30\x2e\x38\
-\x30\x31\x63\x35\x36\x2c\x35\x30\x2e\x30\x36\x36\x2c\x37\x37\x2e\
-\x32\x35\x31\x2c\x31\x33\x32\x2e\x30\x30\x34\x2c\x34\x36\x2e\x39\
-\x31\x38\x2c\x32\x30\x35\x2e\x32\x33\x35\x0a\x09\x63\x2d\x31\x38\
-\x2e\x35\x38\x35\x2c\x34\x34\x2e\x38\x36\x39\x2d\x35\x33\x2e\x35\
-\x33\x31\x2c\x37\x39\x2e\x38\x31\x35\x2d\x39\x38\x2e\x34\x2c\x39\
-\x38\x2e\x34\x63\x2d\x34\x34\x2e\x38\x36\x36\x2c\x31\x38\x2e\x35\
-\x38\x35\x2d\x39\x34\x2e\x32\x38\x38\x2c\x31\x38\x2e\x35\x38\x35\
-\x2d\x31\x33\x39\x2e\x31\x35\x38\x2c\x30\x63\x2d\x34\x34\x2e\x38\
-\x36\x39\x2d\x31\x38\x2e\x35\x38\x35\x2d\x37\x39\x2e\x38\x31\x35\
-\x2d\x35\x33\x2e\x35\x33\x31\x2d\x39\x38\x2e\x34\x2d\x39\x38\x2e\
-\x34\x0a\x09\x63\x2d\x31\x38\x2e\x35\x38\x35\x2d\x34\x34\x2e\x38\
-\x36\x39\x2d\x31\x38\x2e\x35\x38\x35\x2d\x39\x34\x2e\x32\x39\x2c\
-\x30\x2d\x31\x33\x39\x2e\x31\x35\x39\x6c\x2d\x32\x37\x2e\x37\x31\
-\x37\x2d\x31\x31\x2e\x34\x38\x63\x2d\x32\x31\x2e\x36\x35\x31\x2c\
-\x35\x32\x2e\x32\x37\x32\x2d\x32\x31\x2e\x36\x35\x31\x2c\x31\x30\
-\x39\x2e\x38\x34\x38\x2c\x30\x2c\x31\x36\x32\x2e\x31\x32\x0a\x09\
-\x63\x32\x31\x2e\x36\x35\x32\x2c\x35\x32\x2e\x32\x37\x32\x2c\x36\
-\x32\x2e\x33\x36\x34\x2c\x39\x32\x2e\x39\x38\x34\x2c\x31\x31\x34\
-\x2e\x36\x33\x37\x2c\x31\x31\x34\x2e\x36\x33\x36\x63\x32\x36\x2e\
-\x31\x34\x2c\x31\x30\x2e\x38\x32\x37\x2c\x35\x33\x2e\x35\x39\x35\
-\x2c\x31\x36\x2e\x32\x34\x2c\x38\x31\x2e\x30\x36\x2c\x31\x36\x2e\
-\x32\x33\x39\x63\x32\x37\x2e\x34\x35\x39\x2d\x30\x2e\x30\x30\x31\
-\x2c\x35\x34\x2e\x39\x32\x37\x2d\x35\x2e\x34\x31\x34\x2c\x38\x31\
-\x2e\x30\x36\x31\x2d\x31\x36\x2e\x32\x33\x39\x0a\x09\x63\x35\x32\
-\x2e\x32\x37\x31\x2d\x32\x31\x2e\x36\x35\x32\x2c\x39\x32\x2e\x39\
-\x38\x33\x2d\x36\x32\x2e\x33\x36\x34\x2c\x31\x31\x34\x2e\x36\x33\
-\x36\x2d\x31\x31\x34\x2e\x36\x33\x36\x43\x34\x34\x32\x2e\x37\x33\
-\x39\x2c\x32\x30\x30\x2e\x36\x2c\x34\x31\x38\x2e\x35\x33\x32\x2c\
-\x31\x30\x35\x2e\x38\x32\x36\x2c\x33\x35\x34\x2e\x32\x34\x2c\x34\
-\x37\x2e\x34\x7a\x22\x2f\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\
-\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\
-\x67\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x3e\x0a\
-\x3c\x2f\x67\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\
-\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\
-\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\
-\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x3e\x0a\x3c\
-\x2f\x67\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x3e\
-\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\
-\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x03\x3d\
-\x3c\
-\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
@@ -337,40 +288,31 @@
\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
-\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x73\x74\x79\x6c\x65\
-\x3d\x22\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\
-\x75\x6e\x64\x3a\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\
-\x35\x31\x32\x3b\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\
-\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0a\x3c\x70\x61\x74\
-\x68\x20\x64\x3d\x22\x4d\x34\x33\x37\x2e\x35\x2c\x33\x38\x36\x2e\
-\x36\x4c\x33\x30\x36\x2e\x39\x2c\x32\x35\x36\x6c\x31\x33\x30\x2e\
-\x36\x2d\x31\x33\x30\x2e\x36\x63\x31\x34\x2e\x31\x2d\x31\x34\x2e\
-\x31\x2c\x31\x34\x2e\x31\x2d\x33\x36\x2e\x38\x2c\x30\x2d\x35\x30\
-\x2e\x39\x63\x2d\x31\x34\x2e\x31\x2d\x31\x34\x2e\x31\x2d\x33\x36\
-\x2e\x38\x2d\x31\x34\x2e\x31\x2d\x35\x30\x2e\x39\x2c\x30\x4c\x32\
-\x35\x36\x2c\x32\x30\x35\x2e\x31\x4c\x31\x32\x35\x2e\x34\x2c\x37\
-\x34\x2e\x35\x0a\x09\x63\x2d\x31\x34\x2e\x31\x2d\x31\x34\x2e\x31\
-\x2d\x33\x36\x2e\x38\x2d\x31\x34\x2e\x31\x2d\x35\x30\x2e\x39\x2c\
-\x30\x63\x2d\x31\x34\x2e\x31\x2c\x31\x34\x2e\x31\x2d\x31\x34\x2e\
-\x31\x2c\x33\x36\x2e\x38\x2c\x30\x2c\x35\x30\x2e\x39\x4c\x32\x30\
-\x35\x2e\x31\x2c\x32\x35\x36\x4c\x37\x34\x2e\x35\x2c\x33\x38\x36\
-\x2e\x36\x63\x2d\x31\x34\x2e\x31\x2c\x31\x34\x2e\x31\x2d\x31\x34\
-\x2e\x31\x2c\x33\x36\x2e\x38\x2c\x30\x2c\x35\x30\x2e\x39\x0a\x09\
-\x63\x31\x34\x2e\x31\x2c\x31\x34\x2e\x31\x2c\x33\x36\x2e\x38\x2c\
-\x31\x34\x2e\x31\x2c\x35\x30\x2e\x39\x2c\x30\x4c\x32\x35\x36\x2c\
-\x33\x30\x36\x2e\x39\x6c\x31\x33\x30\x2e\x36\x2c\x31\x33\x30\x2e\
-\x36\x63\x31\x34\x2e\x31\x2c\x31\x34\x2e\x31\x2c\x33\x36\x2e\x38\
-\x2c\x31\x34\x2e\x31\x2c\x35\x30\x2e\x39\x2c\x30\x43\x34\x35\x31\
-\x2e\x35\x2c\x34\x32\x33\x2e\x34\x2c\x34\x35\x31\x2e\x35\x2c\x34\
-\x30\x30\x2e\x36\x2c\x34\x33\x37\x2e\x35\x2c\x33\x38\x36\x2e\x36\
-\x7a\x22\x2f\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x03\xb7\
+\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\
+\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
+\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
+\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
+\x76\x65\x22\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x22\x49\x63\x6f\x6e\
+\x5f\x35\x5f\x22\x3e\x0a\x09\x3c\x67\x3e\x0a\x09\x09\x3c\x70\x6f\
+\x6c\x79\x67\x6f\x6e\x20\x70\x6f\x69\x6e\x74\x73\x3d\x22\x34\x30\
+\x35\x2c\x31\x33\x36\x2e\x37\x39\x38\x20\x33\x37\x35\x2e\x32\x30\
+\x32\x2c\x31\x30\x37\x20\x32\x35\x36\x2c\x32\x32\x36\x2e\x32\x30\
+\x32\x20\x31\x33\x36\x2e\x37\x39\x38\x2c\x31\x30\x37\x20\x31\x30\
+\x37\x2c\x31\x33\x36\x2e\x37\x39\x38\x20\x32\x32\x36\x2e\x32\x30\
+\x32\x2c\x32\x35\x36\x20\x31\x30\x37\x2c\x33\x37\x35\x2e\x32\x30\
+\x32\x20\x31\x33\x36\x2e\x37\x39\x38\x2c\x34\x30\x35\x20\x32\x35\
+\x36\x2c\x32\x38\x35\x2e\x37\x39\x38\x20\x0a\x09\x09\x09\x33\x37\
+\x35\x2e\x32\x30\x32\x2c\x34\x30\x35\x20\x34\x30\x35\x2c\x33\x37\
+\x35\x2e\x32\x30\x32\x20\x32\x38\x35\x2e\x37\x39\x38\x2c\x32\x35\
+\x36\x20\x09\x09\x22\x2f\x3e\x0a\x09\x3c\x2f\x67\x3e\x0a\x3c\x2f\
+\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x00\x00\x02\x6c\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
-\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x38\x2e\x31\x2e\x30\x2c\x20\
+\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\x20\
\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
@@ -381,52 +323,31 @@
\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
-\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4d\
-\x61\x67\x6e\x69\x66\x79\x69\x6e\x67\x5f\x67\x6c\x61\x73\x73\x22\
-\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
-\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\
-\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\
-\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\
-\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\x6c\x69\x6e\x6b\x22\x20\x78\
-\x3d\x22\x30\x70\x78\x22\x0a\x09\x20\x79\x3d\x22\x30\x70\x78\x22\
-\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\x30\x20\x35\x31\
-\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\
-\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\x77\x20\x30\x20\
-\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\x6d\x6c\x3a\x73\
-\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\
-\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\
-\x61\x74\x72\x69\x78\x28\x32\x34\x20\x30\x20\x30\x20\x32\x34\x20\
-\x30\x20\x30\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\
-\x4d\x31\x37\x2e\x35\x34\x35\x2c\x31\x35\x2e\x34\x36\x37\x6c\x2d\
-\x33\x2e\x37\x37\x39\x2d\x33\x2e\x37\x37\x39\x63\x30\x2e\x35\x37\
-\x2d\x30\x2e\x39\x33\x35\x2c\x30\x2e\x38\x39\x38\x2d\x32\x2e\x30\
-\x33\x35\x2c\x30\x2e\x38\x39\x38\x2d\x33\x2e\x32\x31\x63\x30\x2d\
-\x33\x2e\x34\x31\x37\x2d\x32\x2e\x39\x36\x31\x2d\x36\x2e\x33\x37\
-\x37\x2d\x36\x2e\x33\x37\x38\x2d\x36\x2e\x33\x37\x37\x0a\x09\x43\
-\x34\x2e\x38\x36\x39\x2c\x32\x2e\x31\x2c\x32\x2e\x31\x2c\x34\x2e\
-\x38\x37\x2c\x32\x2e\x31\x2c\x38\x2e\x32\x38\x37\x63\x30\x2c\x33\
-\x2e\x34\x31\x36\x2c\x32\x2e\x39\x36\x31\x2c\x36\x2e\x33\x37\x37\
-\x2c\x36\x2e\x33\x37\x37\x2c\x36\x2e\x33\x37\x37\x63\x31\x2e\x31\
-\x33\x37\x2c\x30\x2c\x32\x2e\x32\x2d\x30\x2e\x33\x30\x39\x2c\x33\
-\x2e\x31\x31\x35\x2d\x30\x2e\x38\x34\x34\x6c\x33\x2e\x37\x39\x39\
-\x2c\x33\x2e\x38\x30\x31\x0a\x09\x63\x30\x2e\x33\x37\x32\x2c\x30\
-\x2e\x33\x37\x31\x2c\x30\x2e\x39\x37\x35\x2c\x30\x2e\x33\x37\x31\
-\x2c\x31\x2e\x33\x34\x36\x2c\x30\x6c\x30\x2e\x39\x34\x33\x2d\x30\
-\x2e\x39\x34\x33\x43\x31\x38\x2e\x30\x35\x31\x2c\x31\x36\x2e\x33\
-\x30\x37\x2c\x31\x37\x2e\x39\x31\x36\x2c\x31\x35\x2e\x38\x33\x38\
-\x2c\x31\x37\x2e\x35\x34\x35\x2c\x31\x35\x2e\x34\x36\x37\x7a\x20\
-\x4d\x34\x2e\x30\x30\x34\x2c\x38\x2e\x32\x38\x37\x0a\x09\x63\x30\
-\x2d\x32\x2e\x33\x36\x36\x2c\x31\x2e\x39\x31\x37\x2d\x34\x2e\x32\
-\x38\x33\x2c\x34\x2e\x32\x38\x32\x2d\x34\x2e\x32\x38\x33\x63\x32\
-\x2e\x33\x36\x36\x2c\x30\x2c\x34\x2e\x34\x37\x34\x2c\x32\x2e\x31\
-\x30\x37\x2c\x34\x2e\x34\x37\x34\x2c\x34\x2e\x34\x37\x34\x63\x30\
-\x2c\x32\x2e\x33\x36\x35\x2d\x31\x2e\x39\x31\x38\x2c\x34\x2e\x32\
-\x38\x33\x2d\x34\x2e\x32\x38\x33\x2c\x34\x2e\x32\x38\x33\x0a\x09\
-\x43\x36\x2e\x31\x31\x31\x2c\x31\x32\x2e\x37\x36\x2c\x34\x2e\x30\
-\x30\x34\x2c\x31\x30\x2e\x36\x35\x32\x2c\x34\x2e\x30\x30\x34\x2c\
-\x38\x2e\x32\x38\x37\x7a\x22\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\
-\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x04\x22\
+\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4c\
+\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\
+\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\
+\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\
+\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
+\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\
+\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
+\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
+\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
+\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
+\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\
+\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
+\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
+\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
+\x76\x65\x22\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x22\x49\x63\x6f\x6e\
+\x5f\x31\x5f\x22\x3e\x0a\x09\x3c\x67\x3e\x0a\x09\x09\x3c\x67\x3e\
+\x0a\x09\x09\x09\x3c\x70\x6f\x6c\x79\x67\x6f\x6e\x20\x70\x6f\x69\
+\x6e\x74\x73\x3d\x22\x31\x38\x36\x2e\x33\x30\x31\x2c\x33\x33\x39\
+\x2e\x38\x39\x33\x20\x39\x36\x2c\x32\x34\x39\x2e\x34\x36\x31\x20\
+\x36\x34\x2c\x32\x37\x39\x2e\x39\x36\x38\x20\x31\x38\x36\x2e\x33\
+\x30\x31\x2c\x34\x30\x32\x20\x34\x34\x38\x2c\x31\x34\x30\x2e\x35\
+\x30\x36\x20\x34\x31\x36\x2c\x31\x31\x30\x20\x09\x09\x09\x22\x2f\
+\x3e\x0a\x09\x09\x3c\x2f\x67\x3e\x0a\x09\x3c\x2f\x67\x3e\x0a\x3c\
+\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x00\x00\x04\xa3\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x27\x31\x2e\
\x30\x27\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x27\x55\x54\x46\
@@ -449,118 +370,62 @@
\x6e\x73\x6c\x61\x74\x65\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\
\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\
\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\
-\x27\x4d\x20\x36\x2e\x30\x32\x32\x35\x20\x33\x32\x2e\x31\x32\x4c\
+\x27\x4d\x20\x36\x2e\x30\x32\x32\x35\x20\x33\x32\x2e\x31\x32\x43\
+\x20\x34\x2e\x33\x35\x34\x33\x38\x20\x32\x34\x2e\x39\x32\x38\x37\
+\x20\x38\x2e\x34\x33\x32\x31\x37\x20\x31\x38\x2e\x30\x30\x31\x34\
\x20\x31\x33\x2e\x39\x36\x38\x37\x20\x31\x32\x2e\x39\x33\x36\x31\
-\x4c\x20\x35\x38\x2e\x32\x31\x37\x35\x20\x32\x31\x2e\x37\x33\x37\
-\x38\x4c\x20\x34\x32\x2e\x37\x34\x34\x35\x20\x34\x31\x2e\x37\x31\
-\x31\x39\x4c\x20\x36\x2e\x30\x32\x32\x35\x20\x33\x32\x2e\x31\x32\
-\x5a\x27\x20\x66\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\x73\
-\x74\x72\x6f\x6b\x65\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\x20\
-\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\x3d\x27\
-\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\
-\x6e\x65\x6a\x6f\x69\x6e\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\
-\x74\x72\x6f\x6b\x65\x2d\x6d\x69\x74\x65\x72\x6c\x69\x6d\x69\x74\
-\x3d\x27\x31\x30\x2e\x30\x33\x37\x35\x27\x20\x73\x74\x72\x6f\x6b\
-\x65\x2d\x77\x69\x64\x74\x68\x3d\x27\x32\x2e\x35\x30\x39\x33\x37\
-\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\
-\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\
-\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\x35\x38\
-\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\x36\x32\x36\x34\x29\x27\
-\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\x36\x2e\
-\x30\x32\x32\x35\x27\x20\x63\x79\x3d\x27\x33\x32\x2e\x31\x32\x27\
-\x20\x66\x69\x6c\x6c\x3d\x27\x23\x66\x66\x30\x30\x30\x30\x27\x20\
-\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\
-\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\
-\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x35\x38\x2e\x34\x36\x36\
-\x39\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\x28\
-\x2e\x39\x39\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x63\x69\x72\x63\
-\x6c\x65\x20\x63\x78\x3d\x27\x31\x33\x2e\x39\x36\x38\x37\x27\x20\
-\x63\x79\x3d\x27\x31\x32\x2e\x39\x33\x36\x31\x27\x20\x66\x69\x6c\
-\x6c\x3d\x27\x23\x66\x66\x30\x30\x30\x30\x27\x20\x72\x3d\x27\x36\
-\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\
-\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\x6e\
-\x73\x6c\x61\x74\x65\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\
-\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\x36\
-\x32\x36\x34\x29\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\
-\x78\x3d\x27\x35\x38\x2e\x32\x31\x37\x35\x27\x20\x63\x79\x3d\x27\
-\x32\x31\x2e\x37\x33\x37\x38\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\
-\x66\x66\x30\x30\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\
-\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\
+\x43\x20\x33\x31\x2e\x37\x33\x33\x39\x20\x2d\x33\x2e\x33\x31\x36\
+\x37\x35\x20\x35\x37\x2e\x32\x39\x34\x33\x20\x33\x2e\x35\x39\x37\
+\x39\x37\x20\x35\x38\x2e\x32\x31\x37\x35\x20\x32\x31\x2e\x37\x33\
+\x37\x38\x43\x20\x35\x38\x2e\x36\x37\x38\x38\x20\x33\x30\x2e\x38\
+\x30\x31\x39\x20\x35\x31\x2e\x31\x37\x38\x33\x20\x33\x37\x2e\x36\
+\x34\x34\x31\x20\x34\x32\x2e\x37\x34\x34\x35\x20\x34\x31\x2e\x37\
+\x31\x31\x39\x43\x20\x32\x37\x2e\x34\x36\x34\x36\x20\x34\x39\x2e\
+\x30\x38\x31\x38\x20\x39\x2e\x32\x36\x34\x35\x31\x20\x34\x36\x2e\
+\x30\x39\x36\x34\x20\x36\x2e\x30\x32\x32\x35\x20\x33\x32\x2e\x31\
+\x32\x5a\x27\x20\x66\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\
+\x73\x74\x72\x6f\x6b\x65\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\
+\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\x3d\
+\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\
+\x69\x6e\x65\x6a\x6f\x69\x6e\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\
+\x73\x74\x72\x6f\x6b\x65\x2d\x6d\x69\x74\x65\x72\x6c\x69\x6d\x69\
+\x74\x3d\x27\x31\x30\x2e\x30\x33\x37\x35\x27\x20\x73\x74\x72\x6f\
+\x6b\x65\x2d\x77\x69\x64\x74\x68\x3d\x27\x32\x2e\x35\x30\x39\x33\
+\x37\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\
\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\x6e\x73\x6c\x61\x74\
\x65\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\x35\
\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\x36\x32\x36\x34\x29\
-\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\x34\
-\x32\x2e\x37\x34\x34\x35\x27\x20\x63\x79\x3d\x27\x34\x31\x2e\x37\
-\x31\x31\x39\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\x66\x66\x30\x30\
-\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\
-\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\
-\x3e\
-\x00\x00\x03\xd9\
+\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\x36\
+\x2e\x30\x32\x32\x35\x27\x20\x63\x79\x3d\x27\x33\x32\x2e\x31\x32\
+\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\x66\x66\x30\x30\x30\x30\x27\
+\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\
+\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\
+\x27\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x35\x38\x2e\x34\x36\
+\x36\x39\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\
+\x28\x2e\x39\x39\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x63\x69\x72\
+\x63\x6c\x65\x20\x63\x78\x3d\x27\x31\x33\x2e\x39\x36\x38\x37\x27\
+\x20\x63\x79\x3d\x27\x31\x32\x2e\x39\x33\x36\x31\x27\x20\x66\x69\
+\x6c\x6c\x3d\x27\x23\x66\x66\x30\x30\x30\x30\x27\x20\x72\x3d\x27\
+\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\
+\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\
+\x6e\x73\x6c\x61\x74\x65\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\
+\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\
+\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\
+\x63\x78\x3d\x27\x35\x38\x2e\x32\x31\x37\x35\x27\x20\x63\x79\x3d\
+\x27\x32\x31\x2e\x37\x33\x37\x38\x27\x20\x66\x69\x6c\x6c\x3d\x27\
+\x23\x66\x66\x30\x30\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\
+\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\
+\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\x6e\x73\x6c\x61\
+\x74\x65\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\
+\x35\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\x36\x32\x36\x34\
+\x29\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\
+\x34\x32\x2e\x37\x34\x34\x35\x27\x20\x63\x79\x3d\x27\x34\x31\x2e\
+\x37\x31\x31\x39\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\x66\x66\x30\
+\x30\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\
+\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\
+\x67\x3e\
+\x00\x00\x04\x73\
\x3c\
-\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
-\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
-\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
-\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
-\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x38\x2e\x31\x2e\x31\x2c\x20\
-\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
-\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
-\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
-\x20\x2d\x2d\x3e\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x73\
-\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\x57\x33\
-\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\x2f\x2f\
-\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
-\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
-\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
-\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
-\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x43\
-\x68\x65\x76\x72\x6f\x6e\x5f\x63\x69\x72\x63\x6c\x65\x64\x5f\x72\
-\x69\x67\x68\x74\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\
-\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\
-\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x78\
-\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\
-\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\x6c\x69\
-\x6e\x6b\x22\x0a\x09\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
-\x22\x30\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\
-\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\
-\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\
-\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\
-\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\
-\x72\x76\x65\x22\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\
-\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x32\x34\x20\x30\x20\
-\x30\x20\x32\x34\x20\x30\x20\x30\x29\x27\x3e\x0a\x3c\x70\x61\x74\
-\x68\x20\x64\x3d\x22\x4d\x31\x31\x2c\x31\x30\x4c\x38\x2e\x36\x39\
-\x38\x2c\x37\x2e\x34\x39\x34\x63\x2d\x30\x2e\x31\x39\x36\x2d\x30\
-\x2e\x31\x39\x38\x2d\x30\x2e\x31\x39\x36\x2d\x30\x2e\x35\x31\x39\
-\x2c\x30\x2d\x30\x2e\x37\x31\x38\x63\x30\x2e\x31\x39\x36\x2d\x30\
-\x2e\x31\x39\x37\x2c\x30\x2e\x35\x31\x35\x2d\x30\x2e\x31\x39\x37\
-\x2c\x30\x2e\x37\x31\x2c\x30\x6c\x32\x2e\x38\x30\x37\x2c\x32\x2e\
-\x38\x36\x34\x0a\x09\x63\x30\x2e\x31\x39\x36\x2c\x30\x2e\x31\x39\
-\x39\x2c\x30\x2e\x31\x39\x36\x2c\x30\x2e\x35\x32\x2c\x30\x2c\x30\
-\x2e\x37\x31\x37\x6c\x2d\x32\x2e\x38\x30\x37\x2c\x32\x2e\x38\x36\
-\x34\x63\x2d\x30\x2e\x31\x39\x35\x2c\x30\x2e\x31\x39\x39\x2d\x30\
-\x2e\x35\x31\x34\x2c\x30\x2e\x31\x39\x38\x2d\x30\x2e\x37\x31\x2c\
-\x30\x63\x2d\x30\x2e\x31\x39\x36\x2d\x30\x2e\x31\x39\x37\x2d\x30\
-\x2e\x31\x39\x36\x2d\x30\x2e\x35\x31\x38\x2c\x30\x2d\x30\x2e\x37\
-\x31\x37\x4c\x31\x31\x2c\x31\x30\x7a\x20\x4d\x31\x30\x2c\x30\x2e\
-\x34\x0a\x09\x63\x35\x2e\x33\x30\x32\x2c\x30\x2c\x39\x2e\x36\x2c\
-\x34\x2e\x32\x39\x38\x2c\x39\x2e\x36\x2c\x39\x2e\x36\x63\x30\x2c\
-\x35\x2e\x33\x30\x33\x2d\x34\x2e\x32\x39\x38\x2c\x39\x2e\x36\x2d\
-\x39\x2e\x36\x2c\x39\x2e\x36\x53\x30\x2e\x34\x2c\x31\x35\x2e\x33\
-\x30\x33\x2c\x30\x2e\x34\x2c\x31\x30\x43\x30\x2e\x34\x2c\x34\x2e\
-\x36\x39\x38\x2c\x34\x2e\x36\x39\x38\x2c\x30\x2e\x34\x2c\x31\x30\
-\x2c\x30\x2e\x34\x7a\x20\x4d\x31\x30\x2c\x31\x38\x2e\x33\x35\x34\
-\x0a\x09\x63\x34\x2e\x36\x31\x33\x2c\x30\x2c\x38\x2e\x33\x35\x34\
-\x2d\x33\x2e\x37\x34\x2c\x38\x2e\x33\x35\x34\x2d\x38\x2e\x33\x35\
-\x34\x63\x30\x2d\x34\x2e\x36\x31\x34\x2d\x33\x2e\x37\x34\x31\x2d\
-\x38\x2e\x33\x35\x34\x2d\x38\x2e\x33\x35\x34\x2d\x38\x2e\x33\x35\
-\x34\x63\x2d\x34\x2e\x36\x31\x35\x2c\x30\x2d\x38\x2e\x33\x35\x34\
-\x2c\x33\x2e\x37\x34\x2d\x38\x2e\x33\x35\x34\x2c\x38\x2e\x33\x35\
-\x34\x0a\x09\x43\x31\x2e\x36\x34\x35\x2c\x31\x34\x2e\x36\x31\x34\
-\x2c\x35\x2e\x33\x38\x35\x2c\x31\x38\x2e\x33\x35\x34\x2c\x31\x30\
-\x2c\x31\x38\x2e\x33\x35\x34\x7a\x22\x2f\x3e\x0a\x3c\x2f\x67\x3e\
-\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x04\xa3\
-\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x27\x31\x2e\
\x30\x27\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x27\x55\x54\x46\
\x2d\x38\x27\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x54\x68\x69\x73\x20\
@@ -583,19 +448,16 @@
\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\
\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\
\x27\x4d\x20\x36\x2e\x30\x32\x32\x35\x20\x33\x32\x2e\x31\x32\x43\
-\x20\x34\x2e\x33\x35\x34\x33\x38\x20\x32\x34\x2e\x39\x32\x38\x37\
-\x20\x38\x2e\x34\x33\x32\x31\x37\x20\x31\x38\x2e\x30\x30\x31\x34\
+\x20\x36\x2e\x32\x32\x30\x37\x32\x20\x32\x34\x2e\x39\x36\x35\x35\
+\x20\x39\x2e\x30\x34\x39\x38\x39\x20\x31\x38\x2e\x31\x33\x35\x33\
\x20\x31\x33\x2e\x39\x36\x38\x37\x20\x31\x32\x2e\x39\x33\x36\x31\
-\x43\x20\x33\x31\x2e\x37\x33\x33\x39\x20\x2d\x33\x2e\x33\x31\x36\
-\x37\x35\x20\x35\x37\x2e\x32\x39\x34\x33\x20\x33\x2e\x35\x39\x37\
-\x39\x37\x20\x35\x38\x2e\x32\x31\x37\x35\x20\x32\x31\x2e\x37\x33\
-\x37\x38\x43\x20\x35\x38\x2e\x36\x37\x38\x38\x20\x33\x30\x2e\x38\
-\x30\x31\x39\x20\x35\x31\x2e\x31\x37\x38\x33\x20\x33\x37\x2e\x36\
-\x34\x34\x31\x20\x34\x32\x2e\x37\x34\x34\x35\x20\x34\x31\x2e\x37\
-\x31\x31\x39\x43\x20\x32\x37\x2e\x34\x36\x34\x36\x20\x34\x39\x2e\
-\x30\x38\x31\x38\x20\x39\x2e\x32\x36\x34\x35\x31\x20\x34\x36\x2e\
-\x30\x39\x36\x34\x20\x36\x2e\x30\x32\x32\x35\x20\x33\x32\x2e\x31\
-\x32\x5a\x27\x20\x66\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\
+\x43\x20\x32\x39\x2e\x35\x30\x36\x32\x20\x2d\x33\x2e\x34\x38\x36\
+\x38\x36\x20\x35\x35\x2e\x33\x36\x37\x33\x20\x32\x2e\x36\x39\x39\
+\x35\x20\x35\x38\x2e\x32\x31\x37\x35\x20\x32\x31\x2e\x37\x33\x37\
+\x38\x43\x20\x35\x39\x2e\x36\x39\x32\x32\x20\x33\x31\x2e\x35\x38\
+\x38\x31\x20\x35\x32\x2e\x36\x35\x30\x38\x20\x34\x30\x2e\x36\x37\
+\x37\x39\x20\x34\x32\x2e\x37\x34\x34\x35\x20\x34\x31\x2e\x37\x31\
+\x31\x39\x27\x20\x66\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\
\x73\x74\x72\x6f\x6b\x65\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\
\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\x3d\
\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\
@@ -636,7 +498,7 @@
\x30\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\
\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\
\x67\x3e\
-\x00\x00\x03\x03\
+\x00\x00\x04\x9c\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
@@ -654,46 +516,71 @@
\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x43\
-\x68\x65\x63\x6b\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\
-\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\
-\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x78\
-\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\
-\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\x6c\x69\
-\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\x22\x30\
-\x70\x78\x22\x0a\x09\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\
-\x20\x30\x20\x32\x30\x20\x32\x30\x22\x20\x65\x6e\x61\x62\x6c\x65\
-\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\x77\
-\x20\x30\x20\x30\x20\x32\x30\x20\x32\x30\x22\x20\x78\x6d\x6c\x3a\
-\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\
-\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x38\x2e\x32\x39\
-\x34\x2c\x31\x36\x2e\x39\x39\x38\x63\x2d\x30\x2e\x34\x33\x35\x2c\
-\x30\x2d\x30\x2e\x38\x34\x37\x2d\x30\x2e\x32\x30\x33\x2d\x31\x2e\
-\x31\x31\x31\x2d\x30\x2e\x35\x35\x33\x4c\x33\x2e\x36\x31\x2c\x31\
-\x31\x2e\x37\x32\x34\x63\x2d\x30\x2e\x34\x36\x35\x2d\x30\x2e\x36\
-\x31\x33\x2d\x30\x2e\x33\x34\x34\x2d\x31\x2e\x34\x38\x36\x2c\x30\
-\x2e\x32\x37\x2d\x31\x2e\x39\x35\x31\x0a\x09\x63\x30\x2e\x36\x31\
-\x35\x2d\x30\x2e\x34\x36\x37\x2c\x31\x2e\x34\x38\x38\x2d\x30\x2e\
-\x33\x34\x34\x2c\x31\x2e\x39\x35\x33\x2c\x30\x2e\x32\x37\x6c\x32\
-\x2e\x33\x35\x31\x2c\x33\x2e\x31\x30\x34\x6c\x35\x2e\x39\x31\x31\
-\x2d\x39\x2e\x34\x39\x32\x63\x30\x2e\x34\x30\x37\x2d\x30\x2e\x36\
-\x35\x32\x2c\x31\x2e\x32\x36\x37\x2d\x30\x2e\x38\x35\x32\x2c\x31\
-\x2e\x39\x32\x31\x2d\x30\x2e\x34\x34\x35\x0a\x09\x63\x30\x2e\x36\
-\x35\x33\x2c\x30\x2e\x34\x30\x36\x2c\x30\x2e\x38\x35\x34\x2c\x31\
-\x2e\x32\x36\x36\x2c\x30\x2e\x34\x34\x36\x2c\x31\x2e\x39\x32\x4c\
-\x39\x2e\x34\x37\x38\x2c\x31\x36\x2e\x33\x34\x63\x2d\x30\x2e\x32\
-\x34\x32\x2c\x30\x2e\x33\x39\x31\x2d\x30\x2e\x36\x36\x31\x2c\x30\
-\x2e\x36\x33\x35\x2d\x31\x2e\x31\x32\x2c\x30\x2e\x36\x35\x36\x43\
-\x38\x2e\x33\x33\x36\x2c\x31\x36\x2e\x39\x39\x38\x2c\x38\x2e\x33\
-\x31\x36\x2c\x31\x36\x2e\x39\x39\x38\x2c\x38\x2e\x32\x39\x34\x2c\
-\x31\x36\x2e\x39\x39\x38\x7a\x22\x2f\x3e\x0a\x3c\x2f\x73\x76\x67\
-\x3e\x0a\
-\x00\x00\x02\x72\
+\x6f\x64\x65\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\
+\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\
+\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x78\x6c\
+\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
+\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\x6c\x69\x6e\
+\x6b\x22\x20\x78\x3d\x22\x32\x34\x70\x78\x22\x20\x79\x3d\x22\x32\
+\x34\x70\x78\x22\x0a\x09\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\
+\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\
+\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\
+\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\
+\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\
+\x65\x72\x76\x65\x22\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\
+\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x32\x34\x20\x30\
+\x20\x30\x20\x32\x34\x20\x30\x20\x30\x29\x27\x3e\x3c\x70\x61\x74\
+\x68\x20\x64\x3d\x22\x4d\x35\x2e\x37\x31\x39\x2c\x31\x34\x2e\x37\
+\x35\x63\x2d\x30\x2e\x32\x33\x36\x2c\x30\x2d\x30\x2e\x34\x37\x34\
+\x2d\x30\x2e\x30\x38\x33\x2d\x30\x2e\x36\x36\x34\x2d\x30\x2e\x32\
+\x35\x32\x4c\x2d\x30\x2e\x30\x30\x35\x2c\x31\x30\x6c\x35\x2e\x33\
+\x34\x31\x2d\x34\x2e\x37\x34\x38\x43\x35\x2e\x37\x34\x38\x2c\x34\
+\x2e\x38\x38\x37\x2c\x36\x2e\x33\x38\x2c\x34\x2e\x39\x32\x32\x2c\
+\x36\x2e\x37\x34\x37\x2c\x35\x2e\x33\x33\x35\x0a\x09\x63\x30\x2e\
+\x33\x36\x37\x2c\x30\x2e\x34\x31\x33\x2c\x30\x2e\x33\x33\x2c\x31\
+\x2e\x30\x34\x35\x2d\x30\x2e\x30\x38\x33\x2c\x31\x2e\x34\x31\x32\
+\x4c\x33\x2e\x30\x30\x35\x2c\x31\x30\x6c\x33\x2e\x33\x37\x38\x2c\
+\x33\x2e\x30\x30\x32\x63\x30\x2e\x34\x31\x33\x2c\x30\x2e\x33\x36\
+\x37\x2c\x30\x2e\x34\x35\x2c\x30\x2e\x39\x39\x39\x2c\x30\x2e\x30\
+\x38\x33\x2c\x31\x2e\x34\x31\x32\x0a\x09\x43\x36\x2e\x32\x36\x39\
+\x2c\x31\x34\x2e\x36\x33\x37\x2c\x35\x2e\x39\x39\x34\x2c\x31\x34\
+\x2e\x37\x35\x2c\x35\x2e\x37\x31\x39\x2c\x31\x34\x2e\x37\x35\x7a\
+\x20\x4d\x31\x34\x2e\x36\x36\x34\x2c\x31\x34\x2e\x37\x34\x38\x4c\
+\x32\x30\x2e\x30\x30\x35\x2c\x31\x30\x6c\x2d\x35\x2e\x30\x36\x2d\
+\x34\x2e\x34\x39\x38\x63\x2d\x30\x2e\x34\x31\x33\x2d\x30\x2e\x33\
+\x36\x37\x2d\x31\x2e\x30\x34\x35\x2d\x30\x2e\x33\x33\x2d\x31\x2e\
+\x34\x31\x31\x2c\x30\x2e\x30\x38\x33\x0a\x09\x63\x2d\x30\x2e\x33\
+\x36\x37\x2c\x30\x2e\x34\x31\x33\x2d\x30\x2e\x33\x33\x2c\x31\x2e\
+\x30\x34\x35\x2c\x30\x2e\x30\x38\x33\x2c\x31\x2e\x34\x31\x32\x4c\
+\x31\x36\x2e\x39\x39\x35\x2c\x31\x30\x6c\x2d\x33\x2e\x36\x35\x39\
+\x2c\x33\x2e\x32\x35\x32\x63\x2d\x30\x2e\x34\x31\x33\x2c\x30\x2e\
+\x33\x36\x37\x2d\x30\x2e\x34\x35\x2c\x30\x2e\x39\x39\x39\x2d\x30\
+\x2e\x30\x38\x33\x2c\x31\x2e\x34\x31\x32\x43\x31\x33\x2e\x34\x35\
+\x2c\x31\x34\x2e\x38\x38\x37\x2c\x31\x33\x2e\x37\x32\x35\x2c\x31\
+\x35\x2c\x31\x34\x2c\x31\x35\x0a\x09\x43\x31\x34\x2e\x32\x33\x36\
+\x2c\x31\x35\x2c\x31\x34\x2e\x34\x37\x34\x2c\x31\x34\x2e\x39\x31\
+\x37\x2c\x31\x34\x2e\x36\x36\x34\x2c\x31\x34\x2e\x37\x34\x38\x7a\
+\x20\x4d\x39\x2e\x39\x38\x36\x2c\x31\x36\x2e\x31\x36\x35\x6c\x32\
+\x2d\x31\x32\x63\x30\x2e\x30\x39\x31\x2d\x30\x2e\x35\x34\x35\x2d\
+\x30\x2e\x32\x37\x37\x2d\x31\x2e\x30\x36\x2d\x30\x2e\x38\x32\x32\
+\x2d\x31\x2e\x31\x35\x31\x0a\x09\x63\x2d\x30\x2e\x35\x34\x37\x2d\
+\x30\x2e\x30\x39\x32\x2d\x31\x2e\x30\x36\x31\x2c\x30\x2e\x32\x37\
+\x37\x2d\x31\x2e\x31\x35\x2c\x30\x2e\x38\x32\x32\x6c\x2d\x32\x2c\
+\x31\x32\x63\x2d\x30\x2e\x30\x39\x31\x2c\x30\x2e\x35\x34\x35\x2c\
+\x30\x2e\x32\x37\x37\x2c\x31\x2e\x30\x36\x2c\x30\x2e\x38\x32\x32\
+\x2c\x31\x2e\x31\x35\x31\x43\x38\x2e\x38\x39\x32\x2c\x31\x36\x2e\
+\x39\x39\x36\x2c\x38\x2e\x39\x34\x36\x2c\x31\x37\x2c\x39\x2e\x30\
+\x30\x31\x2c\x31\x37\x0a\x09\x43\x39\x2e\x34\x38\x31\x2c\x31\x37\
+\x2c\x39\x2e\x39\x30\x35\x2c\x31\x36\x2e\x36\x35\x33\x2c\x39\x2e\
+\x39\x38\x36\x2c\x31\x36\x2e\x31\x36\x35\x7a\x22\x2f\x3e\x0a\x3c\
+\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x00\x00\x03\xe8\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
-\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\x20\
+\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x38\x2e\x31\x2e\x31\x2c\x20\
\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
@@ -704,42 +591,56 @@
\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
-\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4c\
-\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\
-\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\
-\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\
-\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
-\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\
-\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
-\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
-\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
-\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
+\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x43\
+\x68\x65\x76\x72\x6f\x6e\x5f\x63\x69\x72\x63\x6c\x65\x64\x5f\x6c\
+\x65\x66\x74\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\
+\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\
+\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x78\x6c\
+\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
+\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\x6c\x69\x6e\
+\x6b\x22\x0a\x09\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\x22\
+\x30\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\
\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
-\x76\x65\x22\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x22\x49\x63\x6f\x6e\
-\x5f\x38\x5f\x22\x3e\x0a\x09\x3c\x67\x3e\x0a\x09\x09\x3c\x70\x61\
-\x74\x68\x20\x64\x3d\x22\x4d\x34\x32\x37\x2c\x32\x33\x34\x2e\x36\
-\x32\x35\x48\x31\x36\x37\x2e\x32\x39\x36\x6c\x31\x31\x39\x2e\x37\
-\x30\x32\x2d\x31\x31\x39\x2e\x37\x30\x32\x4c\x32\x35\x36\x2c\x38\
-\x35\x4c\x38\x35\x2c\x32\x35\x36\x6c\x31\x37\x31\x2c\x31\x37\x31\
-\x6c\x32\x39\x2e\x39\x32\x32\x2d\x32\x39\x2e\x39\x32\x34\x4c\x31\
-\x36\x37\x2e\x32\x39\x36\x2c\x32\x37\x37\x2e\x33\x37\x35\x48\x34\
-\x32\x37\x56\x32\x33\x34\x2e\x36\x32\x35\x7a\x22\x2f\x3e\x0a\x09\
-\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\
-\x0a\
-\x00\x00\x00\x6c\
+\x76\x65\x22\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\
+\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x32\x34\x20\x30\x20\x30\
+\x20\x32\x34\x20\x30\x20\x30\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\
+\x20\x64\x3d\x22\x4d\x31\x31\x2e\x33\x30\x32\x2c\x36\x2e\x37\x37\
+\x36\x63\x2d\x30\x2e\x31\x39\x36\x2d\x30\x2e\x31\x39\x37\x2d\x30\
+\x2e\x35\x31\x35\x2d\x30\x2e\x31\x39\x37\x2d\x30\x2e\x37\x31\x2c\
+\x30\x4c\x37\x2e\x37\x38\x35\x2c\x39\x2e\x36\x34\x31\x63\x2d\x30\
+\x2e\x31\x39\x36\x2c\x30\x2e\x31\x39\x39\x2d\x30\x2e\x31\x39\x36\
+\x2c\x30\x2e\x35\x32\x2c\x30\x2c\x30\x2e\x37\x31\x37\x6c\x32\x2e\
+\x38\x30\x37\x2c\x32\x2e\x38\x36\x34\x0a\x09\x63\x30\x2e\x31\x39\
+\x35\x2c\x30\x2e\x31\x39\x39\x2c\x30\x2e\x35\x31\x34\x2c\x30\x2e\
+\x31\x39\x38\x2c\x30\x2e\x37\x31\x2c\x30\x63\x30\x2e\x31\x39\x36\
+\x2d\x30\x2e\x31\x39\x37\x2c\x30\x2e\x31\x39\x36\x2d\x30\x2e\x35\
+\x31\x38\x2c\x30\x2d\x30\x2e\x37\x31\x37\x4c\x39\x2c\x31\x30\x6c\
+\x32\x2e\x33\x30\x32\x2d\x32\x2e\x35\x30\x36\x43\x31\x31\x2e\x34\
+\x39\x38\x2c\x37\x2e\x32\x39\x36\x2c\x31\x31\x2e\x34\x39\x38\x2c\
+\x36\x2e\x39\x37\x36\x2c\x31\x31\x2e\x33\x30\x32\x2c\x36\x2e\x37\
+\x37\x36\x7a\x0a\x09\x20\x4d\x31\x30\x2c\x30\x2e\x34\x63\x2d\x35\
+\x2e\x33\x30\x32\x2c\x30\x2d\x39\x2e\x36\x2c\x34\x2e\x32\x39\x38\
+\x2d\x39\x2e\x36\x2c\x39\x2e\x36\x63\x30\x2c\x35\x2e\x33\x30\x33\
+\x2c\x34\x2e\x32\x39\x38\x2c\x39\x2e\x36\x2c\x39\x2e\x36\x2c\x39\
+\x2e\x36\x73\x39\x2e\x36\x2d\x34\x2e\x32\x39\x37\x2c\x39\x2e\x36\
+\x2d\x39\x2e\x36\x43\x31\x39\x2e\x36\x2c\x34\x2e\x36\x39\x38\x2c\
+\x31\x35\x2e\x33\x30\x32\x2c\x30\x2e\x34\x2c\x31\x30\x2c\x30\x2e\
+\x34\x7a\x20\x4d\x31\x30\x2c\x31\x38\x2e\x33\x35\x34\x0a\x09\x63\
+\x2d\x34\x2e\x36\x31\x35\x2c\x30\x2d\x38\x2e\x33\x35\x34\x2d\x33\
+\x2e\x37\x34\x2d\x38\x2e\x33\x35\x34\x2d\x38\x2e\x33\x35\x34\x63\
+\x30\x2d\x34\x2e\x36\x31\x34\x2c\x33\x2e\x37\x33\x39\x2d\x38\x2e\
+\x33\x35\x34\x2c\x38\x2e\x33\x35\x34\x2d\x38\x2e\x33\x35\x34\x63\
+\x34\x2e\x36\x31\x33\x2c\x30\x2c\x38\x2e\x33\x35\x34\x2c\x33\x2e\
+\x37\x34\x2c\x38\x2e\x33\x35\x34\x2c\x38\x2e\x33\x35\x34\x0a\x09\
+\x43\x31\x38\x2e\x33\x35\x34\x2c\x31\x34\x2e\x36\x31\x34\x2c\x31\
+\x34\x2e\x36\x31\x33\x2c\x31\x38\x2e\x33\x35\x34\x2c\x31\x30\x2c\
+\x31\x38\x2e\x33\x35\x34\x7a\x22\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\
+\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x00\x00\x03\x5f\
\x3c\
-\x73\x76\x67\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\
-\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\
-\x30\x2f\x73\x76\x67\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\
-\x30\x20\x30\x20\x32\x30\x20\x32\x30\x22\x3e\x3c\x70\x61\x74\x68\
-\x20\x64\x3d\x22\x4d\x31\x38\x20\x31\x32\x76\x31\x48\x38\x76\x35\
-\x6c\x2d\x36\x2d\x36\x20\x36\x2d\x36\x76\x35\x68\x38\x56\x32\x68\
-\x32\x7a\x22\x2f\x3e\x3c\x2f\x73\x76\x67\x3e\
-\x00\x00\x03\x2a\
-\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
@@ -769,55 +670,38 @@
\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
-\x76\x65\x22\x3e\x0a\x3c\x67\x3e\x0a\x09\x3c\x70\x6f\x6c\x79\x67\
-\x6f\x6e\x20\x70\x6f\x69\x6e\x74\x73\x3d\x22\x33\x39\x36\x2e\x37\
-\x39\x35\x2c\x33\x39\x36\x2e\x38\x20\x33\x32\x30\x2c\x33\x39\x36\
-\x2e\x38\x20\x33\x32\x30\x2c\x34\x34\x38\x20\x34\x34\x38\x2c\x34\
-\x34\x38\x20\x34\x34\x38\x2c\x33\x32\x30\x20\x33\x39\x36\x2e\x37\
-\x39\x35\x2c\x33\x32\x30\x20\x09\x22\x2f\x3e\x0a\x09\x3c\x70\x6f\
-\x6c\x79\x67\x6f\x6e\x20\x70\x6f\x69\x6e\x74\x73\x3d\x22\x33\x39\
-\x36\x2e\x38\x2c\x31\x31\x35\x2e\x32\x30\x35\x20\x33\x39\x36\x2e\
-\x38\x2c\x31\x39\x32\x20\x34\x34\x38\x2c\x31\x39\x32\x20\x34\x34\
-\x38\x2c\x36\x34\x20\x33\x32\x30\x2c\x36\x34\x20\x33\x32\x30\x2c\
-\x31\x31\x35\x2e\x32\x30\x35\x20\x09\x22\x2f\x3e\x0a\x09\x3c\x70\
-\x6f\x6c\x79\x67\x6f\x6e\x20\x70\x6f\x69\x6e\x74\x73\x3d\x22\x31\
-\x31\x35\x2e\x32\x30\x35\x2c\x31\x31\x35\x2e\x32\x20\x31\x39\x32\
-\x2c\x31\x31\x35\x2e\x32\x20\x31\x39\x32\x2c\x36\x34\x20\x36\x34\
-\x2c\x36\x34\x20\x36\x34\x2c\x31\x39\x32\x20\x31\x31\x35\x2e\x32\
-\x30\x35\x2c\x31\x39\x32\x20\x09\x22\x2f\x3e\x0a\x09\x3c\x70\x6f\
-\x6c\x79\x67\x6f\x6e\x20\x70\x6f\x69\x6e\x74\x73\x3d\x22\x31\x31\
-\x35\x2e\x32\x2c\x33\x39\x36\x2e\x37\x39\x35\x20\x31\x31\x35\x2e\
-\x32\x2c\x33\x32\x30\x20\x36\x34\x2c\x33\x32\x30\x20\x36\x34\x2c\
-\x34\x34\x38\x20\x31\x39\x32\x2c\x34\x34\x38\x20\x31\x39\x32\x2c\
-\x33\x39\x36\x2e\x37\x39\x35\x20\x09\x22\x2f\x3e\x0a\x3c\x2f\x67\
-\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x01\x1c\
+\x76\x65\x22\x3e\x0a\x3c\x67\x3e\x0a\x09\x0a\x09\x09\x3c\x72\x65\
+\x63\x74\x20\x78\x3d\x22\x31\x37\x38\x2e\x38\x34\x36\x22\x20\x79\
+\x3d\x22\x39\x32\x2e\x30\x38\x37\x22\x20\x74\x72\x61\x6e\x73\x66\
+\x6f\x72\x6d\x3d\x22\x6d\x61\x74\x72\x69\x78\x28\x2d\x30\x2e\x37\
+\x30\x37\x31\x20\x2d\x30\x2e\x37\x30\x37\x31\x20\x30\x2e\x37\x30\
+\x37\x31\x20\x2d\x30\x2e\x37\x30\x37\x31\x20\x32\x32\x34\x2e\x33\
+\x34\x37\x36\x20\x36\x33\x31\x2e\x31\x34\x39\x38\x29\x22\x20\x77\
+\x69\x64\x74\x68\x3d\x22\x31\x32\x38\x2e\x30\x38\x35\x22\x20\x68\
+\x65\x69\x67\x68\x74\x3d\x22\x33\x35\x34\x2e\x30\x34\x39\x22\x2f\
+\x3e\x0a\x09\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x34\x37\x31\
+\x2e\x37\x32\x33\x2c\x38\x38\x2e\x33\x39\x33\x6c\x2d\x34\x38\x2e\
+\x31\x31\x35\x2d\x34\x38\x2e\x31\x31\x34\x63\x2d\x31\x31\x2e\x37\
+\x32\x33\x2d\x31\x31\x2e\x37\x32\x34\x2d\x33\x31\x2e\x35\x35\x38\
+\x2d\x31\x30\x2e\x38\x39\x36\x2d\x34\x34\x2e\x33\x30\x34\x2c\x31\
+\x2e\x38\x35\x6c\x2d\x34\x35\x2e\x32\x30\x32\x2c\x34\x35\x2e\x32\
+\x30\x33\x6c\x39\x30\x2e\x35\x36\x39\x2c\x39\x30\x2e\x35\x36\x38\
+\x6c\x34\x35\x2e\x32\x30\x32\x2d\x34\x35\x2e\x32\x30\x32\x0a\x09\
+\x09\x43\x34\x38\x32\x2e\x36\x31\x36\x2c\x31\x31\x39\x2e\x39\x35\
+\x32\x2c\x34\x38\x33\x2e\x34\x34\x35\x2c\x31\x30\x30\x2e\x31\x31\
+\x36\x2c\x34\x37\x31\x2e\x37\x32\x33\x2c\x38\x38\x2e\x33\x39\x33\
+\x7a\x22\x2f\x3e\x0a\x09\x3c\x70\x6f\x6c\x79\x67\x6f\x6e\x20\x70\
+\x6f\x69\x6e\x74\x73\x3d\x22\x36\x34\x2e\x30\x32\x31\x2c\x33\x36\
+\x33\x2e\x32\x35\x32\x20\x33\x32\x2c\x34\x38\x30\x20\x31\x34\x38\
+\x2e\x37\x33\x37\x2c\x34\x34\x37\x2e\x39\x37\x39\x20\x09\x22\x2f\
+\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x00\x00\x04\xca\
\x3c\
-\x73\x76\x67\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\
-\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\
-\x30\x2f\x73\x76\x67\x22\x20\x77\x69\x64\x74\x68\x3d\x22\x35\x31\
-\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\x32\
-\x70\x78\x22\x0a\x20\x20\x20\x20\x20\x76\x69\x65\x77\x42\x6f\x78\
-\x3d\x22\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x3e\x0a\
-\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\
-\x74\x72\x69\x78\x28\x34\x38\x20\x30\x20\x30\x20\x34\x38\x20\x34\
-\x38\x20\x34\x38\x29\x27\x3e\x0a\x20\x20\x3c\x70\x61\x74\x68\x20\
-\x64\x3d\x22\x4d\x30\x20\x30\x76\x32\x68\x2e\x35\x63\x30\x2d\x2e\
-\x35\x35\x2e\x34\x35\x2d\x31\x20\x31\x2d\x31\x68\x31\x2e\x35\x76\
-\x35\x2e\x35\x63\x30\x20\x2e\x32\x38\x2d\x2e\x32\x32\x2e\x35\x2d\
-\x2e\x35\x2e\x35\x68\x2d\x2e\x35\x76\x31\x68\x34\x76\x2d\x31\x68\
-\x2d\x2e\x35\x63\x2d\x2e\x32\x38\x20\x30\x2d\x2e\x35\x2d\x2e\x32\
-\x32\x2d\x2e\x35\x2d\x2e\x35\x76\x2d\x35\x2e\x35\x68\x31\x2e\x35\
-\x63\x2e\x35\x35\x20\x30\x20\x31\x20\x2e\x34\x35\x20\x31\x20\x31\
-\x68\x2e\x35\x76\x2d\x32\x68\x2d\x38\x7a\x22\x20\x2f\x3e\x0a\x3c\
-\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x04\x54\
-\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
-\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\x20\
+\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x39\x2e\x32\x2e\x31\x2c\x20\
\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
@@ -828,105 +712,70 @@
\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
-\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4c\
-\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\
-\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\
-\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\
-\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
-\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\
-\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
-\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
-\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
-\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
-\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\
-\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
-\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
-\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
-\x76\x65\x22\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x22\x49\x63\x6f\x6e\
-\x22\x3e\x0a\x09\x3c\x67\x3e\x0a\x09\x09\x3c\x70\x61\x74\x68\x20\
-\x64\x3d\x22\x4d\x32\x35\x36\x2c\x31\x37\x36\x63\x2d\x34\x34\x2e\
-\x30\x30\x34\x2c\x30\x2d\x38\x30\x2e\x30\x30\x31\x2c\x33\x36\x2d\
-\x38\x30\x2e\x30\x30\x31\x2c\x38\x30\x63\x30\x2c\x34\x34\x2e\x30\
-\x30\x34\x2c\x33\x35\x2e\x39\x39\x37\x2c\x38\x30\x2c\x38\x30\x2e\
-\x30\x30\x31\x2c\x38\x30\x63\x34\x34\x2e\x30\x30\x35\x2c\x30\x2c\
-\x37\x39\x2e\x39\x39\x39\x2d\x33\x35\x2e\x39\x39\x36\x2c\x37\x39\
-\x2e\x39\x39\x39\x2d\x38\x30\x0a\x09\x09\x09\x43\x33\x33\x35\x2e\
-\x39\x39\x39\x2c\x32\x31\x32\x2c\x33\x30\x30\x2e\x30\x30\x35\x2c\
-\x31\x37\x36\x2c\x32\x35\x36\x2c\x31\x37\x36\x7a\x20\x4d\x34\x34\
-\x36\x2e\x39\x33\x38\x2c\x32\x33\x34\x2e\x36\x36\x37\x63\x2d\x39\
-\x2e\x36\x30\x35\x2d\x38\x38\x2e\x35\x33\x31\x2d\x38\x31\x2e\x30\
-\x37\x34\x2d\x31\x36\x30\x2d\x31\x36\x39\x2e\x36\x30\x35\x2d\x31\
-\x36\x39\x2e\x35\x39\x39\x56\x33\x32\x68\x2d\x34\x32\x2e\x36\x36\
-\x36\x76\x33\x33\x2e\x30\x36\x37\x0a\x09\x09\x09\x63\x2d\x38\x38\
-\x2e\x35\x33\x31\x2c\x39\x2e\x35\x39\x39\x2d\x31\x36\x30\x2c\x38\
-\x31\x2e\x30\x36\x38\x2d\x31\x36\x39\x2e\x36\x30\x34\x2c\x31\x36\
-\x39\x2e\x35\x39\x39\x48\x33\x32\x76\x34\x32\x2e\x36\x36\x37\x68\
-\x33\x33\x2e\x30\x36\x32\x63\x39\x2e\x36\x30\x34\x2c\x38\x38\x2e\
-\x35\x33\x31\x2c\x38\x31\x2e\x30\x37\x32\x2c\x31\x36\x30\x2c\x31\
-\x36\x39\x2e\x36\x30\x34\x2c\x31\x36\x39\x2e\x36\x30\x34\x56\x34\
-\x38\x30\x68\x34\x32\x2e\x36\x36\x36\x76\x2d\x33\x33\x2e\x30\x36\
-\x32\x0a\x09\x09\x09\x63\x38\x38\x2e\x35\x33\x31\x2d\x39\x2e\x36\
-\x30\x34\x2c\x31\x36\x30\x2d\x38\x31\x2e\x30\x37\x33\x2c\x31\x36\
-\x39\x2e\x36\x30\x35\x2d\x31\x36\x39\x2e\x36\x30\x34\x48\x34\x38\
-\x30\x76\x2d\x34\x32\x2e\x36\x36\x37\x48\x34\x34\x36\x2e\x39\x33\
-\x38\x7a\x20\x4d\x32\x35\x36\x2c\x34\x30\x35\x2e\x33\x33\x33\x63\
-\x2d\x38\x32\x2e\x31\x33\x37\x2c\x30\x2d\x31\x34\x39\x2e\x33\x33\
-\x34\x2d\x36\x37\x2e\x31\x39\x38\x2d\x31\x34\x39\x2e\x33\x33\x34\
-\x2d\x31\x34\x39\x2e\x33\x33\x33\x0a\x09\x09\x09\x63\x30\x2d\x38\
-\x32\x2e\x31\x33\x36\x2c\x36\x37\x2e\x31\x39\x37\x2d\x31\x34\x39\
-\x2e\x33\x33\x33\x2c\x31\x34\x39\x2e\x33\x33\x34\x2d\x31\x34\x39\
-\x2e\x33\x33\x33\x63\x38\x32\x2e\x31\x33\x35\x2c\x30\x2c\x31\x34\
-\x39\x2e\x33\x33\x32\x2c\x36\x37\x2e\x31\x39\x38\x2c\x31\x34\x39\
-\x2e\x33\x33\x32\x2c\x31\x34\x39\x2e\x33\x33\x33\x43\x34\x30\x35\
-\x2e\x33\x33\x32\x2c\x33\x33\x38\x2e\x31\x33\x35\x2c\x33\x33\x38\
-\x2e\x31\x33\x35\x2c\x34\x30\x35\x2e\x33\x33\x33\x2c\x32\x35\x36\
-\x2c\x34\x30\x35\x2e\x33\x33\x33\x7a\x0a\x09\x09\x09\x22\x2f\x3e\
-\x0a\x09\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\
-\x67\x3e\x0a\
-\x00\x00\x02\x72\
+\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x0a\x09\x20\x69\x64\x3d\
+\x22\x73\x76\x67\x34\x36\x31\x39\x22\x20\x69\x6e\x6b\x73\x63\x61\
+\x70\x65\x3a\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x30\x2e\x39\x31\
+\x2b\x64\x65\x76\x65\x6c\x2b\x6f\x73\x78\x6d\x65\x6e\x75\x20\x72\
+\x31\x32\x39\x31\x31\x22\x20\x73\x6f\x64\x69\x70\x6f\x64\x69\x3a\
+\x64\x6f\x63\x6e\x61\x6d\x65\x3d\x22\x74\x72\x69\x61\x6e\x67\x6c\
+\x65\x2d\x73\x74\x72\x6f\x6b\x65\x64\x2d\x31\x35\x2e\x73\x76\x67\
+\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x63\x63\x3d\x22\x68\x74\x74\x70\
+\x3a\x2f\x2f\x63\x72\x65\x61\x74\x69\x76\x65\x63\x6f\x6d\x6d\x6f\
+\x6e\x73\x2e\x6f\x72\x67\x2f\x6e\x73\x23\x22\x20\x78\x6d\x6c\x6e\
+\x73\x3a\x64\x63\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x70\x75\x72\
+\x6c\x2e\x6f\x72\x67\x2f\x64\x63\x2f\x65\x6c\x65\x6d\x65\x6e\x74\
+\x73\x2f\x31\x2e\x31\x2f\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x69\x6e\
+\x6b\x73\x63\x61\x70\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
+\x77\x77\x2e\x69\x6e\x6b\x73\x63\x61\x70\x65\x2e\x6f\x72\x67\x2f\
+\x6e\x61\x6d\x65\x73\x70\x61\x63\x65\x73\x2f\x69\x6e\x6b\x73\x63\
+\x61\x70\x65\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x72\x64\x66\x3d\x22\
+\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\
+\x67\x2f\x31\x39\x39\x39\x2f\x30\x32\x2f\x32\x32\x2d\x72\x64\x66\
+\x2d\x73\x79\x6e\x74\x61\x78\x2d\x6e\x73\x23\x22\x20\x78\x6d\x6c\
+\x6e\x73\x3a\x73\x6f\x64\x69\x70\x6f\x64\x69\x3d\x22\x68\x74\x74\
+\x70\x3a\x2f\x2f\x73\x6f\x64\x69\x70\x6f\x64\x69\x2e\x73\x6f\x75\
+\x72\x63\x65\x66\x6f\x72\x67\x65\x2e\x6e\x65\x74\x2f\x44\x54\x44\
+\x2f\x73\x6f\x64\x69\x70\x6f\x64\x69\x2d\x30\x2e\x64\x74\x64\x22\
+\x20\x78\x6d\x6c\x6e\x73\x3a\x73\x76\x67\x3d\x22\x68\x74\x74\x70\
+\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\
+\x30\x30\x2f\x73\x76\x67\x22\x0a\x09\x20\x78\x6d\x6c\x6e\x73\x3d\
+\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\
+\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\
+\x6e\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\
+\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\
+\x2f\x78\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\
+\x79\x3d\x22\x30\x70\x78\x22\x20\x77\x69\x64\x74\x68\x3d\x22\x36\
+\x34\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x36\x34\x70\
+\x78\x22\x0a\x09\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
+\x30\x20\x31\x35\x20\x31\x35\x22\x20\x73\x74\x79\x6c\x65\x3d\x22\
+\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\
+\x64\x3a\x6e\x65\x77\x20\x30\x20\x30\x20\x31\x35\x20\x31\x35\x3b\
+\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\
+\x73\x65\x72\x76\x65\x22\x3e\x0a\x3c\x70\x61\x74\x68\x20\x69\x64\
+\x3d\x22\x72\x65\x63\x74\x33\x33\x33\x38\x22\x20\x69\x6e\x6b\x73\
+\x63\x61\x70\x65\x3a\x63\x6f\x6e\x6e\x65\x63\x74\x6f\x72\x2d\x63\
+\x75\x72\x76\x61\x74\x75\x72\x65\x3d\x22\x30\x22\x20\x73\x6f\x64\
+\x69\x70\x6f\x64\x69\x3a\x6e\x6f\x64\x65\x74\x79\x70\x65\x73\x3d\
+\x22\x63\x63\x63\x63\x63\x63\x63\x63\x63\x63\x63\x63\x22\x20\x64\
+\x3d\x22\x4d\x37\x2e\x35\x32\x34\x33\x2c\x31\x2e\x35\x30\x30\x34\
+\x0a\x09\x43\x37\x2e\x32\x34\x32\x39\x2c\x31\x2e\x34\x39\x31\x33\
+\x2c\x36\x2e\x39\x37\x38\x37\x2c\x31\x2e\x36\x34\x32\x33\x2c\x36\
+\x2e\x38\x33\x33\x36\x2c\x31\x2e\x38\x39\x35\x32\x6c\x2d\x35\x2e\
+\x35\x2c\x39\x2e\x38\x36\x39\x32\x43\x31\x2e\x30\x32\x31\x38\x2c\
+\x31\x32\x2e\x33\x30\x37\x38\x2c\x31\x2e\x33\x39\x35\x2c\x31\x32\
+\x2e\x39\x39\x39\x39\x2c\x32\x2c\x31\x33\x68\x31\x31\x0a\x09\x63\
+\x30\x2e\x36\x30\x35\x2d\x30\x2e\x30\x30\x30\x31\x2c\x30\x2e\x39\
+\x37\x38\x32\x2d\x30\x2e\x36\x39\x32\x32\x2c\x30\x2e\x36\x36\x36\
+\x34\x2d\x31\x2e\x32\x33\x35\x35\x6c\x2d\x35\x2e\x35\x2d\x39\x2e\
+\x38\x36\x39\x32\x43\x38\x2e\x30\x33\x30\x32\x2c\x31\x2e\x36\x35\
+\x37\x39\x2c\x37\x2e\x37\x38\x38\x34\x2c\x31\x2e\x35\x30\x39\x32\
+\x2c\x37\x2e\x35\x32\x34\x33\x2c\x31\x2e\x35\x30\x30\x34\x7a\x20\
+\x4d\x37\x2e\x35\x2c\x33\x2e\x38\x39\x39\x33\x6c\x34\x2e\x31\x32\
+\x36\x37\x2c\x37\x2e\x34\x37\x30\x34\x0a\x09\x48\x33\x2e\x33\x37\
+\x33\x33\x4c\x37\x2e\x35\x2c\x33\x2e\x38\x39\x39\x33\x7a\x22\x2f\
+\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x00\x00\x04\x22\
\x3c\
-\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
-\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
-\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
-\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
-\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\x20\
-\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
-\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
-\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
-\x20\x2d\x2d\x3e\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x73\
-\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\x57\x33\
-\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\x2f\x2f\
-\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
-\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
-\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
-\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
-\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4c\
-\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\
-\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\
-\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\
-\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
-\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\
-\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
-\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
-\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
-\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
-\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\
-\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
-\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
-\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
-\x76\x65\x22\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x22\x49\x63\x6f\x6e\
-\x5f\x38\x5f\x22\x3e\x0a\x09\x3c\x67\x3e\x0a\x09\x09\x3c\x70\x61\
-\x74\x68\x20\x64\x3d\x22\x4d\x38\x35\x2c\x32\x37\x37\x2e\x33\x37\
-\x35\x68\x32\x35\x39\x2e\x37\x30\x34\x4c\x32\x32\x35\x2e\x30\x30\
-\x32\x2c\x33\x39\x37\x2e\x30\x37\x37\x4c\x32\x35\x36\x2c\x34\x32\
-\x37\x6c\x31\x37\x31\x2d\x31\x37\x31\x4c\x32\x35\x36\x2c\x38\x35\
-\x6c\x2d\x32\x39\x2e\x39\x32\x32\x2c\x32\x39\x2e\x39\x32\x34\x6c\
-\x31\x31\x38\x2e\x36\x32\x36\x2c\x31\x31\x39\x2e\x37\x30\x31\x48\
-\x38\x35\x56\x32\x37\x37\x2e\x33\x37\x35\x7a\x22\x2f\x3e\x0a\x09\
-\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\
-\x0a\
-\x00\x00\x04\x13\
-\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x27\x31\x2e\
\x30\x27\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x27\x55\x54\x46\
\x2d\x38\x27\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x54\x68\x69\x73\x20\
@@ -952,155 +801,48 @@
\x20\x31\x33\x2e\x39\x36\x38\x37\x20\x31\x32\x2e\x39\x33\x36\x31\
\x4c\x20\x35\x38\x2e\x32\x31\x37\x35\x20\x32\x31\x2e\x37\x33\x37\
\x38\x4c\x20\x34\x32\x2e\x37\x34\x34\x35\x20\x34\x31\x2e\x37\x31\
-\x31\x39\x27\x20\x66\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\
-\x73\x74\x72\x6f\x6b\x65\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\
-\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\x3d\
-\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\
-\x69\x6e\x65\x6a\x6f\x69\x6e\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\
-\x73\x74\x72\x6f\x6b\x65\x2d\x6d\x69\x74\x65\x72\x6c\x69\x6d\x69\
-\x74\x3d\x27\x31\x30\x2e\x30\x33\x37\x35\x27\x20\x73\x74\x72\x6f\
-\x6b\x65\x2d\x77\x69\x64\x74\x68\x3d\x27\x32\x2e\x35\x30\x39\x33\
-\x37\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\
+\x31\x39\x4c\x20\x36\x2e\x30\x32\x32\x35\x20\x33\x32\x2e\x31\x32\
+\x5a\x27\x20\x66\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\x73\
+\x74\x72\x6f\x6b\x65\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\x20\
+\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\x3d\x27\
+\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\
+\x6e\x65\x6a\x6f\x69\x6e\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\
+\x74\x72\x6f\x6b\x65\x2d\x6d\x69\x74\x65\x72\x6c\x69\x6d\x69\x74\
+\x3d\x27\x31\x30\x2e\x30\x33\x37\x35\x27\x20\x73\x74\x72\x6f\x6b\
+\x65\x2d\x77\x69\x64\x74\x68\x3d\x27\x32\x2e\x35\x30\x39\x33\x37\
+\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\
+\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\
+\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\x35\x38\
+\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\x36\x32\x36\x34\x29\x27\
+\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\x36\x2e\
+\x30\x32\x32\x35\x27\x20\x63\x79\x3d\x27\x33\x32\x2e\x31\x32\x27\
+\x20\x66\x69\x6c\x6c\x3d\x27\x23\x66\x66\x30\x30\x30\x30\x27\x20\
+\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\
+\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\
+\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x35\x38\x2e\x34\x36\x36\
+\x39\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\x28\
+\x2e\x39\x39\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x63\x69\x72\x63\
+\x6c\x65\x20\x63\x78\x3d\x27\x31\x33\x2e\x39\x36\x38\x37\x27\x20\
+\x63\x79\x3d\x27\x31\x32\x2e\x39\x33\x36\x31\x27\x20\x66\x69\x6c\
+\x6c\x3d\x27\x23\x66\x66\x30\x30\x30\x30\x27\x20\x72\x3d\x27\x36\
+\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\
+\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\x6e\
+\x73\x6c\x61\x74\x65\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\
+\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\x36\
+\x32\x36\x34\x29\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\
+\x78\x3d\x27\x35\x38\x2e\x32\x31\x37\x35\x27\x20\x63\x79\x3d\x27\
+\x32\x31\x2e\x37\x33\x37\x38\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\
+\x66\x66\x30\x30\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\
+\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\
\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\x6e\x73\x6c\x61\x74\
\x65\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\x35\
\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\x36\x32\x36\x34\x29\
-\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\x36\
-\x2e\x30\x32\x32\x35\x27\x20\x63\x79\x3d\x27\x33\x32\x2e\x31\x32\
-\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\x66\x66\x30\x30\x30\x30\x27\
-\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\
-\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\
-\x27\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x35\x38\x2e\x34\x36\
-\x36\x39\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\
-\x28\x2e\x39\x39\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x63\x69\x72\
-\x63\x6c\x65\x20\x63\x78\x3d\x27\x31\x33\x2e\x39\x36\x38\x37\x27\
-\x20\x63\x79\x3d\x27\x31\x32\x2e\x39\x33\x36\x31\x27\x20\x66\x69\
-\x6c\x6c\x3d\x27\x23\x66\x66\x30\x30\x30\x30\x27\x20\x72\x3d\x27\
-\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\
-\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\
-\x6e\x73\x6c\x61\x74\x65\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\
-\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\
-\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\
-\x63\x78\x3d\x27\x35\x38\x2e\x32\x31\x37\x35\x27\x20\x63\x79\x3d\
-\x27\x32\x31\x2e\x37\x33\x37\x38\x27\x20\x66\x69\x6c\x6c\x3d\x27\
-\x23\x66\x66\x30\x30\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\
-\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\
-\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\x6e\x73\x6c\x61\
-\x74\x65\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\
-\x35\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\x36\x32\x36\x34\
-\x29\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\
-\x34\x32\x2e\x37\x34\x34\x35\x27\x20\x63\x79\x3d\x27\x34\x31\x2e\
-\x37\x31\x31\x39\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\x66\x66\x30\
-\x30\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\
-\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\
-\x67\x3e\
-\x00\x00\x03\xdc\
-\x3c\
-\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
-\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
-\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
-\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
-\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\x20\
-\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
-\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
-\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
-\x20\x2d\x2d\x3e\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x73\
-\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\x57\x33\
-\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\x2f\x2f\
-\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
-\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
-\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
-\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
-\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4c\
-\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\
-\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\
-\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\
-\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
-\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\
-\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
-\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
-\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
-\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
-\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x73\x74\x79\x6c\x65\
-\x3d\x22\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\
-\x75\x6e\x64\x3a\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\
-\x35\x31\x32\x3b\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\
-\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0a\x3c\x67\x3e\x0a\
-\x09\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x32\x35\x36\x2c\x31\
-\x32\x38\x63\x2d\x38\x31\x2e\x39\x2c\x30\x2d\x31\x34\x35\x2e\x37\
-\x2c\x34\x38\x2e\x38\x2d\x32\x32\x34\x2c\x31\x32\x38\x63\x36\x37\
-\x2e\x34\x2c\x36\x37\x2e\x37\x2c\x31\x32\x34\x2c\x31\x32\x38\x2c\
-\x32\x32\x34\x2c\x31\x32\x38\x63\x39\x39\x2e\x39\x2c\x30\x2c\x31\
-\x37\x33\x2e\x34\x2d\x37\x36\x2e\x34\x2c\x32\x32\x34\x2d\x31\x32\
-\x36\x2e\x36\x0a\x09\x09\x43\x34\x32\x38\x2e\x32\x2c\x31\x39\x38\
-\x2e\x36\x2c\x33\x35\x34\x2e\x38\x2c\x31\x32\x38\x2c\x32\x35\x36\
-\x2c\x31\x32\x38\x7a\x20\x4d\x32\x35\x36\x2c\x33\x34\x37\x2e\x33\
-\x63\x2d\x34\x39\x2e\x34\x2c\x30\x2d\x38\x39\x2e\x36\x2d\x34\x31\
-\x2d\x38\x39\x2e\x36\x2d\x39\x31\x2e\x33\x63\x30\x2d\x35\x30\x2e\
-\x34\x2c\x34\x30\x2e\x32\x2d\x39\x31\x2e\x33\x2c\x38\x39\x2e\x36\
-\x2d\x39\x31\x2e\x33\x73\x38\x39\x2e\x36\x2c\x34\x31\x2c\x38\x39\
-\x2e\x36\x2c\x39\x31\x2e\x33\x0a\x09\x09\x43\x33\x34\x35\x2e\x36\
-\x2c\x33\x30\x36\x2e\x34\x2c\x33\x30\x35\x2e\x34\x2c\x33\x34\x37\
-\x2e\x33\x2c\x32\x35\x36\x2c\x33\x34\x37\x2e\x33\x7a\x22\x2f\x3e\
-\x0a\x09\x3c\x67\x3e\x0a\x09\x09\x3c\x70\x61\x74\x68\x20\x64\x3d\
-\x22\x4d\x32\x35\x36\x2c\x32\x32\x34\x63\x30\x2d\x37\x2e\x39\x2c\
-\x32\x2e\x39\x2d\x31\x35\x2e\x31\x2c\x37\x2e\x36\x2d\x32\x30\x2e\
-\x37\x63\x2d\x32\x2e\x35\x2d\x30\x2e\x34\x2d\x35\x2d\x30\x2e\x36\
-\x2d\x37\x2e\x36\x2d\x30\x2e\x36\x63\x2d\x32\x38\x2e\x38\x2c\x30\
-\x2d\x35\x32\x2e\x33\x2c\x32\x33\x2e\x39\x2d\x35\x32\x2e\x33\x2c\
-\x35\x33\x2e\x33\x63\x30\x2c\x32\x39\x2e\x34\x2c\x32\x33\x2e\x35\
-\x2c\x35\x33\x2e\x33\x2c\x35\x32\x2e\x33\x2c\x35\x33\x2e\x33\x0a\
-\x09\x09\x09\x73\x35\x32\x2e\x33\x2d\x32\x33\x2e\x39\x2c\x35\x32\
-\x2e\x33\x2d\x35\x33\x2e\x33\x63\x30\x2d\x32\x2e\x33\x2d\x30\x2e\
-\x32\x2d\x34\x2e\x36\x2d\x30\x2e\x34\x2d\x36\x2e\x39\x63\x2d\x35\
-\x2e\x35\x2c\x34\x2e\x33\x2d\x31\x32\x2e\x33\x2c\x36\x2e\x39\x2d\
-\x31\x39\x2e\x38\x2c\x36\x2e\x39\x43\x32\x37\x30\x2e\x33\x2c\x32\
-\x35\x36\x2c\x32\x35\x36\x2c\x32\x34\x31\x2e\x37\x2c\x32\x35\x36\
-\x2c\x32\x32\x34\x7a\x22\x2f\x3e\x0a\x09\x3c\x2f\x67\x3e\x0a\x3c\
-\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x02\x97\
-\x3c\
-\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
-\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
-\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
-\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
-\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x38\x2e\x31\x2e\x31\x2c\x20\
-\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
-\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
-\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
-\x20\x2d\x2d\x3e\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x73\
-\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\x57\x33\
-\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\x2f\x2f\
-\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
-\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
-\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
-\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
-\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x53\
-\x61\x76\x65\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\
-\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\
-\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x78\x6c\
-\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
-\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\x6c\x69\x6e\
-\x6b\x22\x20\x78\x3d\x22\x35\x31\x32\x70\x78\x22\x20\x79\x3d\x22\
-\x35\x31\x32\x70\x78\x22\x0a\x09\x20\x76\x69\x65\x77\x42\x6f\x78\
-\x3d\x22\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\
-\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\
-\x3d\x22\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\
-\x32\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\
-\x65\x73\x65\x72\x76\x65\x22\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\
-\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x32\x34\
-\x20\x30\x20\x30\x20\x32\x34\x20\x30\x20\x30\x29\x27\x3e\x0a\x3c\
-\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x31\x35\x2e\x31\x37\x33\x2c\
-\x32\x48\x34\x43\x32\x2e\x38\x39\x39\x2c\x32\x2c\x32\x2c\x32\x2e\
-\x39\x2c\x32\x2c\x34\x76\x31\x32\x63\x30\x2c\x31\x2e\x31\x2c\x30\
-\x2e\x38\x39\x39\x2c\x32\x2c\x32\x2c\x32\x68\x31\x32\x63\x31\x2e\
-\x31\x30\x31\x2c\x30\x2c\x32\x2d\x30\x2e\x39\x2c\x32\x2d\x32\x56\
-\x35\x2e\x31\x32\x37\x4c\x31\x35\x2e\x31\x37\x33\x2c\x32\x7a\x20\
-\x4d\x31\x34\x2c\x38\x63\x30\x2c\x30\x2e\x35\x34\x39\x2d\x30\x2e\
-\x34\x35\x2c\x31\x2d\x31\x2c\x31\x48\x37\x0a\x09\x43\x36\x2e\x34\
-\x35\x2c\x39\x2c\x36\x2c\x38\x2e\x35\x34\x39\x2c\x36\x2c\x38\x56\
-\x33\x68\x38\x56\x38\x7a\x20\x4d\x31\x33\x2c\x34\x68\x2d\x32\x76\
-\x34\x68\x32\x56\x34\x7a\x22\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\
-\x2f\x73\x76\x67\x3e\x0a\
+\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\x34\
+\x32\x2e\x37\x34\x34\x35\x27\x20\x63\x79\x3d\x27\x34\x31\x2e\x37\
+\x31\x31\x39\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\x66\x66\x30\x30\
+\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\
+\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\
+\x3e\
\x00\x00\x02\xe7\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
@@ -1150,112 +892,31 @@
\x2e\x31\x39\x37\x2c\x31\x37\x2e\x35\x39\x39\x2c\x31\x30\x2c\x31\
\x37\x2e\x35\x39\x39\x7a\x22\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\
\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x03\x16\
+\x00\x00\x01\x69\
\x3c\
-\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
-\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
-\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
-\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
-\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\x20\
-\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
-\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
-\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
-\x20\x2d\x2d\x3e\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x73\
-\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\x57\x33\
-\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\x2f\x2f\
-\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
-\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
-\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
-\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
-\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4c\
-\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\
-\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\
-\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\
-\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
-\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\
-\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
-\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
-\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
-\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
-\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\
-\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
-\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
-\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
-\x76\x65\x22\x3e\x0a\x3c\x67\x3e\x0a\x09\x3c\x63\x69\x72\x63\x6c\
-\x65\x20\x63\x78\x3d\x22\x32\x35\x36\x22\x20\x63\x79\x3d\x22\x32\
-\x38\x30\x22\x20\x72\x3d\x22\x36\x33\x22\x2f\x3e\x0a\x09\x3c\x70\
-\x61\x74\x68\x20\x64\x3d\x22\x4d\x34\x34\x30\x2c\x39\x36\x68\x2d\
-\x38\x38\x6c\x2d\x33\x32\x2d\x33\x32\x48\x31\x39\x32\x6c\x2d\x33\
-\x32\x2c\x33\x32\x48\x37\x32\x63\x2d\x32\x32\x2e\x30\x39\x32\x2c\
-\x30\x2d\x34\x30\x2c\x31\x37\x2e\x39\x30\x38\x2d\x34\x30\x2c\x34\
-\x30\x76\x32\x37\x32\x63\x30\x2c\x32\x32\x2e\x30\x39\x32\x2c\x31\
-\x37\x2e\x39\x30\x38\x2c\x34\x30\x2c\x34\x30\x2c\x34\x30\x68\x33\
-\x36\x38\x63\x32\x32\x2e\x30\x39\x32\x2c\x30\x2c\x34\x30\x2d\x31\
-\x37\x2e\x39\x30\x38\x2c\x34\x30\x2d\x34\x30\x0a\x09\x09\x56\x31\
-\x33\x36\x43\x34\x38\x30\x2c\x31\x31\x33\x2e\x39\x30\x38\x2c\x34\
-\x36\x32\x2e\x30\x39\x32\x2c\x39\x36\x2c\x34\x34\x30\x2c\x39\x36\
-\x7a\x20\x4d\x32\x35\x36\x2c\x33\x39\x32\x63\x2d\x36\x31\x2e\x38\
-\x35\x35\x2c\x30\x2d\x31\x31\x32\x2d\x35\x30\x2e\x31\x34\x35\x2d\
-\x31\x31\x32\x2d\x31\x31\x32\x73\x35\x30\x2e\x31\x34\x35\x2d\x31\
-\x31\x32\x2c\x31\x31\x32\x2d\x31\x31\x32\x73\x31\x31\x32\x2c\x35\
-\x30\x2e\x31\x34\x35\x2c\x31\x31\x32\x2c\x31\x31\x32\x0a\x09\x09\
-\x53\x33\x31\x37\x2e\x38\x35\x35\x2c\x33\x39\x32\x2c\x32\x35\x36\
-\x2c\x33\x39\x32\x7a\x22\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\
-\x73\x76\x67\x3e\x0a\
-\x00\x00\x03\x3f\
-\x3c\
-\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
-\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
-\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
-\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
-\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\x20\
-\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
-\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
-\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
-\x20\x2d\x2d\x3e\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x73\
-\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\x57\x33\
-\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\x2f\x2f\
-\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
-\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
-\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
-\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
-\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4c\
-\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\
-\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\
-\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\
-\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
-\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\
-\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
-\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
-\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
-\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
-\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\
-\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
-\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
-\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
-\x76\x65\x22\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x22\x49\x63\x6f\x6e\
-\x5f\x32\x31\x5f\x22\x3e\x0a\x09\x3c\x67\x3e\x0a\x09\x09\x3c\x70\
-\x61\x74\x68\x20\x64\x3d\x22\x4d\x32\x35\x36\x2c\x31\x35\x32\x63\
-\x2d\x35\x37\x2e\x32\x2c\x30\x2d\x31\x30\x34\x2c\x34\x36\x2e\x38\
-\x2d\x31\x30\x34\x2c\x31\x30\x34\x73\x34\x36\x2e\x38\x2c\x31\x30\
-\x34\x2c\x31\x30\x34\x2c\x31\x30\x34\x73\x31\x30\x34\x2d\x34\x36\
-\x2e\x38\x2c\x31\x30\x34\x2d\x31\x30\x34\x53\x33\x31\x33\x2e\x32\
-\x2c\x31\x35\x32\x2c\x32\x35\x36\x2c\x31\x35\x32\x7a\x20\x4d\x32\
-\x35\x36\x2c\x34\x38\x0a\x09\x09\x09\x43\x31\x34\x31\x2e\x36\x30\
-\x31\x2c\x34\x38\x2c\x34\x38\x2c\x31\x34\x31\x2e\x36\x30\x31\x2c\
-\x34\x38\x2c\x32\x35\x36\x73\x39\x33\x2e\x36\x30\x31\x2c\x32\x30\
-\x38\x2c\x32\x30\x38\x2c\x32\x30\x38\x73\x32\x30\x38\x2d\x39\x33\
-\x2e\x36\x30\x31\x2c\x32\x30\x38\x2d\x32\x30\x38\x53\x33\x37\x30\
-\x2e\x33\x39\x39\x2c\x34\x38\x2c\x32\x35\x36\x2c\x34\x38\x7a\x20\
-\x4d\x32\x35\x36\x2c\x34\x32\x32\x2e\x34\x0a\x09\x09\x09\x63\x2d\
-\x39\x31\x2e\x35\x31\x38\x2c\x30\x2d\x31\x36\x36\x2e\x34\x2d\x37\
-\x34\x2e\x38\x38\x33\x2d\x31\x36\x36\x2e\x34\x2d\x31\x36\x36\x2e\
-\x34\x53\x31\x36\x34\x2e\x34\x38\x32\x2c\x38\x39\x2e\x36\x2c\x32\
-\x35\x36\x2c\x38\x39\x2e\x36\x53\x34\x32\x32\x2e\x34\x2c\x31\x36\
-\x34\x2e\x34\x38\x32\x2c\x34\x32\x32\x2e\x34\x2c\x32\x35\x36\x53\
-\x33\x34\x37\x2e\x35\x31\x38\x2c\x34\x32\x32\x2e\x34\x2c\x32\x35\
-\x36\x2c\x34\x32\x32\x2e\x34\x7a\x22\x2f\x3e\x0a\x09\x3c\x2f\x67\
-\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x73\x76\x67\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\
+\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\
+\x30\x2f\x73\x76\x67\x22\x20\x77\x69\x64\x74\x68\x3d\x22\x35\x31\
+\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\x32\
+\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\x30\
+\x20\x35\x31\x32\x20\x35\x31\x32\x22\x3e\x3c\x67\x20\x74\x72\x61\
+\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x32\
+\x34\x20\x30\x20\x30\x20\x32\x34\x20\x30\x20\x30\x29\x27\x3e\x3c\
+\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x34\x2e\x33\x34\x20\x31\x35\
+\x2e\x36\x36\x41\x37\x2e\x39\x37\x20\x37\x2e\x39\x37\x20\x30\x20\
+\x30\x20\x30\x20\x39\x20\x31\x37\x2e\x39\x34\x56\x31\x30\x48\x35\
+\x56\x38\x68\x34\x56\x35\x2e\x38\x33\x61\x33\x20\x33\x20\x30\x20\
+\x31\x20\x31\x20\x32\x20\x30\x56\x38\x68\x34\x76\x32\x68\x2d\x34\
+\x76\x37\x2e\x39\x34\x61\x37\x2e\x39\x37\x20\x37\x2e\x39\x37\x20\
+\x30\x20\x30\x20\x30\x20\x34\x2e\x36\x36\x2d\x32\x2e\x32\x38\x6c\
+\x2d\x31\x2e\x34\x32\x2d\x31\x2e\x34\x32\x68\x35\x2e\x36\x36\x6c\
+\x2d\x32\x2e\x38\x33\x20\x32\x2e\x38\x33\x61\x31\x30\x20\x31\x30\
+\x20\x30\x20\x30\x20\x31\x2d\x31\x34\x2e\x31\x34\x20\x30\x4c\x2e\
+\x31\x20\x31\x34\x2e\x32\x34\x68\x35\x2e\x36\x36\x6c\x2d\x31\x2e\
+\x34\x32\x20\x31\x2e\x34\x32\x7a\x4d\x31\x30\x20\x34\x61\x31\x20\
+\x31\x20\x30\x20\x31\x20\x30\x20\x30\x2d\x32\x20\x31\x20\x31\x20\
+\x30\x20\x30\x20\x30\x20\x30\x20\x32\x7a\x22\x2f\x3e\x3c\x2f\x67\
+\x3e\x3c\x2f\x73\x76\x67\x3e\x0a\
\x00\x00\x04\x42\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
@@ -1327,6 +988,132 @@
\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\
\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\
\x0a\
+\x00\x00\x02\x72\
+\x3c\
+\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
+\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
+\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
+\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
+\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\x20\
+\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
+\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
+\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
+\x20\x2d\x2d\x3e\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x73\
+\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\x57\x33\
+\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\x2f\x2f\
+\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
+\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
+\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
+\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
+\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4c\
+\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\
+\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\
+\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\
+\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
+\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\
+\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
+\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
+\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
+\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
+\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\
+\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
+\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
+\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
+\x76\x65\x22\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x22\x49\x63\x6f\x6e\
+\x5f\x38\x5f\x22\x3e\x0a\x09\x3c\x67\x3e\x0a\x09\x09\x3c\x70\x61\
+\x74\x68\x20\x64\x3d\x22\x4d\x38\x35\x2c\x32\x37\x37\x2e\x33\x37\
+\x35\x68\x32\x35\x39\x2e\x37\x30\x34\x4c\x32\x32\x35\x2e\x30\x30\
+\x32\x2c\x33\x39\x37\x2e\x30\x37\x37\x4c\x32\x35\x36\x2c\x34\x32\
+\x37\x6c\x31\x37\x31\x2d\x31\x37\x31\x4c\x32\x35\x36\x2c\x38\x35\
+\x6c\x2d\x32\x39\x2e\x39\x32\x32\x2c\x32\x39\x2e\x39\x32\x34\x6c\
+\x31\x31\x38\x2e\x36\x32\x36\x2c\x31\x31\x39\x2e\x37\x30\x31\x48\
+\x38\x35\x56\x32\x37\x37\x2e\x33\x37\x35\x7a\x22\x2f\x3e\x0a\x09\
+\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\
+\x0a\
+\x00\x00\x05\x16\
+\x3c\
+\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
+\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
+\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
+\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
+\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\x20\
+\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
+\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
+\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
+\x20\x2d\x2d\x3e\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x73\
+\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\x57\x33\
+\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\x2f\x2f\
+\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
+\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
+\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
+\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
+\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4c\
+\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\
+\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\
+\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\
+\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
+\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\
+\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
+\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
+\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
+\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
+\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\
+\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
+\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
+\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
+\x76\x65\x22\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x22\x49\x63\x6f\x6e\
+\x5f\x31\x32\x5f\x22\x3e\x0a\x09\x3c\x67\x3e\x0a\x09\x09\x3c\x70\
+\x61\x74\x68\x20\x64\x3d\x22\x4d\x32\x35\x36\x2c\x36\x34\x43\x31\
+\x35\x30\x2e\x34\x30\x31\x2c\x36\x34\x2c\x36\x34\x2c\x31\x35\x30\
+\x2e\x34\x30\x31\x2c\x36\x34\x2c\x32\x35\x36\x63\x30\x2c\x31\x30\
+\x35\x2e\x36\x30\x34\x2c\x38\x36\x2e\x34\x30\x31\x2c\x31\x39\x32\
+\x2c\x31\x39\x32\x2c\x31\x39\x32\x63\x31\x38\x2e\x31\x33\x36\x2c\
+\x30\x2c\x33\x32\x2d\x31\x33\x2e\x38\x36\x34\x2c\x33\x32\x2d\x33\
+\x32\x0a\x09\x09\x09\x63\x30\x2d\x38\x2e\x35\x33\x31\x2d\x33\x2e\
+\x31\x39\x38\x2d\x31\x36\x2d\x38\x2e\x35\x33\x31\x2d\x32\x31\x2e\
+\x33\x33\x33\x63\x2d\x35\x2e\x33\x33\x33\x2d\x35\x2e\x33\x33\x34\
+\x2d\x38\x2e\x35\x33\x31\x2d\x31\x32\x2e\x38\x30\x33\x2d\x38\x2e\
+\x35\x33\x31\x2d\x32\x31\x2e\x33\x33\x34\x63\x30\x2d\x31\x38\x2e\
+\x31\x33\x35\x2c\x31\x33\x2e\x38\x36\x34\x2d\x33\x32\x2c\x33\x32\
+\x2d\x33\x32\x68\x33\x38\x2e\x33\x39\x36\x0a\x09\x09\x09\x63\x35\
+\x38\x2e\x36\x36\x37\x2c\x30\x2c\x31\x30\x36\x2e\x36\x36\x37\x2d\
+\x34\x38\x2c\x31\x30\x36\x2e\x36\x36\x37\x2d\x31\x30\x36\x2e\x36\
+\x36\x36\x43\x34\x34\x38\x2c\x31\x34\x30\x2e\x38\x30\x32\x2c\x33\
+\x36\x31\x2e\x36\x30\x34\x2c\x36\x34\x2c\x32\x35\x36\x2c\x36\x34\
+\x7a\x20\x4d\x31\x33\x38\x2e\x36\x36\x37\x2c\x32\x35\x36\x63\x2d\
+\x31\x38\x2e\x31\x33\x36\x2c\x30\x2d\x33\x32\x2d\x31\x33\x2e\x38\
+\x36\x34\x2d\x33\x32\x2d\x33\x32\x73\x31\x33\x2e\x38\x36\x34\x2d\
+\x33\x32\x2c\x33\x32\x2d\x33\x32\x0a\x09\x09\x09\x63\x31\x38\x2e\
+\x31\x33\x35\x2c\x30\x2c\x33\x32\x2c\x31\x33\x2e\x38\x36\x34\x2c\
+\x33\x32\x2c\x33\x32\x53\x31\x35\x36\x2e\x38\x30\x32\x2c\x32\x35\
+\x36\x2c\x31\x33\x38\x2e\x36\x36\x37\x2c\x32\x35\x36\x7a\x20\x4d\
+\x32\x30\x32\x2e\x36\x36\x37\x2c\x31\x37\x30\x2e\x36\x36\x37\x63\
+\x2d\x31\x38\x2e\x31\x33\x36\x2c\x30\x2d\x33\x32\x2d\x31\x33\x2e\
+\x38\x36\x35\x2d\x33\x32\x2d\x33\x32\x63\x30\x2d\x31\x38\x2e\x31\
+\x33\x36\x2c\x31\x33\x2e\x38\x36\x34\x2d\x33\x32\x2c\x33\x32\x2d\
+\x33\x32\x0a\x09\x09\x09\x63\x31\x38\x2e\x31\x33\x35\x2c\x30\x2c\
+\x33\x32\x2c\x31\x33\x2e\x38\x36\x34\x2c\x33\x32\x2c\x33\x32\x43\
+\x32\x33\x34\x2e\x36\x36\x37\x2c\x31\x35\x36\x2e\x38\x30\x32\x2c\
+\x32\x32\x30\x2e\x38\x30\x32\x2c\x31\x37\x30\x2e\x36\x36\x37\x2c\
+\x32\x30\x32\x2e\x36\x36\x37\x2c\x31\x37\x30\x2e\x36\x36\x37\x7a\
+\x20\x4d\x33\x30\x39\x2e\x33\x33\x33\x2c\x31\x37\x30\x2e\x36\x36\
+\x37\x63\x2d\x31\x38\x2e\x31\x33\x35\x2c\x30\x2d\x33\x32\x2d\x31\
+\x33\x2e\x38\x36\x35\x2d\x33\x32\x2d\x33\x32\x0a\x09\x09\x09\x63\
+\x30\x2d\x31\x38\x2e\x31\x33\x36\x2c\x31\x33\x2e\x38\x36\x35\x2d\
+\x33\x32\x2c\x33\x32\x2d\x33\x32\x63\x31\x38\x2e\x31\x33\x36\x2c\
+\x30\x2c\x33\x32\x2c\x31\x33\x2e\x38\x36\x34\x2c\x33\x32\x2c\x33\
+\x32\x43\x33\x34\x31\x2e\x33\x33\x33\x2c\x31\x35\x36\x2e\x38\x30\
+\x32\x2c\x33\x32\x37\x2e\x34\x36\x39\x2c\x31\x37\x30\x2e\x36\x36\
+\x37\x2c\x33\x30\x39\x2e\x33\x33\x33\x2c\x31\x37\x30\x2e\x36\x36\
+\x37\x7a\x20\x4d\x33\x37\x33\x2e\x33\x33\x33\x2c\x32\x35\x36\x0a\
+\x09\x09\x09\x63\x2d\x31\x38\x2e\x31\x33\x35\x2c\x30\x2d\x33\x32\
+\x2d\x31\x33\x2e\x38\x36\x34\x2d\x33\x32\x2d\x33\x32\x73\x31\x33\
+\x2e\x38\x36\x35\x2d\x33\x32\x2c\x33\x32\x2d\x33\x32\x63\x31\x38\
+\x2e\x31\x33\x36\x2c\x30\x2c\x33\x32\x2c\x31\x33\x2e\x38\x36\x34\
+\x2c\x33\x32\x2c\x33\x32\x53\x33\x39\x31\x2e\x34\x36\x39\x2c\x32\
+\x35\x36\x2c\x33\x37\x33\x2e\x33\x33\x33\x2c\x32\x35\x36\x7a\x22\
+\x2f\x3e\x0a\x09\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\
+\x73\x76\x67\x3e\x0a\
\x00\x00\x07\x6b\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
@@ -1448,8 +1235,28 @@
\x32\x37\x34\x2c\x33\x38\x32\x2e\x38\x32\x2c\x33\x30\x37\x2e\x38\
\x36\x37\x2c\x33\x38\x32\x2e\x38\x32\x7a\x22\x2f\x3e\x0a\x3c\x2f\
\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x05\x16\
+\x00\x00\x01\x1c\
\x3c\
+\x73\x76\x67\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\
+\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\
+\x30\x2f\x73\x76\x67\x22\x20\x77\x69\x64\x74\x68\x3d\x22\x35\x31\
+\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\x32\
+\x70\x78\x22\x0a\x20\x20\x20\x20\x20\x76\x69\x65\x77\x42\x6f\x78\
+\x3d\x22\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x3e\x0a\
+\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\
+\x74\x72\x69\x78\x28\x34\x38\x20\x30\x20\x30\x20\x34\x38\x20\x34\
+\x38\x20\x34\x38\x29\x27\x3e\x0a\x20\x20\x3c\x70\x61\x74\x68\x20\
+\x64\x3d\x22\x4d\x30\x20\x30\x76\x32\x68\x2e\x35\x63\x30\x2d\x2e\
+\x35\x35\x2e\x34\x35\x2d\x31\x20\x31\x2d\x31\x68\x31\x2e\x35\x76\
+\x35\x2e\x35\x63\x30\x20\x2e\x32\x38\x2d\x2e\x32\x32\x2e\x35\x2d\
+\x2e\x35\x2e\x35\x68\x2d\x2e\x35\x76\x31\x68\x34\x76\x2d\x31\x68\
+\x2d\x2e\x35\x63\x2d\x2e\x32\x38\x20\x30\x2d\x2e\x35\x2d\x2e\x32\
+\x32\x2d\x2e\x35\x2d\x2e\x35\x76\x2d\x35\x2e\x35\x68\x31\x2e\x35\
+\x63\x2e\x35\x35\x20\x30\x20\x31\x20\x2e\x34\x35\x20\x31\x20\x31\
+\x68\x2e\x35\x76\x2d\x32\x68\x2d\x38\x7a\x22\x20\x2f\x3e\x0a\x3c\
+\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x00\x00\x02\xc1\
+\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
@@ -1475,64 +1282,27 @@
\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
-\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\
-\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
-\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
-\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
-\x76\x65\x22\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x22\x49\x63\x6f\x6e\
-\x5f\x31\x32\x5f\x22\x3e\x0a\x09\x3c\x67\x3e\x0a\x09\x09\x3c\x70\
-\x61\x74\x68\x20\x64\x3d\x22\x4d\x32\x35\x36\x2c\x36\x34\x43\x31\
-\x35\x30\x2e\x34\x30\x31\x2c\x36\x34\x2c\x36\x34\x2c\x31\x35\x30\
-\x2e\x34\x30\x31\x2c\x36\x34\x2c\x32\x35\x36\x63\x30\x2c\x31\x30\
-\x35\x2e\x36\x30\x34\x2c\x38\x36\x2e\x34\x30\x31\x2c\x31\x39\x32\
-\x2c\x31\x39\x32\x2c\x31\x39\x32\x63\x31\x38\x2e\x31\x33\x36\x2c\
-\x30\x2c\x33\x32\x2d\x31\x33\x2e\x38\x36\x34\x2c\x33\x32\x2d\x33\
-\x32\x0a\x09\x09\x09\x63\x30\x2d\x38\x2e\x35\x33\x31\x2d\x33\x2e\
-\x31\x39\x38\x2d\x31\x36\x2d\x38\x2e\x35\x33\x31\x2d\x32\x31\x2e\
-\x33\x33\x33\x63\x2d\x35\x2e\x33\x33\x33\x2d\x35\x2e\x33\x33\x34\
-\x2d\x38\x2e\x35\x33\x31\x2d\x31\x32\x2e\x38\x30\x33\x2d\x38\x2e\
-\x35\x33\x31\x2d\x32\x31\x2e\x33\x33\x34\x63\x30\x2d\x31\x38\x2e\
-\x31\x33\x35\x2c\x31\x33\x2e\x38\x36\x34\x2d\x33\x32\x2c\x33\x32\
-\x2d\x33\x32\x68\x33\x38\x2e\x33\x39\x36\x0a\x09\x09\x09\x63\x35\
-\x38\x2e\x36\x36\x37\x2c\x30\x2c\x31\x30\x36\x2e\x36\x36\x37\x2d\
-\x34\x38\x2c\x31\x30\x36\x2e\x36\x36\x37\x2d\x31\x30\x36\x2e\x36\
-\x36\x36\x43\x34\x34\x38\x2c\x31\x34\x30\x2e\x38\x30\x32\x2c\x33\
-\x36\x31\x2e\x36\x30\x34\x2c\x36\x34\x2c\x32\x35\x36\x2c\x36\x34\
-\x7a\x20\x4d\x31\x33\x38\x2e\x36\x36\x37\x2c\x32\x35\x36\x63\x2d\
-\x31\x38\x2e\x31\x33\x36\x2c\x30\x2d\x33\x32\x2d\x31\x33\x2e\x38\
-\x36\x34\x2d\x33\x32\x2d\x33\x32\x73\x31\x33\x2e\x38\x36\x34\x2d\
-\x33\x32\x2c\x33\x32\x2d\x33\x32\x0a\x09\x09\x09\x63\x31\x38\x2e\
-\x31\x33\x35\x2c\x30\x2c\x33\x32\x2c\x31\x33\x2e\x38\x36\x34\x2c\
-\x33\x32\x2c\x33\x32\x53\x31\x35\x36\x2e\x38\x30\x32\x2c\x32\x35\
-\x36\x2c\x31\x33\x38\x2e\x36\x36\x37\x2c\x32\x35\x36\x7a\x20\x4d\
-\x32\x30\x32\x2e\x36\x36\x37\x2c\x31\x37\x30\x2e\x36\x36\x37\x63\
-\x2d\x31\x38\x2e\x31\x33\x36\x2c\x30\x2d\x33\x32\x2d\x31\x33\x2e\
-\x38\x36\x35\x2d\x33\x32\x2d\x33\x32\x63\x30\x2d\x31\x38\x2e\x31\
-\x33\x36\x2c\x31\x33\x2e\x38\x36\x34\x2d\x33\x32\x2c\x33\x32\x2d\
-\x33\x32\x0a\x09\x09\x09\x63\x31\x38\x2e\x31\x33\x35\x2c\x30\x2c\
-\x33\x32\x2c\x31\x33\x2e\x38\x36\x34\x2c\x33\x32\x2c\x33\x32\x43\
-\x32\x33\x34\x2e\x36\x36\x37\x2c\x31\x35\x36\x2e\x38\x30\x32\x2c\
-\x32\x32\x30\x2e\x38\x30\x32\x2c\x31\x37\x30\x2e\x36\x36\x37\x2c\
-\x32\x30\x32\x2e\x36\x36\x37\x2c\x31\x37\x30\x2e\x36\x36\x37\x7a\
-\x20\x4d\x33\x30\x39\x2e\x33\x33\x33\x2c\x31\x37\x30\x2e\x36\x36\
-\x37\x63\x2d\x31\x38\x2e\x31\x33\x35\x2c\x30\x2d\x33\x32\x2d\x31\
-\x33\x2e\x38\x36\x35\x2d\x33\x32\x2d\x33\x32\x0a\x09\x09\x09\x63\
-\x30\x2d\x31\x38\x2e\x31\x33\x36\x2c\x31\x33\x2e\x38\x36\x35\x2d\
-\x33\x32\x2c\x33\x32\x2d\x33\x32\x63\x31\x38\x2e\x31\x33\x36\x2c\
-\x30\x2c\x33\x32\x2c\x31\x33\x2e\x38\x36\x34\x2c\x33\x32\x2c\x33\
-\x32\x43\x33\x34\x31\x2e\x33\x33\x33\x2c\x31\x35\x36\x2e\x38\x30\
-\x32\x2c\x33\x32\x37\x2e\x34\x36\x39\x2c\x31\x37\x30\x2e\x36\x36\
-\x37\x2c\x33\x30\x39\x2e\x33\x33\x33\x2c\x31\x37\x30\x2e\x36\x36\
-\x37\x7a\x20\x4d\x33\x37\x33\x2e\x33\x33\x33\x2c\x32\x35\x36\x0a\
-\x09\x09\x09\x63\x2d\x31\x38\x2e\x31\x33\x35\x2c\x30\x2d\x33\x32\
-\x2d\x31\x33\x2e\x38\x36\x34\x2d\x33\x32\x2d\x33\x32\x73\x31\x33\
-\x2e\x38\x36\x35\x2d\x33\x32\x2c\x33\x32\x2d\x33\x32\x63\x31\x38\
-\x2e\x31\x33\x36\x2c\x30\x2c\x33\x32\x2c\x31\x33\x2e\x38\x36\x34\
-\x2c\x33\x32\x2c\x33\x32\x53\x33\x39\x31\x2e\x34\x36\x39\x2c\x32\
-\x35\x36\x2c\x33\x37\x33\x2e\x33\x33\x33\x2c\x32\x35\x36\x7a\x22\
-\x2f\x3e\x0a\x09\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\
-\x73\x76\x67\x3e\x0a\
-\x00\x00\x05\xbb\
+\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x73\x74\x79\x6c\x65\
+\x3d\x22\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\
+\x75\x6e\x64\x3a\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\
+\x35\x31\x32\x3b\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\
+\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0a\x3c\x70\x6f\x6c\
+\x79\x67\x6f\x6e\x20\x70\x6f\x69\x6e\x74\x73\x3d\x22\x34\x38\x30\
+\x2c\x32\x35\x36\x20\x33\x38\x34\x2c\x31\x36\x30\x20\x33\x38\x34\
+\x2c\x32\x33\x36\x20\x32\x37\x36\x2c\x32\x33\x36\x20\x32\x37\x36\
+\x2c\x31\x32\x38\x20\x33\x35\x32\x2c\x31\x32\x38\x20\x32\x35\x36\
+\x2c\x33\x32\x20\x31\x36\x30\x2c\x31\x32\x38\x20\x32\x33\x36\x2c\
+\x31\x32\x38\x20\x32\x33\x36\x2c\x32\x33\x36\x20\x31\x32\x38\x2c\
+\x32\x33\x36\x20\x31\x32\x38\x2c\x31\x36\x30\x20\x33\x32\x2c\x32\
+\x35\x36\x20\x31\x32\x38\x2c\x33\x35\x32\x20\x0a\x09\x31\x32\x38\
+\x2c\x32\x37\x36\x20\x32\x33\x36\x2c\x32\x37\x36\x20\x32\x33\x36\
+\x2c\x33\x38\x34\x20\x31\x36\x30\x2c\x33\x38\x34\x20\x32\x35\x36\
+\x2c\x34\x38\x30\x20\x33\x35\x32\x2c\x33\x38\x34\x20\x32\x37\x35\
+\x2e\x38\x2c\x33\x38\x34\x20\x32\x37\x35\x2e\x34\x2c\x32\x37\x35\
+\x2e\x35\x20\x33\x38\x34\x2c\x32\x37\x35\x2e\x38\x20\x33\x38\x34\
+\x2c\x33\x35\x32\x20\x22\x2f\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\
+\x00\x00\x02\x98\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
@@ -1563,76 +1333,26 @@
\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
-\x76\x65\x22\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x34\
-\x35\x30\x2e\x36\x37\x39\x2c\x32\x37\x33\x2e\x35\x63\x2d\x31\x34\
-\x2e\x35\x38\x35\x2d\x31\x34\x2e\x35\x37\x37\x2d\x33\x36\x2e\x30\
-\x35\x34\x2d\x31\x35\x2e\x38\x39\x2d\x35\x30\x2e\x36\x33\x39\x2d\
-\x31\x2e\x33\x31\x32\x6c\x2d\x34\x31\x2e\x36\x38\x37\x2c\x34\x31\
-\x2e\x36\x36\x34\x63\x2d\x31\x30\x2e\x38\x35\x32\x2c\x31\x30\x2e\
-\x38\x33\x36\x2d\x32\x33\x2e\x39\x33\x2c\x31\x30\x2e\x38\x35\x39\
-\x2d\x33\x31\x2e\x35\x36\x34\x2c\x31\x2e\x38\x35\x32\x0a\x09\x63\
-\x2d\x35\x2e\x30\x35\x37\x2d\x35\x2e\x39\x36\x38\x2d\x33\x2e\x30\
-\x36\x31\x2d\x32\x34\x2e\x33\x37\x34\x2d\x31\x2e\x36\x34\x34\x2d\
-\x33\x36\x2e\x30\x34\x39\x6c\x32\x30\x2e\x39\x30\x37\x2d\x31\x37\
-\x31\x2e\x38\x34\x39\x63\x31\x2e\x38\x36\x37\x2d\x31\x35\x2e\x33\
-\x35\x33\x2d\x39\x2e\x30\x37\x2d\x33\x30\x2e\x31\x38\x35\x2d\x32\
-\x34\x2e\x34\x33\x2d\x33\x32\x2e\x30\x35\x31\x0a\x09\x63\x2d\x31\
-\x35\x2e\x33\x35\x38\x2d\x31\x2e\x38\x36\x37\x2d\x32\x39\x2e\x33\
-\x32\x32\x2c\x39\x2e\x39\x33\x39\x2d\x33\x31\x2e\x31\x39\x31\x2c\
-\x32\x35\x2e\x32\x38\x39\x4c\x32\x36\x37\x2e\x33\x37\x2c\x32\x33\
-\x36\x2e\x30\x32\x31\x63\x2d\x31\x2e\x32\x30\x35\x2c\x33\x2e\x33\
-\x35\x38\x2d\x33\x2e\x37\x39\x2c\x33\x2e\x39\x33\x38\x2d\x34\x2e\
-\x30\x38\x31\x2d\x30\x2e\x35\x38\x32\x4c\x32\x35\x35\x2e\x34\x34\
-\x2c\x36\x30\x0a\x09\x63\x30\x2d\x31\x35\x2e\x34\x36\x35\x2d\x31\
-\x32\x2e\x35\x34\x32\x2d\x32\x38\x2d\x32\x38\x2e\x30\x31\x34\x2d\
-\x32\x38\x63\x2d\x31\x35\x2e\x34\x37\x33\x2c\x30\x2d\x32\x38\x2e\
-\x30\x31\x35\x2c\x31\x32\x2e\x35\x33\x35\x2d\x32\x38\x2e\x30\x31\
-\x35\x2c\x32\x38\x6c\x2d\x30\x2e\x35\x35\x32\x2c\x31\x37\x36\x2e\
-\x37\x35\x32\x63\x30\x2e\x31\x34\x36\x2c\x32\x2e\x30\x34\x2d\x31\
-\x2e\x36\x30\x34\x2c\x32\x2e\x36\x32\x34\x2d\x31\x2e\x39\x32\x2c\
-\x30\x2e\x32\x39\x34\x4c\x31\x37\x32\x2e\x30\x31\x36\x2c\x39\x39\
-\x2e\x30\x37\x37\x0a\x09\x63\x2d\x32\x2e\x37\x35\x2d\x31\x35\x2e\
-\x32\x31\x39\x2d\x31\x37\x2e\x33\x32\x33\x2d\x32\x36\x2e\x32\x30\
-\x33\x2d\x33\x32\x2e\x35\x34\x38\x2d\x32\x33\x2e\x34\x35\x33\x63\
-\x2d\x31\x35\x2e\x32\x32\x37\x2c\x32\x2e\x37\x34\x38\x2d\x32\x35\
-\x2e\x33\x33\x39\x2c\x31\x38\x2e\x31\x38\x37\x2d\x32\x32\x2e\x35\
-\x39\x31\x2c\x33\x33\x2e\x34\x30\x33\x6c\x32\x32\x2e\x31\x39\x33\
-\x2c\x31\x36\x31\x2e\x34\x35\x35\x0a\x09\x63\x30\x2e\x30\x32\x33\
-\x2c\x32\x2e\x38\x37\x32\x2d\x30\x2e\x39\x34\x31\x2c\x34\x2e\x35\
-\x31\x33\x2d\x32\x2e\x33\x30\x38\x2c\x30\x2e\x38\x33\x31\x6c\x2d\
-\x33\x33\x2e\x31\x30\x39\x2d\x38\x38\x2e\x35\x31\x37\x63\x2d\x35\
-\x2e\x31\x38\x2d\x31\x34\x2e\x35\x37\x32\x2d\x32\x31\x2e\x31\x39\
-\x36\x2d\x32\x33\x2e\x30\x36\x35\x2d\x33\x35\x2e\x37\x37\x36\x2d\
-\x31\x37\x2e\x38\x38\x39\x0a\x09\x63\x2d\x31\x34\x2e\x35\x37\x39\
-\x2c\x35\x2e\x31\x37\x37\x2d\x32\x32\x2e\x32\x30\x31\x2c\x32\x32\
-\x2e\x30\x36\x31\x2d\x31\x37\x2e\x30\x32\x33\x2c\x33\x36\x2e\x36\
-\x33\x31\x6c\x35\x38\x2e\x30\x34\x32\x2c\x31\x38\x39\x2e\x36\x32\
-\x35\x63\x30\x2e\x33\x30\x33\x2c\x31\x2e\x30\x34\x36\x2c\x30\x2e\
-\x36\x32\x34\x2c\x32\x2e\x30\x38\x35\x2c\x30\x2e\x39\x35\x33\x2c\
-\x33\x2e\x31\x31\x38\x6c\x30\x2e\x31\x32\x31\x2c\x30\x2e\x33\x39\
-\x0a\x09\x63\x30\x2e\x30\x31\x31\x2c\x30\x2e\x30\x33\x31\x2c\x30\
-\x2e\x30\x32\x35\x2c\x30\x2e\x30\x35\x38\x2c\x30\x2e\x30\x33\x35\
-\x2c\x30\x2e\x30\x38\x38\x43\x31\x32\x36\x2e\x30\x37\x39\x2c\x34\
-\x34\x34\x2e\x32\x33\x33\x2c\x31\x37\x32\x2e\x35\x37\x2c\x34\x38\
-\x30\x2c\x32\x32\x37\x2e\x34\x32\x37\x2c\x34\x38\x30\x63\x33\x35\
-\x2e\x31\x31\x36\x2c\x30\x2c\x37\x31\x2e\x35\x39\x31\x2d\x31\x32\
-\x2e\x33\x37\x38\x2c\x39\x39\x2e\x33\x35\x37\x2d\x33\x33\x2e\x36\
-\x37\x32\x0a\x09\x63\x30\x2e\x30\x30\x31\x2c\x30\x2c\x30\x2e\x30\
-\x30\x33\x2d\x30\x2e\x30\x30\x32\x2c\x30\x2e\x30\x30\x33\x2d\x30\
-\x2e\x30\x30\x32\x63\x32\x39\x2e\x39\x39\x2d\x31\x38\x2e\x30\x35\
-\x31\x2c\x31\x32\x36\x2e\x30\x37\x31\x2d\x31\x32\x31\x2e\x33\x34\
-\x37\x2c\x31\x32\x36\x2e\x30\x37\x31\x2d\x31\x32\x31\x2e\x33\x34\
-\x37\x43\x34\x36\x37\x2e\x34\x34\x35\x2c\x33\x31\x30\x2e\x34\x30\
-\x32\x2c\x34\x36\x35\x2e\x32\x36\x36\x2c\x32\x38\x38\x2e\x30\x38\
-\x2c\x34\x35\x30\x2e\x36\x37\x39\x2c\x32\x37\x33\x2e\x35\x7a\x22\
-\x2f\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x02\xab\
+\x76\x65\x22\x3e\x0a\x3c\x67\x3e\x0a\x09\x3c\x70\x61\x74\x68\x20\
+\x64\x3d\x22\x4d\x31\x32\x38\x2c\x34\x30\x35\x2e\x34\x32\x39\x43\
+\x31\x32\x38\x2c\x34\x32\x38\x2e\x38\x34\x36\x2c\x31\x34\x37\x2e\
+\x31\x39\x38\x2c\x34\x34\x38\x2c\x31\x37\x30\x2e\x36\x36\x37\x2c\
+\x34\x34\x38\x68\x31\x37\x30\x2e\x36\x36\x37\x43\x33\x36\x34\x2e\
+\x38\x30\x32\x2c\x34\x34\x38\x2c\x33\x38\x34\x2c\x34\x32\x38\x2e\
+\x38\x34\x36\x2c\x33\x38\x34\x2c\x34\x30\x35\x2e\x34\x32\x39\x56\
+\x31\x36\x30\x48\x31\x32\x38\x56\x34\x30\x35\x2e\x34\x32\x39\x7a\
+\x20\x4d\x34\x31\x36\x2c\x39\x36\x0a\x09\x09\x68\x2d\x38\x30\x6c\
+\x2d\x32\x36\x2e\x37\x38\x35\x2d\x33\x32\x48\x32\x30\x32\x2e\x37\
+\x38\x36\x4c\x31\x37\x36\x2c\x39\x36\x48\x39\x36\x76\x33\x32\x68\
+\x33\x32\x30\x56\x39\x36\x7a\x22\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\
+\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x00\x00\x02\x97\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
-\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\x20\
+\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x38\x2e\x31\x2e\x31\x2c\x20\
\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
@@ -1643,34 +1363,33 @@
\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
-\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4c\
-\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\
-\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\
-\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\
-\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
-\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\
-\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
-\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
-\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
-\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
-\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\
-\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
-\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
-\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
-\x76\x65\x22\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x22\x49\x63\x6f\x6e\
-\x5f\x35\x5f\x22\x3e\x0a\x09\x3c\x67\x3e\x0a\x09\x09\x3c\x70\x6f\
-\x6c\x79\x67\x6f\x6e\x20\x70\x6f\x69\x6e\x74\x73\x3d\x22\x34\x30\
-\x35\x2c\x31\x33\x36\x2e\x37\x39\x38\x20\x33\x37\x35\x2e\x32\x30\
-\x32\x2c\x31\x30\x37\x20\x32\x35\x36\x2c\x32\x32\x36\x2e\x32\x30\
-\x32\x20\x31\x33\x36\x2e\x37\x39\x38\x2c\x31\x30\x37\x20\x31\x30\
-\x37\x2c\x31\x33\x36\x2e\x37\x39\x38\x20\x32\x32\x36\x2e\x32\x30\
-\x32\x2c\x32\x35\x36\x20\x31\x30\x37\x2c\x33\x37\x35\x2e\x32\x30\
-\x32\x20\x31\x33\x36\x2e\x37\x39\x38\x2c\x34\x30\x35\x20\x32\x35\
-\x36\x2c\x32\x38\x35\x2e\x37\x39\x38\x20\x0a\x09\x09\x09\x33\x37\
-\x35\x2e\x32\x30\x32\x2c\x34\x30\x35\x20\x34\x30\x35\x2c\x33\x37\
-\x35\x2e\x32\x30\x32\x20\x32\x38\x35\x2e\x37\x39\x38\x2c\x32\x35\
-\x36\x20\x09\x09\x22\x2f\x3e\x0a\x09\x3c\x2f\x67\x3e\x0a\x3c\x2f\
-\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x53\
+\x61\x76\x65\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\
+\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\
+\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x78\x6c\
+\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
+\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\x6c\x69\x6e\
+\x6b\x22\x20\x78\x3d\x22\x35\x31\x32\x70\x78\x22\x20\x79\x3d\x22\
+\x35\x31\x32\x70\x78\x22\x0a\x09\x20\x76\x69\x65\x77\x42\x6f\x78\
+\x3d\x22\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\
+\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\
+\x3d\x22\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\
+\x32\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\
+\x65\x73\x65\x72\x76\x65\x22\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\
+\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x32\x34\
+\x20\x30\x20\x30\x20\x32\x34\x20\x30\x20\x30\x29\x27\x3e\x0a\x3c\
+\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x31\x35\x2e\x31\x37\x33\x2c\
+\x32\x48\x34\x43\x32\x2e\x38\x39\x39\x2c\x32\x2c\x32\x2c\x32\x2e\
+\x39\x2c\x32\x2c\x34\x76\x31\x32\x63\x30\x2c\x31\x2e\x31\x2c\x30\
+\x2e\x38\x39\x39\x2c\x32\x2c\x32\x2c\x32\x68\x31\x32\x63\x31\x2e\
+\x31\x30\x31\x2c\x30\x2c\x32\x2d\x30\x2e\x39\x2c\x32\x2d\x32\x56\
+\x35\x2e\x31\x32\x37\x4c\x31\x35\x2e\x31\x37\x33\x2c\x32\x7a\x20\
+\x4d\x31\x34\x2c\x38\x63\x30\x2c\x30\x2e\x35\x34\x39\x2d\x30\x2e\
+\x34\x35\x2c\x31\x2d\x31\x2c\x31\x48\x37\x0a\x09\x43\x36\x2e\x34\
+\x35\x2c\x39\x2c\x36\x2c\x38\x2e\x35\x34\x39\x2c\x36\x2c\x38\x56\
+\x33\x68\x38\x56\x38\x7a\x20\x4d\x31\x33\x2c\x34\x68\x2d\x32\x76\
+\x34\x68\x32\x56\x34\x7a\x22\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\
+\x2f\x73\x76\x67\x3e\x0a\
\x00\x00\x03\x1b\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
@@ -1723,33 +1442,8 @@
\x33\x2e\x35\x36\x31\x2c\x33\x31\x31\x2e\x37\x31\x32\x2c\x33\x38\
\x38\x2c\x32\x35\x36\x2c\x33\x38\x38\x7a\x22\x2f\x3e\x0a\x3c\x2f\
\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x01\x69\
+\x00\x00\x02\xee\
\x3c\
-\x73\x76\x67\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\
-\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\
-\x30\x2f\x73\x76\x67\x22\x20\x77\x69\x64\x74\x68\x3d\x22\x35\x31\
-\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\x32\
-\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\x30\
-\x20\x35\x31\x32\x20\x35\x31\x32\x22\x3e\x3c\x67\x20\x74\x72\x61\
-\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x32\
-\x34\x20\x30\x20\x30\x20\x32\x34\x20\x30\x20\x30\x29\x27\x3e\x3c\
-\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x34\x2e\x33\x34\x20\x31\x35\
-\x2e\x36\x36\x41\x37\x2e\x39\x37\x20\x37\x2e\x39\x37\x20\x30\x20\
-\x30\x20\x30\x20\x39\x20\x31\x37\x2e\x39\x34\x56\x31\x30\x48\x35\
-\x56\x38\x68\x34\x56\x35\x2e\x38\x33\x61\x33\x20\x33\x20\x30\x20\
-\x31\x20\x31\x20\x32\x20\x30\x56\x38\x68\x34\x76\x32\x68\x2d\x34\
-\x76\x37\x2e\x39\x34\x61\x37\x2e\x39\x37\x20\x37\x2e\x39\x37\x20\
-\x30\x20\x30\x20\x30\x20\x34\x2e\x36\x36\x2d\x32\x2e\x32\x38\x6c\
-\x2d\x31\x2e\x34\x32\x2d\x31\x2e\x34\x32\x68\x35\x2e\x36\x36\x6c\
-\x2d\x32\x2e\x38\x33\x20\x32\x2e\x38\x33\x61\x31\x30\x20\x31\x30\
-\x20\x30\x20\x30\x20\x31\x2d\x31\x34\x2e\x31\x34\x20\x30\x4c\x2e\
-\x31\x20\x31\x34\x2e\x32\x34\x68\x35\x2e\x36\x36\x6c\x2d\x31\x2e\
-\x34\x32\x20\x31\x2e\x34\x32\x7a\x4d\x31\x30\x20\x34\x61\x31\x20\
-\x31\x20\x30\x20\x31\x20\x30\x20\x30\x2d\x32\x20\x31\x20\x31\x20\
-\x30\x20\x30\x20\x30\x20\x30\x20\x32\x7a\x22\x2f\x3e\x3c\x2f\x67\
-\x3e\x3c\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x02\xc1\
-\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
@@ -1779,22 +1473,319 @@
\x3d\x22\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\
\x75\x6e\x64\x3a\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\
\x35\x31\x32\x3b\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\
-\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0a\x3c\x70\x6f\x6c\
-\x79\x67\x6f\x6e\x20\x70\x6f\x69\x6e\x74\x73\x3d\x22\x34\x38\x30\
-\x2c\x32\x35\x36\x20\x33\x38\x34\x2c\x31\x36\x30\x20\x33\x38\x34\
-\x2c\x32\x33\x36\x20\x32\x37\x36\x2c\x32\x33\x36\x20\x32\x37\x36\
-\x2c\x31\x32\x38\x20\x33\x35\x32\x2c\x31\x32\x38\x20\x32\x35\x36\
-\x2c\x33\x32\x20\x31\x36\x30\x2c\x31\x32\x38\x20\x32\x33\x36\x2c\
-\x31\x32\x38\x20\x32\x33\x36\x2c\x32\x33\x36\x20\x31\x32\x38\x2c\
-\x32\x33\x36\x20\x31\x32\x38\x2c\x31\x36\x30\x20\x33\x32\x2c\x32\
-\x35\x36\x20\x31\x32\x38\x2c\x33\x35\x32\x20\x0a\x09\x31\x32\x38\
-\x2c\x32\x37\x36\x20\x32\x33\x36\x2c\x32\x37\x36\x20\x32\x33\x36\
-\x2c\x33\x38\x34\x20\x31\x36\x30\x2c\x33\x38\x34\x20\x32\x35\x36\
-\x2c\x34\x38\x30\x20\x33\x35\x32\x2c\x33\x38\x34\x20\x32\x37\x35\
-\x2e\x38\x2c\x33\x38\x34\x20\x32\x37\x35\x2e\x34\x2c\x32\x37\x35\
-\x2e\x35\x20\x33\x38\x34\x2c\x32\x37\x35\x2e\x38\x20\x33\x38\x34\
-\x2c\x33\x35\x32\x20\x22\x2f\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
-\
+\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0a\x3c\x70\x61\x74\
+\x68\x20\x64\x3d\x22\x4d\x34\x31\x37\x2e\x34\x2c\x32\x32\x34\x48\
+\x32\x38\x38\x56\x39\x34\x2e\x36\x63\x30\x2d\x31\x36\x2e\x39\x2d\
+\x31\x34\x2e\x33\x2d\x33\x30\x2e\x36\x2d\x33\x32\x2d\x33\x30\x2e\
+\x36\x63\x2d\x31\x37\x2e\x37\x2c\x30\x2d\x33\x32\x2c\x31\x33\x2e\
+\x37\x2d\x33\x32\x2c\x33\x30\x2e\x36\x56\x32\x32\x34\x48\x39\x34\
+\x2e\x36\x43\x37\x37\x2e\x37\x2c\x32\x32\x34\x2c\x36\x34\x2c\x32\
+\x33\x38\x2e\x33\x2c\x36\x34\x2c\x32\x35\x36\x0a\x09\x63\x30\x2c\
+\x31\x37\x2e\x37\x2c\x31\x33\x2e\x37\x2c\x33\x32\x2c\x33\x30\x2e\
+\x36\x2c\x33\x32\x48\x32\x32\x34\x76\x31\x32\x39\x2e\x34\x63\x30\
+\x2c\x31\x36\x2e\x39\x2c\x31\x34\x2e\x33\x2c\x33\x30\x2e\x36\x2c\
+\x33\x32\x2c\x33\x30\x2e\x36\x63\x31\x37\x2e\x37\x2c\x30\x2c\x33\
+\x32\x2d\x31\x33\x2e\x37\x2c\x33\x32\x2d\x33\x30\x2e\x36\x56\x32\
+\x38\x38\x68\x31\x32\x39\x2e\x34\x63\x31\x36\x2e\x39\x2c\x30\x2c\
+\x33\x30\x2e\x36\x2d\x31\x34\x2e\x33\x2c\x33\x30\x2e\x36\x2d\x33\
+\x32\x0a\x09\x43\x34\x34\x38\x2c\x32\x33\x38\x2e\x33\x2c\x34\x33\
+\x34\x2e\x33\x2c\x32\x32\x34\x2c\x34\x31\x37\x2e\x34\x2c\x32\x32\
+\x34\x7a\x22\x2f\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x00\x00\x03\x16\
+\x3c\
+\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
+\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
+\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
+\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
+\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\x20\
+\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
+\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
+\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
+\x20\x2d\x2d\x3e\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x73\
+\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\x57\x33\
+\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\x2f\x2f\
+\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
+\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
+\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
+\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
+\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4c\
+\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\
+\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\
+\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\
+\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
+\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\
+\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
+\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
+\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
+\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
+\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\
+\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
+\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
+\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
+\x76\x65\x22\x3e\x0a\x3c\x67\x3e\x0a\x09\x3c\x63\x69\x72\x63\x6c\
+\x65\x20\x63\x78\x3d\x22\x32\x35\x36\x22\x20\x63\x79\x3d\x22\x32\
+\x38\x30\x22\x20\x72\x3d\x22\x36\x33\x22\x2f\x3e\x0a\x09\x3c\x70\
+\x61\x74\x68\x20\x64\x3d\x22\x4d\x34\x34\x30\x2c\x39\x36\x68\x2d\
+\x38\x38\x6c\x2d\x33\x32\x2d\x33\x32\x48\x31\x39\x32\x6c\x2d\x33\
+\x32\x2c\x33\x32\x48\x37\x32\x63\x2d\x32\x32\x2e\x30\x39\x32\x2c\
+\x30\x2d\x34\x30\x2c\x31\x37\x2e\x39\x30\x38\x2d\x34\x30\x2c\x34\
+\x30\x76\x32\x37\x32\x63\x30\x2c\x32\x32\x2e\x30\x39\x32\x2c\x31\
+\x37\x2e\x39\x30\x38\x2c\x34\x30\x2c\x34\x30\x2c\x34\x30\x68\x33\
+\x36\x38\x63\x32\x32\x2e\x30\x39\x32\x2c\x30\x2c\x34\x30\x2d\x31\
+\x37\x2e\x39\x30\x38\x2c\x34\x30\x2d\x34\x30\x0a\x09\x09\x56\x31\
+\x33\x36\x43\x34\x38\x30\x2c\x31\x31\x33\x2e\x39\x30\x38\x2c\x34\
+\x36\x32\x2e\x30\x39\x32\x2c\x39\x36\x2c\x34\x34\x30\x2c\x39\x36\
+\x7a\x20\x4d\x32\x35\x36\x2c\x33\x39\x32\x63\x2d\x36\x31\x2e\x38\
+\x35\x35\x2c\x30\x2d\x31\x31\x32\x2d\x35\x30\x2e\x31\x34\x35\x2d\
+\x31\x31\x32\x2d\x31\x31\x32\x73\x35\x30\x2e\x31\x34\x35\x2d\x31\
+\x31\x32\x2c\x31\x31\x32\x2d\x31\x31\x32\x73\x31\x31\x32\x2c\x35\
+\x30\x2e\x31\x34\x35\x2c\x31\x31\x32\x2c\x31\x31\x32\x0a\x09\x09\
+\x53\x33\x31\x37\x2e\x38\x35\x35\x2c\x33\x39\x32\x2c\x32\x35\x36\
+\x2c\x33\x39\x32\x7a\x22\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\
+\x73\x76\x67\x3e\x0a\
+\x00\x00\x02\xf0\
+\x3c\
+\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
+\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
+\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
+\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
+\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\x20\
+\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
+\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
+\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
+\x20\x2d\x2d\x3e\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x73\
+\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\x57\x33\
+\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\x2f\x2f\
+\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
+\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
+\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
+\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
+\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4c\
+\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\
+\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\
+\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\
+\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
+\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\
+\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
+\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
+\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
+\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
+\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\
+\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
+\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
+\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
+\x76\x65\x22\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x22\x49\x63\x6f\x6e\
+\x5f\x32\x30\x5f\x22\x3e\x0a\x09\x3c\x67\x3e\x0a\x09\x09\x3c\x70\
+\x61\x74\x68\x20\x64\x3d\x22\x4d\x32\x35\x36\x2c\x34\x38\x43\x31\
+\x34\x31\x2e\x36\x30\x31\x2c\x34\x38\x2c\x34\x38\x2c\x31\x34\x31\
+\x2e\x36\x30\x31\x2c\x34\x38\x2c\x32\x35\x36\x73\x39\x33\x2e\x36\
+\x30\x31\x2c\x32\x30\x38\x2c\x32\x30\x38\x2c\x32\x30\x38\x73\x32\
+\x30\x38\x2d\x39\x33\x2e\x36\x30\x31\x2c\x32\x30\x38\x2d\x32\x30\
+\x38\x53\x33\x37\x30\x2e\x33\x39\x39\x2c\x34\x38\x2c\x32\x35\x36\
+\x2c\x34\x38\x7a\x20\x4d\x32\x35\x36\x2c\x34\x32\x32\x2e\x33\x39\
+\x39\x0a\x09\x09\x09\x63\x2d\x39\x31\x2e\x35\x31\x38\x2c\x30\x2d\
+\x31\x36\x36\x2e\x33\x39\x39\x2d\x37\x34\x2e\x38\x38\x32\x2d\x31\
+\x36\x36\x2e\x33\x39\x39\x2d\x31\x36\x36\x2e\x33\x39\x39\x53\x31\
+\x36\x34\x2e\x34\x38\x32\x2c\x38\x39\x2e\x36\x2c\x32\x35\x36\x2c\
+\x38\x39\x2e\x36\x53\x34\x32\x32\x2e\x34\x2c\x31\x36\x34\x2e\x34\
+\x38\x32\x2c\x34\x32\x32\x2e\x34\x2c\x32\x35\x36\x53\x33\x34\x37\
+\x2e\x35\x31\x38\x2c\x34\x32\x32\x2e\x33\x39\x39\x2c\x32\x35\x36\
+\x2c\x34\x32\x32\x2e\x33\x39\x39\x7a\x22\x2f\x3e\x0a\x09\x3c\x2f\
+\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x00\x00\x03\xda\
+\x3c\
+\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
+\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
+\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
+\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
+\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x30\x2e\x30\x2c\x20\
+\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
+\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
+\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
+\x20\x2d\x2d\x3e\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x73\
+\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\x57\x33\
+\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\x2f\x2f\
+\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
+\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
+\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
+\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
+\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4c\
+\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\
+\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\
+\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\
+\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
+\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\
+\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
+\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
+\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
+\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
+\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\
+\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
+\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
+\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
+\x76\x65\x22\x3e\x0a\x3c\x67\x3e\x0a\x09\x3c\x70\x61\x74\x68\x20\
+\x64\x3d\x22\x4d\x34\x38\x2e\x34\x35\x31\x2c\x34\x36\x34\x2e\x38\
+\x32\x38\x63\x34\x30\x2e\x30\x32\x33\x2d\x30\x2e\x33\x31\x35\x2c\
+\x34\x35\x2e\x30\x31\x2d\x39\x2e\x39\x35\x35\x2c\x35\x38\x2e\x30\
+\x35\x32\x2d\x35\x30\x2e\x31\x33\x32\x63\x32\x34\x2e\x30\x35\x37\
+\x2d\x36\x33\x2e\x34\x30\x38\x2c\x31\x33\x32\x2e\x34\x31\x39\x2c\
+\x31\x36\x2e\x35\x39\x31\x2c\x36\x35\x2e\x32\x36\x39\x2c\x34\x34\
+\x2e\x33\x37\x34\x0a\x09\x09\x43\x31\x30\x34\x2e\x36\x32\x32\x2c\
+\x34\x38\x36\x2e\x38\x35\x32\x2c\x38\x2e\x34\x32\x38\x2c\x34\x36\
+\x35\x2e\x31\x34\x33\x2c\x34\x38\x2e\x34\x35\x31\x2c\x34\x36\x34\
+\x2e\x38\x32\x38\x7a\x22\x2f\x3e\x0a\x09\x3c\x70\x61\x74\x68\x20\
+\x64\x3d\x22\x4d\x34\x35\x38\x2e\x38\x35\x37\x2c\x34\x36\x2e\x39\
+\x30\x32\x63\x2d\x31\x39\x2e\x34\x31\x37\x2d\x31\x35\x2e\x36\x34\
+\x37\x2d\x35\x31\x2e\x35\x39\x32\x2d\x37\x2e\x39\x33\x38\x2d\x37\
+\x31\x2e\x38\x36\x34\x2c\x31\x37\x2e\x32\x31\x39\x4c\x31\x38\x31\
+\x2e\x36\x34\x35\x2c\x33\x35\x35\x2e\x38\x34\x39\x63\x2d\x32\x30\
+\x2e\x32\x37\x32\x2c\x32\x35\x2e\x31\x35\x34\x2d\x32\x30\x2e\x31\
+\x37\x31\x2c\x32\x30\x2e\x33\x34\x37\x2d\x30\x2e\x37\x35\x34\x2c\
+\x33\x35\x2e\x39\x39\x32\x0a\x09\x09\x63\x31\x39\x2e\x34\x31\x37\
+\x2c\x31\x35\x2e\x36\x34\x38\x2c\x31\x34\x2e\x37\x33\x38\x2c\x31\
+\x36\x2e\x37\x37\x2c\x33\x35\x2e\x30\x31\x31\x2d\x38\x2e\x33\x38\
+\x38\x6c\x32\x34\x31\x2e\x34\x30\x36\x2d\x32\x36\x32\x2e\x36\x36\
+\x39\x43\x34\x37\x37\x2e\x35\x38\x31\x2c\x39\x35\x2e\x36\x32\x38\
+\x2c\x34\x37\x38\x2e\x32\x37\x35\x2c\x36\x32\x2e\x35\x35\x2c\x34\
+\x35\x38\x2e\x38\x35\x37\x2c\x34\x36\x2e\x39\x30\x32\x7a\x20\x4d\
+\x34\x30\x36\x2e\x30\x36\x35\x2c\x38\x31\x2e\x38\x32\x35\x0a\x09\
+\x09\x63\x30\x2c\x30\x2d\x33\x2d\x33\x2e\x35\x2d\x31\x33\x2d\x31\
+\x31\x2e\x35\x63\x31\x35\x2d\x32\x34\x2e\x35\x2c\x34\x34\x2e\x35\
+\x2d\x32\x30\x2c\x34\x34\x2e\x35\x2d\x32\x30\x43\x34\x30\x39\x2e\
+\x35\x36\x35\x2c\x36\x36\x2e\x38\x32\x35\x2c\x34\x30\x36\x2e\x30\
+\x36\x35\x2c\x38\x31\x2e\x38\x32\x35\x2c\x34\x30\x36\x2e\x30\x36\
+\x35\x2c\x38\x31\x2e\x38\x32\x35\x7a\x22\x2f\x3e\x0a\x3c\x2f\x67\
+\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x00\x00\x02\x72\
+\x3c\
+\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
+\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
+\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
+\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
+\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\x20\
+\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
+\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
+\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
+\x20\x2d\x2d\x3e\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x73\
+\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\x57\x33\
+\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\x2f\x2f\
+\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
+\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
+\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
+\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
+\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4c\
+\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\
+\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\
+\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\
+\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
+\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\
+\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
+\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
+\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
+\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
+\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\
+\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
+\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
+\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
+\x76\x65\x22\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x22\x49\x63\x6f\x6e\
+\x5f\x38\x5f\x22\x3e\x0a\x09\x3c\x67\x3e\x0a\x09\x09\x3c\x70\x61\
+\x74\x68\x20\x64\x3d\x22\x4d\x34\x32\x37\x2c\x32\x33\x34\x2e\x36\
+\x32\x35\x48\x31\x36\x37\x2e\x32\x39\x36\x6c\x31\x31\x39\x2e\x37\
+\x30\x32\x2d\x31\x31\x39\x2e\x37\x30\x32\x4c\x32\x35\x36\x2c\x38\
+\x35\x4c\x38\x35\x2c\x32\x35\x36\x6c\x31\x37\x31\x2c\x31\x37\x31\
+\x6c\x32\x39\x2e\x39\x32\x32\x2d\x32\x39\x2e\x39\x32\x34\x4c\x31\
+\x36\x37\x2e\x32\x39\x36\x2c\x32\x37\x37\x2e\x33\x37\x35\x48\x34\
+\x32\x37\x56\x32\x33\x34\x2e\x36\x32\x35\x7a\x22\x2f\x3e\x0a\x09\
+\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\
+\x0a\
+\x00\x00\x01\xd8\
+\x00\
+\x00\x06\xc4\x78\x9c\xcd\x54\x4d\x6f\x9b\x40\x10\x3d\xe3\x5f\x31\
+\xdd\x5b\x25\xf6\x0b\x62\x62\x53\xe3\xa8\xfe\x90\x65\x29\x6d\x2d\
+\x35\x75\xd5\x53\x85\x61\x0b\x28\x14\x10\x2c\x60\xe7\xd7\x77\x77\
+\xed\x54\xa9\x14\x5f\x43\x0f\x3b\xab\x9d\x79\xf3\xe6\x0d\x4f\x62\
+\x76\x77\xfc\x9d\x43\x27\xea\x26\x2b\x8b\x00\x71\xc2\x10\x88\x22\
+\x2a\xe3\xac\x48\x02\xd4\xca\x5f\x78\x82\xee\xe6\xa3\xd9\x3b\x8c\
+\x61\x23\x0a\x51\x87\xb2\xac\x7d\xf8\x18\x97\x07\x01\xdb\x3c\x6f\
+\x1b\x69\x52\xc0\x3d\xe2\x10\x6e\xc3\xd7\xfd\x06\xd6\xc7\xaa\xac\
+\x25\xec\xf2\x36\xc1\xdb\x02\x88\x49\xee\xcf\x33\x7c\xf0\x08\x63\
+\xb0\x68\xb3\x3c\x06\xf6\x1e\x00\x63\x4d\xbf\xfa\xb2\x7c\xf8\xb1\
+\x5b\x43\xd3\x25\xb0\xfb\xb6\xb8\xdf\x2e\x01\x61\x4a\xbf\xbb\x4b\
+\x4a\x57\x0f\x2b\xc3\xc0\x09\xa7\x74\xfd\x19\x01\x4a\xa5\xac\x7c\
+\x4a\xfb\xbe\x27\xbd\x4b\xca\x3a\xa1\x9b\x3a\xac\xd2\x2c\x6a\xa8\
+\x02\x52\x0d\x54\x4d\x54\x91\x71\x4e\x62\x19\x23\x35\x42\x33\xbf\
+\xd8\x93\x23\xc8\xe2\x00\xdd\x87\x27\x51\xff\x54\x0f\xf5\x19\x8a\
+\x26\x78\x85\xd9\x61\x8c\x69\xa6\x0b\xc4\x3f\xe6\x59\xf1\xf8\x1a\
+\x90\x4f\xa7\x53\x6a\xaa\x0a\x1a\x20\x56\x1d\x11\x9c\xce\xf7\xc8\
+\x82\x3e\x8b\x65\x1a\xa0\x31\x77\x74\x3e\x15\x59\x92\xca\xbf\xcf\
+\x2e\x13\xfd\xa2\xd4\x4d\xc0\x40\xe5\xf4\x41\xd0\xc8\x53\x2e\x02\
+\x24\x8a\xf0\x90\x0b\x7c\x08\xa3\xc7\xa4\x2e\xdb\x22\xf6\x0b\xd1\
+\xc3\x0b\xe4\x07\x23\xcd\x6f\xaa\x30\x52\xf0\xaa\x16\x8d\xa8\x3b\
+\xa1\x77\x4e\xe6\x23\xcb\x04\x6b\x56\x85\x32\x05\xb5\xf0\x27\xee\
+\x31\x9b\x8f\x5d\xe2\x46\xcc\x76\xc9\x2d\x76\x6d\x4f\x45\x75\xf4\
+\x9d\xe2\x31\x23\xe3\x08\xab\x82\xcd\x74\x12\xbb\xf8\x52\xee\xce\
+\x25\x66\x6a\xee\x73\x83\xbe\x53\x53\x30\x2d\x3a\x65\x1b\x46\x7d\
+\xf6\x66\xce\x93\x5a\xdf\xb2\xe8\xbf\x2a\x9c\xc9\xe4\x3f\x50\x71\
+\xc3\xbd\xa1\x54\xcc\xe8\x35\x73\x9c\x09\x7f\x13\x41\x66\xce\x55\
+\x73\x86\x57\xa1\xcd\x19\x48\xc5\x75\x73\x6e\xd8\xf4\x4d\x04\x99\
+\x39\x57\xcd\x19\x5e\x85\x36\x67\x20\x15\xc6\x9c\x4b\x50\xff\xe5\
+\xf9\xe8\x0f\x44\x1a\x94\x79\
+\x00\x00\x03\x5a\
+\x3c\
+\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x27\x31\x2e\
+\x30\x27\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x27\x55\x54\x46\
+\x2d\x38\x27\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x54\x68\x69\x73\x20\
+\x66\x69\x6c\x65\x20\x77\x61\x73\x20\x67\x65\x6e\x65\x72\x61\x74\
+\x65\x64\x20\x62\x79\x20\x64\x76\x69\x73\x76\x67\x6d\x20\x32\x2e\
+\x31\x31\x2e\x31\x20\x2d\x2d\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\
+\x72\x73\x69\x6f\x6e\x3d\x27\x31\x2e\x31\x27\x20\x78\x6d\x6c\x6e\
+\x73\x3d\x27\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\
+\x2e\x6f\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x27\x20\x78\
+\x6d\x6c\x6e\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x27\x68\x74\x74\x70\
+\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\
+\x39\x39\x2f\x78\x6c\x69\x6e\x6b\x27\x20\x77\x69\x64\x74\x68\x3d\
+\x27\x36\x33\x2e\x39\x39\x39\x36\x70\x74\x27\x20\x68\x65\x69\x67\
+\x68\x74\x3d\x27\x36\x34\x70\x74\x27\x20\x76\x69\x65\x77\x42\x6f\
+\x78\x3d\x27\x35\x36\x2e\x34\x30\x39\x34\x20\x31\x31\x37\x2e\x38\
+\x35\x38\x20\x36\x33\x2e\x39\x39\x39\x36\x20\x36\x34\x27\x3e\x0a\
+\x3c\x67\x20\x69\x64\x3d\x27\x70\x61\x67\x65\x31\x27\x3e\x0a\x3c\
+\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\
+\x6e\x73\x6c\x61\x74\x65\x28\x35\x36\x2e\x34\x30\x39\x34\x20\x31\
+\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\
+\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\
+\x27\x4d\x20\x32\x2e\x30\x30\x37\x35\x20\x36\x32\x2e\x32\x33\x32\
+\x35\x4c\x20\x36\x32\x2e\x32\x33\x32\x35\x20\x36\x32\x2e\x32\x33\
+\x32\x35\x4c\x20\x36\x32\x2e\x32\x33\x32\x35\x20\x32\x2e\x30\x30\
+\x37\x35\x4c\x20\x32\x2e\x30\x30\x37\x35\x20\x32\x2e\x30\x30\x37\
+\x35\x4c\x20\x32\x2e\x30\x30\x37\x35\x20\x36\x32\x2e\x32\x33\x32\
+\x35\x5a\x27\x20\x66\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\
+\x73\x74\x72\x6f\x6b\x65\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\
+\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\x3d\
+\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\
+\x69\x6e\x65\x6a\x6f\x69\x6e\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\
+\x73\x74\x72\x6f\x6b\x65\x2d\x6d\x69\x74\x65\x72\x6c\x69\x6d\x69\
+\x74\x3d\x27\x31\x30\x2e\x30\x33\x37\x35\x27\x20\x73\x74\x72\x6f\
+\x6b\x65\x2d\x77\x69\x64\x74\x68\x3d\x27\x34\x2e\x30\x31\x35\x27\
+\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\
+\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\
+\x35\x36\x2e\x34\x30\x39\x34\x20\x31\x31\x37\x2e\x38\x35\x38\x29\
+\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\x36\x32\x36\x34\x29\x27\x3e\
+\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x27\x4d\x20\x34\x37\x2e\x31\
+\x37\x36\x32\x20\x33\x32\x2e\x31\x32\x43\x20\x34\x37\x2e\x31\x37\
+\x36\x32\x20\x32\x33\x2e\x38\x30\x34\x37\x20\x34\x30\x2e\x34\x33\
+\x35\x33\x20\x31\x37\x2e\x30\x36\x33\x37\x20\x33\x32\x2e\x31\x32\
+\x20\x31\x37\x2e\x30\x36\x33\x37\x43\x20\x32\x33\x2e\x38\x30\x34\
+\x37\x20\x31\x37\x2e\x30\x36\x33\x37\x20\x31\x37\x2e\x30\x36\x33\
+\x37\x20\x32\x33\x2e\x38\x30\x34\x37\x20\x31\x37\x2e\x30\x36\x33\
+\x37\x20\x33\x32\x2e\x31\x32\x43\x20\x31\x37\x2e\x30\x36\x33\x37\
+\x20\x34\x30\x2e\x34\x33\x35\x33\x20\x32\x33\x2e\x38\x30\x34\x37\
+\x20\x34\x37\x2e\x31\x37\x36\x32\x20\x33\x32\x2e\x31\x32\x20\x34\
+\x37\x2e\x31\x37\x36\x32\x43\x20\x34\x30\x2e\x34\x33\x35\x33\x20\
+\x34\x37\x2e\x31\x37\x36\x32\x20\x34\x37\x2e\x31\x37\x36\x32\x20\
+\x34\x30\x2e\x34\x33\x35\x33\x20\x34\x37\x2e\x31\x37\x36\x32\x20\
+\x33\x32\x2e\x31\x32\x5a\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\x30\
+\x30\x30\x30\x30\x30\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\
+\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\
\x00\x00\x02\x1c\
\x00\
\x00\x07\x5c\x78\x9c\xdd\x55\x4d\x73\x9b\x30\x10\xbd\xf7\x57\x6c\
@@ -1831,39 +1822,7 @@
\xeb\xd5\x2d\xb2\x5f\x08\x95\x30\x76\xde\x22\x9c\x26\x32\x91\x7e\
\x8b\x4e\xe8\x62\x8b\x5c\xd8\xcf\xc6\xcb\x17\xef\xc3\x7f\xd3\xba\
\xd3\xc5\x7e\xcc\xee\x7e\x01\xb3\x30\xdb\xa9\
-\x00\x00\x01\xd8\
-\x00\
-\x00\x06\xc4\x78\x9c\xcd\x54\x4d\x6f\x9b\x40\x10\x3d\xe3\x5f\x31\
-\xdd\x5b\x25\xf6\x0b\x62\x62\x53\xe3\xa8\xfe\x90\x65\x29\x6d\x2d\
-\x35\x75\xd5\x53\x85\x61\x0b\x28\x14\x10\x2c\x60\xe7\xd7\x77\x77\
-\xed\x54\xa9\x14\x5f\x43\x0f\x3b\xab\x9d\x79\xf3\xe6\x0d\x4f\x62\
-\x76\x77\xfc\x9d\x43\x27\xea\x26\x2b\x8b\x00\x71\xc2\x10\x88\x22\
-\x2a\xe3\xac\x48\x02\xd4\xca\x5f\x78\x82\xee\xe6\xa3\xd9\x3b\x8c\
-\x61\x23\x0a\x51\x87\xb2\xac\x7d\xf8\x18\x97\x07\x01\xdb\x3c\x6f\
-\x1b\x69\x52\xc0\x3d\xe2\x10\x6e\xc3\xd7\xfd\x06\xd6\xc7\xaa\xac\
-\x25\xec\xf2\x36\xc1\xdb\x02\x88\x49\xee\xcf\x33\x7c\xf0\x08\x63\
-\xb0\x68\xb3\x3c\x06\xf6\x1e\x00\x63\x4d\xbf\xfa\xb2\x7c\xf8\xb1\
-\x5b\x43\xd3\x25\xb0\xfb\xb6\xb8\xdf\x2e\x01\x61\x4a\xbf\xbb\x4b\
-\x4a\x57\x0f\x2b\xc3\xc0\x09\xa7\x74\xfd\x19\x01\x4a\xa5\xac\x7c\
-\x4a\xfb\xbe\x27\xbd\x4b\xca\x3a\xa1\x9b\x3a\xac\xd2\x2c\x6a\xa8\
-\x02\x52\x0d\x54\x4d\x54\x91\x71\x4e\x62\x19\x23\x35\x42\x33\xbf\
-\xd8\x93\x23\xc8\xe2\x00\xdd\x87\x27\x51\xff\x54\x0f\xf5\x19\x8a\
-\x26\x78\x85\xd9\x61\x8c\x69\xa6\x0b\xc4\x3f\xe6\x59\xf1\xf8\x1a\
-\x90\x4f\xa7\x53\x6a\xaa\x0a\x1a\x20\x56\x1d\x11\x9c\xce\xf7\xc8\
-\x82\x3e\x8b\x65\x1a\xa0\x31\x77\x74\x3e\x15\x59\x92\xca\xbf\xcf\
-\x2e\x13\xfd\xa2\xd4\x4d\xc0\x40\xe5\xf4\x41\xd0\xc8\x53\x2e\x02\
-\x24\x8a\xf0\x90\x0b\x7c\x08\xa3\xc7\xa4\x2e\xdb\x22\xf6\x0b\xd1\
-\xc3\x0b\xe4\x07\x23\xcd\x6f\xaa\x30\x52\xf0\xaa\x16\x8d\xa8\x3b\
-\xa1\x77\x4e\xe6\x23\xcb\x04\x6b\x56\x85\x32\x05\xb5\xf0\x27\xee\
-\x31\x9b\x8f\x5d\xe2\x46\xcc\x76\xc9\x2d\x76\x6d\x4f\x45\x75\xf4\
-\x9d\xe2\x31\x23\xe3\x08\xab\x82\xcd\x74\x12\xbb\xf8\x52\xee\xce\
-\x25\x66\x6a\xee\x73\x83\xbe\x53\x53\x30\x2d\x3a\x65\x1b\x46\x7d\
-\xf6\x66\xce\x93\x5a\xdf\xb2\xe8\xbf\x2a\x9c\xc9\xe4\x3f\x50\x71\
-\xc3\xbd\xa1\x54\xcc\xe8\x35\x73\x9c\x09\x7f\x13\x41\x66\xce\x55\
-\x73\x86\x57\xa1\xcd\x19\x48\xc5\x75\x73\x6e\xd8\xf4\x4d\x04\x99\
-\x39\x57\xcd\x19\x5e\x85\x36\x67\x20\x15\xc6\x9c\x4b\x50\xff\xe5\
-\xf9\xe8\x0f\x44\x1a\x94\x79\
-\x00\x00\x02\x98\
+\x00\x00\x03\x3f\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
@@ -1894,21 +1853,102 @@
\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
-\x76\x65\x22\x3e\x0a\x3c\x67\x3e\x0a\x09\x3c\x70\x61\x74\x68\x20\
-\x64\x3d\x22\x4d\x31\x32\x38\x2c\x34\x30\x35\x2e\x34\x32\x39\x43\
-\x31\x32\x38\x2c\x34\x32\x38\x2e\x38\x34\x36\x2c\x31\x34\x37\x2e\
-\x31\x39\x38\x2c\x34\x34\x38\x2c\x31\x37\x30\x2e\x36\x36\x37\x2c\
-\x34\x34\x38\x68\x31\x37\x30\x2e\x36\x36\x37\x43\x33\x36\x34\x2e\
-\x38\x30\x32\x2c\x34\x34\x38\x2c\x33\x38\x34\x2c\x34\x32\x38\x2e\
-\x38\x34\x36\x2c\x33\x38\x34\x2c\x34\x30\x35\x2e\x34\x32\x39\x56\
-\x31\x36\x30\x48\x31\x32\x38\x56\x34\x30\x35\x2e\x34\x32\x39\x7a\
-\x20\x4d\x34\x31\x36\x2c\x39\x36\x0a\x09\x09\x68\x2d\x38\x30\x6c\
-\x2d\x32\x36\x2e\x37\x38\x35\x2d\x33\x32\x48\x32\x30\x32\x2e\x37\
-\x38\x36\x4c\x31\x37\x36\x2c\x39\x36\x48\x39\x36\x76\x33\x32\x68\
-\x33\x32\x30\x56\x39\x36\x7a\x22\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\
-\x3c\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x03\x5a\
+\x76\x65\x22\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x22\x49\x63\x6f\x6e\
+\x5f\x32\x31\x5f\x22\x3e\x0a\x09\x3c\x67\x3e\x0a\x09\x09\x3c\x70\
+\x61\x74\x68\x20\x64\x3d\x22\x4d\x32\x35\x36\x2c\x31\x35\x32\x63\
+\x2d\x35\x37\x2e\x32\x2c\x30\x2d\x31\x30\x34\x2c\x34\x36\x2e\x38\
+\x2d\x31\x30\x34\x2c\x31\x30\x34\x73\x34\x36\x2e\x38\x2c\x31\x30\
+\x34\x2c\x31\x30\x34\x2c\x31\x30\x34\x73\x31\x30\x34\x2d\x34\x36\
+\x2e\x38\x2c\x31\x30\x34\x2d\x31\x30\x34\x53\x33\x31\x33\x2e\x32\
+\x2c\x31\x35\x32\x2c\x32\x35\x36\x2c\x31\x35\x32\x7a\x20\x4d\x32\
+\x35\x36\x2c\x34\x38\x0a\x09\x09\x09\x43\x31\x34\x31\x2e\x36\x30\
+\x31\x2c\x34\x38\x2c\x34\x38\x2c\x31\x34\x31\x2e\x36\x30\x31\x2c\
+\x34\x38\x2c\x32\x35\x36\x73\x39\x33\x2e\x36\x30\x31\x2c\x32\x30\
+\x38\x2c\x32\x30\x38\x2c\x32\x30\x38\x73\x32\x30\x38\x2d\x39\x33\
+\x2e\x36\x30\x31\x2c\x32\x30\x38\x2d\x32\x30\x38\x53\x33\x37\x30\
+\x2e\x33\x39\x39\x2c\x34\x38\x2c\x32\x35\x36\x2c\x34\x38\x7a\x20\
+\x4d\x32\x35\x36\x2c\x34\x32\x32\x2e\x34\x0a\x09\x09\x09\x63\x2d\
+\x39\x31\x2e\x35\x31\x38\x2c\x30\x2d\x31\x36\x36\x2e\x34\x2d\x37\
+\x34\x2e\x38\x38\x33\x2d\x31\x36\x36\x2e\x34\x2d\x31\x36\x36\x2e\
+\x34\x53\x31\x36\x34\x2e\x34\x38\x32\x2c\x38\x39\x2e\x36\x2c\x32\
+\x35\x36\x2c\x38\x39\x2e\x36\x53\x34\x32\x32\x2e\x34\x2c\x31\x36\
+\x34\x2e\x34\x38\x32\x2c\x34\x32\x32\x2e\x34\x2c\x32\x35\x36\x53\
+\x33\x34\x37\x2e\x35\x31\x38\x2c\x34\x32\x32\x2e\x34\x2c\x32\x35\
+\x36\x2c\x34\x32\x32\x2e\x34\x7a\x22\x2f\x3e\x0a\x09\x3c\x2f\x67\
+\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x00\x00\x03\xb7\
\x3c\
+\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
+\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
+\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
+\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
+\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x38\x2e\x31\x2e\x30\x2c\x20\
+\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
+\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
+\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
+\x20\x2d\x2d\x3e\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x73\
+\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\x57\x33\
+\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\x2f\x2f\
+\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
+\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
+\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
+\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
+\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4d\
+\x61\x67\x6e\x69\x66\x79\x69\x6e\x67\x5f\x67\x6c\x61\x73\x73\x22\
+\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
+\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\
+\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\
+\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\
+\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\x6c\x69\x6e\x6b\x22\x20\x78\
+\x3d\x22\x30\x70\x78\x22\x0a\x09\x20\x79\x3d\x22\x30\x70\x78\x22\
+\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\x30\x20\x35\x31\
+\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\
+\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\x77\x20\x30\x20\
+\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\x6d\x6c\x3a\x73\
+\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\
+\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\
+\x61\x74\x72\x69\x78\x28\x32\x34\x20\x30\x20\x30\x20\x32\x34\x20\
+\x30\x20\x30\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\
+\x4d\x31\x37\x2e\x35\x34\x35\x2c\x31\x35\x2e\x34\x36\x37\x6c\x2d\
+\x33\x2e\x37\x37\x39\x2d\x33\x2e\x37\x37\x39\x63\x30\x2e\x35\x37\
+\x2d\x30\x2e\x39\x33\x35\x2c\x30\x2e\x38\x39\x38\x2d\x32\x2e\x30\
+\x33\x35\x2c\x30\x2e\x38\x39\x38\x2d\x33\x2e\x32\x31\x63\x30\x2d\
+\x33\x2e\x34\x31\x37\x2d\x32\x2e\x39\x36\x31\x2d\x36\x2e\x33\x37\
+\x37\x2d\x36\x2e\x33\x37\x38\x2d\x36\x2e\x33\x37\x37\x0a\x09\x43\
+\x34\x2e\x38\x36\x39\x2c\x32\x2e\x31\x2c\x32\x2e\x31\x2c\x34\x2e\
+\x38\x37\x2c\x32\x2e\x31\x2c\x38\x2e\x32\x38\x37\x63\x30\x2c\x33\
+\x2e\x34\x31\x36\x2c\x32\x2e\x39\x36\x31\x2c\x36\x2e\x33\x37\x37\
+\x2c\x36\x2e\x33\x37\x37\x2c\x36\x2e\x33\x37\x37\x63\x31\x2e\x31\
+\x33\x37\x2c\x30\x2c\x32\x2e\x32\x2d\x30\x2e\x33\x30\x39\x2c\x33\
+\x2e\x31\x31\x35\x2d\x30\x2e\x38\x34\x34\x6c\x33\x2e\x37\x39\x39\
+\x2c\x33\x2e\x38\x30\x31\x0a\x09\x63\x30\x2e\x33\x37\x32\x2c\x30\
+\x2e\x33\x37\x31\x2c\x30\x2e\x39\x37\x35\x2c\x30\x2e\x33\x37\x31\
+\x2c\x31\x2e\x33\x34\x36\x2c\x30\x6c\x30\x2e\x39\x34\x33\x2d\x30\
+\x2e\x39\x34\x33\x43\x31\x38\x2e\x30\x35\x31\x2c\x31\x36\x2e\x33\
+\x30\x37\x2c\x31\x37\x2e\x39\x31\x36\x2c\x31\x35\x2e\x38\x33\x38\
+\x2c\x31\x37\x2e\x35\x34\x35\x2c\x31\x35\x2e\x34\x36\x37\x7a\x20\
+\x4d\x34\x2e\x30\x30\x34\x2c\x38\x2e\x32\x38\x37\x0a\x09\x63\x30\
+\x2d\x32\x2e\x33\x36\x36\x2c\x31\x2e\x39\x31\x37\x2d\x34\x2e\x32\
+\x38\x33\x2c\x34\x2e\x32\x38\x32\x2d\x34\x2e\x32\x38\x33\x63\x32\
+\x2e\x33\x36\x36\x2c\x30\x2c\x34\x2e\x34\x37\x34\x2c\x32\x2e\x31\
+\x30\x37\x2c\x34\x2e\x34\x37\x34\x2c\x34\x2e\x34\x37\x34\x63\x30\
+\x2c\x32\x2e\x33\x36\x35\x2d\x31\x2e\x39\x31\x38\x2c\x34\x2e\x32\
+\x38\x33\x2d\x34\x2e\x32\x38\x33\x2c\x34\x2e\x32\x38\x33\x0a\x09\
+\x43\x36\x2e\x31\x31\x31\x2c\x31\x32\x2e\x37\x36\x2c\x34\x2e\x30\
+\x30\x34\x2c\x31\x30\x2e\x36\x35\x32\x2c\x34\x2e\x30\x30\x34\x2c\
+\x38\x2e\x32\x38\x37\x7a\x22\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\
+\x2f\x73\x76\x67\x3e\x0a\
+\x00\x00\x00\x6c\
+\x3c\
+\x73\x76\x67\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\
+\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\
+\x30\x2f\x73\x76\x67\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\
+\x30\x20\x30\x20\x32\x30\x20\x32\x30\x22\x3e\x3c\x70\x61\x74\x68\
+\x20\x64\x3d\x22\x4d\x31\x38\x20\x31\x32\x76\x31\x48\x38\x76\x35\
+\x6c\x2d\x36\x2d\x36\x20\x36\x2d\x36\x76\x35\x68\x38\x56\x32\x68\
+\x32\x7a\x22\x2f\x3e\x3c\x2f\x73\x76\x67\x3e\
+\x00\x00\x04\x13\
+\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x27\x31\x2e\
\x30\x27\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x27\x55\x54\x46\
\x2d\x38\x27\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x54\x68\x69\x73\x20\
@@ -1921,21 +1961,20 @@
\x6d\x6c\x6e\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x27\x68\x74\x74\x70\
\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\
\x39\x39\x2f\x78\x6c\x69\x6e\x6b\x27\x20\x77\x69\x64\x74\x68\x3d\
-\x27\x36\x33\x2e\x39\x39\x39\x36\x70\x74\x27\x20\x68\x65\x69\x67\
+\x27\x36\x34\x2e\x30\x30\x30\x31\x70\x74\x27\x20\x68\x65\x69\x67\
\x68\x74\x3d\x27\x36\x34\x70\x74\x27\x20\x76\x69\x65\x77\x42\x6f\
-\x78\x3d\x27\x35\x36\x2e\x34\x30\x39\x34\x20\x31\x31\x37\x2e\x38\
-\x35\x38\x20\x36\x33\x2e\x39\x39\x39\x36\x20\x36\x34\x27\x3e\x0a\
+\x78\x3d\x27\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\
+\x35\x38\x20\x36\x34\x2e\x30\x30\x30\x31\x20\x36\x34\x27\x3e\x0a\
\x3c\x67\x20\x69\x64\x3d\x27\x70\x61\x67\x65\x31\x27\x3e\x0a\x3c\
\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\
-\x6e\x73\x6c\x61\x74\x65\x28\x35\x36\x2e\x34\x30\x39\x34\x20\x31\
+\x6e\x73\x6c\x61\x74\x65\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\
\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\
\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\
-\x27\x4d\x20\x32\x2e\x30\x30\x37\x35\x20\x36\x32\x2e\x32\x33\x32\
-\x35\x4c\x20\x36\x32\x2e\x32\x33\x32\x35\x20\x36\x32\x2e\x32\x33\
-\x32\x35\x4c\x20\x36\x32\x2e\x32\x33\x32\x35\x20\x32\x2e\x30\x30\
-\x37\x35\x4c\x20\x32\x2e\x30\x30\x37\x35\x20\x32\x2e\x30\x30\x37\
-\x35\x4c\x20\x32\x2e\x30\x30\x37\x35\x20\x36\x32\x2e\x32\x33\x32\
-\x35\x5a\x27\x20\x66\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\
+\x27\x4d\x20\x36\x2e\x30\x32\x32\x35\x20\x33\x32\x2e\x31\x32\x4c\
+\x20\x31\x33\x2e\x39\x36\x38\x37\x20\x31\x32\x2e\x39\x33\x36\x31\
+\x4c\x20\x35\x38\x2e\x32\x31\x37\x35\x20\x32\x31\x2e\x37\x33\x37\
+\x38\x4c\x20\x34\x32\x2e\x37\x34\x34\x35\x20\x34\x31\x2e\x37\x31\
+\x31\x39\x27\x20\x66\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\
\x73\x74\x72\x6f\x6b\x65\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\
\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\x3d\
\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\
@@ -1942,30 +1981,111 @@
\x69\x6e\x65\x6a\x6f\x69\x6e\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\
\x73\x74\x72\x6f\x6b\x65\x2d\x6d\x69\x74\x65\x72\x6c\x69\x6d\x69\
\x74\x3d\x27\x31\x30\x2e\x30\x33\x37\x35\x27\x20\x73\x74\x72\x6f\
-\x6b\x65\x2d\x77\x69\x64\x74\x68\x3d\x27\x34\x2e\x30\x31\x35\x27\
-\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\
-\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\
-\x35\x36\x2e\x34\x30\x39\x34\x20\x31\x31\x37\x2e\x38\x35\x38\x29\
-\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\x36\x32\x36\x34\x29\x27\x3e\
-\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x27\x4d\x20\x34\x37\x2e\x31\
-\x37\x36\x32\x20\x33\x32\x2e\x31\x32\x43\x20\x34\x37\x2e\x31\x37\
-\x36\x32\x20\x32\x33\x2e\x38\x30\x34\x37\x20\x34\x30\x2e\x34\x33\
-\x35\x33\x20\x31\x37\x2e\x30\x36\x33\x37\x20\x33\x32\x2e\x31\x32\
-\x20\x31\x37\x2e\x30\x36\x33\x37\x43\x20\x32\x33\x2e\x38\x30\x34\
-\x37\x20\x31\x37\x2e\x30\x36\x33\x37\x20\x31\x37\x2e\x30\x36\x33\
-\x37\x20\x32\x33\x2e\x38\x30\x34\x37\x20\x31\x37\x2e\x30\x36\x33\
-\x37\x20\x33\x32\x2e\x31\x32\x43\x20\x31\x37\x2e\x30\x36\x33\x37\
-\x20\x34\x30\x2e\x34\x33\x35\x33\x20\x32\x33\x2e\x38\x30\x34\x37\
-\x20\x34\x37\x2e\x31\x37\x36\x32\x20\x33\x32\x2e\x31\x32\x20\x34\
-\x37\x2e\x31\x37\x36\x32\x43\x20\x34\x30\x2e\x34\x33\x35\x33\x20\
-\x34\x37\x2e\x31\x37\x36\x32\x20\x34\x37\x2e\x31\x37\x36\x32\x20\
-\x34\x30\x2e\x34\x33\x35\x33\x20\x34\x37\x2e\x31\x37\x36\x32\x20\
-\x33\x32\x2e\x31\x32\x5a\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\x30\
-\x30\x30\x30\x30\x30\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\
-\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\
-\x00\x00\x03\x5f\
+\x6b\x65\x2d\x77\x69\x64\x74\x68\x3d\x27\x32\x2e\x35\x30\x39\x33\
+\x37\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\
+\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\x6e\x73\x6c\x61\x74\
+\x65\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\x35\
+\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\x36\x32\x36\x34\x29\
+\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\x36\
+\x2e\x30\x32\x32\x35\x27\x20\x63\x79\x3d\x27\x33\x32\x2e\x31\x32\
+\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\x66\x66\x30\x30\x30\x30\x27\
+\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\
+\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\
+\x27\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x35\x38\x2e\x34\x36\
+\x36\x39\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\
+\x28\x2e\x39\x39\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x63\x69\x72\
+\x63\x6c\x65\x20\x63\x78\x3d\x27\x31\x33\x2e\x39\x36\x38\x37\x27\
+\x20\x63\x79\x3d\x27\x31\x32\x2e\x39\x33\x36\x31\x27\x20\x66\x69\
+\x6c\x6c\x3d\x27\x23\x66\x66\x30\x30\x30\x30\x27\x20\x72\x3d\x27\
+\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\
+\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\
+\x6e\x73\x6c\x61\x74\x65\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\
+\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\
+\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\
+\x63\x78\x3d\x27\x35\x38\x2e\x32\x31\x37\x35\x27\x20\x63\x79\x3d\
+\x27\x32\x31\x2e\x37\x33\x37\x38\x27\x20\x66\x69\x6c\x6c\x3d\x27\
+\x23\x66\x66\x30\x30\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\
+\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\
+\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\x6e\x73\x6c\x61\
+\x74\x65\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\
+\x35\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\x36\x32\x36\x34\
+\x29\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\
+\x34\x32\x2e\x37\x34\x34\x35\x27\x20\x63\x79\x3d\x27\x34\x31\x2e\
+\x37\x31\x31\x39\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\x66\x66\x30\
+\x30\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\
+\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\
+\x67\x3e\
+\x00\x00\x04\x17\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
+\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x69\x73\x6f\
+\x2d\x38\x38\x35\x39\x2d\x31\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\
+\x47\x65\x6e\x65\x72\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\
+\x20\x49\x6c\x6c\x75\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x39\x2e\
+\x30\x2e\x30\x2c\x20\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\
+\x50\x6c\x75\x67\x2d\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\
+\x72\x73\x69\x6f\x6e\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\
+\x64\x20\x30\x29\x20\x20\x2d\x2d\x3e\x0a\x3c\x73\x76\x67\x20\x76\
+\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\
+\x22\x4c\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\
+\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\
+\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\
+\x6e\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\
+\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\
+\x2f\x78\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\
+\x79\x3d\x22\x30\x70\x78\x22\x0a\x09\x20\x76\x69\x65\x77\x42\x6f\
+\x78\x3d\x22\x30\x20\x30\x20\x34\x32\x33\x2e\x37\x35\x34\x20\x34\
+\x32\x33\x2e\x37\x35\x34\x22\x20\x73\x74\x79\x6c\x65\x3d\x22\x65\
+\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\
+\x3a\x6e\x65\x77\x20\x30\x20\x30\x20\x34\x32\x33\x2e\x37\x35\x34\
+\x20\x34\x32\x33\x2e\x37\x35\x34\x3b\x22\x20\x78\x6d\x6c\x3a\x73\
+\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\
+\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x33\x35\x34\x2e\x32\
+\x34\x2c\x34\x37\x2e\x34\x6c\x33\x39\x2e\x38\x37\x39\x2d\x33\x39\
+\x2e\x38\x37\x39\x48\x32\x37\x32\x2e\x31\x39\x36\x76\x31\x32\x31\
+\x2e\x39\x32\x34\x6c\x36\x30\x2e\x38\x30\x31\x2d\x36\x30\x2e\x38\
+\x30\x31\x63\x35\x36\x2c\x35\x30\x2e\x30\x36\x36\x2c\x37\x37\x2e\
+\x32\x35\x31\x2c\x31\x33\x32\x2e\x30\x30\x34\x2c\x34\x36\x2e\x39\
+\x31\x38\x2c\x32\x30\x35\x2e\x32\x33\x35\x0a\x09\x63\x2d\x31\x38\
+\x2e\x35\x38\x35\x2c\x34\x34\x2e\x38\x36\x39\x2d\x35\x33\x2e\x35\
+\x33\x31\x2c\x37\x39\x2e\x38\x31\x35\x2d\x39\x38\x2e\x34\x2c\x39\
+\x38\x2e\x34\x63\x2d\x34\x34\x2e\x38\x36\x36\x2c\x31\x38\x2e\x35\
+\x38\x35\x2d\x39\x34\x2e\x32\x38\x38\x2c\x31\x38\x2e\x35\x38\x35\
+\x2d\x31\x33\x39\x2e\x31\x35\x38\x2c\x30\x63\x2d\x34\x34\x2e\x38\
+\x36\x39\x2d\x31\x38\x2e\x35\x38\x35\x2d\x37\x39\x2e\x38\x31\x35\
+\x2d\x35\x33\x2e\x35\x33\x31\x2d\x39\x38\x2e\x34\x2d\x39\x38\x2e\
+\x34\x0a\x09\x63\x2d\x31\x38\x2e\x35\x38\x35\x2d\x34\x34\x2e\x38\
+\x36\x39\x2d\x31\x38\x2e\x35\x38\x35\x2d\x39\x34\x2e\x32\x39\x2c\
+\x30\x2d\x31\x33\x39\x2e\x31\x35\x39\x6c\x2d\x32\x37\x2e\x37\x31\
+\x37\x2d\x31\x31\x2e\x34\x38\x63\x2d\x32\x31\x2e\x36\x35\x31\x2c\
+\x35\x32\x2e\x32\x37\x32\x2d\x32\x31\x2e\x36\x35\x31\x2c\x31\x30\
+\x39\x2e\x38\x34\x38\x2c\x30\x2c\x31\x36\x32\x2e\x31\x32\x0a\x09\
+\x63\x32\x31\x2e\x36\x35\x32\x2c\x35\x32\x2e\x32\x37\x32\x2c\x36\
+\x32\x2e\x33\x36\x34\x2c\x39\x32\x2e\x39\x38\x34\x2c\x31\x31\x34\
+\x2e\x36\x33\x37\x2c\x31\x31\x34\x2e\x36\x33\x36\x63\x32\x36\x2e\
+\x31\x34\x2c\x31\x30\x2e\x38\x32\x37\x2c\x35\x33\x2e\x35\x39\x35\
+\x2c\x31\x36\x2e\x32\x34\x2c\x38\x31\x2e\x30\x36\x2c\x31\x36\x2e\
+\x32\x33\x39\x63\x32\x37\x2e\x34\x35\x39\x2d\x30\x2e\x30\x30\x31\
+\x2c\x35\x34\x2e\x39\x32\x37\x2d\x35\x2e\x34\x31\x34\x2c\x38\x31\
+\x2e\x30\x36\x31\x2d\x31\x36\x2e\x32\x33\x39\x0a\x09\x63\x35\x32\
+\x2e\x32\x37\x31\x2d\x32\x31\x2e\x36\x35\x32\x2c\x39\x32\x2e\x39\
+\x38\x33\x2d\x36\x32\x2e\x33\x36\x34\x2c\x31\x31\x34\x2e\x36\x33\
+\x36\x2d\x31\x31\x34\x2e\x36\x33\x36\x43\x34\x34\x32\x2e\x37\x33\
+\x39\x2c\x32\x30\x30\x2e\x36\x2c\x34\x31\x38\x2e\x35\x33\x32\x2c\
+\x31\x30\x35\x2e\x38\x32\x36\x2c\x33\x35\x34\x2e\x32\x34\x2c\x34\
+\x37\x2e\x34\x7a\x22\x2f\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\
+\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\
+\x67\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x3e\x0a\
+\x3c\x2f\x67\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\
+\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\
+\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\
+\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x3e\x0a\x3c\
+\x2f\x67\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x3e\
+\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\
+\x2f\x73\x76\x67\x3e\x0a\
+\x00\x00\x03\x2a\
+\x3c\
+\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
@@ -1994,31 +2114,70 @@
\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
-\x76\x65\x22\x3e\x0a\x3c\x67\x3e\x0a\x09\x0a\x09\x09\x3c\x72\x65\
-\x63\x74\x20\x78\x3d\x22\x31\x37\x38\x2e\x38\x34\x36\x22\x20\x79\
-\x3d\x22\x39\x32\x2e\x30\x38\x37\x22\x20\x74\x72\x61\x6e\x73\x66\
-\x6f\x72\x6d\x3d\x22\x6d\x61\x74\x72\x69\x78\x28\x2d\x30\x2e\x37\
-\x30\x37\x31\x20\x2d\x30\x2e\x37\x30\x37\x31\x20\x30\x2e\x37\x30\
-\x37\x31\x20\x2d\x30\x2e\x37\x30\x37\x31\x20\x32\x32\x34\x2e\x33\
-\x34\x37\x36\x20\x36\x33\x31\x2e\x31\x34\x39\x38\x29\x22\x20\x77\
-\x69\x64\x74\x68\x3d\x22\x31\x32\x38\x2e\x30\x38\x35\x22\x20\x68\
-\x65\x69\x67\x68\x74\x3d\x22\x33\x35\x34\x2e\x30\x34\x39\x22\x2f\
-\x3e\x0a\x09\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x34\x37\x31\
-\x2e\x37\x32\x33\x2c\x38\x38\x2e\x33\x39\x33\x6c\x2d\x34\x38\x2e\
-\x31\x31\x35\x2d\x34\x38\x2e\x31\x31\x34\x63\x2d\x31\x31\x2e\x37\
-\x32\x33\x2d\x31\x31\x2e\x37\x32\x34\x2d\x33\x31\x2e\x35\x35\x38\
-\x2d\x31\x30\x2e\x38\x39\x36\x2d\x34\x34\x2e\x33\x30\x34\x2c\x31\
-\x2e\x38\x35\x6c\x2d\x34\x35\x2e\x32\x30\x32\x2c\x34\x35\x2e\x32\
-\x30\x33\x6c\x39\x30\x2e\x35\x36\x39\x2c\x39\x30\x2e\x35\x36\x38\
-\x6c\x34\x35\x2e\x32\x30\x32\x2d\x34\x35\x2e\x32\x30\x32\x0a\x09\
-\x09\x43\x34\x38\x32\x2e\x36\x31\x36\x2c\x31\x31\x39\x2e\x39\x35\
-\x32\x2c\x34\x38\x33\x2e\x34\x34\x35\x2c\x31\x30\x30\x2e\x31\x31\
-\x36\x2c\x34\x37\x31\x2e\x37\x32\x33\x2c\x38\x38\x2e\x33\x39\x33\
-\x7a\x22\x2f\x3e\x0a\x09\x3c\x70\x6f\x6c\x79\x67\x6f\x6e\x20\x70\
-\x6f\x69\x6e\x74\x73\x3d\x22\x36\x34\x2e\x30\x32\x31\x2c\x33\x36\
-\x33\x2e\x32\x35\x32\x20\x33\x32\x2c\x34\x38\x30\x20\x31\x34\x38\
-\x2e\x37\x33\x37\x2c\x34\x34\x37\x2e\x39\x37\x39\x20\x09\x22\x2f\
-\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x76\x65\x22\x3e\x0a\x3c\x67\x3e\x0a\x09\x3c\x70\x6f\x6c\x79\x67\
+\x6f\x6e\x20\x70\x6f\x69\x6e\x74\x73\x3d\x22\x33\x39\x36\x2e\x37\
+\x39\x35\x2c\x33\x39\x36\x2e\x38\x20\x33\x32\x30\x2c\x33\x39\x36\
+\x2e\x38\x20\x33\x32\x30\x2c\x34\x34\x38\x20\x34\x34\x38\x2c\x34\
+\x34\x38\x20\x34\x34\x38\x2c\x33\x32\x30\x20\x33\x39\x36\x2e\x37\
+\x39\x35\x2c\x33\x32\x30\x20\x09\x22\x2f\x3e\x0a\x09\x3c\x70\x6f\
+\x6c\x79\x67\x6f\x6e\x20\x70\x6f\x69\x6e\x74\x73\x3d\x22\x33\x39\
+\x36\x2e\x38\x2c\x31\x31\x35\x2e\x32\x30\x35\x20\x33\x39\x36\x2e\
+\x38\x2c\x31\x39\x32\x20\x34\x34\x38\x2c\x31\x39\x32\x20\x34\x34\
+\x38\x2c\x36\x34\x20\x33\x32\x30\x2c\x36\x34\x20\x33\x32\x30\x2c\
+\x31\x31\x35\x2e\x32\x30\x35\x20\x09\x22\x2f\x3e\x0a\x09\x3c\x70\
+\x6f\x6c\x79\x67\x6f\x6e\x20\x70\x6f\x69\x6e\x74\x73\x3d\x22\x31\
+\x31\x35\x2e\x32\x30\x35\x2c\x31\x31\x35\x2e\x32\x20\x31\x39\x32\
+\x2c\x31\x31\x35\x2e\x32\x20\x31\x39\x32\x2c\x36\x34\x20\x36\x34\
+\x2c\x36\x34\x20\x36\x34\x2c\x31\x39\x32\x20\x31\x31\x35\x2e\x32\
+\x30\x35\x2c\x31\x39\x32\x20\x09\x22\x2f\x3e\x0a\x09\x3c\x70\x6f\
+\x6c\x79\x67\x6f\x6e\x20\x70\x6f\x69\x6e\x74\x73\x3d\x22\x31\x31\
+\x35\x2e\x32\x2c\x33\x39\x36\x2e\x37\x39\x35\x20\x31\x31\x35\x2e\
+\x32\x2c\x33\x32\x30\x20\x36\x34\x2c\x33\x32\x30\x20\x36\x34\x2c\
+\x34\x34\x38\x20\x31\x39\x32\x2c\x34\x34\x38\x20\x31\x39\x32\x2c\
+\x33\x39\x36\x2e\x37\x39\x35\x20\x09\x22\x2f\x3e\x0a\x3c\x2f\x67\
+\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x00\x00\x02\x77\
+\x3c\
+\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
+\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
+\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
+\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
+\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\x20\
+\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
+\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
+\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
+\x20\x2d\x2d\x3e\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x73\
+\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\x57\x33\
+\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\x2f\x2f\
+\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
+\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
+\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
+\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
+\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4c\
+\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\
+\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\
+\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\
+\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
+\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\
+\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
+\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
+\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
+\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
+\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x73\x74\x79\x6c\x65\
+\x3d\x22\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\
+\x75\x6e\x64\x3a\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\
+\x35\x31\x32\x3b\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\
+\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0a\x3c\x70\x6f\x6c\
+\x79\x67\x6f\x6e\x20\x70\x6f\x69\x6e\x74\x73\x3d\x22\x32\x38\x38\
+\x2c\x39\x36\x20\x33\x33\x37\x2e\x39\x2c\x31\x34\x35\x2e\x39\x20\
+\x32\x37\x34\x2c\x32\x30\x39\x2e\x37\x20\x32\x37\x34\x2c\x32\x30\
+\x39\x2e\x37\x20\x31\x34\x35\x2e\x39\x2c\x33\x33\x37\x2e\x39\x20\
+\x39\x36\x2c\x32\x38\x38\x20\x39\x36\x2c\x34\x31\x36\x20\x32\x32\
+\x34\x2c\x34\x31\x36\x20\x31\x37\x34\x2e\x31\x2c\x33\x36\x36\x2e\
+\x31\x20\x33\x35\x37\x2e\x34\x2c\x31\x38\x32\x2e\x39\x20\x33\x36\
+\x36\x2e\x31\x2c\x31\x37\x34\x2e\x31\x20\x0a\x09\x34\x31\x36\x2c\
+\x32\x32\x34\x20\x34\x31\x36\x2c\x39\x36\x20\x22\x2f\x3e\x0a\x3c\
+\x2f\x73\x76\x67\x3e\x0a\
\x00\x00\x03\x48\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
@@ -2074,13 +2233,13 @@
\x38\x38\x35\x2c\x31\x30\x2e\x36\x36\x36\x2c\x31\x30\x2e\x36\x36\
\x37\x0a\x09\x56\x33\x37\x33\x2e\x33\x33\x33\x7a\x22\x2f\x3e\x0a\
\x3c\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x02\x6c\
+\x00\x00\x03\x03\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
-\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\x20\
+\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x38\x2e\x31\x2e\x30\x2c\x20\
\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
@@ -2091,37 +2250,47 @@
\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
-\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4c\
-\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\
-\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\
-\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\
-\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
-\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\
-\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
-\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
-\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
-\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
-\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\
-\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
-\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
-\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
-\x76\x65\x22\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x22\x49\x63\x6f\x6e\
-\x5f\x31\x5f\x22\x3e\x0a\x09\x3c\x67\x3e\x0a\x09\x09\x3c\x67\x3e\
-\x0a\x09\x09\x09\x3c\x70\x6f\x6c\x79\x67\x6f\x6e\x20\x70\x6f\x69\
-\x6e\x74\x73\x3d\x22\x31\x38\x36\x2e\x33\x30\x31\x2c\x33\x33\x39\
-\x2e\x38\x39\x33\x20\x39\x36\x2c\x32\x34\x39\x2e\x34\x36\x31\x20\
-\x36\x34\x2c\x32\x37\x39\x2e\x39\x36\x38\x20\x31\x38\x36\x2e\x33\
-\x30\x31\x2c\x34\x30\x32\x20\x34\x34\x38\x2c\x31\x34\x30\x2e\x35\
-\x30\x36\x20\x34\x31\x36\x2c\x31\x31\x30\x20\x09\x09\x09\x22\x2f\
-\x3e\x0a\x09\x09\x3c\x2f\x67\x3e\x0a\x09\x3c\x2f\x67\x3e\x0a\x3c\
-\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x03\xe8\
+\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x43\
+\x68\x65\x63\x6b\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\
+\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\
+\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x78\
+\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\
+\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\x6c\x69\
+\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\x22\x30\
+\x70\x78\x22\x0a\x09\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\
+\x20\x30\x20\x32\x30\x20\x32\x30\x22\x20\x65\x6e\x61\x62\x6c\x65\
+\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\x77\
+\x20\x30\x20\x30\x20\x32\x30\x20\x32\x30\x22\x20\x78\x6d\x6c\x3a\
+\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\
+\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x38\x2e\x32\x39\
+\x34\x2c\x31\x36\x2e\x39\x39\x38\x63\x2d\x30\x2e\x34\x33\x35\x2c\
+\x30\x2d\x30\x2e\x38\x34\x37\x2d\x30\x2e\x32\x30\x33\x2d\x31\x2e\
+\x31\x31\x31\x2d\x30\x2e\x35\x35\x33\x4c\x33\x2e\x36\x31\x2c\x31\
+\x31\x2e\x37\x32\x34\x63\x2d\x30\x2e\x34\x36\x35\x2d\x30\x2e\x36\
+\x31\x33\x2d\x30\x2e\x33\x34\x34\x2d\x31\x2e\x34\x38\x36\x2c\x30\
+\x2e\x32\x37\x2d\x31\x2e\x39\x35\x31\x0a\x09\x63\x30\x2e\x36\x31\
+\x35\x2d\x30\x2e\x34\x36\x37\x2c\x31\x2e\x34\x38\x38\x2d\x30\x2e\
+\x33\x34\x34\x2c\x31\x2e\x39\x35\x33\x2c\x30\x2e\x32\x37\x6c\x32\
+\x2e\x33\x35\x31\x2c\x33\x2e\x31\x30\x34\x6c\x35\x2e\x39\x31\x31\
+\x2d\x39\x2e\x34\x39\x32\x63\x30\x2e\x34\x30\x37\x2d\x30\x2e\x36\
+\x35\x32\x2c\x31\x2e\x32\x36\x37\x2d\x30\x2e\x38\x35\x32\x2c\x31\
+\x2e\x39\x32\x31\x2d\x30\x2e\x34\x34\x35\x0a\x09\x63\x30\x2e\x36\
+\x35\x33\x2c\x30\x2e\x34\x30\x36\x2c\x30\x2e\x38\x35\x34\x2c\x31\
+\x2e\x32\x36\x36\x2c\x30\x2e\x34\x34\x36\x2c\x31\x2e\x39\x32\x4c\
+\x39\x2e\x34\x37\x38\x2c\x31\x36\x2e\x33\x34\x63\x2d\x30\x2e\x32\
+\x34\x32\x2c\x30\x2e\x33\x39\x31\x2d\x30\x2e\x36\x36\x31\x2c\x30\
+\x2e\x36\x33\x35\x2d\x31\x2e\x31\x32\x2c\x30\x2e\x36\x35\x36\x43\
+\x38\x2e\x33\x33\x36\x2c\x31\x36\x2e\x39\x39\x38\x2c\x38\x2e\x33\
+\x31\x36\x2c\x31\x36\x2e\x39\x39\x38\x2c\x38\x2e\x32\x39\x34\x2c\
+\x31\x36\x2e\x39\x39\x38\x7a\x22\x2f\x3e\x0a\x3c\x2f\x73\x76\x67\
+\x3e\x0a\
+\x00\x00\x03\x3d\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
-\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x38\x2e\x31\x2e\x31\x2c\x20\
+\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\x20\
\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
@@ -2132,61 +2301,50 @@
\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
-\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x43\
-\x68\x65\x76\x72\x6f\x6e\x5f\x63\x69\x72\x63\x6c\x65\x64\x5f\x6c\
-\x65\x66\x74\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\
-\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\
-\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x78\x6c\
-\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
-\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\x6c\x69\x6e\
-\x6b\x22\x0a\x09\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\x22\
-\x30\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
-\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\
-\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
-\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
-\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
-\x76\x65\x22\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\
-\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x32\x34\x20\x30\x20\x30\
-\x20\x32\x34\x20\x30\x20\x30\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\
-\x20\x64\x3d\x22\x4d\x31\x31\x2e\x33\x30\x32\x2c\x36\x2e\x37\x37\
-\x36\x63\x2d\x30\x2e\x31\x39\x36\x2d\x30\x2e\x31\x39\x37\x2d\x30\
-\x2e\x35\x31\x35\x2d\x30\x2e\x31\x39\x37\x2d\x30\x2e\x37\x31\x2c\
-\x30\x4c\x37\x2e\x37\x38\x35\x2c\x39\x2e\x36\x34\x31\x63\x2d\x30\
-\x2e\x31\x39\x36\x2c\x30\x2e\x31\x39\x39\x2d\x30\x2e\x31\x39\x36\
-\x2c\x30\x2e\x35\x32\x2c\x30\x2c\x30\x2e\x37\x31\x37\x6c\x32\x2e\
-\x38\x30\x37\x2c\x32\x2e\x38\x36\x34\x0a\x09\x63\x30\x2e\x31\x39\
-\x35\x2c\x30\x2e\x31\x39\x39\x2c\x30\x2e\x35\x31\x34\x2c\x30\x2e\
-\x31\x39\x38\x2c\x30\x2e\x37\x31\x2c\x30\x63\x30\x2e\x31\x39\x36\
-\x2d\x30\x2e\x31\x39\x37\x2c\x30\x2e\x31\x39\x36\x2d\x30\x2e\x35\
-\x31\x38\x2c\x30\x2d\x30\x2e\x37\x31\x37\x4c\x39\x2c\x31\x30\x6c\
-\x32\x2e\x33\x30\x32\x2d\x32\x2e\x35\x30\x36\x43\x31\x31\x2e\x34\
-\x39\x38\x2c\x37\x2e\x32\x39\x36\x2c\x31\x31\x2e\x34\x39\x38\x2c\
-\x36\x2e\x39\x37\x36\x2c\x31\x31\x2e\x33\x30\x32\x2c\x36\x2e\x37\
-\x37\x36\x7a\x0a\x09\x20\x4d\x31\x30\x2c\x30\x2e\x34\x63\x2d\x35\
-\x2e\x33\x30\x32\x2c\x30\x2d\x39\x2e\x36\x2c\x34\x2e\x32\x39\x38\
-\x2d\x39\x2e\x36\x2c\x39\x2e\x36\x63\x30\x2c\x35\x2e\x33\x30\x33\
-\x2c\x34\x2e\x32\x39\x38\x2c\x39\x2e\x36\x2c\x39\x2e\x36\x2c\x39\
-\x2e\x36\x73\x39\x2e\x36\x2d\x34\x2e\x32\x39\x37\x2c\x39\x2e\x36\
-\x2d\x39\x2e\x36\x43\x31\x39\x2e\x36\x2c\x34\x2e\x36\x39\x38\x2c\
-\x31\x35\x2e\x33\x30\x32\x2c\x30\x2e\x34\x2c\x31\x30\x2c\x30\x2e\
-\x34\x7a\x20\x4d\x31\x30\x2c\x31\x38\x2e\x33\x35\x34\x0a\x09\x63\
-\x2d\x34\x2e\x36\x31\x35\x2c\x30\x2d\x38\x2e\x33\x35\x34\x2d\x33\
-\x2e\x37\x34\x2d\x38\x2e\x33\x35\x34\x2d\x38\x2e\x33\x35\x34\x63\
-\x30\x2d\x34\x2e\x36\x31\x34\x2c\x33\x2e\x37\x33\x39\x2d\x38\x2e\
-\x33\x35\x34\x2c\x38\x2e\x33\x35\x34\x2d\x38\x2e\x33\x35\x34\x63\
-\x34\x2e\x36\x31\x33\x2c\x30\x2c\x38\x2e\x33\x35\x34\x2c\x33\x2e\
-\x37\x34\x2c\x38\x2e\x33\x35\x34\x2c\x38\x2e\x33\x35\x34\x0a\x09\
-\x43\x31\x38\x2e\x33\x35\x34\x2c\x31\x34\x2e\x36\x31\x34\x2c\x31\
-\x34\x2e\x36\x31\x33\x2c\x31\x38\x2e\x33\x35\x34\x2c\x31\x30\x2c\
-\x31\x38\x2e\x33\x35\x34\x7a\x22\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\
-\x3c\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x03\xda\
+\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4c\
+\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\
+\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\
+\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\
+\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
+\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\
+\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
+\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
+\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
+\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
+\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x73\x74\x79\x6c\x65\
+\x3d\x22\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\
+\x75\x6e\x64\x3a\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\
+\x35\x31\x32\x3b\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\
+\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0a\x3c\x70\x61\x74\
+\x68\x20\x64\x3d\x22\x4d\x34\x33\x37\x2e\x35\x2c\x33\x38\x36\x2e\
+\x36\x4c\x33\x30\x36\x2e\x39\x2c\x32\x35\x36\x6c\x31\x33\x30\x2e\
+\x36\x2d\x31\x33\x30\x2e\x36\x63\x31\x34\x2e\x31\x2d\x31\x34\x2e\
+\x31\x2c\x31\x34\x2e\x31\x2d\x33\x36\x2e\x38\x2c\x30\x2d\x35\x30\
+\x2e\x39\x63\x2d\x31\x34\x2e\x31\x2d\x31\x34\x2e\x31\x2d\x33\x36\
+\x2e\x38\x2d\x31\x34\x2e\x31\x2d\x35\x30\x2e\x39\x2c\x30\x4c\x32\
+\x35\x36\x2c\x32\x30\x35\x2e\x31\x4c\x31\x32\x35\x2e\x34\x2c\x37\
+\x34\x2e\x35\x0a\x09\x63\x2d\x31\x34\x2e\x31\x2d\x31\x34\x2e\x31\
+\x2d\x33\x36\x2e\x38\x2d\x31\x34\x2e\x31\x2d\x35\x30\x2e\x39\x2c\
+\x30\x63\x2d\x31\x34\x2e\x31\x2c\x31\x34\x2e\x31\x2d\x31\x34\x2e\
+\x31\x2c\x33\x36\x2e\x38\x2c\x30\x2c\x35\x30\x2e\x39\x4c\x32\x30\
+\x35\x2e\x31\x2c\x32\x35\x36\x4c\x37\x34\x2e\x35\x2c\x33\x38\x36\
+\x2e\x36\x63\x2d\x31\x34\x2e\x31\x2c\x31\x34\x2e\x31\x2d\x31\x34\
+\x2e\x31\x2c\x33\x36\x2e\x38\x2c\x30\x2c\x35\x30\x2e\x39\x0a\x09\
+\x63\x31\x34\x2e\x31\x2c\x31\x34\x2e\x31\x2c\x33\x36\x2e\x38\x2c\
+\x31\x34\x2e\x31\x2c\x35\x30\x2e\x39\x2c\x30\x4c\x32\x35\x36\x2c\
+\x33\x30\x36\x2e\x39\x6c\x31\x33\x30\x2e\x36\x2c\x31\x33\x30\x2e\
+\x36\x63\x31\x34\x2e\x31\x2c\x31\x34\x2e\x31\x2c\x33\x36\x2e\x38\
+\x2c\x31\x34\x2e\x31\x2c\x35\x30\x2e\x39\x2c\x30\x43\x34\x35\x31\
+\x2e\x35\x2c\x34\x32\x33\x2e\x34\x2c\x34\x35\x31\x2e\x35\x2c\x34\
+\x30\x30\x2e\x36\x2c\x34\x33\x37\x2e\x35\x2c\x33\x38\x36\x2e\x36\
+\x7a\x22\x2f\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x00\x00\x04\x54\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
-\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x30\x2e\x30\x2c\x20\
+\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\x20\
\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
@@ -2211,120 +2369,54 @@
\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
-\x76\x65\x22\x3e\x0a\x3c\x67\x3e\x0a\x09\x3c\x70\x61\x74\x68\x20\
-\x64\x3d\x22\x4d\x34\x38\x2e\x34\x35\x31\x2c\x34\x36\x34\x2e\x38\
-\x32\x38\x63\x34\x30\x2e\x30\x32\x33\x2d\x30\x2e\x33\x31\x35\x2c\
-\x34\x35\x2e\x30\x31\x2d\x39\x2e\x39\x35\x35\x2c\x35\x38\x2e\x30\
-\x35\x32\x2d\x35\x30\x2e\x31\x33\x32\x63\x32\x34\x2e\x30\x35\x37\
-\x2d\x36\x33\x2e\x34\x30\x38\x2c\x31\x33\x32\x2e\x34\x31\x39\x2c\
-\x31\x36\x2e\x35\x39\x31\x2c\x36\x35\x2e\x32\x36\x39\x2c\x34\x34\
-\x2e\x33\x37\x34\x0a\x09\x09\x43\x31\x30\x34\x2e\x36\x32\x32\x2c\
-\x34\x38\x36\x2e\x38\x35\x32\x2c\x38\x2e\x34\x32\x38\x2c\x34\x36\
-\x35\x2e\x31\x34\x33\x2c\x34\x38\x2e\x34\x35\x31\x2c\x34\x36\x34\
-\x2e\x38\x32\x38\x7a\x22\x2f\x3e\x0a\x09\x3c\x70\x61\x74\x68\x20\
-\x64\x3d\x22\x4d\x34\x35\x38\x2e\x38\x35\x37\x2c\x34\x36\x2e\x39\
-\x30\x32\x63\x2d\x31\x39\x2e\x34\x31\x37\x2d\x31\x35\x2e\x36\x34\
-\x37\x2d\x35\x31\x2e\x35\x39\x32\x2d\x37\x2e\x39\x33\x38\x2d\x37\
-\x31\x2e\x38\x36\x34\x2c\x31\x37\x2e\x32\x31\x39\x4c\x31\x38\x31\
-\x2e\x36\x34\x35\x2c\x33\x35\x35\x2e\x38\x34\x39\x63\x2d\x32\x30\
-\x2e\x32\x37\x32\x2c\x32\x35\x2e\x31\x35\x34\x2d\x32\x30\x2e\x31\
-\x37\x31\x2c\x32\x30\x2e\x33\x34\x37\x2d\x30\x2e\x37\x35\x34\x2c\
-\x33\x35\x2e\x39\x39\x32\x0a\x09\x09\x63\x31\x39\x2e\x34\x31\x37\
-\x2c\x31\x35\x2e\x36\x34\x38\x2c\x31\x34\x2e\x37\x33\x38\x2c\x31\
-\x36\x2e\x37\x37\x2c\x33\x35\x2e\x30\x31\x31\x2d\x38\x2e\x33\x38\
-\x38\x6c\x32\x34\x31\x2e\x34\x30\x36\x2d\x32\x36\x32\x2e\x36\x36\
-\x39\x43\x34\x37\x37\x2e\x35\x38\x31\x2c\x39\x35\x2e\x36\x32\x38\
-\x2c\x34\x37\x38\x2e\x32\x37\x35\x2c\x36\x32\x2e\x35\x35\x2c\x34\
-\x35\x38\x2e\x38\x35\x37\x2c\x34\x36\x2e\x39\x30\x32\x7a\x20\x4d\
-\x34\x30\x36\x2e\x30\x36\x35\x2c\x38\x31\x2e\x38\x32\x35\x0a\x09\
-\x09\x63\x30\x2c\x30\x2d\x33\x2d\x33\x2e\x35\x2d\x31\x33\x2d\x31\
-\x31\x2e\x35\x63\x31\x35\x2d\x32\x34\x2e\x35\x2c\x34\x34\x2e\x35\
-\x2d\x32\x30\x2c\x34\x34\x2e\x35\x2d\x32\x30\x43\x34\x30\x39\x2e\
-\x35\x36\x35\x2c\x36\x36\x2e\x38\x32\x35\x2c\x34\x30\x36\x2e\x30\
-\x36\x35\x2c\x38\x31\x2e\x38\x32\x35\x2c\x34\x30\x36\x2e\x30\x36\
-\x35\x2c\x38\x31\x2e\x38\x32\x35\x7a\x22\x2f\x3e\x0a\x3c\x2f\x67\
-\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x04\x73\
+\x76\x65\x22\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x22\x49\x63\x6f\x6e\
+\x22\x3e\x0a\x09\x3c\x67\x3e\x0a\x09\x09\x3c\x70\x61\x74\x68\x20\
+\x64\x3d\x22\x4d\x32\x35\x36\x2c\x31\x37\x36\x63\x2d\x34\x34\x2e\
+\x30\x30\x34\x2c\x30\x2d\x38\x30\x2e\x30\x30\x31\x2c\x33\x36\x2d\
+\x38\x30\x2e\x30\x30\x31\x2c\x38\x30\x63\x30\x2c\x34\x34\x2e\x30\
+\x30\x34\x2c\x33\x35\x2e\x39\x39\x37\x2c\x38\x30\x2c\x38\x30\x2e\
+\x30\x30\x31\x2c\x38\x30\x63\x34\x34\x2e\x30\x30\x35\x2c\x30\x2c\
+\x37\x39\x2e\x39\x39\x39\x2d\x33\x35\x2e\x39\x39\x36\x2c\x37\x39\
+\x2e\x39\x39\x39\x2d\x38\x30\x0a\x09\x09\x09\x43\x33\x33\x35\x2e\
+\x39\x39\x39\x2c\x32\x31\x32\x2c\x33\x30\x30\x2e\x30\x30\x35\x2c\
+\x31\x37\x36\x2c\x32\x35\x36\x2c\x31\x37\x36\x7a\x20\x4d\x34\x34\
+\x36\x2e\x39\x33\x38\x2c\x32\x33\x34\x2e\x36\x36\x37\x63\x2d\x39\
+\x2e\x36\x30\x35\x2d\x38\x38\x2e\x35\x33\x31\x2d\x38\x31\x2e\x30\
+\x37\x34\x2d\x31\x36\x30\x2d\x31\x36\x39\x2e\x36\x30\x35\x2d\x31\
+\x36\x39\x2e\x35\x39\x39\x56\x33\x32\x68\x2d\x34\x32\x2e\x36\x36\
+\x36\x76\x33\x33\x2e\x30\x36\x37\x0a\x09\x09\x09\x63\x2d\x38\x38\
+\x2e\x35\x33\x31\x2c\x39\x2e\x35\x39\x39\x2d\x31\x36\x30\x2c\x38\
+\x31\x2e\x30\x36\x38\x2d\x31\x36\x39\x2e\x36\x30\x34\x2c\x31\x36\
+\x39\x2e\x35\x39\x39\x48\x33\x32\x76\x34\x32\x2e\x36\x36\x37\x68\
+\x33\x33\x2e\x30\x36\x32\x63\x39\x2e\x36\x30\x34\x2c\x38\x38\x2e\
+\x35\x33\x31\x2c\x38\x31\x2e\x30\x37\x32\x2c\x31\x36\x30\x2c\x31\
+\x36\x39\x2e\x36\x30\x34\x2c\x31\x36\x39\x2e\x36\x30\x34\x56\x34\
+\x38\x30\x68\x34\x32\x2e\x36\x36\x36\x76\x2d\x33\x33\x2e\x30\x36\
+\x32\x0a\x09\x09\x09\x63\x38\x38\x2e\x35\x33\x31\x2d\x39\x2e\x36\
+\x30\x34\x2c\x31\x36\x30\x2d\x38\x31\x2e\x30\x37\x33\x2c\x31\x36\
+\x39\x2e\x36\x30\x35\x2d\x31\x36\x39\x2e\x36\x30\x34\x48\x34\x38\
+\x30\x76\x2d\x34\x32\x2e\x36\x36\x37\x48\x34\x34\x36\x2e\x39\x33\
+\x38\x7a\x20\x4d\x32\x35\x36\x2c\x34\x30\x35\x2e\x33\x33\x33\x63\
+\x2d\x38\x32\x2e\x31\x33\x37\x2c\x30\x2d\x31\x34\x39\x2e\x33\x33\
+\x34\x2d\x36\x37\x2e\x31\x39\x38\x2d\x31\x34\x39\x2e\x33\x33\x34\
+\x2d\x31\x34\x39\x2e\x33\x33\x33\x0a\x09\x09\x09\x63\x30\x2d\x38\
+\x32\x2e\x31\x33\x36\x2c\x36\x37\x2e\x31\x39\x37\x2d\x31\x34\x39\
+\x2e\x33\x33\x33\x2c\x31\x34\x39\x2e\x33\x33\x34\x2d\x31\x34\x39\
+\x2e\x33\x33\x33\x63\x38\x32\x2e\x31\x33\x35\x2c\x30\x2c\x31\x34\
+\x39\x2e\x33\x33\x32\x2c\x36\x37\x2e\x31\x39\x38\x2c\x31\x34\x39\
+\x2e\x33\x33\x32\x2c\x31\x34\x39\x2e\x33\x33\x33\x43\x34\x30\x35\
+\x2e\x33\x33\x32\x2c\x33\x33\x38\x2e\x31\x33\x35\x2c\x33\x33\x38\
+\x2e\x31\x33\x35\x2c\x34\x30\x35\x2e\x33\x33\x33\x2c\x32\x35\x36\
+\x2c\x34\x30\x35\x2e\x33\x33\x33\x7a\x0a\x09\x09\x09\x22\x2f\x3e\
+\x0a\x09\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\
+\x67\x3e\x0a\
+\x00\x00\x03\xd9\
\x3c\
-\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x27\x31\x2e\
-\x30\x27\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x27\x55\x54\x46\
-\x2d\x38\x27\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x54\x68\x69\x73\x20\
-\x66\x69\x6c\x65\x20\x77\x61\x73\x20\x67\x65\x6e\x65\x72\x61\x74\
-\x65\x64\x20\x62\x79\x20\x64\x76\x69\x73\x76\x67\x6d\x20\x32\x2e\
-\x31\x31\x2e\x31\x20\x2d\x2d\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\
-\x72\x73\x69\x6f\x6e\x3d\x27\x31\x2e\x31\x27\x20\x78\x6d\x6c\x6e\
-\x73\x3d\x27\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\
-\x2e\x6f\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x27\x20\x78\
-\x6d\x6c\x6e\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x27\x68\x74\x74\x70\
-\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\
-\x39\x39\x2f\x78\x6c\x69\x6e\x6b\x27\x20\x77\x69\x64\x74\x68\x3d\
-\x27\x36\x34\x2e\x30\x30\x30\x31\x70\x74\x27\x20\x68\x65\x69\x67\
-\x68\x74\x3d\x27\x36\x34\x70\x74\x27\x20\x76\x69\x65\x77\x42\x6f\
-\x78\x3d\x27\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\
-\x35\x38\x20\x36\x34\x2e\x30\x30\x30\x31\x20\x36\x34\x27\x3e\x0a\
-\x3c\x67\x20\x69\x64\x3d\x27\x70\x61\x67\x65\x31\x27\x3e\x0a\x3c\
-\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\
-\x6e\x73\x6c\x61\x74\x65\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\
-\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\
-\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\
-\x27\x4d\x20\x36\x2e\x30\x32\x32\x35\x20\x33\x32\x2e\x31\x32\x43\
-\x20\x36\x2e\x32\x32\x30\x37\x32\x20\x32\x34\x2e\x39\x36\x35\x35\
-\x20\x39\x2e\x30\x34\x39\x38\x39\x20\x31\x38\x2e\x31\x33\x35\x33\
-\x20\x31\x33\x2e\x39\x36\x38\x37\x20\x31\x32\x2e\x39\x33\x36\x31\
-\x43\x20\x32\x39\x2e\x35\x30\x36\x32\x20\x2d\x33\x2e\x34\x38\x36\
-\x38\x36\x20\x35\x35\x2e\x33\x36\x37\x33\x20\x32\x2e\x36\x39\x39\
-\x35\x20\x35\x38\x2e\x32\x31\x37\x35\x20\x32\x31\x2e\x37\x33\x37\
-\x38\x43\x20\x35\x39\x2e\x36\x39\x32\x32\x20\x33\x31\x2e\x35\x38\
-\x38\x31\x20\x35\x32\x2e\x36\x35\x30\x38\x20\x34\x30\x2e\x36\x37\
-\x37\x39\x20\x34\x32\x2e\x37\x34\x34\x35\x20\x34\x31\x2e\x37\x31\
-\x31\x39\x27\x20\x66\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\
-\x73\x74\x72\x6f\x6b\x65\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\
-\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\x3d\
-\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\
-\x69\x6e\x65\x6a\x6f\x69\x6e\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\
-\x73\x74\x72\x6f\x6b\x65\x2d\x6d\x69\x74\x65\x72\x6c\x69\x6d\x69\
-\x74\x3d\x27\x31\x30\x2e\x30\x33\x37\x35\x27\x20\x73\x74\x72\x6f\
-\x6b\x65\x2d\x77\x69\x64\x74\x68\x3d\x27\x32\x2e\x35\x30\x39\x33\
-\x37\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\
-\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\x6e\x73\x6c\x61\x74\
-\x65\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\x35\
-\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\x36\x32\x36\x34\x29\
-\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\x36\
-\x2e\x30\x32\x32\x35\x27\x20\x63\x79\x3d\x27\x33\x32\x2e\x31\x32\
-\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\x66\x66\x30\x30\x30\x30\x27\
-\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\
-\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\
-\x27\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x35\x38\x2e\x34\x36\
-\x36\x39\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\
-\x28\x2e\x39\x39\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x63\x69\x72\
-\x63\x6c\x65\x20\x63\x78\x3d\x27\x31\x33\x2e\x39\x36\x38\x37\x27\
-\x20\x63\x79\x3d\x27\x31\x32\x2e\x39\x33\x36\x31\x27\x20\x66\x69\
-\x6c\x6c\x3d\x27\x23\x66\x66\x30\x30\x30\x30\x27\x20\x72\x3d\x27\
-\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\
-\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\
-\x6e\x73\x6c\x61\x74\x65\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\
-\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\
-\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\
-\x63\x78\x3d\x27\x35\x38\x2e\x32\x31\x37\x35\x27\x20\x63\x79\x3d\
-\x27\x32\x31\x2e\x37\x33\x37\x38\x27\x20\x66\x69\x6c\x6c\x3d\x27\
-\x23\x66\x66\x30\x30\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\
-\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\
-\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\x6e\x73\x6c\x61\
-\x74\x65\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\
-\x35\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\x36\x32\x36\x34\
-\x29\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\
-\x34\x32\x2e\x37\x34\x34\x35\x27\x20\x63\x79\x3d\x27\x34\x31\x2e\
-\x37\x31\x31\x39\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\x66\x66\x30\
-\x30\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\
-\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\
-\x67\x3e\
-\x00\x00\x04\xca\
-\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
-\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x39\x2e\x32\x2e\x31\x2c\x20\
+\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x38\x2e\x31\x2e\x31\x2c\x20\
\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
@@ -2335,162 +2427,55 @@
\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
-\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x0a\x09\x20\x69\x64\x3d\
-\x22\x73\x76\x67\x34\x36\x31\x39\x22\x20\x69\x6e\x6b\x73\x63\x61\
-\x70\x65\x3a\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x30\x2e\x39\x31\
-\x2b\x64\x65\x76\x65\x6c\x2b\x6f\x73\x78\x6d\x65\x6e\x75\x20\x72\
-\x31\x32\x39\x31\x31\x22\x20\x73\x6f\x64\x69\x70\x6f\x64\x69\x3a\
-\x64\x6f\x63\x6e\x61\x6d\x65\x3d\x22\x74\x72\x69\x61\x6e\x67\x6c\
-\x65\x2d\x73\x74\x72\x6f\x6b\x65\x64\x2d\x31\x35\x2e\x73\x76\x67\
-\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x63\x63\x3d\x22\x68\x74\x74\x70\
-\x3a\x2f\x2f\x63\x72\x65\x61\x74\x69\x76\x65\x63\x6f\x6d\x6d\x6f\
-\x6e\x73\x2e\x6f\x72\x67\x2f\x6e\x73\x23\x22\x20\x78\x6d\x6c\x6e\
-\x73\x3a\x64\x63\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x70\x75\x72\
-\x6c\x2e\x6f\x72\x67\x2f\x64\x63\x2f\x65\x6c\x65\x6d\x65\x6e\x74\
-\x73\x2f\x31\x2e\x31\x2f\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x69\x6e\
-\x6b\x73\x63\x61\x70\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
-\x77\x77\x2e\x69\x6e\x6b\x73\x63\x61\x70\x65\x2e\x6f\x72\x67\x2f\
-\x6e\x61\x6d\x65\x73\x70\x61\x63\x65\x73\x2f\x69\x6e\x6b\x73\x63\
-\x61\x70\x65\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x72\x64\x66\x3d\x22\
-\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\
-\x67\x2f\x31\x39\x39\x39\x2f\x30\x32\x2f\x32\x32\x2d\x72\x64\x66\
-\x2d\x73\x79\x6e\x74\x61\x78\x2d\x6e\x73\x23\x22\x20\x78\x6d\x6c\
-\x6e\x73\x3a\x73\x6f\x64\x69\x70\x6f\x64\x69\x3d\x22\x68\x74\x74\
-\x70\x3a\x2f\x2f\x73\x6f\x64\x69\x70\x6f\x64\x69\x2e\x73\x6f\x75\
-\x72\x63\x65\x66\x6f\x72\x67\x65\x2e\x6e\x65\x74\x2f\x44\x54\x44\
-\x2f\x73\x6f\x64\x69\x70\x6f\x64\x69\x2d\x30\x2e\x64\x74\x64\x22\
-\x20\x78\x6d\x6c\x6e\x73\x3a\x73\x76\x67\x3d\x22\x68\x74\x74\x70\
-\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\
-\x30\x30\x2f\x73\x76\x67\x22\x0a\x09\x20\x78\x6d\x6c\x6e\x73\x3d\
-\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\
-\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\
-\x6e\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\
-\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\
-\x2f\x78\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\
-\x79\x3d\x22\x30\x70\x78\x22\x20\x77\x69\x64\x74\x68\x3d\x22\x36\
-\x34\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x36\x34\x70\
-\x78\x22\x0a\x09\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
-\x30\x20\x31\x35\x20\x31\x35\x22\x20\x73\x74\x79\x6c\x65\x3d\x22\
-\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\
-\x64\x3a\x6e\x65\x77\x20\x30\x20\x30\x20\x31\x35\x20\x31\x35\x3b\
-\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\
-\x73\x65\x72\x76\x65\x22\x3e\x0a\x3c\x70\x61\x74\x68\x20\x69\x64\
-\x3d\x22\x72\x65\x63\x74\x33\x33\x33\x38\x22\x20\x69\x6e\x6b\x73\
-\x63\x61\x70\x65\x3a\x63\x6f\x6e\x6e\x65\x63\x74\x6f\x72\x2d\x63\
-\x75\x72\x76\x61\x74\x75\x72\x65\x3d\x22\x30\x22\x20\x73\x6f\x64\
-\x69\x70\x6f\x64\x69\x3a\x6e\x6f\x64\x65\x74\x79\x70\x65\x73\x3d\
-\x22\x63\x63\x63\x63\x63\x63\x63\x63\x63\x63\x63\x63\x22\x20\x64\
-\x3d\x22\x4d\x37\x2e\x35\x32\x34\x33\x2c\x31\x2e\x35\x30\x30\x34\
-\x0a\x09\x43\x37\x2e\x32\x34\x32\x39\x2c\x31\x2e\x34\x39\x31\x33\
-\x2c\x36\x2e\x39\x37\x38\x37\x2c\x31\x2e\x36\x34\x32\x33\x2c\x36\
-\x2e\x38\x33\x33\x36\x2c\x31\x2e\x38\x39\x35\x32\x6c\x2d\x35\x2e\
-\x35\x2c\x39\x2e\x38\x36\x39\x32\x43\x31\x2e\x30\x32\x31\x38\x2c\
-\x31\x32\x2e\x33\x30\x37\x38\x2c\x31\x2e\x33\x39\x35\x2c\x31\x32\
-\x2e\x39\x39\x39\x39\x2c\x32\x2c\x31\x33\x68\x31\x31\x0a\x09\x63\
-\x30\x2e\x36\x30\x35\x2d\x30\x2e\x30\x30\x30\x31\x2c\x30\x2e\x39\
-\x37\x38\x32\x2d\x30\x2e\x36\x39\x32\x32\x2c\x30\x2e\x36\x36\x36\
-\x34\x2d\x31\x2e\x32\x33\x35\x35\x6c\x2d\x35\x2e\x35\x2d\x39\x2e\
-\x38\x36\x39\x32\x43\x38\x2e\x30\x33\x30\x32\x2c\x31\x2e\x36\x35\
-\x37\x39\x2c\x37\x2e\x37\x38\x38\x34\x2c\x31\x2e\x35\x30\x39\x32\
-\x2c\x37\x2e\x35\x32\x34\x33\x2c\x31\x2e\x35\x30\x30\x34\x7a\x20\
-\x4d\x37\x2e\x35\x2c\x33\x2e\x38\x39\x39\x33\x6c\x34\x2e\x31\x32\
-\x36\x37\x2c\x37\x2e\x34\x37\x30\x34\x0a\x09\x48\x33\x2e\x33\x37\
-\x33\x33\x4c\x37\x2e\x35\x2c\x33\x2e\x38\x39\x39\x33\x7a\x22\x2f\
-\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x05\x9c\
+\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x43\
+\x68\x65\x76\x72\x6f\x6e\x5f\x63\x69\x72\x63\x6c\x65\x64\x5f\x72\
+\x69\x67\x68\x74\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\
+\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\
+\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x78\
+\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\
+\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\x6c\x69\
+\x6e\x6b\x22\x0a\x09\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
+\x22\x30\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\
+\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\
+\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\
+\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\
+\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\
+\x72\x76\x65\x22\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\
+\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x32\x34\x20\x30\x20\
+\x30\x20\x32\x34\x20\x30\x20\x30\x29\x27\x3e\x0a\x3c\x70\x61\x74\
+\x68\x20\x64\x3d\x22\x4d\x31\x31\x2c\x31\x30\x4c\x38\x2e\x36\x39\
+\x38\x2c\x37\x2e\x34\x39\x34\x63\x2d\x30\x2e\x31\x39\x36\x2d\x30\
+\x2e\x31\x39\x38\x2d\x30\x2e\x31\x39\x36\x2d\x30\x2e\x35\x31\x39\
+\x2c\x30\x2d\x30\x2e\x37\x31\x38\x63\x30\x2e\x31\x39\x36\x2d\x30\
+\x2e\x31\x39\x37\x2c\x30\x2e\x35\x31\x35\x2d\x30\x2e\x31\x39\x37\
+\x2c\x30\x2e\x37\x31\x2c\x30\x6c\x32\x2e\x38\x30\x37\x2c\x32\x2e\
+\x38\x36\x34\x0a\x09\x63\x30\x2e\x31\x39\x36\x2c\x30\x2e\x31\x39\
+\x39\x2c\x30\x2e\x31\x39\x36\x2c\x30\x2e\x35\x32\x2c\x30\x2c\x30\
+\x2e\x37\x31\x37\x6c\x2d\x32\x2e\x38\x30\x37\x2c\x32\x2e\x38\x36\
+\x34\x63\x2d\x30\x2e\x31\x39\x35\x2c\x30\x2e\x31\x39\x39\x2d\x30\
+\x2e\x35\x31\x34\x2c\x30\x2e\x31\x39\x38\x2d\x30\x2e\x37\x31\x2c\
+\x30\x63\x2d\x30\x2e\x31\x39\x36\x2d\x30\x2e\x31\x39\x37\x2d\x30\
+\x2e\x31\x39\x36\x2d\x30\x2e\x35\x31\x38\x2c\x30\x2d\x30\x2e\x37\
+\x31\x37\x4c\x31\x31\x2c\x31\x30\x7a\x20\x4d\x31\x30\x2c\x30\x2e\
+\x34\x0a\x09\x63\x35\x2e\x33\x30\x32\x2c\x30\x2c\x39\x2e\x36\x2c\
+\x34\x2e\x32\x39\x38\x2c\x39\x2e\x36\x2c\x39\x2e\x36\x63\x30\x2c\
+\x35\x2e\x33\x30\x33\x2d\x34\x2e\x32\x39\x38\x2c\x39\x2e\x36\x2d\
+\x39\x2e\x36\x2c\x39\x2e\x36\x53\x30\x2e\x34\x2c\x31\x35\x2e\x33\
+\x30\x33\x2c\x30\x2e\x34\x2c\x31\x30\x43\x30\x2e\x34\x2c\x34\x2e\
+\x36\x39\x38\x2c\x34\x2e\x36\x39\x38\x2c\x30\x2e\x34\x2c\x31\x30\
+\x2c\x30\x2e\x34\x7a\x20\x4d\x31\x30\x2c\x31\x38\x2e\x33\x35\x34\
+\x0a\x09\x63\x34\x2e\x36\x31\x33\x2c\x30\x2c\x38\x2e\x33\x35\x34\
+\x2d\x33\x2e\x37\x34\x2c\x38\x2e\x33\x35\x34\x2d\x38\x2e\x33\x35\
+\x34\x63\x30\x2d\x34\x2e\x36\x31\x34\x2d\x33\x2e\x37\x34\x31\x2d\
+\x38\x2e\x33\x35\x34\x2d\x38\x2e\x33\x35\x34\x2d\x38\x2e\x33\x35\
+\x34\x63\x2d\x34\x2e\x36\x31\x35\x2c\x30\x2d\x38\x2e\x33\x35\x34\
+\x2c\x33\x2e\x37\x34\x2d\x38\x2e\x33\x35\x34\x2c\x38\x2e\x33\x35\
+\x34\x0a\x09\x43\x31\x2e\x36\x34\x35\x2c\x31\x34\x2e\x36\x31\x34\
+\x2c\x35\x2e\x33\x38\x35\x2c\x31\x38\x2e\x33\x35\x34\x2c\x31\x30\
+\x2c\x31\x38\x2e\x33\x35\x34\x7a\x22\x2f\x3e\x0a\x3c\x2f\x67\x3e\
+\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x00\x00\x03\xdc\
\x3c\
-\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x27\x31\x2e\
-\x30\x27\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x27\x55\x54\x46\
-\x2d\x38\x27\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x54\x68\x69\x73\x20\
-\x66\x69\x6c\x65\x20\x77\x61\x73\x20\x67\x65\x6e\x65\x72\x61\x74\
-\x65\x64\x20\x62\x79\x20\x64\x76\x69\x73\x76\x67\x6d\x20\x32\x2e\
-\x31\x31\x2e\x31\x20\x2d\x2d\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\
-\x72\x73\x69\x6f\x6e\x3d\x27\x31\x2e\x31\x27\x20\x78\x6d\x6c\x6e\
-\x73\x3d\x27\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\
-\x2e\x6f\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x27\x20\x78\
-\x6d\x6c\x6e\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x27\x68\x74\x74\x70\
-\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\
-\x39\x39\x2f\x78\x6c\x69\x6e\x6b\x27\x20\x77\x69\x64\x74\x68\x3d\
-\x27\x36\x33\x2e\x39\x39\x39\x36\x70\x74\x27\x20\x68\x65\x69\x67\
-\x68\x74\x3d\x27\x36\x34\x70\x74\x27\x20\x76\x69\x65\x77\x42\x6f\
-\x78\x3d\x27\x35\x36\x2e\x34\x30\x39\x34\x20\x31\x31\x37\x2e\x38\
-\x35\x38\x20\x36\x33\x2e\x39\x39\x39\x36\x20\x36\x34\x27\x3e\x0a\
-\x3c\x67\x20\x69\x64\x3d\x27\x70\x61\x67\x65\x31\x27\x3e\x0a\x3c\
-\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\
-\x6e\x73\x6c\x61\x74\x65\x28\x35\x36\x2e\x34\x30\x39\x34\x20\x31\
-\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\
-\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\
-\x27\x4d\x20\x35\x34\x2e\x38\x39\x32\x36\x20\x32\x34\x2e\x35\x32\
-\x39\x31\x43\x20\x35\x34\x2e\x38\x39\x32\x36\x20\x32\x30\x2e\x33\
-\x33\x36\x38\x20\x34\x34\x2e\x36\x39\x36\x39\x20\x31\x36\x2e\x39\
-\x33\x38\x33\x20\x33\x32\x2e\x31\x32\x20\x31\x36\x2e\x39\x33\x38\
-\x33\x43\x20\x31\x39\x2e\x35\x34\x33\x31\x20\x31\x36\x2e\x39\x33\
-\x38\x33\x20\x39\x2e\x33\x34\x37\x34\x32\x20\x32\x30\x2e\x33\x33\
-\x36\x38\x20\x39\x2e\x33\x34\x37\x34\x32\x20\x32\x34\x2e\x35\x32\
-\x39\x31\x43\x20\x39\x2e\x33\x34\x37\x34\x32\x20\x32\x38\x2e\x37\
-\x32\x31\x35\x20\x31\x39\x2e\x35\x34\x33\x31\x20\x33\x32\x2e\x31\
-\x32\x20\x33\x32\x2e\x31\x32\x20\x33\x32\x2e\x31\x32\x43\x20\x34\
-\x34\x2e\x36\x39\x36\x39\x20\x33\x32\x2e\x31\x32\x20\x35\x34\x2e\
-\x38\x39\x32\x36\x20\x32\x38\x2e\x37\x32\x31\x35\x20\x35\x34\x2e\
-\x38\x39\x32\x36\x20\x32\x34\x2e\x35\x32\x39\x31\x5a\x27\x20\x66\
-\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\x73\x74\x72\x6f\x6b\
-\x65\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\x20\x73\x74\x72\x6f\
-\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\x3d\x27\x72\x6f\x75\x6e\
-\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x6a\x6f\
-\x69\x6e\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\
-\x65\x2d\x6d\x69\x74\x65\x72\x6c\x69\x6d\x69\x74\x3d\x27\x31\x30\
-\x2e\x30\x33\x37\x35\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x77\x69\
-\x64\x74\x68\x3d\x27\x33\x2e\x35\x31\x33\x31\x32\x27\x2f\x3e\x0a\
-\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\
-\x6d\x3d\x27\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x35\x36\x2e\
-\x34\x30\x39\x34\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\
-\x6c\x65\x28\x2e\x39\x39\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x70\
-\x61\x74\x68\x20\x64\x3d\x27\x4d\x20\x39\x2e\x33\x34\x37\x34\x32\
-\x20\x32\x34\x2e\x35\x32\x39\x31\x4c\x20\x39\x2e\x33\x34\x37\x34\
-\x32\x20\x35\x34\x2e\x38\x39\x32\x36\x4c\x20\x39\x2e\x33\x34\x37\
-\x34\x32\x20\x35\x34\x2e\x38\x39\x32\x36\x43\x20\x39\x2e\x33\x34\
-\x37\x34\x32\x20\x35\x34\x2e\x38\x39\x32\x36\x20\x39\x2e\x33\x34\
-\x37\x34\x32\x20\x35\x34\x2e\x38\x39\x32\x36\x20\x39\x2e\x33\x34\
-\x37\x34\x32\x20\x35\x34\x2e\x38\x39\x32\x36\x43\x20\x39\x2e\x33\
-\x34\x37\x34\x32\x20\x35\x39\x2e\x30\x38\x34\x39\x20\x31\x39\x2e\
-\x35\x34\x33\x31\x20\x36\x32\x2e\x34\x38\x33\x34\x20\x33\x32\x2e\
-\x31\x32\x20\x36\x32\x2e\x34\x38\x33\x34\x43\x20\x34\x34\x2e\x36\
-\x39\x36\x39\x20\x36\x32\x2e\x34\x38\x33\x34\x20\x35\x34\x2e\x38\
-\x39\x32\x36\x20\x35\x39\x2e\x30\x38\x34\x39\x20\x35\x34\x2e\x38\
-\x39\x32\x36\x20\x35\x34\x2e\x38\x39\x32\x36\x4c\x20\x35\x34\x2e\
-\x38\x39\x32\x36\x20\x35\x34\x2e\x38\x39\x32\x36\x4c\x20\x35\x34\
-\x2e\x38\x39\x32\x36\x20\x32\x34\x2e\x35\x32\x39\x31\x27\x20\x66\
-\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\x73\x74\x72\x6f\x6b\
-\x65\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\x20\x73\x74\x72\x6f\
-\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\x3d\x27\x72\x6f\x75\x6e\
-\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x6a\x6f\
-\x69\x6e\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\
-\x65\x2d\x6d\x69\x74\x65\x72\x6c\x69\x6d\x69\x74\x3d\x27\x31\x30\
-\x2e\x30\x33\x37\x35\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x77\x69\
-\x64\x74\x68\x3d\x27\x33\x2e\x35\x31\x33\x31\x32\x27\x2f\x3e\x0a\
-\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\
-\x6d\x3d\x27\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x35\x36\x2e\
-\x34\x30\x39\x34\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\
-\x6c\x65\x28\x2e\x39\x39\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x70\
-\x61\x74\x68\x20\x64\x3d\x27\x4d\x20\x35\x34\x2e\x38\x39\x32\x36\
-\x20\x32\x34\x2e\x35\x32\x39\x31\x43\x20\x35\x34\x2e\x38\x39\x32\
-\x36\x20\x31\x31\x2e\x39\x35\x32\x32\x20\x34\x34\x2e\x36\x39\x36\
-\x39\x20\x31\x2e\x37\x35\x36\x35\x36\x20\x33\x32\x2e\x31\x32\x20\
-\x31\x2e\x37\x35\x36\x35\x36\x43\x20\x31\x39\x2e\x35\x34\x33\x31\
-\x20\x31\x2e\x37\x35\x36\x35\x36\x20\x39\x2e\x33\x34\x37\x34\x32\
-\x20\x31\x31\x2e\x39\x35\x32\x32\x20\x39\x2e\x33\x34\x37\x34\x32\
-\x20\x32\x34\x2e\x35\x32\x39\x31\x27\x20\x66\x69\x6c\x6c\x3d\x27\
-\x6e\x6f\x6e\x65\x27\x20\x73\x74\x72\x6f\x6b\x65\x3d\x27\x23\x30\
-\x30\x30\x30\x30\x30\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\
-\x6e\x65\x63\x61\x70\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\
-\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x6a\x6f\x69\x6e\x3d\x27\x72\
-\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6d\x69\x74\
-\x65\x72\x6c\x69\x6d\x69\x74\x3d\x27\x31\x30\x2e\x30\x33\x37\x35\
-\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x77\x69\x64\x74\x68\x3d\x27\
-\x33\x2e\x35\x31\x33\x31\x32\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\
-\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\
-\x00\x00\x02\xee\
-\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
@@ -2520,24 +2505,39 @@
\x3d\x22\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\
\x75\x6e\x64\x3a\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\
\x35\x31\x32\x3b\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\
-\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0a\x3c\x70\x61\x74\
-\x68\x20\x64\x3d\x22\x4d\x34\x31\x37\x2e\x34\x2c\x32\x32\x34\x48\
-\x32\x38\x38\x56\x39\x34\x2e\x36\x63\x30\x2d\x31\x36\x2e\x39\x2d\
-\x31\x34\x2e\x33\x2d\x33\x30\x2e\x36\x2d\x33\x32\x2d\x33\x30\x2e\
-\x36\x63\x2d\x31\x37\x2e\x37\x2c\x30\x2d\x33\x32\x2c\x31\x33\x2e\
-\x37\x2d\x33\x32\x2c\x33\x30\x2e\x36\x56\x32\x32\x34\x48\x39\x34\
-\x2e\x36\x43\x37\x37\x2e\x37\x2c\x32\x32\x34\x2c\x36\x34\x2c\x32\
-\x33\x38\x2e\x33\x2c\x36\x34\x2c\x32\x35\x36\x0a\x09\x63\x30\x2c\
-\x31\x37\x2e\x37\x2c\x31\x33\x2e\x37\x2c\x33\x32\x2c\x33\x30\x2e\
-\x36\x2c\x33\x32\x48\x32\x32\x34\x76\x31\x32\x39\x2e\x34\x63\x30\
-\x2c\x31\x36\x2e\x39\x2c\x31\x34\x2e\x33\x2c\x33\x30\x2e\x36\x2c\
-\x33\x32\x2c\x33\x30\x2e\x36\x63\x31\x37\x2e\x37\x2c\x30\x2c\x33\
-\x32\x2d\x31\x33\x2e\x37\x2c\x33\x32\x2d\x33\x30\x2e\x36\x56\x32\
-\x38\x38\x68\x31\x32\x39\x2e\x34\x63\x31\x36\x2e\x39\x2c\x30\x2c\
-\x33\x30\x2e\x36\x2d\x31\x34\x2e\x33\x2c\x33\x30\x2e\x36\x2d\x33\
-\x32\x0a\x09\x43\x34\x34\x38\x2c\x32\x33\x38\x2e\x33\x2c\x34\x33\
-\x34\x2e\x33\x2c\x32\x32\x34\x2c\x34\x31\x37\x2e\x34\x2c\x32\x32\
-\x34\x7a\x22\x2f\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0a\x3c\x67\x3e\x0a\
+\x09\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x32\x35\x36\x2c\x31\
+\x32\x38\x63\x2d\x38\x31\x2e\x39\x2c\x30\x2d\x31\x34\x35\x2e\x37\
+\x2c\x34\x38\x2e\x38\x2d\x32\x32\x34\x2c\x31\x32\x38\x63\x36\x37\
+\x2e\x34\x2c\x36\x37\x2e\x37\x2c\x31\x32\x34\x2c\x31\x32\x38\x2c\
+\x32\x32\x34\x2c\x31\x32\x38\x63\x39\x39\x2e\x39\x2c\x30\x2c\x31\
+\x37\x33\x2e\x34\x2d\x37\x36\x2e\x34\x2c\x32\x32\x34\x2d\x31\x32\
+\x36\x2e\x36\x0a\x09\x09\x43\x34\x32\x38\x2e\x32\x2c\x31\x39\x38\
+\x2e\x36\x2c\x33\x35\x34\x2e\x38\x2c\x31\x32\x38\x2c\x32\x35\x36\
+\x2c\x31\x32\x38\x7a\x20\x4d\x32\x35\x36\x2c\x33\x34\x37\x2e\x33\
+\x63\x2d\x34\x39\x2e\x34\x2c\x30\x2d\x38\x39\x2e\x36\x2d\x34\x31\
+\x2d\x38\x39\x2e\x36\x2d\x39\x31\x2e\x33\x63\x30\x2d\x35\x30\x2e\
+\x34\x2c\x34\x30\x2e\x32\x2d\x39\x31\x2e\x33\x2c\x38\x39\x2e\x36\
+\x2d\x39\x31\x2e\x33\x73\x38\x39\x2e\x36\x2c\x34\x31\x2c\x38\x39\
+\x2e\x36\x2c\x39\x31\x2e\x33\x0a\x09\x09\x43\x33\x34\x35\x2e\x36\
+\x2c\x33\x30\x36\x2e\x34\x2c\x33\x30\x35\x2e\x34\x2c\x33\x34\x37\
+\x2e\x33\x2c\x32\x35\x36\x2c\x33\x34\x37\x2e\x33\x7a\x22\x2f\x3e\
+\x0a\x09\x3c\x67\x3e\x0a\x09\x09\x3c\x70\x61\x74\x68\x20\x64\x3d\
+\x22\x4d\x32\x35\x36\x2c\x32\x32\x34\x63\x30\x2d\x37\x2e\x39\x2c\
+\x32\x2e\x39\x2d\x31\x35\x2e\x31\x2c\x37\x2e\x36\x2d\x32\x30\x2e\
+\x37\x63\x2d\x32\x2e\x35\x2d\x30\x2e\x34\x2d\x35\x2d\x30\x2e\x36\
+\x2d\x37\x2e\x36\x2d\x30\x2e\x36\x63\x2d\x32\x38\x2e\x38\x2c\x30\
+\x2d\x35\x32\x2e\x33\x2c\x32\x33\x2e\x39\x2d\x35\x32\x2e\x33\x2c\
+\x35\x33\x2e\x33\x63\x30\x2c\x32\x39\x2e\x34\x2c\x32\x33\x2e\x35\
+\x2c\x35\x33\x2e\x33\x2c\x35\x32\x2e\x33\x2c\x35\x33\x2e\x33\x0a\
+\x09\x09\x09\x73\x35\x32\x2e\x33\x2d\x32\x33\x2e\x39\x2c\x35\x32\
+\x2e\x33\x2d\x35\x33\x2e\x33\x63\x30\x2d\x32\x2e\x33\x2d\x30\x2e\
+\x32\x2d\x34\x2e\x36\x2d\x30\x2e\x34\x2d\x36\x2e\x39\x63\x2d\x35\
+\x2e\x35\x2c\x34\x2e\x33\x2d\x31\x32\x2e\x33\x2c\x36\x2e\x39\x2d\
+\x31\x39\x2e\x38\x2c\x36\x2e\x39\x43\x32\x37\x30\x2e\x33\x2c\x32\
+\x35\x36\x2c\x32\x35\x36\x2c\x32\x34\x31\x2e\x37\x2c\x32\x35\x36\
+\x2c\x32\x32\x34\x7a\x22\x2f\x3e\x0a\x09\x3c\x2f\x67\x3e\x0a\x3c\
+\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
"
qt_resource_name = b"\
@@ -2545,250 +2545,250 @@
\x00\x6f\xa6\x53\
\x00\x69\
\x00\x63\x00\x6f\x00\x6e\x00\x73\
-\x00\x1c\
-\x08\x8a\x79\x07\
-\x00\x61\
-\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x72\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x2d\x00\x62\x00\x75\x00\x74\
-\x00\x74\x00\x6f\x00\x6e\x00\x2d\x00\x6f\x00\x66\x00\x66\x00\x2e\x00\x73\x00\x76\x00\x67\
\x00\x10\
-\x0c\x57\x65\x47\
+\x06\xe3\xaf\xe7\
\x00\x61\
-\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x2d\x00\x72\x00\x65\x00\x73\x00\x69\x00\x7a\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x68\x00\x61\x00\x6e\x00\x64\x00\x2e\x00\x73\x00\x76\x00\x67\
\x00\x10\
\x08\x89\xfa\x47\
\x00\x63\
\x00\x65\x00\x6e\x00\x74\x00\x65\x00\x72\x00\x6f\x00\x72\x00\x69\x00\x67\x00\x69\x00\x6e\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x0a\
+\x01\xca\x6d\x87\
+\x00\x62\
+\x00\x75\x00\x63\x00\x6b\x00\x65\x00\x74\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x11\
+\x0c\xdb\x38\xe7\
+\x00\x61\
+\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
+\
+\x00\x10\
+\x08\xe4\xaf\x47\
+\x00\x61\
+\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x64\x00\x6f\x00\x6e\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x0f\
+\x04\xf2\xa7\x87\
+\x00\x63\
+\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x64\x00\x63\x00\x75\x00\x72\x00\x76\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x0d\
+\x05\x20\xce\x87\
+\x00\x6f\
+\x00\x70\x00\x65\x00\x6e\x00\x63\x00\x75\x00\x72\x00\x76\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
\x00\x08\
\x05\xa8\x57\x87\
\x00\x63\
\x00\x6f\x00\x64\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x1c\
+\x04\x66\xe1\x67\
+\x00\x63\
+\x00\x68\x00\x65\x00\x76\x00\x72\x00\x6f\x00\x6e\x00\x2d\x00\x77\x00\x69\x00\x74\x00\x68\x00\x2d\x00\x63\x00\x69\x00\x72\x00\x63\
+\x00\x6c\x00\x65\x00\x2d\x00\x6c\x00\x65\x00\x66\x00\x74\x00\x2e\x00\x73\x00\x76\x00\x67\
\x00\x08\
-\x04\xb2\x55\x47\
-\x00\x75\
-\x00\x6e\x00\x64\x00\x6f\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x0f\
-\x09\x76\x60\xc7\
-\x00\x63\
-\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x2d\x00\x72\x00\x6f\x00\x75\x00\x6e\x00\x64\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x14\
-\x0f\xa5\xe0\xc7\
-\x00\x6d\
-\x00\x61\x00\x67\x00\x6e\x00\x69\x00\x66\x00\x79\x00\x69\x00\x6e\x00\x67\x00\x2d\x00\x67\x00\x6c\x00\x61\x00\x73\x00\x73\x00\x2e\
-\x00\x73\x00\x76\x00\x67\
+\x0b\x07\x57\xa7\
+\x00\x65\
+\x00\x64\x00\x69\x00\x74\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x17\
+\x06\xc6\x02\xa7\
+\x00\x74\
+\x00\x72\x00\x69\x00\x61\x00\x6e\x00\x67\x00\x6c\x00\x65\x00\x2d\x00\x73\x00\x74\x00\x72\x00\x6f\x00\x6b\x00\x65\x00\x64\x00\x2d\
+\x00\x31\x00\x35\x00\x2e\x00\x73\x00\x76\x00\x67\
\x00\x11\
\x0c\xa7\xc7\x47\
\x00\x63\
\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x64\x00\x70\x00\x6f\x00\x6c\x00\x79\x00\x67\x00\x6f\x00\x6e\x00\x2e\x00\x73\x00\x76\x00\x67\
\
-\x00\x1d\
-\x06\xec\xf4\xc7\
+\x00\x0a\
+\x0a\x2d\x1b\xc7\
\x00\x63\
-\x00\x68\x00\x65\x00\x76\x00\x72\x00\x6f\x00\x6e\x00\x2d\x00\x77\x00\x69\x00\x74\x00\x68\x00\x2d\x00\x63\x00\x69\x00\x72\x00\x63\
-\x00\x6c\x00\x65\x00\x2d\x00\x72\x00\x69\x00\x67\x00\x68\x00\x74\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x0f\
-\x04\xf2\xa7\x87\
-\x00\x63\
-\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x64\x00\x63\x00\x75\x00\x72\x00\x76\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x09\
-\x0b\x9e\x89\x07\
-\x00\x63\
-\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x16\
-\x01\xfb\x76\x27\
+\x00\x69\x00\x72\x00\x63\x00\x6c\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x0a\
+\x0f\x68\x53\xe7\
\x00\x61\
-\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x61\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x2d\x00\x62\x00\x61\x00\x63\
-\x00\x6b\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x15\
-\x0f\xc4\x59\xe7\
-\x00\x73\
-\x00\x75\x00\x62\x00\x64\x00\x69\x00\x72\x00\x65\x00\x63\x00\x74\x00\x6f\x00\x72\x00\x79\x00\x2d\x00\x6c\x00\x65\x00\x66\x00\x74\
-\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x12\
-\x04\xb2\x21\x47\
-\x00\x61\
-\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x65\x00\x78\x00\x70\x00\x61\x00\x6e\x00\x64\x00\x2e\x00\x73\x00\x76\
-\x00\x67\
+\x00\x6e\x00\x63\x00\x68\x00\x6f\x00\x72\x00\x2e\x00\x73\x00\x76\x00\x67\
\x00\x08\
-\x0c\xf7\x55\x87\
-\x00\x74\
-\x00\x65\x00\x78\x00\x74\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x12\
-\x0c\x5e\xd4\xa7\
-\x00\x61\
-\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x6c\x00\x6f\x00\x63\x00\x61\x00\x74\x00\x65\x00\x2e\x00\x73\x00\x76\
-\x00\x67\
+\x0b\xb2\x55\xc7\
+\x00\x72\
+\x00\x65\x00\x64\x00\x6f\x00\x2e\x00\x73\x00\x76\x00\x67\
\x00\x19\
\x0a\x43\x45\xc7\
\x00\x61\
\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x61\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x2d\x00\x66\x00\x6f\x00\x72\
\x00\x77\x00\x61\x00\x72\x00\x64\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x0f\
-\x07\x0e\xc4\x87\
-\x00\x6f\
-\x00\x70\x00\x65\x00\x6e\x00\x70\x00\x6f\x00\x6c\x00\x79\x00\x67\x00\x6f\x00\x6e\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x07\
-\x0c\xf8\x5a\x07\
-\x00\x65\
-\x00\x79\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x08\
-\x08\xc8\x55\xe7\
-\x00\x73\
-\x00\x61\x00\x76\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x0a\
-\x0a\x2d\x1b\xc7\
-\x00\x63\
-\x00\x69\x00\x72\x00\x63\x00\x6c\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x12\
-\x08\x79\x97\xe7\
+\x00\x19\
+\x0f\xef\x7b\xe7\
\x00\x61\
-\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x63\x00\x61\x00\x6d\x00\x65\x00\x72\x00\x61\x00\x2e\x00\x73\x00\x76\
-\x00\x67\
-\x00\x1b\
-\x0e\xb5\x68\xe7\
-\x00\x61\
-\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x72\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x2d\x00\x62\x00\x75\x00\x74\
-\x00\x74\x00\x6f\x00\x6e\x00\x2d\x00\x6f\x00\x6e\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x08\
-\x0b\xb2\x55\xc7\
-\x00\x72\
-\x00\x65\x00\x64\x00\x6f\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x63\x00\x6f\x00\x6c\x00\x6f\x00\x72\x00\x2d\x00\x70\x00\x61\x00\x6c\
+\x00\x65\x00\x74\x00\x74\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
\x00\x11\
\x01\x60\xbc\x47\
\x00\x73\
\x00\x6f\x00\x63\x00\x69\x00\x61\x00\x6c\x00\x2d\x00\x70\x00\x79\x00\x74\x00\x68\x00\x6f\x00\x6e\x00\x2e\x00\x73\x00\x76\x00\x67\
\
-\x00\x19\
-\x0f\xef\x7b\xe7\
+\x00\x08\
+\x0c\xf7\x55\x87\
+\x00\x74\
+\x00\x65\x00\x78\x00\x74\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x0e\
+\x05\xed\x38\x67\
\x00\x61\
-\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x63\x00\x6f\x00\x6c\x00\x6f\x00\x72\x00\x2d\x00\x70\x00\x61\x00\x6c\
-\x00\x65\x00\x74\x00\x74\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x10\
-\x06\xe3\xaf\xe7\
+\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x2d\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x12\
+\x08\x55\xef\xc7\
\x00\x61\
-\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x68\x00\x61\x00\x6e\x00\x64\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x11\
-\x0c\xdb\x38\xe7\
-\x00\x61\
-\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
-\
+\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x64\x00\x65\x00\x6c\x00\x65\x00\x74\x00\x65\x00\x2e\x00\x73\x00\x76\
+\x00\x67\
+\x00\x08\
+\x08\xc8\x55\xe7\
+\x00\x73\
+\x00\x61\x00\x76\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
\x00\x13\
\x03\x24\x75\x47\
\x00\x61\
\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x72\x00\x65\x00\x66\x00\x72\x00\x65\x00\x73\x00\x68\x00\x2e\x00\x73\
\x00\x76\x00\x67\
-\x00\x0a\
-\x0f\x68\x53\xe7\
-\x00\x61\
-\x00\x6e\x00\x63\x00\x68\x00\x6f\x00\x72\x00\x2e\x00\x73\x00\x76\x00\x67\
\x00\x0e\
-\x05\xed\x38\x67\
+\x0f\xcb\xd5\xc7\
+\x00\x70\
+\x00\x6c\x00\x75\x00\x73\x00\x2d\x00\x72\x00\x6f\x00\x75\x00\x6e\x00\x64\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x12\
+\x08\x79\x97\xe7\
\x00\x61\
-\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x2d\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x10\
-\x04\xa9\x22\xc7\
-\x00\x66\
-\x00\x69\x00\x6c\x00\x6c\x00\x65\x00\x64\x00\x62\x00\x75\x00\x63\x00\x6b\x00\x65\x00\x74\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x63\x00\x61\x00\x6d\x00\x65\x00\x72\x00\x61\x00\x2e\x00\x73\x00\x76\
+\x00\x67\
+\x00\x1c\
+\x08\x8a\x79\x07\
+\x00\x61\
+\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x72\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x2d\x00\x62\x00\x75\x00\x74\
+\x00\x74\x00\x6f\x00\x6e\x00\x2d\x00\x6f\x00\x66\x00\x66\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x09\
+\x0c\x9b\x89\xe7\
+\x00\x62\
+\x00\x72\x00\x75\x00\x73\x00\x68\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x16\
+\x01\xfb\x76\x27\
+\x00\x61\
+\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x61\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x2d\x00\x62\x00\x61\x00\x63\
+\x00\x6b\x00\x2e\x00\x73\x00\x76\x00\x67\
\x00\x08\
\x08\xf7\x57\x07\
\x00\x67\
\x00\x72\x00\x69\x00\x64\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x12\
-\x08\x55\xef\xc7\
-\x00\x61\
-\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x64\x00\x65\x00\x6c\x00\x65\x00\x74\x00\x65\x00\x2e\x00\x73\x00\x76\
-\x00\x67\
\x00\x0a\
\x0a\xc8\x62\x67\
\x00\x63\
\x00\x65\x00\x6e\x00\x74\x00\x65\x00\x72\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x10\
+\x04\xa9\x22\xc7\
+\x00\x66\
+\x00\x69\x00\x6c\x00\x6c\x00\x65\x00\x64\x00\x62\x00\x75\x00\x63\x00\x6b\x00\x65\x00\x74\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x1b\
+\x0e\xb5\x68\xe7\
+\x00\x61\
+\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x72\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x2d\x00\x62\x00\x75\x00\x74\
+\x00\x74\x00\x6f\x00\x6e\x00\x2d\x00\x6f\x00\x6e\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x14\
+\x0f\xa5\xe0\xc7\
+\x00\x6d\
+\x00\x61\x00\x67\x00\x6e\x00\x69\x00\x66\x00\x79\x00\x69\x00\x6e\x00\x67\x00\x2d\x00\x67\x00\x6c\x00\x61\x00\x73\x00\x73\x00\x2e\
+\x00\x73\x00\x76\x00\x67\
+\x00\x15\
+\x0f\xc4\x59\xe7\
+\x00\x73\
+\x00\x75\x00\x62\x00\x64\x00\x69\x00\x72\x00\x65\x00\x63\x00\x74\x00\x6f\x00\x72\x00\x79\x00\x2d\x00\x6c\x00\x65\x00\x66\x00\x74\
+\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x0f\
+\x07\x0e\xc4\x87\
+\x00\x6f\
+\x00\x70\x00\x65\x00\x6e\x00\x70\x00\x6f\x00\x6c\x00\x79\x00\x67\x00\x6f\x00\x6e\x00\x2e\x00\x73\x00\x76\x00\x67\
\x00\x08\
-\x0b\x07\x57\xa7\
-\x00\x65\
-\x00\x64\x00\x69\x00\x74\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x04\xb2\x55\x47\
+\x00\x75\
+\x00\x6e\x00\x64\x00\x6f\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x12\
+\x04\xb2\x21\x47\
+\x00\x61\
+\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x65\x00\x78\x00\x70\x00\x61\x00\x6e\x00\x64\x00\x2e\x00\x73\x00\x76\
+\x00\x67\
+\x00\x10\
+\x0c\x57\x65\x47\
+\x00\x61\
+\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x2d\x00\x72\x00\x65\x00\x73\x00\x69\x00\x7a\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
\x00\x17\
\x07\x87\x48\x27\
\x00\x61\
\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x66\x00\x6f\x00\x6c\x00\x64\x00\x65\x00\x72\x00\x2d\x00\x6f\x00\x70\
\x00\x65\x00\x6e\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x10\
-\x08\xe4\xaf\x47\
+\x00\x09\
+\x0b\x9e\x89\x07\
+\x00\x63\
+\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x0f\
+\x09\x76\x60\xc7\
+\x00\x63\
+\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x2d\x00\x72\x00\x6f\x00\x75\x00\x6e\x00\x64\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x12\
+\x0c\x5e\xd4\xa7\
\x00\x61\
-\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x64\x00\x6f\x00\x6e\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x1c\
-\x04\x66\xe1\x67\
+\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x6c\x00\x6f\x00\x63\x00\x61\x00\x74\x00\x65\x00\x2e\x00\x73\x00\x76\
+\x00\x67\
+\x00\x1d\
+\x06\xec\xf4\xc7\
\x00\x63\
\x00\x68\x00\x65\x00\x76\x00\x72\x00\x6f\x00\x6e\x00\x2d\x00\x77\x00\x69\x00\x74\x00\x68\x00\x2d\x00\x63\x00\x69\x00\x72\x00\x63\
-\x00\x6c\x00\x65\x00\x2d\x00\x6c\x00\x65\x00\x66\x00\x74\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x09\
-\x0c\x9b\x89\xe7\
-\x00\x62\
-\x00\x72\x00\x75\x00\x73\x00\x68\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x0d\
-\x05\x20\xce\x87\
-\x00\x6f\
-\x00\x70\x00\x65\x00\x6e\x00\x63\x00\x75\x00\x72\x00\x76\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x17\
-\x06\xc6\x02\xa7\
-\x00\x74\
-\x00\x72\x00\x69\x00\x61\x00\x6e\x00\x67\x00\x6c\x00\x65\x00\x2d\x00\x73\x00\x74\x00\x72\x00\x6f\x00\x6b\x00\x65\x00\x64\x00\x2d\
-\x00\x31\x00\x35\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x0a\
-\x01\xca\x6d\x87\
-\x00\x62\
-\x00\x75\x00\x63\x00\x6b\x00\x65\x00\x74\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x0e\
-\x0f\xcb\xd5\xc7\
-\x00\x70\
-\x00\x6c\x00\x75\x00\x73\x00\x2d\x00\x72\x00\x6f\x00\x75\x00\x6e\x00\x64\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x6c\x00\x65\x00\x2d\x00\x72\x00\x69\x00\x67\x00\x68\x00\x74\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x07\
+\x0c\xf8\x5a\x07\
+\x00\x65\
+\x00\x79\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
"
qt_resource_struct_v1 = b"\
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x2c\x00\x00\x00\x02\
-\x00\x00\x03\xa4\x00\x00\x00\x00\x00\x01\x00\x00\x4e\xfb\
-\x00\x00\x06\x54\x00\x00\x00\x00\x00\x01\x00\x00\x8f\x67\
-\x00\x00\x01\xbc\x00\x00\x00\x00\x00\x01\x00\x00\x28\xd9\
-\x00\x00\x04\x52\x00\x00\x00\x00\x00\x01\x00\x00\x63\xf2\
-\x00\x00\x05\xaa\x00\x00\x00\x00\x00\x01\x00\x00\x7e\x58\
-\x00\x00\x04\xba\x00\x01\x00\x00\x00\x01\x00\x00\x6b\x43\
-\x00\x00\x02\x1e\x00\x00\x00\x00\x00\x01\x00\x00\x2b\xbf\
-\x00\x00\x00\xb0\x00\x00\x00\x00\x00\x01\x00\x00\x0e\x11\
-\x00\x00\x01\x80\x00\x00\x00\x00\x00\x01\x00\x00\x21\x2b\
-\x00\x00\x06\x00\x00\x00\x00\x00\x00\x01\x00\x00\x86\x22\
-\x00\x00\x00\x9a\x00\x00\x00\x00\x00\x01\x00\x00\x09\x71\
-\x00\x00\x04\x98\x00\x00\x00\x00\x00\x01\x00\x00\x68\x7e\
-\x00\x00\x06\x20\x00\x00\x00\x00\x00\x01\x00\x00\x8a\x99\
-\x00\x00\x04\x04\x00\x00\x00\x00\x00\x01\x00\x00\x5b\x84\
-\x00\x00\x01\x40\x00\x00\x00\x00\x00\x01\x00\x00\x1d\x4e\
-\x00\x00\x02\xc0\x00\x00\x00\x00\x00\x01\x00\x00\x36\xdb\
-\x00\x00\x05\x50\x00\x00\x00\x00\x00\x01\x00\x00\x78\x9c\
-\x00\x00\x04\xf6\x00\x00\x00\x00\x00\x01\x00\x00\x6f\x3f\
-\x00\x00\x03\x28\x00\x00\x00\x00\x00\x01\x00\x00\x44\x58\
-\x00\x00\x00\x74\x00\x00\x00\x00\x00\x01\x00\x00\x05\x6f\
+\x00\x00\x02\x88\x00\x00\x00\x00\x00\x01\x00\x00\x42\xaf\
+\x00\x00\x00\x5c\x00\x00\x00\x00\x00\x01\x00\x00\x09\xc1\
+\x00\x00\x03\xf6\x00\x00\x00\x00\x00\x01\x00\x00\x63\x37\
+\x00\x00\x03\x28\x00\x00\x00\x00\x00\x01\x00\x00\x53\x3a\
+\x00\x00\x01\x1e\x00\x00\x00\x00\x00\x01\x00\x00\x22\x3e\
+\x00\x00\x04\x58\x00\x01\x00\x00\x00\x01\x00\x00\x6a\xe7\
+\x00\x00\x05\x52\x00\x00\x00\x00\x00\x01\x00\x00\x7c\xa7\
+\x00\x00\x05\x3c\x00\x00\x00\x00\x00\x01\x00\x00\x78\x8c\
+\x00\x00\x00\xc4\x00\x00\x00\x00\x00\x01\x00\x00\x14\x80\
+\x00\x00\x00\xe8\x00\x00\x00\x00\x00\x01\x00\x00\x19\x27\
+\x00\x00\x01\x08\x00\x00\x00\x00\x00\x01\x00\x00\x1d\x9e\
+\x00\x00\x02\xc6\x00\x00\x00\x00\x00\x01\x00\x00\x4b\x3e\
+\x00\x00\x01\x72\x00\x00\x00\x00\x00\x01\x00\x00\x29\x8d\
\x00\x00\x00\x10\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
-\x00\x00\x02\xf8\x00\x00\x00\x00\x00\x01\x00\x00\x3e\xd2\
-\x00\x00\x05\x84\x00\x00\x00\x00\x00\x01\x00\x00\x7b\xe8\
-\x00\x00\x04\xe0\x00\x01\x00\x00\x00\x01\x00\x00\x6d\x63\
-\x00\x00\x00\xc6\x00\x00\x00\x00\x00\x01\x00\x00\x12\x2c\
-\x00\x00\x03\x0e\x00\x00\x00\x00\x00\x01\x00\x00\x41\x6d\
-\x00\x00\x02\x88\x00\x00\x00\x00\x00\x01\x00\x00\x34\x65\
-\x00\x00\x05\x20\x00\x00\x00\x00\x00\x01\x00\x00\x71\xdb\
-\x00\x00\x05\x3a\x00\x00\x00\x00\x00\x01\x00\x00\x75\x39\
-\x00\x00\x01\xa4\x00\x00\x00\x00\x00\x01\x00\x00\x25\xd2\
-\x00\x00\x03\x8e\x00\x00\x00\x00\x00\x01\x00\x00\x4a\xb5\
-\x00\x00\x00\x4e\x00\x00\x00\x00\x00\x01\x00\x00\x02\xf4\
-\x00\x00\x02\x5e\x00\x00\x00\x00\x00\x01\x00\x00\x30\x0d\
-\x00\x00\x05\xe8\x00\x00\x00\x00\x00\x01\x00\x00\x82\x44\
-\x00\x00\x01\x18\x00\x00\x00\x00\x00\x01\x00\x00\x19\x28\
-\x00\x00\x04\x2a\x00\x00\x00\x00\x00\x01\x00\x00\x61\x43\
-\x00\x00\x02\x48\x00\x00\x00\x00\x00\x01\x00\x00\x2e\xed\
-\x00\x00\x02\xe4\x00\x00\x00\x00\x00\x01\x00\x00\x3a\xf2\
-\x00\x00\x03\x52\x00\x00\x00\x00\x00\x01\x00\x00\x47\x72\
-\x00\x00\x04\x7e\x00\x00\x00\x00\x00\x01\x00\x00\x67\x11\
-\x00\x00\x00\xea\x00\x00\x00\x00\x00\x01\x00\x00\x15\x6d\
-\x00\x00\x01\xee\x00\x00\x00\x00\x00\x01\x00\x00\x2b\x4f\
-\x00\x00\x06\x6e\x00\x00\x00\x00\x00\x01\x00\x00\x95\x07\
-\x00\x00\x03\xcc\x00\x00\x00\x00\x00\x01\x00\x00\x56\x6a\
+\x00\x00\x06\x3c\x00\x00\x00\x00\x00\x01\x00\x00\x90\x3c\
+\x00\x00\x05\x18\x00\x00\x00\x00\x00\x01\x00\x00\x74\x75\
+\x00\x00\x05\xa2\x00\x00\x00\x00\x00\x01\x00\x00\x82\x50\
+\x00\x00\x02\xe8\x00\x00\x00\x00\x00\x01\x00\x00\x4e\x03\
+\x00\x00\x03\x76\x00\x00\x00\x00\x00\x01\x00\x00\x59\x4b\
+\x00\x00\x00\x36\x00\x00\x00\x00\x00\x01\x00\x00\x05\xbf\
+\x00\x00\x03\xa0\x00\x00\x00\x00\x00\x01\x00\x00\x5c\x65\
+\x00\x00\x03\x12\x00\x00\x00\x00\x00\x01\x00\x00\x50\x9f\
+\x00\x00\x00\x9e\x00\x00\x00\x00\x00\x01\x00\x00\x12\x10\
+\x00\x00\x04\x28\x00\x01\x00\x00\x00\x01\x00\x00\x65\xad\
+\x00\x00\x05\xee\x00\x00\x00\x00\x00\x01\x00\x00\x88\xa3\
+\x00\x00\x01\xce\x00\x00\x00\x00\x00\x01\x00\x00\x32\x81\
+\x00\x00\x02\x18\x00\x00\x00\x00\x00\x01\x00\x00\x3b\x1f\
+\x00\x00\x04\x3e\x00\x00\x00\x00\x00\x01\x00\x00\x67\x89\
+\x00\x00\x01\x5c\x00\x00\x00\x00\x00\x01\x00\x00\x26\x2a\
+\x00\x00\x05\xd6\x00\x00\x00\x00\x00\x01\x00\x00\x85\x9c\
+\x00\x00\x02\x02\x00\x00\x00\x00\x00\x01\x00\x00\x36\xd9\
+\x00\x00\x05\x7c\x00\x00\x00\x00\x00\x01\x00\x00\x7f\xd5\
+\x00\x00\x06\x12\x00\x00\x00\x00\x00\x01\x00\x00\x8b\xe4\
+\x00\x00\x03\xde\x00\x00\x00\x00\x00\x01\x00\x00\x5f\x59\
+\x00\x00\x01\xa6\x00\x00\x00\x00\x00\x01\x00\x00\x2e\x5b\
+\x00\x00\x00\x76\x00\x00\x00\x00\x00\x01\x00\x00\x0f\x61\
+\x00\x00\x02\xb0\x00\x00\x00\x00\x00\x01\x00\x00\x4a\x1e\
+\x00\x00\x06\x7c\x00\x00\x00\x00\x00\x01\x00\x00\x94\x19\
+\x00\x00\x04\x7e\x00\x00\x00\x00\x00\x01\x00\x00\x6d\x07\
+\x00\x00\x01\xe8\x00\x00\x00\x00\x00\x01\x00\x00\x35\x6c\
+\x00\x00\x04\xba\x00\x00\x00\x00\x00\x01\x00\x00\x70\x4a\
+\x00\x00\x04\xe8\x00\x00\x00\x00\x00\x01\x00\x00\x74\x05\
+\x00\x00\x03\x54\x00\x00\x00\x00\x00\x01\x00\x00\x56\x59\
+\x00\x00\x02\x50\x00\x00\x00\x00\x00\x01\x00\x00\x3d\x95\
"
qt_resource_struct_v2 = b"\
@@ -2796,94 +2796,94 @@
\x00\x00\x00\x00\x00\x00\x00\x00\
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x2c\x00\x00\x00\x02\
\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x03\xa4\x00\x00\x00\x00\x00\x01\x00\x00\x4e\xfb\
-\x00\x00\x01\x86\x34\x85\x88\xf8\
-\x00\x00\x06\x54\x00\x00\x00\x00\x00\x01\x00\x00\x8f\x67\
-\x00\x00\x01\x86\x34\x85\x88\xf6\
-\x00\x00\x01\xbc\x00\x00\x00\x00\x00\x01\x00\x00\x28\xd9\
-\x00\x00\x01\x86\x34\x85\x88\xf4\
-\x00\x00\x04\x52\x00\x00\x00\x00\x00\x01\x00\x00\x63\xf2\
-\x00\x00\x01\x86\x34\x85\x88\xf6\
-\x00\x00\x05\xaa\x00\x00\x00\x00\x00\x01\x00\x00\x7e\x58\
-\x00\x00\x01\x86\x34\x85\x88\xf7\
-\x00\x00\x04\xba\x00\x01\x00\x00\x00\x01\x00\x00\x6b\x43\
-\x00\x00\x01\x86\x34\x85\x88\xf8\
-\x00\x00\x02\x1e\x00\x00\x00\x00\x00\x01\x00\x00\x2b\xbf\
-\x00\x00\x01\x86\x34\x85\x88\xf5\
-\x00\x00\x00\xb0\x00\x00\x00\x00\x00\x01\x00\x00\x0e\x11\
-\x00\x00\x01\x86\x34\x85\x88\xf9\
-\x00\x00\x01\x80\x00\x00\x00\x00\x00\x01\x00\x00\x21\x2b\
-\x00\x00\x01\x86\x34\x85\x88\xf7\
-\x00\x00\x06\x00\x00\x00\x00\x00\x00\x01\x00\x00\x86\x22\
-\x00\x00\x01\x86\x34\x85\x88\xf8\
-\x00\x00\x00\x9a\x00\x00\x00\x00\x00\x01\x00\x00\x09\x71\
-\x00\x00\x01\x86\x34\x85\x88\xf7\
-\x00\x00\x04\x98\x00\x00\x00\x00\x00\x01\x00\x00\x68\x7e\
-\x00\x00\x01\x86\x34\x85\x88\xf6\
-\x00\x00\x06\x20\x00\x00\x00\x00\x00\x01\x00\x00\x8a\x99\
-\x00\x00\x01\x86\x34\x85\x88\xf9\
-\x00\x00\x04\x04\x00\x00\x00\x00\x00\x01\x00\x00\x5b\x84\
-\x00\x00\x01\x86\x34\x85\x88\xf5\
-\x00\x00\x01\x40\x00\x00\x00\x00\x00\x01\x00\x00\x1d\x4e\
-\x00\x00\x01\x86\x34\x85\x88\xf7\
-\x00\x00\x02\xc0\x00\x00\x00\x00\x00\x01\x00\x00\x36\xdb\
-\x00\x00\x01\x86\x34\x85\x88\xf8\
-\x00\x00\x05\x50\x00\x00\x00\x00\x00\x01\x00\x00\x78\x9c\
-\x00\x00\x01\x86\x34\x85\x88\xf5\
-\x00\x00\x04\xf6\x00\x00\x00\x00\x00\x01\x00\x00\x6f\x3f\
-\x00\x00\x01\x86\x34\x85\x88\xf5\
-\x00\x00\x03\x28\x00\x00\x00\x00\x00\x01\x00\x00\x44\x58\
-\x00\x00\x01\x86\x34\x85\x88\xf5\
-\x00\x00\x00\x74\x00\x00\x00\x00\x00\x01\x00\x00\x05\x6f\
-\x00\x00\x01\x86\x34\x85\x88\xf6\
+\x00\x00\x02\x88\x00\x00\x00\x00\x00\x01\x00\x00\x42\xaf\
+\x00\x00\x01\x8d\xe7\xff\x00\x7d\
+\x00\x00\x00\x5c\x00\x00\x00\x00\x00\x01\x00\x00\x09\xc1\
+\x00\x00\x01\x8d\xe7\xff\x00\x7b\
+\x00\x00\x03\xf6\x00\x00\x00\x00\x00\x01\x00\x00\x63\x37\
+\x00\x00\x01\x8d\xe7\xff\x00\x7a\
+\x00\x00\x03\x28\x00\x00\x00\x00\x00\x01\x00\x00\x53\x3a\
+\x00\x00\x01\x8d\xe7\xff\x00\x7b\
+\x00\x00\x01\x1e\x00\x00\x00\x00\x00\x01\x00\x00\x22\x3e\
+\x00\x00\x01\x8d\xe7\xff\x00\x7c\
+\x00\x00\x04\x58\x00\x01\x00\x00\x00\x01\x00\x00\x6a\xe7\
+\x00\x00\x01\x8d\xe7\xff\x00\x7c\
+\x00\x00\x05\x52\x00\x00\x00\x00\x00\x01\x00\x00\x7c\xa7\
+\x00\x00\x01\x8d\xe7\xff\x00\x7a\
+\x00\x00\x05\x3c\x00\x00\x00\x00\x00\x01\x00\x00\x78\x8c\
+\x00\x00\x01\x8d\xe7\xff\x00\x7d\
+\x00\x00\x00\xc4\x00\x00\x00\x00\x00\x01\x00\x00\x14\x80\
+\x00\x00\x01\x8d\xe7\xff\x00\x7c\
+\x00\x00\x00\xe8\x00\x00\x00\x00\x00\x01\x00\x00\x19\x27\
+\x00\x00\x01\x8d\xe7\xff\x00\x7d\
+\x00\x00\x01\x08\x00\x00\x00\x00\x00\x01\x00\x00\x1d\x9e\
+\x00\x00\x01\x8d\xe7\xff\x00\x7c\
+\x00\x00\x02\xc6\x00\x00\x00\x00\x00\x01\x00\x00\x4b\x3e\
+\x00\x00\x01\x8d\xe7\xff\x00\x7b\
+\x00\x00\x01\x72\x00\x00\x00\x00\x00\x01\x00\x00\x29\x8d\
+\x00\x00\x01\x8d\xe7\xff\x00\x7d\
\x00\x00\x00\x10\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
-\x00\x00\x01\x86\x34\x85\x88\xf5\
-\x00\x00\x02\xf8\x00\x00\x00\x00\x00\x01\x00\x00\x3e\xd2\
-\x00\x00\x01\x86\x34\x85\x88\xf8\
-\x00\x00\x05\x84\x00\x00\x00\x00\x00\x01\x00\x00\x7b\xe8\
-\x00\x00\x01\x86\x34\x85\x88\xf5\
-\x00\x00\x04\xe0\x00\x01\x00\x00\x00\x01\x00\x00\x6d\x63\
-\x00\x00\x01\x86\x34\x85\x88\xf8\
-\x00\x00\x00\xc6\x00\x00\x00\x00\x00\x01\x00\x00\x12\x2c\
-\x00\x00\x01\x86\x34\x85\x88\xf7\
-\x00\x00\x03\x0e\x00\x00\x00\x00\x00\x01\x00\x00\x41\x6d\
-\x00\x00\x01\x86\x34\x85\x88\xf7\
-\x00\x00\x02\x88\x00\x00\x00\x00\x00\x01\x00\x00\x34\x65\
-\x00\x00\x01\x86\x34\x85\x88\xf4\
-\x00\x00\x05\x20\x00\x00\x00\x00\x00\x01\x00\x00\x71\xdb\
-\x00\x00\x01\x86\x34\x85\x88\xf6\
-\x00\x00\x05\x3a\x00\x00\x00\x00\x00\x01\x00\x00\x75\x39\
-\x00\x00\x01\x86\x34\x85\x88\xf7\
-\x00\x00\x01\xa4\x00\x00\x00\x00\x00\x01\x00\x00\x25\xd2\
-\x00\x00\x01\x86\x34\x85\x88\xf7\
-\x00\x00\x03\x8e\x00\x00\x00\x00\x00\x01\x00\x00\x4a\xb5\
-\x00\x00\x01\x86\x34\x85\x88\xf8\
-\x00\x00\x00\x4e\x00\x00\x00\x00\x00\x01\x00\x00\x02\xf4\
-\x00\x00\x01\x86\x34\x85\x88\xf6\
-\x00\x00\x02\x5e\x00\x00\x00\x00\x00\x01\x00\x00\x30\x0d\
-\x00\x00\x01\x86\x34\x85\x88\xf5\
-\x00\x00\x05\xe8\x00\x00\x00\x00\x00\x01\x00\x00\x82\x44\
-\x00\x00\x01\x86\x34\x85\x88\xf6\
-\x00\x00\x01\x18\x00\x00\x00\x00\x00\x01\x00\x00\x19\x28\
-\x00\x00\x01\x86\x34\x85\x88\xf7\
-\x00\x00\x04\x2a\x00\x00\x00\x00\x00\x01\x00\x00\x61\x43\
-\x00\x00\x01\x86\x34\x85\x88\xf5\
-\x00\x00\x02\x48\x00\x00\x00\x00\x00\x01\x00\x00\x2e\xed\
-\x00\x00\x01\x86\x34\x85\x88\xf8\
-\x00\x00\x02\xe4\x00\x00\x00\x00\x00\x01\x00\x00\x3a\xf2\
-\x00\x00\x01\x86\x34\x85\x88\xf7\
-\x00\x00\x03\x52\x00\x00\x00\x00\x00\x01\x00\x00\x47\x72\
-\x00\x00\x01\x86\x34\x85\x88\xf6\
-\x00\x00\x04\x7e\x00\x00\x00\x00\x00\x01\x00\x00\x67\x11\
-\x00\x00\x01\x86\x34\x85\x88\xf4\
-\x00\x00\x00\xea\x00\x00\x00\x00\x00\x01\x00\x00\x15\x6d\
-\x00\x00\x01\x86\x34\x85\x88\xf8\
-\x00\x00\x01\xee\x00\x00\x00\x00\x00\x01\x00\x00\x2b\x4f\
-\x00\x00\x01\x86\x34\x85\x88\xf8\
-\x00\x00\x06\x6e\x00\x00\x00\x00\x00\x01\x00\x00\x95\x07\
-\x00\x00\x01\x86\x34\x85\x88\xf8\
-\x00\x00\x03\xcc\x00\x00\x00\x00\x00\x01\x00\x00\x56\x6a\
-\x00\x00\x01\x86\x34\x85\x88\xf5\
+\x00\x00\x01\x8d\xe7\xff\x00\x7b\
+\x00\x00\x06\x3c\x00\x00\x00\x00\x00\x01\x00\x00\x90\x3c\
+\x00\x00\x01\x8d\xe7\xff\x00\x7c\
+\x00\x00\x05\x18\x00\x00\x00\x00\x00\x01\x00\x00\x74\x75\
+\x00\x00\x01\x8d\xe7\xff\x00\x7d\
+\x00\x00\x05\xa2\x00\x00\x00\x00\x00\x01\x00\x00\x82\x50\
+\x00\x00\x01\x8d\xe7\xff\x00\x7b\
+\x00\x00\x02\xe8\x00\x00\x00\x00\x00\x01\x00\x00\x4e\x03\
+\x00\x00\x01\x8d\xe7\xff\x00\x7a\
+\x00\x00\x03\x76\x00\x00\x00\x00\x00\x01\x00\x00\x59\x4b\
+\x00\x00\x01\x8d\xe7\xff\x00\x7a\
+\x00\x00\x00\x36\x00\x00\x00\x00\x00\x01\x00\x00\x05\xbf\
+\x00\x00\x01\x8d\xe7\xff\x00\x7c\
+\x00\x00\x03\xa0\x00\x00\x00\x00\x00\x01\x00\x00\x5c\x65\
+\x00\x00\x01\x8d\xe7\xff\x00\x7b\
+\x00\x00\x03\x12\x00\x00\x00\x00\x00\x01\x00\x00\x50\x9f\
+\x00\x00\x01\x8d\xe7\xff\x00\x7d\
+\x00\x00\x00\x9e\x00\x00\x00\x00\x00\x01\x00\x00\x12\x10\
+\x00\x00\x01\x8d\xe7\xff\x00\x7a\
+\x00\x00\x04\x28\x00\x01\x00\x00\x00\x01\x00\x00\x65\xad\
+\x00\x00\x01\x8d\xe7\xff\x00\x7c\
+\x00\x00\x05\xee\x00\x00\x00\x00\x00\x01\x00\x00\x88\xa3\
+\x00\x00\x01\x8d\xe7\xff\x00\x7c\
+\x00\x00\x01\xce\x00\x00\x00\x00\x00\x01\x00\x00\x32\x81\
+\x00\x00\x01\x8d\xe7\xff\x00\x7c\
+\x00\x00\x02\x18\x00\x00\x00\x00\x00\x01\x00\x00\x3b\x1f\
+\x00\x00\x01\x8d\xe7\xff\x00\x7a\
+\x00\x00\x04\x3e\x00\x00\x00\x00\x00\x01\x00\x00\x67\x89\
+\x00\x00\x01\x8d\xe7\xff\x00\x7b\
+\x00\x00\x01\x5c\x00\x00\x00\x00\x00\x01\x00\x00\x26\x2a\
+\x00\x00\x01\x8d\xe7\xff\x00\x7c\
+\x00\x00\x05\xd6\x00\x00\x00\x00\x00\x01\x00\x00\x85\x9c\
+\x00\x00\x01\x8d\xe7\xff\x00\x7c\
+\x00\x00\x02\x02\x00\x00\x00\x00\x00\x01\x00\x00\x36\xd9\
+\x00\x00\x01\x8d\xe7\xff\x00\x7d\
+\x00\x00\x05\x7c\x00\x00\x00\x00\x00\x01\x00\x00\x7f\xd5\
+\x00\x00\x01\x8d\xe7\xff\x00\x7b\
+\x00\x00\x06\x12\x00\x00\x00\x00\x00\x01\x00\x00\x8b\xe4\
+\x00\x00\x01\x8d\xe7\xff\x00\x7b\
+\x00\x00\x03\xde\x00\x00\x00\x00\x00\x01\x00\x00\x5f\x59\
+\x00\x00\x01\x8d\xe7\xff\x00\x7b\
+\x00\x00\x01\xa6\x00\x00\x00\x00\x00\x01\x00\x00\x2e\x5b\
+\x00\x00\x01\x8d\xe7\xff\x00\x7c\
+\x00\x00\x00\x76\x00\x00\x00\x00\x00\x01\x00\x00\x0f\x61\
+\x00\x00\x01\x8d\xe7\xff\x00\x7a\
+\x00\x00\x02\xb0\x00\x00\x00\x00\x00\x01\x00\x00\x4a\x1e\
+\x00\x00\x01\x8d\xe7\xff\x00\x7d\
+\x00\x00\x06\x7c\x00\x00\x00\x00\x00\x01\x00\x00\x94\x19\
+\x00\x00\x01\x8d\xe7\xff\x00\x7c\
+\x00\x00\x04\x7e\x00\x00\x00\x00\x00\x01\x00\x00\x6d\x07\
+\x00\x00\x01\x8d\xe7\xff\x00\x7b\
+\x00\x00\x01\xe8\x00\x00\x00\x00\x00\x01\x00\x00\x35\x6c\
+\x00\x00\x01\x8d\xe7\xff\x00\x7a\
+\x00\x00\x04\xba\x00\x00\x00\x00\x00\x01\x00\x00\x70\x4a\
+\x00\x00\x01\x8d\xe7\xff\x00\x7d\
+\x00\x00\x04\xe8\x00\x00\x00\x00\x00\x01\x00\x00\x74\x05\
+\x00\x00\x01\x8d\xe7\xff\x00\x7d\
+\x00\x00\x03\x54\x00\x00\x00\x00\x00\x01\x00\x00\x56\x59\
+\x00\x00\x01\x8d\xe7\xff\x00\x7d\
+\x00\x00\x02\x50\x00\x00\x00\x00\x00\x01\x00\x00\x3d\x95\
+\x00\x00\x01\x8d\xe7\xff\x00\x7a\
"
qt_version = [int(v) for v in QtCore.qVersion().split('.')]
Modified: trunk/Build/source/utils/asymptote/GUI/pyUIClass/custMatTransform.py
===================================================================
--- trunk/Build/source/utils/asymptote/GUI/pyUIClass/custMatTransform.py 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/GUI/pyUIClass/custMatTransform.py 2024-02-27 20:51:03 UTC (rev 70212)
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'GUI/windows/custMatTransform.ui'
#
-# Created by: PyQt5 UI code generator 5.15.6
+# Created by: PyQt5 UI code generator 5.15.9
#
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
# run again. Do not edit this file unless you know what you are doing.
Modified: trunk/Build/source/utils/asymptote/GUI/pyUIClass/labelTextEditor.py
===================================================================
--- trunk/Build/source/utils/asymptote/GUI/pyUIClass/labelTextEditor.py 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/GUI/pyUIClass/labelTextEditor.py 2024-02-27 20:51:03 UTC (rev 70212)
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'GUI/windows/labelTextEditor.ui'
#
-# Created by: PyQt5 UI code generator 5.15.6
+# Created by: PyQt5 UI code generator 5.15.9
#
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
# run again. Do not edit this file unless you know what you are doing.
Modified: trunk/Build/source/utils/asymptote/GUI/pyUIClass/setCustomAnchor.py
===================================================================
--- trunk/Build/source/utils/asymptote/GUI/pyUIClass/setCustomAnchor.py 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/GUI/pyUIClass/setCustomAnchor.py 2024-02-27 20:51:03 UTC (rev 70212)
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'GUI/windows/setCustomAnchor.ui'
#
-# Created by: PyQt5 UI code generator 5.15.6
+# Created by: PyQt5 UI code generator 5.15.9
#
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
# run again. Do not edit this file unless you know what you are doing.
Modified: trunk/Build/source/utils/asymptote/GUI/pyUIClass/widg_addLabel.py
===================================================================
--- trunk/Build/source/utils/asymptote/GUI/pyUIClass/widg_addLabel.py 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/GUI/pyUIClass/widg_addLabel.py 2024-02-27 20:51:03 UTC (rev 70212)
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'GUI/windows/widg_addLabel.ui'
#
-# Created by: PyQt5 UI code generator 5.15.6
+# Created by: PyQt5 UI code generator 5.15.9
#
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
# run again. Do not edit this file unless you know what you are doing.
Modified: trunk/Build/source/utils/asymptote/GUI/pyUIClass/widg_addPolyOpt.py
===================================================================
--- trunk/Build/source/utils/asymptote/GUI/pyUIClass/widg_addPolyOpt.py 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/GUI/pyUIClass/widg_addPolyOpt.py 2024-02-27 20:51:03 UTC (rev 70212)
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'GUI/windows/widg_addPolyOpt.ui'
#
-# Created by: PyQt5 UI code generator 5.15.6
+# Created by: PyQt5 UI code generator 5.15.9
#
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
# run again. Do not edit this file unless you know what you are doing.
Modified: trunk/Build/source/utils/asymptote/GUI/pyUIClass/widg_editBezier.py
===================================================================
--- trunk/Build/source/utils/asymptote/GUI/pyUIClass/widg_editBezier.py 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/GUI/pyUIClass/widg_editBezier.py 2024-02-27 20:51:03 UTC (rev 70212)
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'GUI/windows/widg_editBezier.ui'
#
-# Created by: PyQt5 UI code generator 5.15.6
+# Created by: PyQt5 UI code generator 5.15.9
#
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
# run again. Do not edit this file unless you know what you are doing.
Modified: trunk/Build/source/utils/asymptote/GUI/pyUIClass/widgetPointEditor.py
===================================================================
--- trunk/Build/source/utils/asymptote/GUI/pyUIClass/widgetPointEditor.py 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/GUI/pyUIClass/widgetPointEditor.py 2024-02-27 20:51:03 UTC (rev 70212)
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'GUI/windows/widgetPointEditor.ui'
#
-# Created by: PyQt5 UI code generator 5.15.6
+# Created by: PyQt5 UI code generator 5.15.9
#
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
# run again. Do not edit this file unless you know what you are doing.
Modified: trunk/Build/source/utils/asymptote/GUI/pyUIClass/window1.py
===================================================================
--- trunk/Build/source/utils/asymptote/GUI/pyUIClass/window1.py 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/GUI/pyUIClass/window1.py 2024-02-27 20:51:03 UTC (rev 70212)
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'GUI/windows/window1.ui'
#
-# Created by: PyQt5 UI code generator 5.15.6
+# Created by: PyQt5 UI code generator 5.15.9
#
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
# run again. Do not edit this file unless you know what you are doing.
Modified: trunk/Build/source/utils/asymptote/GUI/xasy2asy.py
===================================================================
--- trunk/Build/source/utils/asymptote/GUI/xasy2asy.py 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/GUI/xasy2asy.py 2024-02-27 20:51:03 UTC (rev 70212)
@@ -1166,9 +1166,8 @@
"""
Purpose:
--------
- A base class dedicated to any xasy item that is drawn on GUI. Every object of this class
- will correspond to a particular drawn xasy item on GUI, which contains all its particular
- data.
+ A base class dedicated to any xasy item that is drawn with the GUI.
+ Each object of this class corresponds to a particular drawn xasy item.
Attributes:
-----------
Modified: trunk/Build/source/utils/asymptote/LspCpp/CMakeLists.txt
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/CMakeLists.txt 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/CMakeLists.txt 2024-02-27 20:51:03 UTC (rev 70212)
@@ -38,11 +38,22 @@
option_if_not_defined(LSPCPP_WARNINGS_AS_ERRORS "Treat warnings as errors" OFF)
option_if_not_defined(LSPCPP_BUILD_EXAMPLES "Build example applications" OFF)
option_if_not_defined(LSPCPP_BUILD_FUZZER "Build fuzzer" OFF)
+option_if_not_defined(LSPCPP_BUILD_WEBSOCKETS "Build websocket server" ON)
option_if_not_defined(LSPCPP_ASAN "Build lsp with address sanitizer" OFF)
option_if_not_defined(LSPCPP_MSAN "Build lsp with memory sanitizer" OFF)
option_if_not_defined(LSPCPP_TSAN "Build lsp with thread sanitizer" OFF)
option_if_not_defined(LSPCPP_INSTALL "Create lsp install target" OFF)
+option_if_not_defined(LSPCPP_SUPPORT_BOEHM_GC
+ "Enable support for Boehm GC. Boehm GC must be available by find_package(BDWgc CONFIG REQUIRED)." OFF)
+option_if_not_defined(LSPCPP_USE_CPP17 "Use C++17 for compilation. Setting this to off requires boost-optional." OFF)
+
+# Boehm GC
+
+if (LSPCPP_SUPPORT_BOEHM_GC)
+ find_package(BDWgc CONFIG REQUIRED)
+endif()
+
###########################################################
# Directories
###########################################################
@@ -88,8 +99,12 @@
set_property(TARGET ${target} PROPERTY CXX_STANDARD_REQUIRED ON)
- # Enable C++14 (Required)
- set_property(TARGET ${target} PROPERTY CXX_STANDARD 14)
+ # Enable C++14/17 (Required)
+ if (LSPCPP_USE_CPP17)
+ set_property(TARGET ${target} PROPERTY CXX_STANDARD 17)
+ else()
+ set_property(TARGET ${target} PROPERTY CXX_STANDARD 14)
+ endif()
set_property(TARGET ${target} PROPERTY CXX_EXTENSIONS OFF)
@@ -151,6 +166,11 @@
# target_compile_options(${target} PRIVATE "-Wl,--no-undefined")
# endif()
+ if (LSPCPP_SUPPORT_BOEHM_GC)
+ target_link_libraries(${target} PUBLIC BDWgc::gc)
+ target_compile_definitions(${target} PUBLIC LSPCPP_USEGC)
+ endif()
+
endfunction()
@@ -241,7 +261,7 @@
endforeach()
### Sources
-set(LSPCPP_LIST
+set(JSONRPC_LIST
src/jsonrpc/Context.cpp
src/jsonrpc/Endpoint.cpp
src/jsonrpc/GCThreadContext.cpp
@@ -252,8 +272,8 @@
src/jsonrpc/StreamMessageProducer.cpp
src/jsonrpc/TcpServer.cpp
src/jsonrpc/threaded_queue.cpp
- src/jsonrpc/WebSocketServer.cpp
-
+)
+set(LSPCPP_LIST
src/lsp/initialize.cpp
src/lsp/lsp.cpp
src/lsp/lsp_diagnostic.cpp
@@ -265,7 +285,15 @@
src/lsp/working_files.cpp
)
+if(LSPCPP_BUILD_WEBSOCKETS)
+ set(JSONRPC_LIST
+ ${JSONRPC_LIST}
+ src/jsonrpc/WebSocketServer.cpp
+ )
+endif()
+
target_sources(lspcpp PRIVATE
+ ${JSONRPC_LIST}
${LSPCPP_LIST})
### Compile options
Modified: trunk/Build/source/utils/asymptote/LspCpp/examples/StdIOClientExample.cpp
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/examples/StdIOClientExample.cpp 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/examples/StdIOClientExample.cpp 2024-02-27 20:51:03 UTC (rev 70212)
@@ -22,6 +22,7 @@
#include <boost/asio.hpp>
#include <iostream>
+#include <thread>
using namespace boost::asio::ip;
using namespace std;
@@ -162,7 +163,7 @@
}
else
{
- execPath = "STDIO_SERVER_EXAMPLE.exe";
+ execPath = "StdIOServerExample";
}
Client client(execPath, {});
Modified: trunk/Build/source/utils/asymptote/LspCpp/examples/StdIOServerExample.cpp
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/examples/StdIOServerExample.cpp 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/examples/StdIOServerExample.cpp 2024-02-27 20:51:03 UTC (rev 70212)
@@ -20,6 +20,8 @@
#include <boost/filesystem.hpp>
#include <boost/asio.hpp>
#include <iostream>
+#include <thread>
+
using namespace boost::asio::ip;
using namespace std;
class DummyLog :public lsp::Log
Modified: trunk/Build/source/utils/asymptote/LspCpp/examples/TcpServerExample.cpp
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/examples/TcpServerExample.cpp 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/examples/TcpServerExample.cpp 2024-02-27 20:51:03 UTC (rev 70212)
@@ -19,6 +19,8 @@
#include <boost/filesystem.hpp>
#include <boost/asio.hpp>
#include <iostream>
+#include <thread>
+
using namespace boost::asio::ip;
using namespace std;
class DummyLog :public lsp::Log
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/GCThreadContext.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/GCThreadContext.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/GCThreadContext.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -1,6 +1,6 @@
#pragma once
-#if defined(USEGC)
+#if defined(LSPCPP_USEGC)
#define GC_THREADS
#include <gc.h>
#endif
@@ -12,7 +12,7 @@
~GCThreadContext();
private:
-#if defined(USEGC)
+#if defined(LSPCPP_USEGC)
GC_stack_base gsb;
#endif
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/MessageProducer.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/MessageProducer.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/MessageProducer.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -2,11 +2,18 @@
#include <string>
#include <functional>
+namespace lsp {
+ /// The encoding style of the JSON-RPC messages (both input and output).
+ enum JSONStreamStyle {
+ /// Encoding per the LSP specification, with mandatory Content-Length header.
+ Standard,
+ /// Messages are delimited by a '// -----' line. Comment lines start with //.
+ Delimited
+ };
+}
class MessageProducer
{
public:
-
-
typedef std::function< void(std::string&&) > MessageConsumer;
virtual ~MessageProducer() = default;
virtual void listen(MessageConsumer) = 0;
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/RemoteEndPoint.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/RemoteEndPoint.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/RemoteEndPoint.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -13,6 +13,7 @@
#include "LibLsp/JsonRpc/MessageJsonHandler.h"
#include "Endpoint.h"
#include "future.h"
+#include "MessageProducer.h"
class MessageJsonHandler;
@@ -125,7 +126,9 @@
RemoteEndPoint(const std::shared_ptr <MessageJsonHandler>& json_handler,
const std::shared_ptr < Endpoint >& localEndPoint,
- lsp::Log& _log, uint8_t max_workers = 2);
+ lsp::Log& _log,
+ lsp::JSONStreamStyle style = lsp::JSONStreamStyle::Standard,
+ uint8_t max_workers = 2);
~RemoteEndPoint() override;
template <typename F, typename RequestType = ParamType<F, 0>, typename ResponseType = typename RequestType::Response>
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/StreamMessageProducer.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/StreamMessageProducer.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/StreamMessageProducer.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -13,24 +13,14 @@
class StreamMessageProducer : public MessageProducer
{
public:
- struct Headers
- {
- int contentLength = -1;
- std::string charset;
- void clear()
- {
- contentLength = -1;
- charset.clear();
- }
- };
- bool handleMessage(Headers& headers, MessageConsumer callBack);
- StreamMessageProducer(
+
+ StreamMessageProducer(
MessageIssueHandler& message_issue_handler, std::shared_ptr < lsp::istream> _input)
: issueHandler(message_issue_handler),
input(_input)
{
}
- StreamMessageProducer(
+ StreamMessageProducer(
MessageIssueHandler& message_issue_handler)
: issueHandler(message_issue_handler)
{
@@ -37,12 +27,65 @@
}
bool keepRunning = false;
- void listen(MessageConsumer) override;
- void bind(std::shared_ptr < lsp::istream>);
- void parseHeader(std::string& line, Headers& headers);
-private:
+
+ virtual void bind(std::shared_ptr<lsp::istream>) = 0 ;
+
+protected:
MessageIssueHandler& issueHandler;
std::shared_ptr < lsp::istream> input;
+
+};
+class LSPStreamMessageProducer : public StreamMessageProducer
+{
+public:
+ struct Headers
+ {
+ int contentLength = -1;
+ std::string charset;
+ void clear()
+ {
+ contentLength = -1;
+ charset.clear();
+ }
+ };
+ bool handleMessage(Headers& headers, MessageConsumer callBack);
+ LSPStreamMessageProducer(
+ MessageIssueHandler& message_issue_handler, std::shared_ptr < lsp::istream> _input)
+ : StreamMessageProducer(message_issue_handler,_input)
+ {
+ }
+ LSPStreamMessageProducer(
+ MessageIssueHandler& message_issue_handler)
+ : StreamMessageProducer(message_issue_handler)
+ {
+ }
+
+
+ void listen(MessageConsumer) override;
+ void bind(std::shared_ptr<lsp::istream>) override;
+ void parseHeader(std::string& line, Headers& headers);
+
+
};
+class DelimitedStreamMessageProducer : public StreamMessageProducer
+{
+public:
+
+ DelimitedStreamMessageProducer(
+ MessageIssueHandler& message_issue_handler, std::shared_ptr <lsp::istream> _input)
+ : StreamMessageProducer(message_issue_handler,_input)
+ {
+ }
+ DelimitedStreamMessageProducer(
+ MessageIssueHandler& message_issue_handler)
+ : StreamMessageProducer(message_issue_handler)
+ {
+ }
+
+
+ void listen(MessageConsumer) override;
+ void bind(std::shared_ptr < lsp::istream>) override;
+
+};
\ No newline at end of file
Added: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/optionalVersion.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/optionalVersion.h (rev 0)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/optionalVersion.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -0,0 +1,13 @@
+#ifndef boost
+#if __cplusplus < 201703L
+
+#include <boost/optional.hpp>
+using boost::optional;
+
+#else
+
+#include <optional>
+using std::optional;
+
+#endif
+#endif
Property changes on: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/optionalVersion.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/serializer.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/serializer.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/serializer.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -1,11 +1,6 @@
#pragma once
#include "macro_map.h"
-#ifdef boost
-#include "optional.hpp"
-#else
-#include <boost/optional.hpp>
-#endif
#include <cassert>
#include <memory>
@@ -16,6 +11,7 @@
#include <map>
#include <algorithm>
+#include "optionalVersion.h"
struct AbsolutePath;
@@ -205,9 +201,8 @@
void Reflect(Writer& visitor, SerializeFormat& value);
//// Type constructors
-
template <typename T>
-void Reflect(Reader& visitor, boost::optional<T>& value) {
+void Reflect(Reader& visitor, optional<T>& value) {
if (visitor.IsNull()) {
visitor.GetNull();
return;
@@ -217,7 +212,7 @@
value = std::move(real_value);
}
template <typename T>
-void Reflect(Writer& visitor, boost::optional<T>& value) {
+void Reflect(Writer& visitor, optional<T>& value) {
if (value)
Reflect(visitor, *value);
else
@@ -226,7 +221,7 @@
template <typename T>
-void ReflectMember(Writer& visitor, const char* name, boost::optional<T>& value) {
+void ReflectMember(Writer& visitor, const char* name, optional<T>& value) {
// For TypeScript optional property key?: value in the spec,
// We omit both key and value if value is std::nullopt (null) for JsonWriter
// to reduce output. But keep it for other serialization formats.
@@ -237,7 +232,6 @@
}
-
template <typename T>
void ReflectMember(Writer& visitor,
const char* name,
@@ -329,7 +323,7 @@
}
template<class _Ty1, class _Ty2>
-void Reflect(Writer& visitor, std::pair< boost::optional<_Ty1>, boost::optional<_Ty2> >& value)
+void Reflect(Writer& visitor, std::pair< optional<_Ty1>, optional<_Ty2> >& value)
{
if (value.first)
{
@@ -341,7 +335,7 @@
}
}
template<class _Ty2>
-void Reflect(Reader& visitor, std::pair< boost::optional<bool>, boost::optional<_Ty2> >& value)
+void Reflect(Reader& visitor, std::pair< optional<bool>, optional<_Ty2> >& value)
{
if(visitor.IsBool())
{
@@ -352,7 +346,7 @@
Reflect(visitor, value.second);
}
template<class _Ty2>
-void Reflect(Reader& visitor, std::pair< boost::optional<std::string>, boost::optional<_Ty2> >& value)
+void Reflect(Reader& visitor, std::pair< optional<std::string>, optional<_Ty2> >& value)
{
if (visitor.IsString())
{
@@ -365,7 +359,7 @@
template<class _Ty1, class _Ty2>
-void Reflect(Reader& visitor, std::pair< boost::optional<_Ty1>, boost::optional<_Ty2> >& value)
+void Reflect(Reader& visitor, std::pair< optional<_Ty1>, optional<_Ty2> >& value)
{
try
{
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/threaded_queue.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/threaded_queue.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/threaded_queue.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -1,6 +1,6 @@
#pragma once
-#include <boost/optional/optional.hpp>
+#include <optional>
#include <algorithm>
#include <atomic>
#include <condition_variable>
@@ -11,6 +11,7 @@
#include <utility>
#include <vector>
+#include "optionalVersion.h"
struct MultiQueueWaiter;
@@ -156,7 +157,7 @@
// Get the first element from the queue without blocking. Returns a null
// value if the queue is empty.
- boost::optional<T> TryDequeue(bool priority) {
+ optional<T> TryDequeue(bool priority) {
std::lock_guard<std::mutex> lock(mutex);
auto pop = [&](std::deque<T>* q) {
@@ -167,7 +168,7 @@
};
auto get_result = [&](std::deque<T>* first,
- std::deque<T>* second) -> boost::optional<T> {
+ std::deque<T>* second) -> optional<T> {
if (!first->empty())
return pop(first);
if (!second->empty())
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/ClientPreferences.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/ClientPreferences.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/ClientPreferences.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -79,7 +79,7 @@
return v3supported && isDynamicRegistrationSupported(textDocument.signatureHelp);
}
template<typename T>
- static bool isDynamicRegistrationSupported(boost::optional<T>& capability)
+ static bool isDynamicRegistrationSupported(optional<T>& capability)
{
if(capability)
return (capability.value().dynamicRegistration.value());
@@ -86,7 +86,7 @@
return false;
}
- bool isTrue(const boost::optional<bool>& value)
+ bool isTrue(const optional<bool>& value)
{
return value.get_value_or(false);
}
@@ -282,8 +282,8 @@
return false;
}
- bool isTagSupported(const boost::optional < std::pair<boost::optional<bool>,
- boost::optional<DiagnosticsTagSupport> > >& tagSupport) {
+ bool isTagSupported(const optional < std::pair<optional<bool>,
+ optional<DiagnosticsTagSupport> > >& tagSupport) {
if(tagSupport)
{
auto &v = tagSupport.value();
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/CodeActionParams.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/CodeActionParams.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/CodeActionParams.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -77,7 +77,7 @@
*
* See {@link CodeActionKind} for allowed values.
*/
- boost::optional<std::vector<std::string>> only;
+ optional<std::vector<std::string>> only;
MAKE_SWAP_METHOD(lsCodeActionContext,
diagnostics, only);
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/ExecuteCommandParams.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/ExecuteCommandParams.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/ExecuteCommandParams.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -13,7 +13,7 @@
* The arguments are typically specified when a command is returned from the server to the client.
* Example requests that return a command are textDocument/codeAction or textDocument/codeLens.
*/
- boost::optional<std::vector<lsp::Any>> arguments;
+ optional<std::vector<lsp::Any>> arguments;
MAKE_SWAP_METHOD(ExecuteCommandParams, command, arguments);
};
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/ResourceOperation.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/ResourceOperation.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/ResourceOperation.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -18,12 +18,12 @@
/**
* Overwrite existing file. Overwrite wins over `ignoreIfExists`
*/
- boost::optional<bool> overwrite = false;
+ optional<bool> overwrite = false;
/**
* Ignore if exists.
*/
- boost::optional< bool> ignoreIfExists =false;
+ optional< bool> ignoreIfExists =false;
MAKE_SWAP_METHOD(CreateFileOptions, overwrite, ignoreIfExists)
};
@@ -39,7 +39,7 @@
/**
* Additional options
*/
- boost::optional<CreateFileOptions> options;
+ optional<CreateFileOptions> options;
/**
@@ -47,7 +47,7 @@
*
* @since 3.16.0
*/
- boost::optional<lsChangeAnnotationIdentifier> annotationId;
+ optional<lsChangeAnnotationIdentifier> annotationId;
MAKE_SWAP_METHOD(lsCreateFile, kind, uri, options, annotationId)
};
@@ -58,12 +58,12 @@
/**
* Delete the content recursively if a folder is denoted.
*/
- boost::optional<bool> recursive = false;
+ optional<bool> recursive = false;
/**
* Ignore the operation if the file doesn't exist.
*/
- boost::optional<bool> ignoreIfNotExists = false;
+ optional<bool> ignoreIfNotExists = false;
MAKE_SWAP_METHOD(DeleteFileOptions, recursive, ignoreIfNotExists);
@@ -81,7 +81,7 @@
/**
* Delete options.
*/
- boost::optional<DeleteFileOptions> options;
+ optional<DeleteFileOptions> options;
MAKE_SWAP_METHOD(lsDeleteFile, kind, uri, options);
};
@@ -104,7 +104,7 @@
/**
* Rename options.
*/
- boost::optional<RenameFileOptions> options;
+ optional<RenameFileOptions> options;
/**
* An optional annotation identifer describing the operation.
@@ -111,7 +111,7 @@
*
* @since 3.16.0
*/
- boost::optional<lsChangeAnnotationIdentifier> annotationId;
+ optional<lsChangeAnnotationIdentifier> annotationId;
MAKE_SWAP_METHOD(lsRenameFile, kind, oldUri, newUri, options, annotationId)
};
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/extention/jdtls/getMoveDestinations.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/extention/jdtls/getMoveDestinations.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/extention/jdtls/getMoveDestinations.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -35,7 +35,7 @@
/**
* The code action params when the move operation is triggered.
*/
- boost::optional<lsCodeActionParams> params;
+ optional<lsCodeActionParams> params;
/**
* The possible destination: a folder/package, class, instanceDeclaration.
*/
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/extention/jdtls/getRefactorEdit.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/extention/jdtls/getRefactorEdit.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/extention/jdtls/getRefactorEdit.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -47,7 +47,7 @@
std::string command;
std::vector<lsp::Any> commandArguments;
lsCodeActionParams context;
- boost::optional<lsFormattingOptions> options;
+ optional<lsFormattingOptions> options;
MAKE_SWAP_METHOD(GetRefactorEditParams, command, context, options);
};
MAKE_REFLECT_STRUCT(GetRefactorEditParams, command, context, options);
@@ -65,9 +65,9 @@
* command, first the edit is executed and then the command.
*/
- boost::optional<std::string> errorMessage;
+ optional<std::string> errorMessage;
- boost::optional < lsCommandWithAny > command;
+ optional < lsCommandWithAny > command;
MAKE_SWAP_METHOD(RefactorWorkspaceEdit, edit, command, errorMessage)
};
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/extention/jdtls/searchSymbols.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/extention/jdtls/searchSymbols.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/extention/jdtls/searchSymbols.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -13,9 +13,9 @@
struct SearchSymbolParams :public WorkspaceSymbolParams
{
- boost::optional<std::string> projectName;
- boost::optional< bool >sourceOnly;
- boost::optional< int> maxResults;
+ optional<std::string> projectName;
+ optional< bool >sourceOnly;
+ optional< int> maxResults;
MAKE_SWAP_METHOD(SearchSymbolParams, query, projectName, sourceOnly, maxResults);
};
MAKE_REFLECT_STRUCT(SearchSymbolParams, query, projectName, sourceOnly, maxResults);
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/extention/sonarlint/protocol.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/extention/sonarlint/protocol.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/extention/sonarlint/protocol.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -1,6 +1,6 @@
#pragma once
#include <string>
-#include <boost/optional.hpp>
+#include <optional>
#include "LibLsp/JsonRpc/RequestInMessage.h"
#include "LibLsp/lsp/lsDocumentUri.h"
#include "LibLsp/lsp/lsAny.h"
@@ -18,8 +18,8 @@
return name + " (" + key + ")";
}
bool activeByDefault = true;
- boost::optional<std::string> severity;
- boost::optional<std::string> type;
+ optional<std::string> severity;
+ optional<std::string> type;
int icon_index = -1;
MAKE_SWAP_METHOD(LintRule, key, name, activeByDefault, severity, type);
@@ -29,8 +29,8 @@
struct RuleParameter {
std::string name;
- boost::optional<std::string> description;
- boost::optional<std::string> defaultValue;
+ optional<std::string> description;
+ optional<std::string> defaultValue;
};
MAKE_REFLECT_STRUCT(RuleParameter, name, description, defaultValue);
@@ -37,17 +37,17 @@
struct ShowRuleDescriptionParams {
- boost::optional<std::string> key;
+ optional<std::string> key;
- boost::optional<std::string> name;
+ optional<std::string> name;
- boost::optional<std::string> htmlDescription;
+ optional<std::string> htmlDescription;
- boost::optional<std::string> type;
+ optional<std::string> type;
- boost::optional<std::string> severity;
+ optional<std::string> severity;
- boost::optional< std::vector<RuleParameter> > parameters;
+ optional< std::vector<RuleParameter> > parameters;
MAKE_SWAP_METHOD(ShowRuleDescriptionParams, key, name, htmlDescription, type, severity, parameters)
@@ -82,7 +82,7 @@
std::string connectionId;
std::string serverUrl;
std::string token;
- boost::optional<std::string> organizationKey;
+ optional<std::string> organizationKey;
MAKE_SWAP_METHOD(ServerConnectionSettings, connectionId, serverUrl, token, organizationKey)
};
@@ -114,14 +114,14 @@
off();
}
}
- boost::optional< std::map<std::string, std::string > > parameters;
+ optional< std::map<std::string, std::string > > parameters;
};
MAKE_REFLECT_STRUCT(RuleSetting, level, parameters)
struct ConsoleParams
{
- boost::optional < bool >showAnalyzerLogs;
- boost::optional < bool >showVerboseLogs;
+ optional < bool >showAnalyzerLogs;
+ optional < bool >showVerboseLogs;
MAKE_SWAP_METHOD(ConsoleParams, showAnalyzerLogs, showVerboseLogs)
};
MAKE_REFLECT_STRUCT(ConsoleParams, showAnalyzerLogs, showVerboseLogs)
@@ -128,14 +128,14 @@
struct SonarLintWorkspaceSettings
{
- boost::optional < bool > disableTelemetry;
- boost::optional < std::map<std::string, ServerConnectionSettings> >connectedMode;
- boost::optional<std::map<std::string, RuleSetting>> rules;
- boost::optional<ConsoleParams> output;
+ optional < bool > disableTelemetry;
+ optional < std::map<std::string, ServerConnectionSettings> >connectedMode;
+ optional<std::map<std::string, RuleSetting>> rules;
+ optional<ConsoleParams> output;
- boost::optional<std::string > pathToNodeExecutable;
+ optional<std::string > pathToNodeExecutable;
- boost::optional< std::map<std::string, std::string > > getConfigurationParameters(const std::string& ruleKey);
+ optional< std::map<std::string, std::string > > getConfigurationParameters(const std::string& ruleKey);
};
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/InitializeParams.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/InitializeParams.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/InitializeParams.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -7,7 +7,7 @@
struct ClientInfo {
std::string name;
- boost::optional<std::string> version;
+ optional<std::string> version;
MAKE_SWAP_METHOD(ClientInfo,name,version);
};
@@ -18,7 +18,7 @@
// the server. Is null if the process has not been started by another process.
// If the parent process is not alive then the server should exit (see exit
// notification) its process.
- boost::optional<int> processId;
+ optional<int> processId;
/**
* Information about the client
@@ -25,7 +25,7 @@
*
* @since 3.15.0
*/
- boost::optional<ClientInfo> clientInfo;
+ optional<ClientInfo> clientInfo;
/**
* The locale the client is currently showing the user interface
* in. This must not necessarily be the locale of the operating
@@ -36,21 +36,21 @@
*
* @since 3.16.0
*/
- boost::optional<std::string> locale;
+ optional<std::string> locale;
// The rootPath of the workspace. Is null
// if no folder is open.
//
// @deprecated in favour of rootUri.
- boost::optional<std::string> rootPath;
+ optional<std::string> rootPath;
// The rootUri of the workspace. Is null if no
// folder is open. If both `rootPath` and `rootUri` are set
// `rootUri` wins.
- boost::optional<lsDocumentUri> rootUri;
+ optional<lsDocumentUri> rootUri;
// User provided initialization options.
- boost::optional<lsp::Any> initializationOptions;
+ optional<lsp::Any> initializationOptions;
// The capabilities provided by the client (editor or tool)
lsClientCapabilities capabilities;
@@ -57,11 +57,11 @@
/**
- * An boost::optional extension to the protocol.
+ * An optional extension to the protocol.
* To tell the server what client (editor) is talking to it.
*/
// @Deprecated
- boost::optional< std::string >clientName;
+ optional< std::string >clientName;
@@ -85,7 +85,7 @@
*
* Since 3.6.0
*/
- boost::optional< std::vector<WorkspaceFolder> > workspaceFolders;
+ optional< std::vector<WorkspaceFolder> > workspaceFolders;
MAKE_SWAP_METHOD(lsInitializeParams,
processId,
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/exit.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/exit.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/exit.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -4,4 +4,4 @@
/**
* A notification to ask the server to exit its process.
*/
-DEFINE_NOTIFICATION_TYPE(Notify_Exit, boost::optional<JsonNull>, "exit");
+DEFINE_NOTIFICATION_TYPE(Notify_Exit, optional<JsonNull>, "exit");
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/lsClientCapabilities.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/lsClientCapabilities.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/lsClientCapabilities.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -18,7 +18,7 @@
/**
* The version of the parser.
*/
- boost::optional<std::string> version;
+ optional<std::string> version;
MAKE_SWAP_METHOD(MarkdownClientCapabilities, parser, version)
};
@@ -26,19 +26,19 @@
struct lsClientCapabilities {
// Workspace specific client capabilities.
- boost::optional<lsWorkspaceClientCapabilites> workspace;
+ optional<lsWorkspaceClientCapabilites> workspace;
// Text document specific client capabilities.
- boost::optional<lsTextDocumentClientCapabilities> textDocument;
+ optional<lsTextDocumentClientCapabilities> textDocument;
/**
* Window specific client capabilities.
*/
- boost::optional<lsp::Any> window;
+ optional<lsp::Any> window;
/**
* Experimental client capabilities.
*/
- boost::optional<lsp::Any> experimental;
+ optional<lsp::Any> experimental;
MAKE_SWAP_METHOD(lsClientCapabilities, workspace, textDocument, window, experimental)
};
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/lsServerCapabilities.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/lsServerCapabilities.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/lsServerCapabilities.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -10,7 +10,7 @@
#include "LibLsp/lsp/textDocument/SemanticTokens.h"
-extern void Reflect(Reader&, std::pair<boost::optional<lsTextDocumentSyncKind>, boost::optional<lsTextDocumentSyncOptions> >&);
+extern void Reflect(Reader&, std::pair<optional<lsTextDocumentSyncKind>, optional<lsTextDocumentSyncOptions> >&);
//
// Code Action options.
@@ -32,7 +32,7 @@
//
// Code lens has a resolve provider as well.
//
- boost::optional<bool> resolveProvider ;
+ optional<bool> resolveProvider ;
MAKE_SWAP_METHOD(CodeLensOptions, workDoneProgress, resolveProvider);
};
MAKE_REFLECT_STRUCT(CodeLensOptions, workDoneProgress, resolveProvider)
@@ -56,7 +56,7 @@
//
// Renames should be checked and tested before being executed.
//
- boost::optional<bool> prepareProvider;
+ optional<bool> prepareProvider;
MAKE_SWAP_METHOD(RenameOptions, workDoneProgress, prepareProvider);
};
MAKE_REFLECT_STRUCT(RenameOptions,workDoneProgress,prepareProvider)
@@ -65,11 +65,11 @@
//
// A language id, like `typescript`.
//
- boost::optional<std::string> language;
+ optional<std::string> language;
//
// A Uri [scheme](#Uri.scheme), like `file` or `untitled`.
//
- boost::optional<std::string>scheme;
+ optional<std::string>scheme;
//
// A glob pattern, like `*.{ts,js}`.
//
@@ -85,7 +85,7 @@
// (e.g., `example.[!0-9]` to match on `example.a`, `example.b`, but
// not `example.0`)
//
- boost::optional<std::string>pattern;
+ optional<std::string>pattern;
MAKE_SWAP_METHOD(DocumentFilter, language, scheme, pattern)
};
MAKE_REFLECT_STRUCT(DocumentFilter, language, scheme, pattern)
@@ -96,7 +96,7 @@
// Document link options
struct lsDocumentLinkOptions :WorkDoneProgressOptions {
// Document links have a resolve provider as well.
- boost::optional<bool> resolveProvider;
+ optional<bool> resolveProvider;
MAKE_SWAP_METHOD(lsDocumentLinkOptions, workDoneProgress, resolveProvider);
};
MAKE_REFLECT_STRUCT(lsDocumentLinkOptions, workDoneProgress,resolveProvider);
@@ -116,7 +116,7 @@
// A document selector to identify the scope of the registration. If set to null
// the document selector provided on the client side will be used.
//
- boost::optional<DocumentSelector> documentSelector;
+ optional<DocumentSelector> documentSelector;
MAKE_SWAP_METHOD(TextDocumentRegistrationOptions, documentSelector);
};
@@ -131,7 +131,7 @@
// The id used to register the request. The id can be used to deregister
// the request again. See also Registration#id.
//
- boost::optional<std::string> id;
+ optional<std::string> id;
MAKE_SWAP_METHOD(StaticRegistrationOptions, documentSelector, id)
};
MAKE_REFLECT_STRUCT(StaticRegistrationOptions, documentSelector,id)
@@ -146,7 +146,7 @@
//
// The server has support for workspace folders
//
- boost::optional<bool> supported;
+ optional<bool> supported;
//
// Whether the server wants to receive workspace folder
@@ -157,7 +157,7 @@
// side. The ID can be used to unregister for these events
// using the `client/unregisterCapability` request.
//
- boost::optional<std::pair< boost::optional<std::string>, boost::optional<bool> > > changeNotifications;
+ optional<std::pair< optional<std::string>, optional<bool> > > changeNotifications;
MAKE_SWAP_METHOD(WorkspaceFoldersOptions, supported, changeNotifications);
};
MAKE_REFLECT_STRUCT(WorkspaceFoldersOptions, supported, changeNotifications);
@@ -185,7 +185,7 @@
//
// The pattern should be matched ignoring casing.
//
- boost::optional<bool> ignoreCase;
+ optional<bool> ignoreCase;
MAKE_SWAP_METHOD(lsFileOperationPatternOptions, ignoreCase)
};
MAKE_REFLECT_STRUCT(lsFileOperationPatternOptions, ignoreCase)
@@ -216,12 +216,12 @@
//
// Matches both if undefined.
//
- boost::optional<lsFileOperationPatternKind> matches;
+ optional<lsFileOperationPatternKind> matches;
//
// Additional options used during matching.
//
- boost::optional<lsFileOperationPatternOptions> options ;
+ optional<lsFileOperationPatternOptions> options ;
MAKE_SWAP_METHOD(lsFileOperationPattern, glob, matches, options)
};
MAKE_REFLECT_STRUCT(lsFileOperationPattern, glob, matches, options)
@@ -236,12 +236,12 @@
//
// A Uri like `file` or `untitled`.
//
- boost::optional<std::string> scheme;
+ optional<std::string> scheme;
//
// The actual file operation pattern.
//
- boost::optional<lsFileOperationPattern> pattern;
+ optional<lsFileOperationPattern> pattern;
MAKE_SWAP_METHOD(lsFileOperationFilter, scheme, pattern)
};
MAKE_REFLECT_STRUCT(lsFileOperationFilter, scheme, pattern)
@@ -254,7 +254,7 @@
//
// The actual filters.
//
- boost::optional<std::vector<lsFileOperationFilter>> filters;
+ optional<std::vector<lsFileOperationFilter>> filters;
MAKE_SWAP_METHOD(lsFileOperationRegistrationOptions, filters)
};
MAKE_REFLECT_STRUCT(lsFileOperationRegistrationOptions, filters)
@@ -279,38 +279,38 @@
// The server is interested in receiving didCreateFiles
// notifications.
//
- boost::optional<lsFileOperationRegistrationOptions> didCreate;
+ optional<lsFileOperationRegistrationOptions> didCreate;
//
// The server is interested in receiving willCreateFiles requests.
//
- boost::optional<lsFileOperationRegistrationOptions> willCreate;
+ optional<lsFileOperationRegistrationOptions> willCreate;
//
// The server is interested in receiving didRenameFiles
// notifications.
//
- boost::optional<lsFileOperationRegistrationOptions> didRename;
+ optional<lsFileOperationRegistrationOptions> didRename;
//
// The server is interested in receiving willRenameFiles requests.
//
- boost::optional<lsFileOperationRegistrationOptions> willRename;
+ optional<lsFileOperationRegistrationOptions> willRename;
//
// The server is interested in receiving didDeleteFiles file
// notifications.
//
- boost::optional<lsFileOperationRegistrationOptions> didDelete;
+ optional<lsFileOperationRegistrationOptions> didDelete;
//
// The server is interested in receiving willDeleteFiles file
// requests.
//
- boost::optional<lsFileOperationRegistrationOptions> willDelete;
+ optional<lsFileOperationRegistrationOptions> willDelete;
MAKE_SWAP_METHOD(lsFileOperations, didCreate, willCreate, didRename, willRename, didDelete, willDelete)
};
- boost::optional<lsFileOperations>fileOperations;
+ optional<lsFileOperations>fileOperations;
MAKE_SWAP_METHOD(WorkspaceServerCapabilities, workspaceFolders, fileOperations)
@@ -356,24 +356,24 @@
// Server supports providing semantic tokens for a specific range
// of a document.
//
- boost::optional< std::pair< boost::optional<bool>, boost::optional<lsp::Any> > > range;
+ optional< std::pair< optional<bool>, optional<lsp::Any> > > range;
//
// Server supports providing semantic tokens for a full document.
//
- boost::optional< std::pair< boost::optional<bool>,
- boost::optional<SemanticTokensServerFull> > > full;
+ optional< std::pair< optional<bool>,
+ optional<SemanticTokensServerFull> > > full;
//
// A document selector to identify the scope of the registration. If set to null
// the document selector provided on the client side will be used.
//
- boost::optional < std::vector<DocumentFilter> > documentSelector;
+ optional < std::vector<DocumentFilter> > documentSelector;
//
// The id used to register the request. The id can be used to deregister
// the request again. See also Registration#id.
//
- boost::optional<std::string> id;
+ optional<std::string> id;
MAKE_SWAP_METHOD(SemanticTokensWithRegistrationOptions, legend, range, full, documentSelector, id)
};
MAKE_REFLECT_STRUCT(SemanticTokensWithRegistrationOptions, legend, range, full, documentSelector ,id)
@@ -385,20 +385,20 @@
// defining each notification or for backwards compatibility the
// TextDocumentSyncKind number.
- boost::optional< std::pair<boost::optional<lsTextDocumentSyncKind>,
- boost::optional<lsTextDocumentSyncOptions> >> textDocumentSync;
+ optional< std::pair<optional<lsTextDocumentSyncKind>,
+ optional<lsTextDocumentSyncOptions> >> textDocumentSync;
// The server provides hover support.
- boost::optional<bool> hoverProvider;
+ optional<bool> hoverProvider;
// The server provides completion support.
- boost::optional < lsCompletionOptions > completionProvider;
+ optional < lsCompletionOptions > completionProvider;
// The server provides signature help support.
- boost::optional < lsSignatureHelpOptions > signatureHelpProvider;
+ optional < lsSignatureHelpOptions > signatureHelpProvider;
// The server provides goto definition support.
- boost::optional< std::pair< boost::optional<bool>, boost::optional<WorkDoneProgressOptions> > > definitionProvider;
+ optional< std::pair< optional<bool>, optional<WorkDoneProgressOptions> > > definitionProvider;
//
@@ -406,44 +406,44 @@
//
// Since 3.6.0
//
- boost::optional< std::pair< boost::optional<bool>, boost::optional<StaticRegistrationOptions> > > typeDefinitionProvider ;
+ optional< std::pair< optional<bool>, optional<StaticRegistrationOptions> > > typeDefinitionProvider ;
// The server provides implementation support.
- boost::optional< std::pair< boost::optional<bool>, boost::optional<StaticRegistrationOptions> > > implementationProvider ;
+ optional< std::pair< optional<bool>, optional<StaticRegistrationOptions> > > implementationProvider ;
// The server provides find references support.
- boost::optional< std::pair< boost::optional<bool>, boost::optional<WorkDoneProgressOptions> > > referencesProvider ;
+ optional< std::pair< optional<bool>, optional<WorkDoneProgressOptions> > > referencesProvider ;
// The server provides document highlight support.
- boost::optional< std::pair< boost::optional<bool>, boost::optional<WorkDoneProgressOptions> > > documentHighlightProvider ;
+ optional< std::pair< optional<bool>, optional<WorkDoneProgressOptions> > > documentHighlightProvider ;
// The server provides document symbol support.
- boost::optional< std::pair< boost::optional<bool>, boost::optional<WorkDoneProgressOptions> > > documentSymbolProvider ;
+ optional< std::pair< optional<bool>, optional<WorkDoneProgressOptions> > > documentSymbolProvider ;
// The server provides workspace symbol support.
- boost::optional< std::pair< boost::optional<bool>, boost::optional<WorkDoneProgressOptions> > > workspaceSymbolProvider ;
+ optional< std::pair< optional<bool>, optional<WorkDoneProgressOptions> > > workspaceSymbolProvider ;
// The server provides code actions.
- boost::optional< std::pair< boost::optional<bool>, boost::optional<CodeActionOptions> > > codeActionProvider ;
+ optional< std::pair< optional<bool>, optional<CodeActionOptions> > > codeActionProvider ;
// The server provides code lens.
- boost::optional<CodeLensOptions> codeLensProvider;
+ optional<CodeLensOptions> codeLensProvider;
// The server provides document formatting.
- boost::optional< std::pair< boost::optional<bool>, boost::optional<WorkDoneProgressOptions> > > documentFormattingProvider ;
+ optional< std::pair< optional<bool>, optional<WorkDoneProgressOptions> > > documentFormattingProvider ;
// The server provides document range formatting.
- boost::optional< std::pair< boost::optional<bool>, boost::optional<WorkDoneProgressOptions> > > documentRangeFormattingProvider ;
+ optional< std::pair< optional<bool>, optional<WorkDoneProgressOptions> > > documentRangeFormattingProvider ;
// The server provides document formatting on typing.
- boost::optional<lsDocumentOnTypeFormattingOptions> documentOnTypeFormattingProvider;
+ optional<lsDocumentOnTypeFormattingOptions> documentOnTypeFormattingProvider;
// The server provides rename support.
- boost::optional< std::pair< boost::optional<bool>, boost::optional<RenameOptions> > > renameProvider;
+ optional< std::pair< optional<bool>, optional<RenameOptions> > > renameProvider;
// The server provides document link support.
- boost::optional<lsDocumentLinkOptions > documentLinkProvider;
+ optional<lsDocumentLinkOptions > documentLinkProvider;
//
@@ -451,7 +451,7 @@
//
// @since 3.6.0
//
- boost::optional< std::pair< boost::optional<bool>, boost::optional<DocumentColorOptions> > > colorProvider;
+ optional< std::pair< optional<bool>, optional<DocumentColorOptions> > > colorProvider;
//
@@ -459,22 +459,22 @@
//
// @since 3.10.0
//
- boost::optional < std::pair< boost::optional<bool>, boost::optional<FoldingRangeOptions> > > foldingRangeProvider;
+ optional < std::pair< optional<bool>, optional<FoldingRangeOptions> > > foldingRangeProvider;
// The server provides execute command support.
- boost::optional < lsExecuteCommandOptions >executeCommandProvider;
+ optional < lsExecuteCommandOptions >executeCommandProvider;
//
// Workspace specific server capabilities
//
- boost::optional< WorkspaceServerCapabilities > workspace;
+ optional< WorkspaceServerCapabilities > workspace;
//
// Semantic highlighting server capabilities.
//
- boost::optional< SemanticHighlightingServerCapabilities >semanticHighlighting;
+ optional< SemanticHighlightingServerCapabilities >semanticHighlighting;
//
// Server capability for calculating super- and subtype hierarchies.
@@ -486,15 +486,15 @@
// language feature</a> is not yet part of the official LSP specification.
//
- boost::optional< std::pair< boost::optional<bool>,
- boost::optional<StaticRegistrationOptions> > > typeHierarchyProvider;
+ optional< std::pair< optional<bool>,
+ optional<StaticRegistrationOptions> > > typeHierarchyProvider;
//
// The server provides Call Hierarchy support.
//
- boost::optional< std::pair< boost::optional<bool>,
- boost::optional<StaticRegistrationOptions> > > callHierarchyProvider;
+ optional< std::pair< optional<bool>,
+ optional<StaticRegistrationOptions> > > callHierarchyProvider;
//
// The server provides selection range support.
@@ -501,8 +501,8 @@
//
// Since 3.15.0
//
- boost::optional< std::pair< boost::optional<bool>,
- boost::optional<StaticRegistrationOptions> > > selectionRangeProvider;
+ optional< std::pair< optional<bool>,
+ optional<StaticRegistrationOptions> > > selectionRangeProvider;
//
// The server provides linked editing range support.
@@ -509,8 +509,8 @@
//
// Since 3.16.0
//
- boost::optional< std::pair< boost::optional<bool>,
- boost::optional<StaticRegistrationOptions> > > linkedEditingRangeProvider;
+ optional< std::pair< optional<bool>,
+ optional<StaticRegistrationOptions> > > linkedEditingRangeProvider;
//
@@ -518,7 +518,7 @@
//
// Since 3.16.0
//
- boost::optional < SemanticTokensWithRegistrationOptions> semanticTokensProvider;
+ optional < SemanticTokensWithRegistrationOptions> semanticTokensProvider;
//
// Whether server provides moniker support.
@@ -525,10 +525,10 @@
//
// Since 3.16.0
//
- boost::optional< std::pair< boost::optional<bool>,
- boost::optional<StaticRegistrationOptions> > > monikerProvider;
+ optional< std::pair< optional<bool>,
+ optional<StaticRegistrationOptions> > > monikerProvider;
- boost::optional<lsp::Any> experimental;
+ optional<lsp::Any> experimental;
MAKE_SWAP_METHOD(lsServerCapabilities,
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/lsTextDocumentClientCapabilities.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/lsTextDocumentClientCapabilities.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/lsTextDocumentClientCapabilities.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -14,7 +14,7 @@
struct WorkDoneProgressOptions
{
- boost::optional<bool>workDoneProgress;
+ optional<bool>workDoneProgress;
MAKE_SWAP_METHOD(WorkDoneProgressOptions, workDoneProgress);
};
MAKE_REFLECT_STRUCT(WorkDoneProgressOptions, workDoneProgress);
@@ -24,7 +24,7 @@
{
// The server provides support to resolve additional
// information for a completion item.
- boost::optional<bool> resolveProvider = false;
+ optional<bool> resolveProvider = false;
//
// Most tools trigger completion request automatically without explicitly requesting
@@ -37,7 +37,7 @@
// an identifier (for example `.` in JavaScript) list them in `triggerCharacters`.
//
// https://github.com/Microsoft/language-server-protocol/issues/138.
- boost::optional< std::vector<std::string> > triggerCharacters ;
+ optional< std::vector<std::string> > triggerCharacters ;
//
// The list of all possible characters that commit a completion. This field can be used
@@ -44,7 +44,7 @@
// if clients don't support individual commmit characters per completion item. See
// `ClientCapabilities.textDocument.completion.completionItem.commitCharactersSupport`
//
- boost::optional< std::vector<std::string> > allCommitCharacters;
+ optional< std::vector<std::string> > allCommitCharacters;
MAKE_SWAP_METHOD(lsCompletionOptions, workDoneProgress, resolveProvider, triggerCharacters, allCommitCharacters);
};
@@ -102,16 +102,16 @@
struct lsTextDocumentSyncOptions {
// Open and close notifications are sent to the server.
- boost::optional<bool> openClose ;
+ optional<bool> openClose ;
// Change notificatins are sent to the server. See TextDocumentSyncKind.None,
// TextDocumentSyncKind.Full and TextDocumentSyncKindIncremental.
- boost::optional< lsTextDocumentSyncKind> change ;
+ optional< lsTextDocumentSyncKind> change ;
// Will save notifications are sent to the server.
- boost::optional<bool> willSave;
+ optional<bool> willSave;
// Will save wait until requests are sent to the server.
- boost::optional<bool> willSaveWaitUntil;
+ optional<bool> willSaveWaitUntil;
// Save notifications are sent to the server.
- boost::optional<lsSaveOptions> save;
+ optional<lsSaveOptions> save;
MAKE_SWAP_METHOD(lsTextDocumentSyncOptions,
openClose,
@@ -129,18 +129,18 @@
struct SynchronizationCapabilities {
// Whether text document synchronization supports dynamic registration.
- boost::optional<bool> dynamicRegistration;
+ optional<bool> dynamicRegistration;
// The client supports sending will save notifications.
- boost::optional<bool> willSave;
+ optional<bool> willSave;
// The client supports sending a will save request and
// waits for a response providing text edits which will
// be applied to the document before it is saved.
- boost::optional<bool> willSaveWaitUntil;
+ optional<bool> willSaveWaitUntil;
// The client supports did save notifications.
- boost::optional<bool> didSave;
+ optional<bool> didSave;
MAKE_SWAP_METHOD(SynchronizationCapabilities,
dynamicRegistration,
@@ -156,7 +156,7 @@
struct CompletionItemKindCapabilities
{
- boost::optional<std::vector<lsCompletionItemKind> >valueSet;
+ optional<std::vector<lsCompletionItemKind> >valueSet;
MAKE_SWAP_METHOD(CompletionItemKindCapabilities, valueSet);
};
MAKE_REFLECT_STRUCT(CompletionItemKindCapabilities, valueSet);
@@ -168,26 +168,26 @@
// and `${3:foo}`. `$0` defines the final tab stop, it defaults to
// the end of the snippet. Placeholders with equal identifiers are linked,
// that is typing in one will update others too.
- boost::optional<bool> snippetSupport;
+ optional<bool> snippetSupport;
// Client supports commit characters on a completion item.
- boost::optional<bool> commitCharactersSupport;
+ optional<bool> commitCharactersSupport;
// Client supports the following content formats for the documentation
// property. The order describes the preferred format of the client.
- boost::optional< std::vector<std::string> > documentationFormat;
+ optional< std::vector<std::string> > documentationFormat;
// Client supports the deprecated property on a completion item.
- boost::optional<bool> deprecatedSupport;
+ optional<bool> deprecatedSupport;
//
// Client supports the preselect property on a completion item.
//
- boost::optional<bool> preselectSupport;
+ optional<bool> preselectSupport;
MAKE_SWAP_METHOD(CompletionItemCapabilities,
snippetSupport,
@@ -207,25 +207,25 @@
//
struct CompletionCapabilities {
// Whether completion supports dynamic registration.
- boost::optional<bool> dynamicRegistration;
+ optional<bool> dynamicRegistration;
// The client supports the following `CompletionItem` specific
// capabilities.
- boost::optional<CompletionItemCapabilities> completionItem;
+ optional<CompletionItemCapabilities> completionItem;
//
// The client supports the following `CompletionItemKind` specific
// capabilities.
//
- boost::optional<CompletionItemKindCapabilities> completionItemKind;
+ optional<CompletionItemKindCapabilities> completionItemKind;
//
// The client supports sending additional context information for a
// `textDocument/completion` request.
//
- boost::optional<bool> contextSupport;
+ optional<bool> contextSupport;
MAKE_SWAP_METHOD(CompletionCapabilities,
@@ -246,7 +246,7 @@
//
// See {@link MarkupKind} for allowed values.
//
- boost::optional<std::vector<std::string>> contentFormat;
+ optional<std::vector<std::string>> contentFormat;
MAKE_SWAP_METHOD(HoverCapabilities, dynamicRegistration, contentFormat);
};
@@ -262,7 +262,7 @@
//
// Since 3.14.0
//
- boost::optional<bool> labelOffsetSupport;
+ optional<bool> labelOffsetSupport;
MAKE_SWAP_METHOD(ParameterInformationCapabilities, labelOffsetSupport);
};
@@ -293,7 +293,7 @@
// The client supports the following `SignatureInformation`
// specific properties.
//
- boost::optional< SignatureInformationCapabilities > signatureInformation;
+ optional< SignatureInformationCapabilities > signatureInformation;
MAKE_SWAP_METHOD(SignatureHelpCapabilities, dynamicRegistration, signatureInformation)
};
@@ -303,12 +303,12 @@
//
// Specific capabilities for the `SymbolKind`.
//
- boost::optional<SymbolKindCapabilities> symbolKind;
+ optional<SymbolKindCapabilities> symbolKind;
//
// The client support hierarchical document symbols.
//
- boost::optional<bool> hierarchicalDocumentSymbolSupport;
+ optional<bool> hierarchicalDocumentSymbolSupport;
MAKE_SWAP_METHOD(DocumentSymbolCapabilities, dynamicRegistration, symbolKind, hierarchicalDocumentSymbolSupport)
};
@@ -318,7 +318,7 @@
//
// The client supports additional metadata in the form of declaration links.
//
- boost::optional<bool>linkSupport;
+ optional<bool>linkSupport;
MAKE_SWAP_METHOD(DeclarationCapabilities, dynamicRegistration, linkSupport);
};
@@ -335,7 +335,7 @@
//
// See {@link CodeActionKind} for allowed values.
//
- boost::optional< std::vector< std::string> >valueSet;
+ optional< std::vector< std::string> >valueSet;
MAKE_SWAP_METHOD(CodeActionKindCapabilities, valueSet)
};
@@ -343,7 +343,7 @@
struct CodeActionLiteralSupportCapabilities
{
- boost::optional<CodeActionKindCapabilities> codeActionKind;
+ optional<CodeActionKindCapabilities> codeActionKind;
MAKE_SWAP_METHOD(CodeActionLiteralSupportCapabilities, codeActionKind)
};
@@ -354,7 +354,7 @@
// The client support code action literals as a valid
// response of the `textDocument/codeAction` request.
//
- boost::optional<CodeActionLiteralSupportCapabilities> codeActionLiteralSupport;
+ optional<CodeActionLiteralSupportCapabilities> codeActionLiteralSupport;
MAKE_SWAP_METHOD(CodeActionCapabilities, dynamicRegistration, codeActionLiteralSupport)
};
@@ -365,7 +365,7 @@
// The client support code action literals as a valid
// response of the `textDocument/codeAction` request.
//
- boost::optional<bool> prepareSupport;
+ optional<bool> prepareSupport;
MAKE_SWAP_METHOD(RenameCapabilities, dynamicRegistration, prepareSupport)
};
@@ -385,7 +385,7 @@
* The client support code action literals as a valid
* response of the `textDocument/codeAction` request.
*/
- boost::optional<bool> relatedInformation;
+ optional<bool> relatedInformation;
/**
* Client supports the tag property to provide meta data about a diagnostic.
@@ -398,7 +398,7 @@
*
* Since 3.15
*/
- boost::optional < std::pair<boost::optional<bool>, boost::optional<DiagnosticsTagSupport> > > tagSupport;
+ optional < std::pair<optional<bool>, optional<DiagnosticsTagSupport> > > tagSupport;
/**
* Whether the client interprets the version property of the
@@ -406,7 +406,7 @@
*
* Since 3.15.0
*/
- boost::optional<bool> versionSupport;
+ optional<bool> versionSupport;
/**
* Client supports a codeDescription property
@@ -413,7 +413,7 @@
*
* @since 3.16.0
*/
- boost::optional<bool> codeDescriptionSupport ;
+ optional<bool> codeDescriptionSupport ;
/**
* Whether code action supports the `data` property which is
@@ -422,7 +422,7 @@
*
* @since 3.16.0
*/
- boost::optional<bool> dataSupport ;
+ optional<bool> dataSupport ;
MAKE_SWAP_METHOD(PublishDiagnosticsClientCapabilities, dynamicRegistration, relatedInformation, tagSupport,versionSupport,codeDescriptionSupport,dataSupport)
@@ -435,13 +435,13 @@
// The maximum number of folding ranges that the client prefers to receive per document. The value serves as a
// hint, servers are free to follow the limit.
//
- boost::optional<int> rangeLimit;
+ optional<int> rangeLimit;
//
// If set, the client signals that it only supports folding complete lines. If set, client will
// ignore specified `startCharacter` and `endCharacter` properties in a FoldingRange.
//
- boost::optional<bool> lineFoldingOnly;
+ optional<bool> lineFoldingOnly;
MAKE_SWAP_METHOD(FoldingRangeCapabilities, dynamicRegistration, rangeLimit, lineFoldingOnly)
};
MAKE_REFLECT_STRUCT(FoldingRangeCapabilities, dynamicRegistration, rangeLimit,lineFoldingOnly)
@@ -452,7 +452,7 @@
// The client support code action literals as a valid
// response of the `textDocument/codeAction` request.
//
- boost::optional<bool> semanticHighlighting;
+ optional<bool> semanticHighlighting;
MAKE_SWAP_METHOD(SemanticHighlightingCapabilities, dynamicRegistration, semanticHighlighting)
};
@@ -478,13 +478,13 @@
// The client will send the `textDocument/semanticTokens/range` request
// if the server provides a corresponding handler.
//
- boost::optional<std::pair< boost::optional<bool>,
- boost::optional<SemanticTokensClientCapabilitiesRequestsFull>>> range;
+ optional<std::pair< optional<bool>,
+ optional<SemanticTokensClientCapabilitiesRequestsFull>>> range;
//
// The client will send the `textDocument/semanticTokens/full` request
// if the server provides a corresponding handler.
//
- boost::optional<std::pair< boost::optional<bool>, boost::optional<lsp::Any>>> full;
+ optional<std::pair< optional<bool>, optional<lsp::Any>>> full;
MAKE_SWAP_METHOD(lsRequests, range, full)
};
@@ -505,12 +505,12 @@
//
// Whether the client supports tokens that can overlap each other.
//
- boost::optional < bool >overlappingTokenSupport;
+ optional < bool >overlappingTokenSupport;
//
// Whether the client supports tokens that can span multiple lines.
//
- boost::optional < bool > multilineTokenSupport;
+ optional < bool > multilineTokenSupport;
MAKE_SWAP_METHOD(SemanticTokensClientCapabilities, dynamicRegistration,requests, tokenTypes, tokenModifiers,
formats, overlappingTokenSupport, multilineTokenSupport)
@@ -527,18 +527,18 @@
// Capabilities specific to the `textDocument/completion`
- boost::optional<CompletionCapabilities> completion;
+ optional<CompletionCapabilities> completion;
// Capabilities specific to the `textDocument/hover`
- boost::optional<HoverCapabilities> hover;
+ optional<HoverCapabilities> hover;
// Capabilities specific to the `textDocument/signatureHelp`
- boost::optional<SignatureHelpCapabilities> signatureHelp;
+ optional<SignatureHelpCapabilities> signatureHelp;
// Capabilities specific to the `textDocument/references`
- boost::optional<DynamicRegistrationCapabilities> references;
+ optional<DynamicRegistrationCapabilities> references;
@@ -545,19 +545,19 @@
// Capabilities specific to the `textDocument/documentHighlight`
- boost::optional<DynamicRegistrationCapabilities> documentHighlight;
+ optional<DynamicRegistrationCapabilities> documentHighlight;
// Capabilities specific to the `textDocument/documentSymbol`
- boost::optional<DocumentSymbolCapabilities> documentSymbol;
+ optional<DocumentSymbolCapabilities> documentSymbol;
// Capabilities specific to the `textDocument/formatting`
- boost::optional<DynamicRegistrationCapabilities> formatting;
+ optional<DynamicRegistrationCapabilities> formatting;
// Capabilities specific to the `textDocument/rangeFormatting`
- boost::optional<DynamicRegistrationCapabilities> rangeFormatting;
+ optional<DynamicRegistrationCapabilities> rangeFormatting;
// Capabilities specific to the `textDocument/onTypeFormatting`
- boost::optional<DynamicRegistrationCapabilities> onTypeFormatting;
+ optional<DynamicRegistrationCapabilities> onTypeFormatting;
//
@@ -565,12 +565,12 @@
//
// Since 3.14.0
//
- boost::optional< DeclarationCapabilities> declaration;
+ optional< DeclarationCapabilities> declaration;
typedef DeclarationCapabilities DefinitionCapabilities;
// Capabilities specific to the `textDocument/definition`
- boost::optional<DefinitionCapabilities> definition;
+ optional<DefinitionCapabilities> definition;
@@ -580,23 +580,23 @@
// Since 3.6.0
//
typedef DeclarationCapabilities TypeDefinitionCapabilities;
- boost::optional<TypeDefinitionCapabilities> typeDefinition;
+ optional<TypeDefinitionCapabilities> typeDefinition;
typedef DeclarationCapabilities ImplementationCapabilities;
// Capabilities specific to the `textDocument/implementation`
- boost::optional<ImplementationCapabilities> implementation;
+ optional<ImplementationCapabilities> implementation;
// Capabilities specific to the `textDocument/codeAction`
- boost::optional<CodeActionCapabilities> codeAction;
+ optional<CodeActionCapabilities> codeAction;
// Capabilities specific to the `textDocument/codeLens`
- boost::optional<DynamicRegistrationCapabilities> codeLens;
+ optional<DynamicRegistrationCapabilities> codeLens;
// Capabilities specific to the `textDocument/documentLink`
- boost::optional<DynamicRegistrationCapabilities> documentLink;
+ optional<DynamicRegistrationCapabilities> documentLink;
//
// Capabilities specific to the `textDocument/documentColor` and the
@@ -604,15 +604,15 @@
//
// Since 3.6.0
//
- boost::optional<DynamicRegistrationCapabilities> colorProvider;
+ optional<DynamicRegistrationCapabilities> colorProvider;
// Capabilities specific to the `textDocument/rename`
- boost::optional<RenameCapabilities> rename;
+ optional<RenameCapabilities> rename;
//
// Capabilities specific to `textDocument/publishDiagnostics`.
//
- boost::optional<PublishDiagnosticsClientCapabilities> publishDiagnostics;
+ optional<PublishDiagnosticsClientCapabilities> publishDiagnostics;
//
// Capabilities specific to `textDocument/foldingRange` requests.
@@ -619,18 +619,18 @@
//
// Since 3.10.0
//
- boost::optional< FoldingRangeCapabilities > foldingRange;
+ optional< FoldingRangeCapabilities > foldingRange;
//
// Capabilities specific to {@code textDocument/semanticHighlighting}.
//
- boost::optional< SemanticHighlightingCapabilities > semanticHighlightingCapabilities;
+ optional< SemanticHighlightingCapabilities > semanticHighlightingCapabilities;
//
// Capabilities specific to {@code textDocument/typeHierarchy}.
//
- boost::optional< DynamicRegistrationCapabilities > typeHierarchyCapabilities;
+ optional< DynamicRegistrationCapabilities > typeHierarchyCapabilities;
@@ -638,7 +638,7 @@
// Capabilities specific to `textDocument/selectionRange` requests
//
- boost::optional< DynamicRegistrationCapabilities > selectionRange;
+ optional< DynamicRegistrationCapabilities > selectionRange;
//
// Capabilities specific to the `textDocument/linkedEditingRange` request.
@@ -645,7 +645,7 @@
//
// @since 3.16.0
//
- boost::optional< DynamicRegistrationCapabilities > linkedEditingRange;
+ optional< DynamicRegistrationCapabilities > linkedEditingRange;
//
// Capabilities specific to the various call hierarchy requests.
@@ -652,7 +652,7 @@
//
// @since 3.16.0
//
- boost::optional< DynamicRegistrationCapabilities > callHierarchy;
+ optional< DynamicRegistrationCapabilities > callHierarchy;
//
// Capabilities specific to the various semantic token requests.
@@ -659,7 +659,7 @@
//
// @since 3.16.0
//
- boost::optional< SemanticTokensClientCapabilities > semanticTokens;
+ optional< SemanticTokensClientCapabilities > semanticTokens;
//
// Capabilities specific to the `textDocument/moniker` request.
@@ -666,7 +666,7 @@
//
// @since 3.16.0
//
- boost::optional< DynamicRegistrationCapabilities > moniker;
+ optional< DynamicRegistrationCapabilities > moniker;
MAKE_SWAP_METHOD(lsTextDocumentClientCapabilities,
synchronization,
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/lsWorkspaceClientCapabilites.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/lsWorkspaceClientCapabilites.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/lsWorkspaceClientCapabilites.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -26,7 +26,7 @@
* for instance all edits labelled with "Changes in Strings" would
* be a tree node.
*/
- boost::optional<bool> groupsOnLabel;
+ optional<bool> groupsOnLabel;
MAKE_SWAP_METHOD(lschangeAnnotationSupport, groupsOnLabel)
};
MAKE_REFLECT_STRUCT(lschangeAnnotationSupport, groupsOnLabel)
@@ -35,7 +35,7 @@
/**
* The client supports versioned document changes in `WorkspaceEdit`s
*/
- boost::optional<bool> documentChanges;
+ optional<bool> documentChanges;
/**
* The client supports resource changes
@@ -44,7 +44,7 @@
* @deprecated Since LSP introduces resource operations, use {link #resourceOperations}
*/
- boost::optional<bool> resourceChanges;
+ optional<bool> resourceChanges;
/**
* The resource operations the client supports. Clients should at least
@@ -52,7 +52,7 @@
*
* @since 3.13.0
*/
- boost::optional< std::vector<std::string> > resourceOperations;
+ optional< std::vector<std::string> > resourceOperations;
/**
* The failure handling strategy of a client if applying the workspace edit
@@ -60,7 +60,7 @@
*
* See {@link FailureHandlingKind} for allowed values.
*/
- boost::optional<std::string > failureHandling;
+ optional<std::string > failureHandling;
/**
* Whether the client normalizes line endings to the client specific
@@ -70,7 +70,7 @@
*
* @since 3.16.0
*/
- boost::optional<bool> normalizesLineEndings;;
+ optional<bool> normalizesLineEndings;;
/**
* Whether the client in general supports change annotations on text edits,
@@ -78,7 +78,7 @@
*
* @since 3.16.0
*/
- boost::optional<lschangeAnnotationSupport> changeAnnotationSupport;
+ optional<lschangeAnnotationSupport> changeAnnotationSupport;
MAKE_SWAP_METHOD(WorkspaceEditCapabilities, documentChanges, resourceChanges, resourceOperations, failureHandling, normalizesLineEndings, changeAnnotationSupport)
@@ -88,7 +88,7 @@
struct DynamicRegistrationCapabilities {
// Did foo notification supports dynamic registration.
- boost::optional<bool> dynamicRegistration;
+ optional<bool> dynamicRegistration;
MAKE_SWAP_METHOD(DynamicRegistrationCapabilities,
dynamicRegistration);
@@ -102,7 +102,7 @@
// Workspace specific client capabilities.
struct SymbolKindCapabilities
{
- boost::optional< std::vector<lsSymbolKind> > valueSet;
+ optional< std::vector<lsSymbolKind> > valueSet;
MAKE_SWAP_METHOD(SymbolKindCapabilities, valueSet)
@@ -117,7 +117,7 @@
/**
* Specific capabilities for the `SymbolKind` in the `workspace/symbol` request.
*/
- boost::optional<SymbolKindCapabilities> symbolKind;
+ optional<SymbolKindCapabilities> symbolKind;
MAKE_SWAP_METHOD(SymbolCapabilities,
symbolKind, dynamicRegistration)
@@ -132,37 +132,37 @@
* Whether the client supports dynamic registration for file
* requests/notifications.
*/
- boost::optional<bool> dynamicRegistration ;
+ optional<bool> dynamicRegistration ;
/**
* The client has support for sending didCreateFiles notifications.
*/
- boost::optional<bool>didCreate ;
+ optional<bool>didCreate ;
/**
* The client has support for sending willCreateFiles requests.
*/
- boost::optional<bool>willCreate ;
+ optional<bool>willCreate ;
/**
* The client has support for sending didRenameFiles notifications.
*/
- boost::optional<bool>didRename ;
+ optional<bool>didRename ;
/**
* The client has support for sending willRenameFiles requests.
*/
- boost::optional<bool>willRename ;
+ optional<bool>willRename ;
/**
* The client has support for sending didDeleteFiles notifications.
*/
- boost::optional<bool>didDelete ;
+ optional<bool>didDelete ;
/**
* The client has support for sending willDeleteFiles requests.
*/
- boost::optional<bool> willDelete ;
+ optional<bool> willDelete ;
MAKE_SWAP_METHOD(lsFileOperations, dynamicRegistration, didCreate, willCreate,
didRename, willRename, didDelete, willDelete)
};
@@ -171,28 +171,28 @@
struct lsWorkspaceClientCapabilites {
// The client supports applying batch edits to the workspace.
- boost::optional<bool> applyEdit;
+ optional<bool> applyEdit;
// Capabilities specific to `WorkspaceEdit`s
- boost::optional<WorkspaceEditCapabilities> workspaceEdit;
+ optional<WorkspaceEditCapabilities> workspaceEdit;
// Capabilities specific to the `workspace/didChangeConfiguration`
// notification.
- boost::optional<DynamicRegistrationCapabilities> didChangeConfiguration;
+ optional<DynamicRegistrationCapabilities> didChangeConfiguration;
// Capabilities specific to the `workspace/didChangeWatchedFiles`
// notification.
- boost::optional<DynamicRegistrationCapabilities> didChangeWatchedFiles;
+ optional<DynamicRegistrationCapabilities> didChangeWatchedFiles;
// Capabilities specific to the `workspace/symbol` request.
- boost::optional<SymbolCapabilities> symbol;
+ optional<SymbolCapabilities> symbol;
// Capabilities specific to the `workspace/executeCommand` request.
- boost::optional<DynamicRegistrationCapabilities> executeCommand;
+ optional<DynamicRegistrationCapabilities> executeCommand;
/**
@@ -200,7 +200,7 @@
*
* Since 3.6.0
*/
- boost::optional<bool> workspaceFolders;
+ optional<bool> workspaceFolders;
/**
* The client supports `workspace/configuration` requests.
@@ -207,7 +207,7 @@
*
* Since 3.6.0
*/
- boost::optional<bool> configuration;
+ optional<bool> configuration;
/**
@@ -216,7 +216,7 @@
*
* @since 3.16.0
*/
- boost::optional<DynamicRegistrationCapabilities> semanticTokens ;
+ optional<DynamicRegistrationCapabilities> semanticTokens ;
/**
* Capabilities specific to the code lens requests scoped to the
@@ -224,7 +224,7 @@
*
* @since 3.16.0
*/
- boost::optional<DynamicRegistrationCapabilities> codeLens ;
+ optional<DynamicRegistrationCapabilities> codeLens ;
/**
* The client has support for file requests/notifications.
@@ -231,7 +231,7 @@
*
* @since 3.16.0
*/
- boost::optional<lsFileOperations> fileOperations;
+ optional<lsFileOperations> fileOperations;
MAKE_SWAP_METHOD(lsWorkspaceClientCapabilites,
applyEdit,
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/progress.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/progress.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/progress.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -8,7 +8,7 @@
//and partial result progress to support streaming of results.
struct ProgressParams
{
- std::pair<boost::optional<std::string> , boost::optional<int> > token;
+ std::pair<optional<std::string> , optional<int> > token;
lsp::Any value;
MAKE_SWAP_METHOD(ProgressParams, token, value)
};
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/shutdown.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/shutdown.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/shutdown.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -11,5 +11,5 @@
* that asks the server to exit.
*/
-DEFINE_REQUEST_RESPONSE_TYPE(td_shutdown, boost::optional<JsonNull>, boost::optional<lsp::Any>, "shutdown");
+DEFINE_REQUEST_RESPONSE_TYPE(td_shutdown, optional<JsonNull>, optional<lsp::Any>, "shutdown");
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/language/language.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/language/language.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/language/language.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -89,7 +89,7 @@
*
*/
- boost::optional<lsp::Any> data;
+ optional<lsp::Any> data;
/**
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/location_type.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/location_type.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/location_type.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -35,7 +35,7 @@
* Used as the underlined span for mouse interaction. Defaults to the word range at
* the mouse position.
*/
- boost::optional<lsRange> originSelectionRange;
+ optional<lsRange> originSelectionRange;
/**
* The target resource identifier of this link.
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsAny.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsAny.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsAny.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -64,7 +64,7 @@
template <typename T>
bool GetForMapHelper(T& value);
bool GetForMapHelper(std::string& value);
- bool GetForMapHelper(boost::optional<std::string>& value);
+ bool GetForMapHelper(optional<std::string>& value);
private:
std::unique_ptr<Reader> GetReader();
std::unique_ptr<Writer> GetWriter() const;
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsCodeAction.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsCodeAction.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsCodeAction.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -24,17 +24,17 @@
*
* Used to filter code actions.
*/
- boost::optional < std::string> kind;
+ optional < std::string> kind;
/**
* The diagnostics that this code action resolves.
*/
- boost::optional < std::vector<lsDiagnostic>> diagnostics;
+ optional < std::vector<lsDiagnostic>> diagnostics;
/**
* The workspace edit this code action performs.
*/
- boost::optional < lsWorkspaceEdit >edit;
+ optional < lsWorkspaceEdit >edit;
/**
* A command this code action executes. If a code action
@@ -41,7 +41,7 @@
* provides a edit and a command, first the edit is
* executed and then the command.
*/
- boost::optional< lsCommandWithAny > command;
+ optional< lsCommandWithAny > command;
MAKE_SWAP_METHOD(CodeAction, title, kind, diagnostics, edit, command)
};
@@ -50,7 +50,7 @@
{
- typedef std::pair<boost::optional<lsCommandWithAny>, boost::optional<CodeAction> > Either;
+ typedef std::pair<optional<lsCommandWithAny>, optional<CodeAction> > Either;
};
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsCommand.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsCommand.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsCommand.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -22,7 +22,7 @@
// Arguments to run the command with.
// **NOTE** This must be serialized as an array. Use
// MAKE_REFLECT_STRUCT_WRITER_AS_ARRAY.
- boost::optional<AnyArray> arguments;
+ optional<AnyArray> arguments;
void swap(lsCommand<AnyArray>& arg) noexcept
{
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsFormattingOptions.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsFormattingOptions.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsFormattingOptions.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -4,9 +4,9 @@
struct lsFormattingOptions {
struct KeyData {
- boost::optional<bool> _boolean;
- boost::optional<int32_t> _integer;
- boost::optional<std::string> _string;
+ optional<bool> _boolean;
+ optional<int32_t> _integer;
+ optional<std::string> _string;
};
// Size of a tab in spaces.
@@ -19,7 +19,7 @@
*
* @since 3.15.0
*/
- boost::optional<bool> trimTrailingWhitespace;
+ optional<bool> trimTrailingWhitespace;
/**
* Insert a newline character at the end of the file if one does not exist.
@@ -26,7 +26,7 @@
*
* @since 3.15.0
*/
- boost::optional<bool> insertFinalNewline;
+ optional<bool> insertFinalNewline;
/**
* Trim all newlines after the final newline at the end of the file.
@@ -33,8 +33,8 @@
*
* @since 3.15.0
*/
- boost::optional<bool> trimFinalNewlines;
- boost::optional<KeyData> key;
+ optional<bool> trimFinalNewlines;
+ optional<KeyData> key;
MAKE_SWAP_METHOD(lsFormattingOptions, tabSize, insertSpaces, trimTrailingWhitespace, insertFinalNewline, trimFinalNewlines, key)
};
MAKE_REFLECT_STRUCT(lsFormattingOptions, tabSize, insertSpaces, trimTrailingWhitespace, insertFinalNewline, trimFinalNewlines, key);
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsMarkedString.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsMarkedString.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsMarkedString.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -20,7 +20,7 @@
// Note that markdown strings will be sanitized - that means html will be
// escaped.
struct lsMarkedString {
- boost::optional<std::string> language;
+ optional<std::string> language;
std::string value;
};
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsResponseError.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsResponseError.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsResponseError.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -108,7 +108,7 @@
* A primitive or structured value that contains additional
* information about the error. Can be omitted.
*/
- boost::optional<lsp::Any> data;
+ optional<lsp::Any> data;
std::string ToString();
void Write(Writer& visitor);
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsTextDocumentPositionParams.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsTextDocumentPositionParams.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsTextDocumentPositionParams.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -18,7 +18,7 @@
/**
* Legacy property to support protocol version 1.0 requests.
*/
- boost::optional<lsDocumentUri> uri;
+ optional<lsDocumentUri> uri;
MAKE_SWAP_METHOD(lsTextDocumentPositionParams, textDocument, position, uri);
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsTextEdit.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsTextEdit.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsTextEdit.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -27,13 +27,13 @@
* A flag which indicates that user confirmation is needed
* before applying the change.
*/
- boost::optional<bool> needsConfirmation;
+ optional<bool> needsConfirmation;
/**
* A human-readable string which is rendered less prominent in
* the user interface.
*/
- boost::optional < std::string > description;
+ optional < std::string > description;
MAKE_REFLECT_STRUCT(lsChangeAnnotation, label, needsConfirmation, description)
};
MAKE_REFLECT_STRUCT(lsChangeAnnotation, label, needsConfirmation, description)
@@ -75,7 +75,7 @@
/**
* The actual annotation identifier.
*/
- boost::optional<lsChangeAnnotationIdentifier> annotationId;
+ optional<lsChangeAnnotationIdentifier> annotationId;
bool operator==(const lsTextEdit& that);
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsVersionedTextDocumentIdentifier.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsVersionedTextDocumentIdentifier.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsVersionedTextDocumentIdentifier.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -10,7 +10,7 @@
{
lsDocumentUri uri;
// The version number of this document. number | null
- boost::optional<int> version;
+ optional<int> version;
lsTextDocumentIdentifier AsTextDocumentIdentifier() const;
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsWorkspaceEdit.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsWorkspaceEdit.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsWorkspaceEdit.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -33,10 +33,10 @@
// version of a text document. Whether a client supports versioned document
// edits is expressed via `WorkspaceClientCapabilites.versionedWorkspaceEdit`.
//
- boost::optional< std::map<std::string, std::vector<lsTextEdit> > > changes;
- typedef std::pair < boost::optional<lsTextDocumentEdit>, boost::optional<lsp::Any> > Either;
+ optional< std::map<std::string, std::vector<lsTextEdit> > > changes;
+ typedef std::pair < optional<lsTextDocumentEdit>, optional<lsp::Any> > Either;
- boost::optional < std::vector< Either > > documentChanges;
+ optional < std::vector< Either > > documentChanges;
/**
* A map of change annotations that can be referenced in
* `AnnotatedTextEdit`s or create, rename and delete file / folder
@@ -47,7 +47,7 @@
*
* @since 3.16.0
*/
- boost::optional< lsChangeAnnotations > changeAnnotations;
+ optional< lsChangeAnnotations > changeAnnotations;
MAKE_SWAP_METHOD(lsWorkspaceEdit, changes, documentChanges, changeAnnotations)
};
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsp_completion.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsp_completion.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsp_completion.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -75,20 +75,20 @@
// The kind of this completion item. Based of the kind
// an icon is chosen by the editor.
- boost::optional<lsCompletionItemKind> kind ;
+ optional<lsCompletionItemKind> kind ;
// A human-readable string with additional information
// about this item, like type or symbol information.
- boost::optional < std::string > detail;
+ optional < std::string > detail;
// A human-readable string that represents a doc-comment.
- boost::optional< std::pair<boost::optional< std::string> , boost::optional<MarkupContent> > > documentation;
+ optional< std::pair<optional< std::string> , optional<MarkupContent> > > documentation;
/**
* Indicates if this item is deprecated.
*/
- boost::optional< bool >deprecated;
+ optional< bool >deprecated;
/**
@@ -98,7 +98,7 @@
* tool / client decides which item that is. The rule is that the *first
* item of those that match best is selected.
*/
- boost::optional< bool > preselect;
+ optional< bool > preselect;
// Internal information to order candidates.
@@ -106,19 +106,19 @@
// A string that shoud be used when comparing this item
// with other items. When `falsy` the label is used.
- boost::optional< std::string > sortText;
+ optional< std::string > sortText;
// A string that should be used when filtering a set of
// completion items. When `falsy` the label is used.
- boost::optional<std::string> filterText;
+ optional<std::string> filterText;
// A string that should be inserted a document when selecting
// this completion. When `falsy` the label is used.
- boost::optional<std::string> insertText;
+ optional<std::string> insertText;
// The format of the insert text. The format applies to both the `insertText`
// property and the `newText` property of a provided `textEdit`.
- boost::optional< lsInsertTextFormat> insertTextFormat ;
+ optional< lsInsertTextFormat> insertTextFormat ;
// An edit which is applied to a document when selecting this completion. When
// an edit is provided the value of `insertText` is ignored.
@@ -125,14 +125,14 @@
//
// *Note:* The range of the edit must be a single line range and it must
// contain the position at which completion has been requested.
- boost::optional<lsTextEdit> textEdit;
+ optional<lsTextEdit> textEdit;
- // An boost::optional array of additional text edits that are applied when
+ // An optional array of additional text edits that are applied when
// selecting this completion. Edits must not overlap with the main edit
// nor with themselves.
// std::vector<TextEdit> additionalTextEdits;
- // An boost::optional command that is executed *after* inserting this completion.
+ // An optional command that is executed *after* inserting this completion.
// *Note* that additional modifications to the current document should be
// described with the additionalTextEdits-property. Command command;
@@ -147,7 +147,7 @@
std::string DisplayText();
/**
- * An boost::optional array of additional text edits that are applied when
+ * An optional array of additional text edits that are applied when
* selecting this completion. Edits must not overlap (including the same insert position)
* with the main edit nor with themselves.
*
@@ -155,26 +155,26 @@
* (for example adding an import statement at the top of the file if the completion item will
* insert an unqualified type).
*/
- boost::optional<std::vector<lsTextEdit> >additionalTextEdits;
+ optional<std::vector<lsTextEdit> >additionalTextEdits;
/**
-* An boost::optional set of characters that when pressed while this completion is active will accept it first and
+* An optional set of characters that when pressed while this completion is active will accept it first and
* then type that character. *Note* that all commit characters should have `length=1` and that superfluous
* characters will be ignored.
*/
- boost::optional< std::vector<std::string> > commitCharacters;
+ optional< std::vector<std::string> > commitCharacters;
/**
-* An boost::optional command that is executed *after* inserting this completion. *Note* that
+* An optional command that is executed *after* inserting this completion. *Note* that
* additional modifications to the current document should be described with the
* additionalTextEdits-property.
*/
- boost::optional<lsCommandWithAny> command;
+ optional<lsCommandWithAny> command;
/**
* An data entry field that is preserved on a completion item between a completion and a completion resolve request.
*/
- boost::optional<lsp::Any> data;
+ optional<lsp::Any> data;
std::string ToString();
MAKE_SWAP_METHOD(lsCompletionItem,
label,
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsp_diagnostic.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsp_diagnostic.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsp_diagnostic.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -1,4 +1,5 @@
#pragma once
+#include <optional>
#include "lsRange.h"
#include "lsTextEdit.h"
#include "lsDocumentUri.h"
@@ -92,15 +93,15 @@
// The diagnostic's severity. Can be omitted. If omitted it is up to the
// client to interpret diagnostics as error, warning, info or hint.
- boost::optional<lsDiagnosticSeverity> severity;
+ optional<lsDiagnosticSeverity> severity;
// The diagnostic's code. Can be omitted.
- boost::optional< std::pair<boost::optional<std::string>, boost::optional<int>> > code;
+ optional< std::pair<optional<std::string>, optional<int>> > code;
- boost::optional<DiagnosticCodeDescription> codeDescription;
+ optional<DiagnosticCodeDescription> codeDescription;
// A human-readable string describing the source of this
// diagnostic, e.g. 'typescript' or 'super lint'.
- boost::optional < std::string >source ;
+ optional < std::string >source ;
// The diagnostic's message.
std::string message;
@@ -113,7 +114,7 @@
*
* @since 3.15.0
*/
- boost::optional<std::vector<DiagnosticTag>> tags;
+ optional<std::vector<DiagnosticTag>> tags;
/**
@@ -122,7 +123,7 @@
*
* Since 3.7.0
*/
- boost::optional<std::vector<DiagnosticRelatedInformation>> relatedInformation;
+ optional<std::vector<DiagnosticRelatedInformation>> relatedInformation;
/**
* A data entry field that is preserved between a
@@ -131,7 +132,7 @@
*
* @since 3.16.0
*/
- boost::optional<lsp::Any> data;
+ optional<lsp::Any> data;
bool operator==(const lsDiagnostic& rhs) const;
bool operator!=(const lsDiagnostic& rhs) const;
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/out_list.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/out_list.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/out_list.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -15,7 +15,7 @@
namespace LocationListEither{
- typedef std::pair< boost::optional<std::vector<lsLocation>> , boost::optional<std::vector<LocationLink> > > Either;
+ typedef std::pair< optional<std::vector<lsLocation>> , optional<std::vector<LocationLink> > > Either;
};
extern void Reflect(Reader& visitor, LocationListEither::Either& value);
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/symbol.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/symbol.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/symbol.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -66,7 +66,7 @@
lsRange range;
// The highlight kind, default is DocumentHighlightKind.Text.
- boost::optional<lsDocumentHighlightKind> kind ;
+ optional<lsDocumentHighlightKind> kind ;
MAKE_SWAP_METHOD(lsDocumentHighlight, range, kind)
};
@@ -85,7 +85,7 @@
/**
* Indicates if this symbol is deprecated.
*/
- boost::optional<bool> deprecated;
+ optional<bool> deprecated;
/**
* The location of this symbol. The location's range is used by a tool
* to reveal the location in the editor. If the symbol is selected in the
@@ -104,7 +104,7 @@
* if necessary). It can't be used to re-infer a hierarchy for the document
* symbols.
*/
- boost::optional<std::string> containerName;
+ optional<std::string> containerName;
MAKE_SWAP_METHOD(lsSymbolInformation, name, kind, deprecated, location, containerName);
@@ -144,17 +144,17 @@
* More detail for this symbol, e.g the signature of a function. If not provided the
* name is used.
*/
- boost::optional< std::string > detail;
+ optional< std::string > detail;
/**
* Indicates if this symbol is deprecated.
*/
- boost::optional< bool > deprecated;
+ optional< bool > deprecated;
/**
* Children of this symbol, e.g. properties of a class.
*/
- boost::optional < std::vector<lsDocumentSymbol> > children;
+ optional < std::vector<lsDocumentSymbol> > children;
//internal use
int flags=0;
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/SemanticTokens.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/SemanticTokens.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/SemanticTokens.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -199,7 +199,7 @@
* A server can then instead of computing all semantic tokens again simply
* send a delta.
*/
- boost::optional<std::string> resultId;
+ optional<std::string> resultId;
MAKE_SWAP_METHOD(SemanticTokens, data, resultId)
};
MAKE_REFLECT_STRUCT(SemanticTokens, data, resultId)
@@ -245,12 +245,12 @@
/// This models LSP SemanticTokensDelta | SemanticTokens, which is the result of
/// textDocument/semanticTokens/full/delta.
struct SemanticTokensOrDelta {
- boost::optional<std::string > resultId;
+ optional<std::string > resultId;
/// Set if we computed edits relative to a previous set of tokens.
- boost::optional< std::vector<SemanticTokensEdit> > edits;
+ optional< std::vector<SemanticTokensEdit> > edits;
/// Set if we computed a fresh set of tokens.
/// Set if we computed edits relative to a previous set of tokens.
- boost::optional<std::vector<int32_t>> tokens; // encoded as integer array
+ optional<std::vector<int32_t>> tokens; // encoded as integer array
MAKE_REFLECT_STRUCT(SemanticTokensOrDelta, resultId, edits, tokens)
};
MAKE_REFLECT_STRUCT(SemanticTokensOrDelta, resultId, edits, tokens)
@@ -263,5 +263,5 @@
};
MAKE_REFLECT_STRUCT(SemanticTokensLegend, tokenTypes, tokenModifiers)
-DEFINE_REQUEST_RESPONSE_TYPE(td_semanticTokens_full, SemanticTokensParams,boost::optional<SemanticTokens >,"textDocument/semanticTokens/full")
-DEFINE_REQUEST_RESPONSE_TYPE(td_semanticTokens_full_delta, SemanticTokensDeltaParams, boost::optional<SemanticTokensOrDelta >, "textDocument/semanticTokens/full/delta")
+DEFINE_REQUEST_RESPONSE_TYPE(td_semanticTokens_full, SemanticTokensParams,optional<SemanticTokens >,"textDocument/semanticTokens/full")
+DEFINE_REQUEST_RESPONSE_TYPE(td_semanticTokens_full_delta, SemanticTokensDeltaParams, optional<SemanticTokensOrDelta >, "textDocument/semanticTokens/full/delta")
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/callHierarchy.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/callHierarchy.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/callHierarchy.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -35,10 +35,10 @@
SymbolKind kind;
/// Tags for this item.
- boost::optional<std::vector<SymbolTag>> tags;
+ optional<std::vector<SymbolTag>> tags;
/// More detaill for this item, e.g. the signature of a function.
- boost::optional<std::string> detail;
+ optional<std::string> detail;
/// The resource identifier of this item.
lsDocumentUri uri;
@@ -60,7 +60,7 @@
* A data entry field that is preserved between a call hierarchy prepare and
* incoming calls or outgoing calls requests.
*/
- boost::optional<lsp::Any> data;
+ optional<lsp::Any> data;
MAKE_SWAP_METHOD(CallHierarchyItem, name, kind, tags, detail, uri, range, selectionRange, data)
};
MAKE_REFLECT_STRUCT(CallHierarchyItem, name, kind, tags, detail, uri, range, selectionRange, data)
@@ -112,10 +112,10 @@
DEFINE_REQUEST_RESPONSE_TYPE(td_prepareCallHierarchy, CallHierarchyPrepareParams,
- boost::optional<std::vector<CallHierarchyItem>>, "textDocument/prepareCallHierarchy")
+ optional<std::vector<CallHierarchyItem>>, "textDocument/prepareCallHierarchy")
DEFINE_REQUEST_RESPONSE_TYPE(td_incomingCalls, CallHierarchyIncomingCallsParams,
- boost::optional<std::vector<CallHierarchyIncomingCall>>, "callHierarchy/incomingCalls")
+ optional<std::vector<CallHierarchyIncomingCall>>, "callHierarchy/incomingCalls")
DEFINE_REQUEST_RESPONSE_TYPE(td_outgoingCalls, CallHierarchyOutgoingCallsParams,
- boost::optional<std::vector<CallHierarchyOutgoingCall>>, "callHierarchy/CallHierarchyOutgoingCall")
+ optional<std::vector<CallHierarchyOutgoingCall>>, "callHierarchy/CallHierarchyOutgoingCall")
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/code_lens.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/code_lens.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/code_lens.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -21,10 +21,10 @@
// The range in which this code lens is valid. Should only span a single line.
lsRange range;
// The command this code lens represents.
- boost::optional<lsCommandWithAny> command;
+ optional<lsCommandWithAny> command;
// A data entry field that is preserved on a code lens item between
// a code lens and a code lens resolve request.
- boost::optional< lsp::Any> data;
+ optional< lsp::Any> data;
MAKE_SWAP_METHOD(lsCodeLens, range, command, data)
};
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/completion.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/completion.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/completion.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -30,7 +30,7 @@
// The trigger character (a single character) that has trigger code complete.
// Is undefined if `triggerKind !== CompletionTriggerKind.TriggerCharacter`
- boost::optional<std::string> triggerCharacter;
+ optional<std::string> triggerCharacter;
MAKE_SWAP_METHOD(lsCompletionContext, triggerKind, triggerCharacter);
};
@@ -40,7 +40,7 @@
// The completion context. This is only available it the client specifies to
// send this using
// `ClientCapabilities.textDocument.completion.contextSupport === true`
- boost::optional<lsCompletionContext> context;
+ optional<lsCompletionContext> context;
MAKE_SWAP_METHOD(lsCompletionParams, textDocument, position, context);
@@ -57,7 +57,7 @@
namespace TextDocumentComplete{
- typedef std::pair< boost::optional<std::vector<lsCompletionItem>>, boost::optional<CompletionList> > Either;
+ typedef std::pair< optional<std::vector<lsCompletionItem>>, optional<CompletionList> > Either;
};
extern void Reflect(Reader& visitor, TextDocumentComplete::Either& value);
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/didRenameFiles.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/didRenameFiles.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/didRenameFiles.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -38,7 +38,7 @@
MAKE_REFLECT_STRUCT(FileRenameParams, files);
-DEFINE_REQUEST_RESPONSE_TYPE(td_didRenameFiles, FileRenameParams, boost::optional<lsWorkspaceEdit>, "java/didRenameFiles");
+DEFINE_REQUEST_RESPONSE_TYPE(td_didRenameFiles, FileRenameParams, optional<lsWorkspaceEdit>, "java/didRenameFiles");
-DEFINE_REQUEST_RESPONSE_TYPE(td_willRenameFiles, FileRenameParams, boost::optional<lsWorkspaceEdit>, "java/willRenameFiles");
+DEFINE_REQUEST_RESPONSE_TYPE(td_willRenameFiles, FileRenameParams, optional<lsWorkspaceEdit>, "java/willRenameFiles");
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/did_change.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/did_change.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/did_change.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -9,9 +9,9 @@
#include "LibLsp/lsp/lsDocumentUri.h"
struct lsTextDocumentContentChangeEvent {
// The range of the document that changed.
- boost::optional<lsRange> range;
+ optional<lsRange> range;
// The length of the range that got replaced.
- boost::optional<int> rangeLength;
+ optional<int> rangeLength;
// The new text of the range/document.
std::string text;
@@ -28,7 +28,7 @@
* Legacy property to support protocol version 1.0 requests.
*/
- boost::optional<lsDocumentUri> uri;
+ optional<lsDocumentUri> uri;
void swap(lsTextDocumentDidChangeParams& arg) noexcept
{
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/did_open.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/did_open.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/did_open.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -16,7 +16,7 @@
/**
* Legacy property to support protocol version 1.0 requests.
*/
- boost::optional<std::string> text;
+ optional<std::string> text;
MAKE_SWAP_METHOD(TextDocumentDidOpen::Params, textDocument, text);
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/did_save.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/did_save.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/did_save.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -13,7 +13,7 @@
// Optional the content when saved. Depends on the includeText value
// when the save notifcation was requested.
- boost::optional<std::string> text;
+ optional<std::string> text;
MAKE_SWAP_METHOD(TextDocumentDidSave::Params, textDocument, text);
};
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/document_link.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/document_link.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/document_link.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -24,9 +24,9 @@
// The range this link applies to.
lsRange range;
// The uri this link points to. If missing a resolve request is sent later.
- boost::optional<lsDocumentUri> target;
+ optional<lsDocumentUri> target;
- boost::optional<lsp::Any> data;
+ optional<lsp::Any> data;
MAKE_SWAP_METHOD(lsDocumentLink, range, target, data)
@@ -34,11 +34,11 @@
MAKE_REFLECT_STRUCT(lsDocumentLink, range, target,data);
-DEFINE_REQUEST_RESPONSE_TYPE(td_links, TextDocumentDocumentLink::Params, lsDocumentLink, "textDocument/documentLink");
+DEFINE_REQUEST_RESPONSE_TYPE(td_links, TextDocumentDocumentLink::Params, std::vector<lsDocumentLink>, "textDocument/documentLink");
/**
* The document link resolve request is sent from the client to the server to resolve the target of a given document link.
*/
-DEFINE_REQUEST_RESPONSE_TYPE(td_linkResolve, std::vector<lsDocumentLink>, lsDocumentLink, "documentLink/resolve");
+DEFINE_REQUEST_RESPONSE_TYPE(td_linkResolve, lsDocumentLink, lsDocumentLink, "documentLink/resolve");
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/document_symbol.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/document_symbol.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/document_symbol.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -18,7 +18,7 @@
struct TextDocumentDocumentSymbol{
- typedef std::pair< boost::optional<lsSymbolInformation> , boost::optional<lsDocumentSymbol> > Either;
+ typedef std::pair< optional<lsSymbolInformation> , optional<lsDocumentSymbol> > Either;
};
void Reflect(Reader& visitor, TextDocumentDocumentSymbol::Either& value);
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/hover.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/hover.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/hover.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -16,8 +16,8 @@
namespace TextDocumentHover
{
- typedef boost::optional< std::vector< std::pair<boost::optional<std::string>, boost::optional<lsMarkedString>> > > Left;
- typedef std::pair< Left, boost::optional<MarkupContent> > Either;
+ typedef optional< std::vector< std::pair<optional<std::string>, optional<lsMarkedString>> > > Left;
+ typedef std::pair< Left, optional<MarkupContent> > Either;
struct Result {
/**
* The hover's content as markdown
@@ -25,9 +25,9 @@
Either contents;
/**
- * An boost::optional range
+ * An optional range
*/
- boost::optional<lsRange> range;
+ optional<lsRange> range;
MAKE_SWAP_METHOD(Result, contents, range)
};
@@ -34,7 +34,7 @@
}
MAKE_REFLECT_STRUCT(TextDocumentHover::Result, contents, range);
-extern void Reflect(Reader& visitor, std::pair<boost::optional<std::string>, boost::optional<lsMarkedString>>& value);
+extern void Reflect(Reader& visitor, std::pair<optional<std::string>, optional<lsMarkedString>>& value);
extern void Reflect(Reader& visitor, TextDocumentHover::Either& value);
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/linkedEditingRange.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/linkedEditingRange.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/linkedEditingRange.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -38,7 +38,7 @@
* pattern will be used.
*/
- boost::optional<std::string> wordPattern;
+ optional<std::string> wordPattern;
MAKE_SWAP_METHOD(LinkedEditingRanges,
ranges,
wordPattern)
@@ -48,4 +48,4 @@
ranges,
wordPattern)
DEFINE_REQUEST_RESPONSE_TYPE(td_linkedEditingRange, LinkedEditingRangeParams,
- boost::optional<std::vector<LinkedEditingRanges >>,"textDocument/linkedEditingRange")
+ optional<std::vector<LinkedEditingRanges >>,"textDocument/linkedEditingRange")
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/prepareRename.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/prepareRename.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/prepareRename.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -32,7 +32,7 @@
-typedef std::pair< boost::optional< lsRange>, boost::optional<PrepareRenameResult>> TextDocumentPrepareRenameResult;
+typedef std::pair< optional< lsRange>, optional<PrepareRenameResult>> TextDocumentPrepareRenameResult;
extern void Reflect(Reader& visitor, TextDocumentPrepareRenameResult& value);
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/references.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/references.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/references.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -11,7 +11,7 @@
struct lsReferenceContext {
// Include the declaration of the current symbol.
- boost::optional<bool> includeDeclaration;
+ optional<bool> includeDeclaration;
MAKE_REFLECT_STRUCT(lsReferenceContext,
includeDeclaration)
};
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/resolveTypeHierarchy.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/resolveTypeHierarchy.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/resolveTypeHierarchy.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -18,7 +18,7 @@
/**
* The number of hierarchy levels to resolve. {@code 0} indicates no hierarchy level.
*/
- boost::optional<int> resolve;
+ optional<int> resolve;
/**
* The direction of the type hierarchy resolution.
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/selectionRange.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/selectionRange.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/selectionRange.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -35,11 +35,11 @@
/**
* The parent selection range containing this range. Therefore `parent.range` must contain `this.range`.
*/
- boost::optional<SelectionRange*> parent;
+ optional<SelectionRange*> parent;
MAKE_SWAP_METHOD(SelectionRange, range, parent)
};
-extern void Reflect(Reader& visitor, boost::optional<SelectionRange*>& value);
+extern void Reflect(Reader& visitor, optional<SelectionRange*>& value);
extern void Reflect(Writer& visitor, SelectionRange* value);
MAKE_REFLECT_STRUCT(SelectionRange,range,parent)
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/signature_help.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/signature_help.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/signature_help.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -7,7 +7,7 @@
#include "LibLsp/lsp/lsTextDocumentPositionParams.h"
extern void Reflect(Reader& visitor,
- std::pair<boost::optional<std::string>, boost::optional<MarkupContent>>& value);
+ std::pair<optional<std::string>, optional<MarkupContent>>& value);
@@ -20,7 +20,7 @@
// The human-readable doc-comment of this parameter. Will be shown
// in the UI but can be omitted.
- boost::optional< std::pair< boost::optional<std::string> , boost::optional <MarkupContent> > > documentation;
+ optional< std::pair< optional<std::string> , optional <MarkupContent> > > documentation;
MAKE_SWAP_METHOD(lsParameterInformation, label, documentation)
};
@@ -36,7 +36,7 @@
// The human-readable doc-comment of this signature. Will be shown
// in the UI but can be omitted.
- boost::optional< std::pair< boost::optional<std::string>, boost::optional <MarkupContent> > > documentation;
+ optional< std::pair< optional<std::string>, optional <MarkupContent> > > documentation;
// The parameters of this signature.
std::vector<lsParameterInformation> parameters;
@@ -59,7 +59,7 @@
// rely on a default value.
// In future version of the protocol this property might become
// mandantory to better express this.
- boost::optional<int> activeSignature;
+ optional<int> activeSignature;
// The active parameter of the active signature. If omitted or the value
// lies outside the range of `signatures[activeSignature].parameters`
@@ -68,7 +68,7 @@
// In future version of the protocol this property might become
// mandantory to better express the active parameter if the
// active signature does have any.
- boost::optional<int> activeParameter;
+ optional<int> activeParameter;
MAKE_SWAP_METHOD(lsSignatureHelp,
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/typeHierarchy.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/typeHierarchy.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/typeHierarchy.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -42,8 +42,8 @@
struct TypeHierarchyParams :public lsTextDocumentPositionParams
{
- boost::optional<int> resolve;
- boost::optional<TypeHierarchyDirection> direction ;
+ optional<int> resolve;
+ optional<TypeHierarchyDirection> direction ;
MAKE_SWAP_METHOD(TypeHierarchyParams, textDocument, position, resolve, direction)
};
@@ -67,7 +67,7 @@
/**
* Optional detail for the hierarchy item. It can be, for instance, the signature of a function or method.
*/
- boost::optional<std::string>
+ optional<std::string>
detail;
/**
@@ -80,7 +80,7 @@
* {@code true} if the hierarchy item is deprecated. Otherwise, {@code false}. It is {@code false} by default.
*/
- boost::optional<bool> deprecated;
+ optional<bool> deprecated;
/**
* The URI of the text document where this type hierarchy item belongs to.
@@ -111,18 +111,18 @@
* If this type hierarchy item is resolved, it contains the direct parents. Could be empty if the item does not have any
* direct parents. If not defined, the parents have not been resolved yet.
*/
- boost::optional< std::vector<TypeHierarchyItem> > parents;
+ optional< std::vector<TypeHierarchyItem> > parents;
/**
* If this type hierarchy item is resolved, it contains the direct children of the current item.
* Could be empty if the item does not have any descendants. If not defined, the children have not been resolved.
*/
- boost::optional< std::vector<TypeHierarchyItem> > children;
+ optional< std::vector<TypeHierarchyItem> > children;
/**
- * An boost::optional data field can be used to identify a type hierarchy item in a resolve request.
+ * An optional data field can be used to identify a type hierarchy item in a resolve request.
*/
- boost::optional<lsp::Any> data;
+ optional<lsp::Any> data;
MAKE_SWAP_METHOD(TypeHierarchyItem, name, detail, kind, deprecated, uri, range, selectionRange, parents, children, data)
};
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/willSave.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/willSave.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/willSave.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -40,7 +40,7 @@
* A reason why a text document is saved.
*/
- boost::optional<TextDocumentSaveReason> reason;
+ optional<TextDocumentSaveReason> reason;
MAKE_SWAP_METHOD(Params, textDocument, reason);
};
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/utils.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/utils.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/utils.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -7,7 +7,7 @@
#include <memory>
#include <string>
#include <vector>
-#include <boost/optional/optional.hpp>
+#include <optional>
#include <LibLsp/lsp/AbsolutePath.h>
#include "lsPosition.h"
@@ -80,7 +80,7 @@
// FIXME: Move ReadContent into ICacheManager?
bool FileExists(const std::string& filename);
-boost::optional<std::string> ReadContent(const AbsolutePath& filename);
+optional<std::string> ReadContent(const AbsolutePath& filename);
std::vector<std::string> ReadLinesWithEnding(const AbsolutePath& filename);
bool WriteToFile(const std::string& filename, const std::string& content);
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/workspace/applyEdit.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/workspace/applyEdit.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/workspace/applyEdit.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -33,7 +33,7 @@
struct ApplyWorkspaceEditResponse
{
bool applied;
- boost::optional<std::string> failureReason;
+ optional<std::string> failureReason;
MAKE_SWAP_METHOD(ApplyWorkspaceEditResponse, applied, failureReason)
};
MAKE_REFLECT_STRUCT(ApplyWorkspaceEditResponse, applied, failureReason);
Modified: trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/workspace/workspaceFolders.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/workspace/workspaceFolders.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/workspace/workspaceFolders.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -30,5 +30,5 @@
* the workspace folders otherwise.
*/
DEFINE_REQUEST_RESPONSE_TYPE(WorkspaceFolders,
- boost::optional<JsonNull>, boost::optional<std::vector< WorkspaceFolder>>, "workspace/workspaceFolders");
+ optional<JsonNull>, optional<std::vector< WorkspaceFolder>>, "workspace/workspaceFolders");
Modified: trunk/Build/source/utils/asymptote/LspCpp/src/jsonrpc/GCThreadContext.cpp
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/src/jsonrpc/GCThreadContext.cpp 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/src/jsonrpc/GCThreadContext.cpp 2024-02-27 20:51:03 UTC (rev 70212)
@@ -3,7 +3,7 @@
GCThreadContext::GCThreadContext()
{
-#ifdef USEGC
+#ifdef LSPCPP_USEGC
GC_get_stack_base(&gsb);
GC_register_my_thread(&gsb);
#endif
@@ -11,7 +11,7 @@
GCThreadContext::~GCThreadContext()
{
-#ifdef USEGC
+#ifdef LSPCPP_USEGC
GC_unregister_my_thread();
#endif
}
\ No newline at end of file
Modified: trunk/Build/source/utils/asymptote/LspCpp/src/jsonrpc/RemoteEndPoint.cpp
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/src/jsonrpc/RemoteEndPoint.cpp 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/src/jsonrpc/RemoteEndPoint.cpp 2024-02-27 20:51:03 UTC (rev 70212)
@@ -11,13 +11,15 @@
#include "LibLsp/JsonRpc/Context.h"
#include "rapidjson/error/en.h"
#include "LibLsp/JsonRpc/json.h"
-#include "LibLsp/JsonRpc/GCThreadContext.h"
#include "LibLsp/JsonRpc/ScopeExit.h"
#include "LibLsp/JsonRpc/stream.h"
#include <atomic>
+#include <optional>
#include <boost/asio/thread_pool.hpp>
#include <boost/asio/post.hpp>
+#include "LibLsp/JsonRpc/GCThreadContext.h"
+
namespace lsp {
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
@@ -103,7 +105,7 @@
/// (If the context is within multiple nested tasks, true if any are cancelled).
/// Always zero if there is no active cancelable task.
/// This isn't free (context lookup) - don't call it in a tight loop.
- boost::optional<CancelMonitor> getCancelledMonitor(const lsRequestId& id, const Context& ctx = Context::current()){
+ optional<CancelMonitor> getCancelledMonitor(const lsRequestId& id, const Context& ctx = Context::current()){
for (const CancelState* state = ctx.get(g_stateKey); state != nullptr;
state = state->parent)
{
@@ -143,14 +145,18 @@
}
struct RemoteEndPoint::Data
{
- explicit Data(uint8_t workers,lsp::Log& _log , RemoteEndPoint* owner)
- : max_workers(workers), m_id(0),next_request_cookie(0), message_producer(new StreamMessageProducer(*owner)), log(_log)
+ explicit Data(lsp::JSONStreamStyle style,uint8_t workers,lsp::Log& _log , RemoteEndPoint* owner)
+ : max_workers(workers), m_id(0),next_request_cookie(0), log(_log)
{
-
+ if(style == lsp::JSONStreamStyle::Standard )
+ message_producer = (new LSPStreamMessageProducer(*owner)) ;
+ else{
+ message_producer = (new DelimitedStreamMessageProducer(*owner)) ;
+ }
}
~Data()
{
- delete message_producer;
+ delete message_producer;
}
uint8_t max_workers;
std::atomic<int> m_id;
@@ -332,8 +338,9 @@
}
RemoteEndPoint::RemoteEndPoint(
- const std::shared_ptr < MessageJsonHandler >& json_handler,const std::shared_ptr < Endpoint>& localEndPoint, lsp::Log& _log, uint8_t max_workers):
- d_ptr(new Data(max_workers,_log,this)),jsonHandler(json_handler), local_endpoint(localEndPoint)
+ const std::shared_ptr < MessageJsonHandler >& json_handler,const std::shared_ptr < Endpoint>& localEndPoint,
+ lsp::Log& _log, lsp::JSONStreamStyle style, uint8_t max_workers):
+ d_ptr(new Data(style,max_workers,_log,this)),jsonHandler(json_handler), local_endpoint(localEndPoint)
{
jsonHandler->method2notification[Notify_Cancellation::notify::kMethodInfo] = [](Reader& visitor)
{
@@ -341,7 +348,6 @@
};
d_ptr->quit.store(false, std::memory_order_relaxed);
-
}
RemoteEndPoint::~RemoteEndPoint()
@@ -607,7 +613,7 @@
const auto temp = std::make_shared<std::string>(std::move(content));
boost::asio::post(*d_ptr->tp,
[this, temp]{
-#ifdef USEGC
+#ifdef LSPCPP_USEGC
GCThreadContext gcContext;
#endif
Modified: trunk/Build/source/utils/asymptote/LspCpp/src/jsonrpc/StreamMessageProducer.cpp
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/src/jsonrpc/StreamMessageProducer.cpp 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/src/jsonrpc/StreamMessageProducer.cpp 2024-02-27 20:51:03 UTC (rev 70212)
@@ -3,6 +3,7 @@
#include <cassert>
#include "LibLsp/JsonRpc/stream.h"
+#include "LibLsp/lsp/Markup/string_ref.h"
bool StartsWith(std::string value, std::string start);
@@ -23,7 +24,7 @@
}
- void StreamMessageProducer::parseHeader(std::string& line, StreamMessageProducer::Headers& headers)
+ void LSPStreamMessageProducer::parseHeader(std::string& line, LSPStreamMessageProducer::Headers& headers)
{
int sepIndex = line.find(':');
if (sepIndex >= 0) {
@@ -42,7 +43,7 @@
}
-void StreamMessageProducer::listen(MessageConsumer callBack)
+void LSPStreamMessageProducer::listen(MessageConsumer callBack)
{
if(!input)
return;
@@ -94,51 +95,51 @@
else
{
- debugBuilder.push_back((char)c);
- if (c == '\n')
- {
- if (newLine) {
- // Two consecutive newlines have been read, which signals the start of the message content
- if (headers.contentLength <= 0)
- {
- string info = "Unexpected token:" + debugBuilder;
- info = +" (expected Content-Length: sequence);";
- MessageIssue issue(info, lsp::Log::Level::WARNING);
- issueHandler.handle(std::move(issue));
- }
- else {
- bool result = handleMessage(headers,callBack);
- if (!result)
- keepRunning = false;
- newLine = false;
- }
- headers.clear();
- debugBuilder.clear();
- }
- else if (!headerBuilder.empty()) {
- // A single newline ends a header line
- parseHeader(headerBuilder, headers);
- headerBuilder.clear();
- }
- newLine = true;
+ debugBuilder.push_back((char)c);
+ if (c == '\n')
+ {
+ if (newLine) {
+ // Two consecutive newlines have been read, which signals the start of the message content
+ if (headers.contentLength <= 0)
+ {
+ string info = "Unexpected token:" + debugBuilder;
+ info = +" (expected Content-Length: sequence);";
+ MessageIssue issue(info, lsp::Log::Level::WARNING);
+ issueHandler.handle(std::move(issue));
+ }
+ else {
+ bool result = handleMessage(headers,callBack);
+ if (!result)
+ keepRunning = false;
+ newLine = false;
+ }
+ headers.clear();
+ debugBuilder.clear();
}
- else if (c != '\r') {
- // Add the input to the current header line
+ else if (!headerBuilder.empty()) {
+ // A single newline ends a header line
+ parseHeader(headerBuilder, headers);
+ headerBuilder.clear();
+ }
+ newLine = true;
+ }
+ else if (c != '\r') {
+ // Add the input to the current header line
- headerBuilder.push_back((char)c);
- newLine = false;
- }
+ headerBuilder.push_back((char)c);
+ newLine = false;
+ }
}
}
}
-void StreamMessageProducer::bind(std::shared_ptr<lsp::istream>_in)
+void LSPStreamMessageProducer::bind(std::shared_ptr<lsp::istream>_in)
{
input = _in;
}
-bool StreamMessageProducer::handleMessage(Headers& headers ,MessageConsumer callBack)
+bool LSPStreamMessageProducer::handleMessage(Headers& headers ,MessageConsumer callBack)
{
// Read content.
auto content_length = headers.contentLength;
@@ -189,3 +190,108 @@
return true;
}
+
+
+/// For lit tests we support a simplified syntax:
+/// - messages are delimited by '// -----' on a line by itself
+/// - lines starting with // are ignored.
+/// This is a testing path, so favor simplicity over performance here.
+
+void DelimitedStreamMessageProducer::listen(MessageConsumer callBack)
+{
+ if(!input)
+ return;
+
+ keepRunning = true;
+
+ auto readLine = [&]( std::string_ref& lineBuilder) -> bool {
+ while (keepRunning)
+ {
+ if(input->bad())
+ {
+ std::string info = "Input stream is bad.";
+ auto what = input->what();
+ if (what.size())
+ {
+ info += "Reason:";
+ info += input->what();
+ }
+ MessageIssue issue(info, lsp::Log::Level::SEVERE);
+ issueHandler.handle(std::move(issue));
+ return false;
+ }
+ if(input->fail())
+ {
+ std::string info = "Input fail.";
+ auto what = input->what();
+ if(what.size())
+ {
+ info += "Reason:";
+ info += input->what();
+ }
+ MessageIssue issue(info, lsp::Log::Level::WARNING);
+ issueHandler.handle(std::move(issue));
+ if(input->need_to_clear_the_state())
+ input->clear();
+ else
+ {
+ return false;
+ }
+ }
+ int c = input->get();
+ if (c == EOF) {
+ // End of input stream has been reached
+ keepRunning = false;
+ }
+ else
+ {
+ if (c == '\n')
+ {
+ if(!lineBuilder.empty()){
+ lineBuilder.push_back(c);
+ return true;
+ }
+ }
+ else if (c != '\r') {
+ // Add the input to the current header line
+
+ lineBuilder.push_back((char)c);
+ }
+ }
+ }
+ return false;
+ };
+
+ auto getMessage = [&](std::string& json) -> bool {
+ std::string_ref lineBuilder ;
+ while (readLine(lineBuilder)){
+ lineBuilder.trim();
+ if(lineBuilder.start_with("//")){
+ // Found a delimiter for the message.
+ if (lineBuilder == "// -----")
+ {
+ return true;
+ }
+ }
+ json += lineBuilder;
+ }
+ return false;
+ };
+
+
+ while (true) {
+ std::string json;
+ if (getMessage(json)) {
+ callBack(std::move(json));
+ }else{
+ return ;
+ }
+ }
+}
+
+void DelimitedStreamMessageProducer::bind(std::shared_ptr<lsp::istream>_in)
+{
+ input = _in;
+}
+
+
Modified: trunk/Build/source/utils/asymptote/LspCpp/src/jsonrpc/TcpServer.cpp
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/src/jsonrpc/TcpServer.cpp 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/src/jsonrpc/TcpServer.cpp 2024-02-27 20:51:03 UTC (rev 70212)
@@ -97,18 +97,18 @@
{
do_read();
}
- void do_write(const std::string& data)
+ void do_write(const char* data, size_t size)
{
- socket_.async_write_some(boost::asio::buffer(data.data(), data.size()),
- boost::asio::bind_executor(strand_,[this](boost::system::error_code ec, std::size_t n)
- {
- if (!ec)
- {
- return;
- }
- proxy_->error_message = ec.message();
+ socket_.async_write_some(boost::asio::buffer(data, size),
+ boost::asio::bind_executor(strand_,[this](boost::system::error_code ec, std::size_t n)
+ {
+ if (!ec)
+ {
+ return;
+ }
+ proxy_->error_message = ec.message();
- }));
+ }));
}
void do_read()
{
@@ -140,13 +140,23 @@
tcp_stream_wrapper& tcp_stream_wrapper::write(const std::string& c)
{
- session.do_write(c);
- return *this;
+ size_t off = 0;
+ for(;off < c.size();){
+ if(off + 1024 < c.size()){
+ session.do_write(c.data()+off,1024);
+ off += 1024;
+ }else{
+ session.do_write(c.data()+off,c.size() - off);
+ break;
+ }
+ }
+ return *this;
}
tcp_stream_wrapper& tcp_stream_wrapper::write(std::streamsize _s)
{
- session.do_write(std::to_string(_s));
+ auto s = std::to_string(_s);
+ session.do_write(s.data(),s.size());
return *this;
}
@@ -195,7 +205,7 @@
TcpServer::TcpServer(const std::string& address, const std::string& port,
std::shared_ptr < MessageJsonHandler> json_handler,
std::shared_ptr < Endpoint> localEndPoint, lsp::Log& log, uint32_t _max_workers)
- : point(json_handler, localEndPoint, log, _max_workers),d_ptr(new Data( log, _max_workers))
+ : point(json_handler, localEndPoint, log,lsp::JSONStreamStyle::Standard, _max_workers),d_ptr(new Data( log, _max_workers))
{
Modified: trunk/Build/source/utils/asymptote/LspCpp/src/jsonrpc/WebSocketServer.cpp
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/src/jsonrpc/WebSocketServer.cpp 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/src/jsonrpc/WebSocketServer.cpp 2024-02-27 20:51:03 UTC (rev 70212)
@@ -239,7 +239,7 @@
WebSocketServer::WebSocketServer(const std::string& user_agent, const std::string& address, const std::string& port,
std::shared_ptr < MessageJsonHandler> json_handler,
std::shared_ptr < Endpoint> localEndPoint, lsp::Log& log, uint32_t _max_workers)
- : point(json_handler,localEndPoint,log, _max_workers),d_ptr(new Data(user_agent,log))
+ : point(json_handler,localEndPoint,log,lsp::JSONStreamStyle::Standard, _max_workers),d_ptr(new Data(user_agent,log))
{
Modified: trunk/Build/source/utils/asymptote/LspCpp/src/lsp/ParentProcessWatcher.cpp
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/src/lsp/ParentProcessWatcher.cpp 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/src/lsp/ParentProcessWatcher.cpp 2024-02-27 20:51:03 UTC (rev 70212)
@@ -1,4 +1,5 @@
#include "LibLsp/lsp/ParentProcessWatcher.h"
+#include <algorithm>
#include <boost/process.hpp>
#ifdef _WIN32
Modified: trunk/Build/source/utils/asymptote/LspCpp/src/lsp/initialize.cpp
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/src/lsp/initialize.cpp 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/src/lsp/initialize.cpp 2024-02-27 20:51:03 UTC (rev 70212)
@@ -32,7 +32,7 @@
break;
}
}
- void Reflect(Reader& visitor, std::pair<boost::optional<lsTextDocumentSyncKind>, boost::optional<lsTextDocumentSyncOptions> >& value)
+ void Reflect(Reader& visitor, std::pair<optional<lsTextDocumentSyncKind>, optional<lsTextDocumentSyncOptions> >& value)
{
if(((JsonReader&)visitor).m_->IsObject())
{
Modified: trunk/Build/source/utils/asymptote/LspCpp/src/lsp/lsp.cpp
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/src/lsp/lsp.cpp 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/src/lsp/lsp.cpp 2024-02-27 20:51:03 UTC (rev 70212)
@@ -397,7 +397,7 @@
return Get(value);
}
-bool lsp::Any::GetForMapHelper(boost::optional<std::string>& value)
+bool lsp::Any::GetForMapHelper(optional<std::string>& value)
{
return Get(value);
}
@@ -558,7 +558,7 @@
}
-void Reflect(Reader& visitor, boost::optional< SelectionRange* >& value)
+void Reflect(Reader& visitor, optional< SelectionRange* >& value)
{
if (visitor.IsNull()) {
visitor.GetNull();
Modified: trunk/Build/source/utils/asymptote/LspCpp/src/lsp/textDocument.cpp
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/src/lsp/textDocument.cpp 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/src/lsp/textDocument.cpp 2024-02-27 20:51:03 UTC (rev 70212)
@@ -231,7 +231,7 @@
}
}
-void Reflect(Reader& visitor, std::pair<boost::optional<std::string>, boost::optional<lsMarkedString>>& value)
+void Reflect(Reader& visitor, std::pair<optional<std::string>, optional<lsMarkedString>>& value)
{
if (!visitor.IsString())
@@ -244,7 +244,7 @@
}
}
-void Reflect(Reader& visitor, std::pair<boost::optional<std::string>, boost::optional<MarkupContent>>& value)
+void Reflect(Reader& visitor, std::pair<optional<std::string>, optional<MarkupContent>>& value)
{
if (!visitor.IsString())
{
Modified: trunk/Build/source/utils/asymptote/LspCpp/src/lsp/utils.cpp
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/src/lsp/utils.cpp 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/src/lsp/utils.cpp 2024-02-27 20:51:03 UTC (rev 70212)
@@ -191,7 +191,7 @@
return cache.is_open();
}
-boost::optional<std::string> ReadContent(const AbsolutePath& filename) {
+optional<std::string> ReadContent(const AbsolutePath& filename) {
std::ifstream cache;
cache.open(filename.path);
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/CMakeLists.txt
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/CMakeLists.txt 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/CMakeLists.txt 2024-02-27 20:51:03 UTC (rev 70212)
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
if(POLICY CMP0025)
# detect Apple's Clang
cmake_policy(SET CMP0025 NEW)
@@ -68,7 +68,7 @@
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
if(RAPIDJSON_ENABLE_INSTRUMENTATION_OPT AND NOT CMAKE_CROSSCOMPILING)
- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "powerpc" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le")
+ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "powerpc" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native")
else()
#FIXME: x86 is -march=native, but doesn't mean every arch is this option. To keep original project's compatibility, I leave this except POWER.
@@ -102,7 +102,7 @@
endif()
elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
if(NOT CMAKE_CROSSCOMPILING)
- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "powerpc" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le")
+ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "powerpc" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native")
else()
#FIXME: x86 is -march=native, but doesn't mean every arch is this option. To keep original project's compatibility, I leave this except POWER.
@@ -128,6 +128,7 @@
endif()
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
add_definitions(-D_CRT_SECURE_NO_WARNINGS=1)
+ add_definitions(-DNOMINMAX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
# CMake >= 3.10 should handle the above CMAKE_CXX_STANDARD fine, otherwise use /std:c++XX with MSVC >= 19.10
if (RAPIDJSON_BUILD_CXX11 AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "19.10")
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/bin/unittestschema/address.json
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/bin/unittestschema/address.json 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/bin/unittestschema/address.json 2024-02-27 20:51:03 UTC (rev 70212)
@@ -97,11 +97,11 @@
},
"county_type": {
"type": "string",
- "enum": ["Sussex", "Surrey", "Kent"]
+ "enum": ["Sussex", "Surrey", "Kent", "Narnia"]
},
"province_type": {
"type": "string",
- "enum": ["Quebec", "BC", "Alberta"]
+ "enum": ["Quebec", "Narnia", "BC", "Alberta"]
},
"date_type": {
"pattern": "^([0-9]([0-9]([0-9][1-9]|[1-9]0)|[1-9]00)|[1-9]000)(-(0[1-9]|1[0-2])(-(0[1-9]|[1-2][0-9]|3[0-1]))?)?$",
@@ -132,7 +132,6 @@
"type": "string"
},
"url_type": {
- "pattern": "^\\S*$",
"type": "string"
}
}
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/contrib/natvis/rapidjson.natvis
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/contrib/natvis/rapidjson.natvis 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/contrib/natvis/rapidjson.natvis 2024-02-27 20:51:03 UTC (rev 70212)
@@ -2,30 +2,30 @@
<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
<!-- rapidjson::GenericValue - basic support -->
<Type Name="rapidjson::GenericValue<*,*>">
- <DisplayString Condition="(data_.f.flags & kTypeMask) == kNullType">null</DisplayString>
+ <DisplayString Condition="(data_.f.flags & kTypeMask) == rapidjson::kNullType">null</DisplayString>
<DisplayString Condition="data_.f.flags == kTrueFlag">true</DisplayString>
<DisplayString Condition="data_.f.flags == kFalseFlag">false</DisplayString>
<DisplayString Condition="data_.f.flags == kShortStringFlag">{(const Ch*)data_.ss.str,na}</DisplayString>
- <DisplayString Condition="(data_.f.flags & kTypeMask) == kStringType">{(const Ch*)((size_t)data_.s.str & 0x0000FFFFFFFFFFFF),na}</DisplayString>
+ <DisplayString Condition="(data_.f.flags & kTypeMask) == rapidjson::kStringType">{(const Ch*)((size_t)data_.s.str & 0x0000FFFFFFFFFFFF),[data_.s.length]na}</DisplayString>
<DisplayString Condition="(data_.f.flags & kNumberIntFlag) == kNumberIntFlag">{data_.n.i.i}</DisplayString>
<DisplayString Condition="(data_.f.flags & kNumberUintFlag) == kNumberUintFlag">{data_.n.u.u}</DisplayString>
<DisplayString Condition="(data_.f.flags & kNumberInt64Flag) == kNumberInt64Flag">{data_.n.i64}</DisplayString>
<DisplayString Condition="(data_.f.flags & kNumberUint64Flag) == kNumberUint64Flag">{data_.n.u64}</DisplayString>
<DisplayString Condition="(data_.f.flags & kNumberDoubleFlag) == kNumberDoubleFlag">{data_.n.d}</DisplayString>
- <DisplayString Condition="data_.f.flags == kObjectType">Object members={data_.o.size}</DisplayString>
- <DisplayString Condition="data_.f.flags == kArrayType">Array members={data_.a.size}</DisplayString>
+ <DisplayString Condition="data_.f.flags == rapidjson::kObjectType">Object members={data_.o.size}</DisplayString>
+ <DisplayString Condition="data_.f.flags == rapidjson::kArrayType">Array members={data_.a.size}</DisplayString>
<Expand>
- <Item Condition="data_.f.flags == kObjectType" Name="[size]">data_.o.size</Item>
- <Item Condition="data_.f.flags == kObjectType" Name="[capacity]">data_.o.capacity</Item>
- <ArrayItems Condition="data_.f.flags == kObjectType">
+ <Item Condition="data_.f.flags == rapidjson::kObjectType" Name="[size]">data_.o.size</Item>
+ <Item Condition="data_.f.flags == rapidjson::kObjectType" Name="[capacity]">data_.o.capacity</Item>
+ <ArrayItems Condition="data_.f.flags == rapidjson::kObjectType">
<Size>data_.o.size</Size>
<!-- NOTE: Rapidjson stores some extra data in the high bits of pointers, which is why the mask -->
<ValuePointer>(rapidjson::GenericMember<$T1,$T2>*)(((size_t)data_.o.members) & 0x0000FFFFFFFFFFFF)</ValuePointer>
</ArrayItems>
- <Item Condition="data_.f.flags == kArrayType" Name="[size]">data_.a.size</Item>
- <Item Condition="data_.f.flags == kArrayType" Name="[capacity]">data_.a.capacity</Item>
- <ArrayItems Condition="data_.f.flags == kArrayType">
+ <Item Condition="data_.f.flags == rapidjson::kArrayType" Name="[size]">data_.a.size</Item>
+ <Item Condition="data_.f.flags == rapidjson::kArrayType" Name="[capacity]">data_.a.capacity</Item>
+ <ArrayItems Condition="data_.f.flags == rapidjson::kArrayType">
<Size>data_.a.size</Size>
<!-- NOTE: Rapidjson stores some extra data in the high bits of pointers, which is why the mask -->
<ValuePointer>(rapidjson::GenericValue<$T1,$T2>*)(((size_t)data_.a.elements) & 0x0000FFFFFFFFFFFF)</ValuePointer>
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/doc/features.md
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/doc/features.md 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/doc/features.md 2024-02-27 20:51:03 UTC (rev 70212)
@@ -22,13 +22,15 @@
* RapidJSON should be fully RFC4627/ECMA-404 compliance.
* Support JSON Pointer (RFC6901).
* Support JSON Schema Draft v4.
+* Support Swagger v2 schema.
+* Support OpenAPI v3.0.x schema.
* Support Unicode surrogate.
* Support null character (`"\u0000"`)
- * For example, `["Hello\u0000World"]` can be parsed and handled gracefully. There is API for getting/setting lengths of string.
+* For example, `["Hello\u0000World"]` can be parsed and handled gracefully. There is API for getting/setting lengths of string.
* Support optional relaxed syntax.
- * Single line (`// ...`) and multiple line (`/* ... */`) comments (`kParseCommentsFlag`).
- * Trailing commas at the end of objects and arrays (`kParseTrailingCommasFlag`).
- * `NaN`, `Inf`, `Infinity`, `-Inf` and `-Infinity` as `double` values (`kParseNanAndInfFlag`)
+* Single line (`// ...`) and multiple line (`/* ... */`) comments (`kParseCommentsFlag`).
+* Trailing commas at the end of objects and arrays (`kParseTrailingCommasFlag`).
+* `NaN`, `Inf`, `Infinity`, `-Inf` and `-Infinity` as `double` values (`kParseNanAndInfFlag`)
* [NPM compliant](http://github.com/Tencent/rapidjson/blob/master/doc/npm.md).
## Unicode
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/doc/schema.md
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/doc/schema.md 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/doc/schema.md 2024-02-27 20:51:03 UTC (rev 70212)
@@ -24,7 +24,15 @@
// the schema is not a valid JSON.
// ...
}
+
SchemaDocument schema(sd); // Compile a Document to SchemaDocument
+if (!schema.GetError().ObjectEmpty()) {
+ // there was a problem compiling the schema
+ StringBuffer sb;
+ Writer<StringBuffer> w(sb);
+ schema.GetError().Accept(w);
+ printf("Invalid schema: %s\n", sb.GetString());
+}
// sd is no longer needed here.
Document d;
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/example/schemavalidator/schemavalidator.cpp
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/example/schemavalidator/schemavalidator.cpp 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/example/schemavalidator/schemavalidator.cpp 2024-02-27 20:51:03 UTC (rev 70212)
@@ -41,7 +41,8 @@
s << "false";
else if (val.IsFloat())
s << val.GetFloat();
- return s.str();}
+ return s.str();
+}
// Create the error message for a named error
// The error object can either be empty or contain at least member properties:
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/allocators.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/allocators.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/allocators.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -19,6 +19,7 @@
#include "internal/meta.h"
#include <memory>
+#include <limits>
#if RAPIDJSON_HAS_CXX11
#include <type_traits>
@@ -433,7 +434,7 @@
template<typename T, typename A>
inline T* Realloc(A& a, T* old_p, size_t old_n, size_t new_n)
{
- RAPIDJSON_NOEXCEPT_ASSERT(old_n <= SIZE_MAX / sizeof(T) && new_n <= SIZE_MAX / sizeof(T));
+ RAPIDJSON_NOEXCEPT_ASSERT(old_n <= (std::numeric_limits<size_t>::max)() / sizeof(T) && new_n <= (std::numeric_limits<size_t>::max)() / sizeof(T));
return static_cast<T*>(a.Realloc(old_p, old_n * sizeof(T), new_n * sizeof(T)));
}
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/document.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/document.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/document.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -75,7 +75,7 @@
User can define this to use CrtAllocator or MemoryPoolAllocator.
*/
#ifndef RAPIDJSON_DEFAULT_ALLOCATOR
-#define RAPIDJSON_DEFAULT_ALLOCATOR MemoryPoolAllocator<CrtAllocator>
+#define RAPIDJSON_DEFAULT_ALLOCATOR ::RAPIDJSON_NAMESPACE::MemoryPoolAllocator<::RAPIDJSON_NAMESPACE::CrtAllocator>
#endif
/*! \def RAPIDJSON_DEFAULT_STACK_ALLOCATOR
@@ -85,7 +85,7 @@
User can define this to use CrtAllocator or MemoryPoolAllocator.
*/
#ifndef RAPIDJSON_DEFAULT_STACK_ALLOCATOR
-#define RAPIDJSON_DEFAULT_STACK_ALLOCATOR CrtAllocator
+#define RAPIDJSON_DEFAULT_STACK_ALLOCATOR ::RAPIDJSON_NAMESPACE::CrtAllocator
#endif
/*! \def RAPIDJSON_VALUE_DEFAULT_OBJECT_CAPACITY
@@ -1078,6 +1078,7 @@
*/
template <typename T> RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>,internal::IsGenericValue<T> >), (bool)) operator==(const T& rhs) const { return *this == GenericValue(rhs); }
+#ifndef __cpp_impl_three_way_comparison
//! Not-equal-to operator
/*! \return !(*this == rhs)
*/
@@ -1092,7 +1093,6 @@
*/
template <typename T> RAPIDJSON_DISABLEIF_RETURN((internal::IsGenericValue<T>), (bool)) operator!=(const T& rhs) const { return !(*this == rhs); }
-#ifndef __cpp_lib_three_way_comparison
//! Equal-to operator with arbitrary types (symmetric version)
/*! \return (rhs == lhs)
*/
@@ -1230,13 +1230,28 @@
else {
RAPIDJSON_ASSERT(false); // see above note
- // This will generate -Wexit-time-destructors in clang
- // static GenericValue NullValue;
- // return NullValue;
-
- // Use static buffer and placement-new to prevent destruction
- static char buffer[sizeof(GenericValue)];
+#if RAPIDJSON_HAS_CXX11
+ // Use thread-local storage to prevent races between threads.
+ // Use static buffer and placement-new to prevent destruction, with
+ // alignas() to ensure proper alignment.
+ alignas(GenericValue) thread_local static char buffer[sizeof(GenericValue)];
return *new (buffer) GenericValue();
+#elif defined(_MSC_VER) && _MSC_VER < 1900
+ // There's no way to solve both thread locality and proper alignment
+ // simultaneously.
+ __declspec(thread) static char buffer[sizeof(GenericValue)];
+ return *new (buffer) GenericValue();
+#elif defined(__GNUC__) || defined(__clang__)
+ // This will generate -Wexit-time-destructors in clang, but that's
+ // better than having under-alignment.
+ __thread static GenericValue buffer;
+ return buffer;
+#else
+ // Don't know what compiler this is, so don't know how to ensure
+ // thread-locality.
+ static GenericValue buffer;
+ return buffer;
+#endif
}
}
template <typename SourceAllocator>
@@ -2486,6 +2501,7 @@
typedef typename Encoding::Ch Ch; //!< Character type derived from Encoding.
typedef GenericValue<Encoding, Allocator> ValueType; //!< Value type of the document.
typedef Allocator AllocatorType; //!< Allocator type from template parameter.
+ typedef StackAllocator StackAllocatorType; //!< StackAllocator type from template parameter.
//! Constructor
/*! Creates an empty document of specified type.
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/error/en.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/error/en.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/error/en.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -104,15 +104,69 @@
case kValidateErrorType: return RAPIDJSON_ERROR_STRING("Property has a type '%actual' that is not in the following list: '%expected'.");
case kValidateErrorOneOf: return RAPIDJSON_ERROR_STRING("Property did not match any of the sub-schemas specified by 'oneOf', refer to following errors.");
- case kValidateErrorOneOfMatch: return RAPIDJSON_ERROR_STRING("Property matched more than one of the sub-schemas specified by 'oneOf'.");
+ case kValidateErrorOneOfMatch: return RAPIDJSON_ERROR_STRING("Property matched more than one of the sub-schemas specified by 'oneOf', indices '%matches'.");
case kValidateErrorAllOf: return RAPIDJSON_ERROR_STRING("Property did not match all of the sub-schemas specified by 'allOf', refer to following errors.");
case kValidateErrorAnyOf: return RAPIDJSON_ERROR_STRING("Property did not match any of the sub-schemas specified by 'anyOf', refer to following errors.");
case kValidateErrorNot: return RAPIDJSON_ERROR_STRING("Property matched the sub-schema specified by 'not'.");
+ case kValidateErrorReadOnly: return RAPIDJSON_ERROR_STRING("Property is read-only but has been provided when validation is for writing.");
+ case kValidateErrorWriteOnly: return RAPIDJSON_ERROR_STRING("Property is write-only but has been provided when validation is for reading.");
+
default: return RAPIDJSON_ERROR_STRING("Unknown error.");
}
}
+//! Maps error code of schema document compilation into error message.
+/*!
+ \ingroup RAPIDJSON_ERRORS
+ \param schemaErrorCode Error code obtained from compiling the schema document.
+ \return the error message.
+ \note User can make a copy of this function for localization.
+ Using switch-case is safer for future modification of error codes.
+*/
+ inline const RAPIDJSON_ERROR_CHARTYPE* GetSchemaError_En(SchemaErrorCode schemaErrorCode) {
+ switch (schemaErrorCode) {
+ case kSchemaErrorNone: return RAPIDJSON_ERROR_STRING("No error.");
+
+ case kSchemaErrorStartUnknown: return RAPIDJSON_ERROR_STRING("Pointer '%value' to start of schema does not resolve to a location in the document.");
+ case kSchemaErrorRefPlainName: return RAPIDJSON_ERROR_STRING("$ref fragment '%value' must be a JSON pointer.");
+ case kSchemaErrorRefInvalid: return RAPIDJSON_ERROR_STRING("$ref must not be an empty string.");
+ case kSchemaErrorRefPointerInvalid: return RAPIDJSON_ERROR_STRING("$ref fragment '%value' is not a valid JSON pointer at offset '%offset'.");
+ case kSchemaErrorRefUnknown: return RAPIDJSON_ERROR_STRING("$ref '%value' does not resolve to a location in the target document.");
+ case kSchemaErrorRefCyclical: return RAPIDJSON_ERROR_STRING("$ref '%value' is cyclical.");
+ case kSchemaErrorRefNoRemoteProvider: return RAPIDJSON_ERROR_STRING("$ref is remote but there is no remote provider.");
+ case kSchemaErrorRefNoRemoteSchema: return RAPIDJSON_ERROR_STRING("$ref '%value' is remote but the remote provider did not return a schema.");
+ case kSchemaErrorRegexInvalid: return RAPIDJSON_ERROR_STRING("Invalid regular expression '%value' in 'pattern' or 'patternProperties'.");
+ case kSchemaErrorSpecUnknown: return RAPIDJSON_ERROR_STRING("JSON schema draft or OpenAPI version is not recognized.");
+ case kSchemaErrorSpecUnsupported: return RAPIDJSON_ERROR_STRING("JSON schema draft or OpenAPI version is not supported.");
+ case kSchemaErrorSpecIllegal: return RAPIDJSON_ERROR_STRING("Both JSON schema draft and OpenAPI version found in document.");
+ case kSchemaErrorReadOnlyAndWriteOnly: return RAPIDJSON_ERROR_STRING("Property must not be both 'readOnly' and 'writeOnly'.");
+
+ default: return RAPIDJSON_ERROR_STRING("Unknown error.");
+ }
+ }
+
+//! Maps error code of pointer parse into error message.
+/*!
+ \ingroup RAPIDJSON_ERRORS
+ \param pointerParseErrorCode Error code obtained from pointer parse.
+ \return the error message.
+ \note User can make a copy of this function for localization.
+ Using switch-case is safer for future modification of error codes.
+*/
+inline const RAPIDJSON_ERROR_CHARTYPE* GetPointerParseError_En(PointerParseErrorCode pointerParseErrorCode) {
+ switch (pointerParseErrorCode) {
+ case kPointerParseErrorNone: return RAPIDJSON_ERROR_STRING("No error.");
+
+ case kPointerParseErrorTokenMustBeginWithSolidus: return RAPIDJSON_ERROR_STRING("A token must begin with a '/'.");
+ case kPointerParseErrorInvalidEscape: return RAPIDJSON_ERROR_STRING("Invalid escape.");
+ case kPointerParseErrorInvalidPercentEncoding: return RAPIDJSON_ERROR_STRING("Invalid percent encoding in URI fragment.");
+ case kPointerParseErrorCharacterMustPercentEncode: return RAPIDJSON_ERROR_STRING("A character must be percent encoded in a URI fragment.");
+
+ default: return RAPIDJSON_ERROR_STRING("Unknown error.");
+ }
+}
+
RAPIDJSON_NAMESPACE_END
#ifdef __clang__
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/error/error.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/error/error.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/error/error.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -42,7 +42,7 @@
///////////////////////////////////////////////////////////////////////////////
// RAPIDJSON_ERROR_STRING
-//! Macro for converting string literial to \ref RAPIDJSON_ERROR_CHARTYPE[].
+//! Macro for converting string literal to \ref RAPIDJSON_ERROR_CHARTYPE[].
/*! \ingroup RAPIDJSON_ERRORS
By default this conversion macro does nothing.
On Windows, user can define this macro as \c _T(x) for supporting both
@@ -185,14 +185,17 @@
kValidateErrorPatternProperties, //!< See other errors.
kValidateErrorDependencies, //!< Object has missing property or schema dependencies.
- kValidateErrorEnum, //!< Property has a value that is not one of its allowed enumerated values
- kValidateErrorType, //!< Property has a type that is not allowed by the schema..
+ kValidateErrorEnum, //!< Property has a value that is not one of its allowed enumerated values.
+ kValidateErrorType, //!< Property has a type that is not allowed by the schema.
kValidateErrorOneOf, //!< Property did not match any of the sub-schemas specified by 'oneOf'.
kValidateErrorOneOfMatch, //!< Property matched more than one of the sub-schemas specified by 'oneOf'.
kValidateErrorAllOf, //!< Property did not match all of the sub-schemas specified by 'allOf'.
kValidateErrorAnyOf, //!< Property did not match any of the sub-schemas specified by 'anyOf'.
- kValidateErrorNot //!< Property matched the sub-schema specified by 'not'.
+ kValidateErrorNot, //!< Property matched the sub-schema specified by 'not'.
+
+ kValidateErrorReadOnly, //!< Property is read-only but has been provided when validation is for writing
+ kValidateErrorWriteOnly //!< Property is write-only but has been provided when validation is for reading
};
//! Function pointer type of GetValidateError().
@@ -207,6 +210,72 @@
*/
typedef const RAPIDJSON_ERROR_CHARTYPE* (*GetValidateErrorFunc)(ValidateErrorCode);
+///////////////////////////////////////////////////////////////////////////////
+// SchemaErrorCode
+
+//! Error codes when validating.
+/*! \ingroup RAPIDJSON_ERRORS
+ \see GenericSchemaValidator
+*/
+enum SchemaErrorCode {
+ kSchemaErrorNone = 0, //!< No error.
+
+ kSchemaErrorStartUnknown, //!< Pointer to start of schema does not resolve to a location in the document
+ kSchemaErrorRefPlainName, //!< $ref fragment must be a JSON pointer
+ kSchemaErrorRefInvalid, //!< $ref must not be an empty string
+ kSchemaErrorRefPointerInvalid, //!< $ref fragment is not a valid JSON pointer at offset
+ kSchemaErrorRefUnknown, //!< $ref does not resolve to a location in the target document
+ kSchemaErrorRefCyclical, //!< $ref is cyclical
+ kSchemaErrorRefNoRemoteProvider, //!< $ref is remote but there is no remote provider
+ kSchemaErrorRefNoRemoteSchema, //!< $ref is remote but the remote provider did not return a schema
+ kSchemaErrorRegexInvalid, //!< Invalid regular expression in 'pattern' or 'patternProperties'
+ kSchemaErrorSpecUnknown, //!< JSON schema draft or OpenAPI version is not recognized
+ kSchemaErrorSpecUnsupported, //!< JSON schema draft or OpenAPI version is not supported
+ kSchemaErrorSpecIllegal, //!< Both JSON schema draft and OpenAPI version found in document
+ kSchemaErrorReadOnlyAndWriteOnly //!< Property must not be both 'readOnly' and 'writeOnly'
+};
+
+//! Function pointer type of GetSchemaError().
+/*! \ingroup RAPIDJSON_ERRORS
+
+ This is the prototype for \c GetSchemaError_X(), where \c X is a locale.
+ User can dynamically change locale in runtime, e.g.:
+\code
+ GetSchemaErrorFunc GetSchemaError = GetSchemaError_En; // or whatever
+ const RAPIDJSON_ERROR_CHARTYPE* s = GetSchemaError(validator.GetInvalidSchemaCode());
+\endcode
+*/
+typedef const RAPIDJSON_ERROR_CHARTYPE* (*GetSchemaErrorFunc)(SchemaErrorCode);
+
+///////////////////////////////////////////////////////////////////////////////
+// PointerParseErrorCode
+
+//! Error code of JSON pointer parsing.
+/*! \ingroup RAPIDJSON_ERRORS
+ \see GenericPointer::GenericPointer, GenericPointer::GetParseErrorCode
+*/
+enum PointerParseErrorCode {
+ kPointerParseErrorNone = 0, //!< The parse is successful
+
+ kPointerParseErrorTokenMustBeginWithSolidus, //!< A token must begin with a '/'
+ kPointerParseErrorInvalidEscape, //!< Invalid escape
+ kPointerParseErrorInvalidPercentEncoding, //!< Invalid percent encoding in URI fragment
+ kPointerParseErrorCharacterMustPercentEncode //!< A character must percent encoded in URI fragment
+};
+
+//! Function pointer type of GetPointerParseError().
+/*! \ingroup RAPIDJSON_ERRORS
+
+ This is the prototype for \c GetPointerParseError_X(), where \c X is a locale.
+ User can dynamically change locale in runtime, e.g.:
+\code
+ GetPointerParseErrorFunc GetPointerParseError = GetPointerParseError_En; // or whatever
+ const RAPIDJSON_ERROR_CHARTYPE* s = GetPointerParseError(pointer.GetParseErrorCode());
+\endcode
+*/
+typedef const RAPIDJSON_ERROR_CHARTYPE* (*GetPointerParseErrorFunc)(PointerParseErrorCode);
+
+
RAPIDJSON_NAMESPACE_END
#ifdef __clang__
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/internal/biginteger.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/internal/biginteger.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/internal/biginteger.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -259,7 +259,7 @@
if (low < k)
(*outHigh)++;
return low;
-#elif (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__x86_64__)
+#elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__x86_64__)
__extension__ typedef unsigned __int128 uint128;
uint128 p = static_cast<uint128>(a) * static_cast<uint128>(b);
p += k;
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/internal/diyfp.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/internal/diyfp.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/internal/diyfp.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -79,7 +79,7 @@
if (l & (uint64_t(1) << 63)) // rounding
h++;
return DiyFp(h, e + rhs.e + 64);
-#elif (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__x86_64__)
+#elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__x86_64__)
__extension__ typedef unsigned __int128 uint128;
uint128 p = static_cast<uint128>(f) * static_cast<uint128>(rhs.f);
uint64_t h = static_cast<uint64_t>(p >> 64);
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/internal/dtoa.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/internal/dtoa.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/internal/dtoa.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -58,11 +58,11 @@
}
inline void DigitGen(const DiyFp& W, const DiyFp& Mp, uint64_t delta, char* buffer, int* len, int* K) {
- static const uint64_t kPow10[] = { 1U, 10U, 100U, 1000U, 10000U, 100000U, 1000000U, 10000000U, 100000000U,
- 1000000000U, 10000000000U, 100000000000U, 1000000000000U,
- 10000000000000U, 100000000000000U, 1000000000000000U,
- 10000000000000000U, 100000000000000000U, 1000000000000000000U,
- 10000000000000000000U };
+ static const uint64_t kPow10[] = { 1ULL, 10ULL, 100ULL, 1000ULL, 10000ULL, 100000ULL, 1000000ULL, 10000000ULL, 100000000ULL,
+ 1000000000ULL, 10000000000ULL, 100000000000ULL, 1000000000000ULL,
+ 10000000000000ULL, 100000000000000ULL, 1000000000000000ULL,
+ 10000000000000000ULL, 100000000000000000ULL, 1000000000000000000ULL,
+ 10000000000000000000ULL };
const DiyFp one(uint64_t(1) << -Mp.e, Mp.e);
const DiyFp wp_w = Mp - W;
uint32_t p1 = static_cast<uint32_t>(Mp.f >> -one.e);
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/pointer.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/pointer.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/pointer.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -18,6 +18,7 @@
#include "document.h"
#include "uri.h"
#include "internal/itoa.h"
+#include "error/error.h" // PointerParseErrorCode
#ifdef __clang__
RAPIDJSON_DIAG_PUSH
@@ -31,19 +32,6 @@
static const SizeType kPointerInvalidIndex = ~SizeType(0); //!< Represents an invalid index in GenericPointer::Token
-//! Error code of parsing.
-/*! \ingroup RAPIDJSON_ERRORS
- \see GenericPointer::GenericPointer, GenericPointer::GetParseErrorCode
-*/
-enum PointerParseErrorCode {
- kPointerParseErrorNone = 0, //!< The parse is successful
-
- kPointerParseErrorTokenMustBeginWithSolidus, //!< A token must begin with a '/'
- kPointerParseErrorInvalidEscape, //!< Invalid escape
- kPointerParseErrorInvalidPercentEncoding, //!< Invalid percent encoding in URI fragment
- kPointerParseErrorCharacterMustPercentEncode //!< A character must percent encoded in URI fragment
-};
-
///////////////////////////////////////////////////////////////////////////////
// GenericPointer
@@ -84,7 +72,7 @@
typedef GenericUri<ValueType, Allocator> UriType;
- //! A token is the basic units of internal representation.
+ //! A token is the basic units of internal representation.
/*!
A JSON pointer string representation "/foo/123" is parsed to two tokens:
"foo" and 123. 123 will be represented in both numeric form and string form.
@@ -902,10 +890,16 @@
std::memcpy(nameBuffer_, rhs.nameBuffer_, nameBufferSize * sizeof(Ch));
}
- // Adjust pointers to name buffer
- std::ptrdiff_t diff = nameBuffer_ - rhs.nameBuffer_;
- for (Token *t = tokens_; t != tokens_ + rhs.tokenCount_; ++t)
- t->name += diff;
+ // The names of each token point to a string in the nameBuffer_. The
+ // previous memcpy copied over string pointers into the rhs.nameBuffer_,
+ // but they should point to the strings in the new nameBuffer_.
+ for (size_t i = 0; i < rhs.tokenCount_; ++i) {
+ // The offset between the string address and the name buffer should
+ // still be constant, so we can just get this offset and set each new
+ // token name according the new buffer start + the known offset.
+ std::ptrdiff_t name_offset = rhs.tokens_[i].name - rhs.nameBuffer_;
+ tokens_[i].name = nameBuffer_ + name_offset;
+ }
return nameBuffer_ + nameBufferSize;
}
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/rapidjson.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/rapidjson.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/rapidjson.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -195,7 +195,7 @@
*/
#ifndef RAPIDJSON_NO_INT64DEFINE
//!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
-#if defined(_MSC_VER) && (_MSC_VER < 1800) // Visual Studio 2013
+#if defined(_MSC_VER) && (_MSC_VER < 1800) // Visual Studio 2013
#include "msinttypes/stdint.h"
#include "msinttypes/inttypes.h"
#else
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/reader.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/reader.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/reader.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -1433,7 +1433,7 @@
class NumberStream<InputStream, StackCharacter, true, false> : public NumberStream<InputStream, StackCharacter, false, false> {
typedef NumberStream<InputStream, StackCharacter, false, false> Base;
public:
- NumberStream(GenericReader& reader, InputStream& is) : Base(reader, is), stackStream(reader.stack_) {}
+ NumberStream(GenericReader& reader, InputStream& s) : Base(reader, s), stackStream(reader.stack_) {}
RAPIDJSON_FORCEINLINE Ch TakePush() {
stackStream.Put(static_cast<StackCharacter>(Base::is.Peek()));
@@ -1459,7 +1459,7 @@
class NumberStream<InputStream, StackCharacter, true, true> : public NumberStream<InputStream, StackCharacter, true, false> {
typedef NumberStream<InputStream, StackCharacter, true, false> Base;
public:
- NumberStream(GenericReader& reader, InputStream& is) : Base(reader, is) {}
+ NumberStream(GenericReader& reader, InputStream& s) : Base(reader, s) {}
RAPIDJSON_FORCEINLINE Ch Take() { return Base::TakePush(); }
};
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/schema.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/schema.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/schema.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -50,10 +50,6 @@
#define RAPIDJSON_SCHEMA_VERBOSE 0
#endif
-#if RAPIDJSON_SCHEMA_VERBOSE
-#include "stringbuffer.h"
-#endif
-
RAPIDJSON_DIAG_PUSH
#if defined(__GNUC__)
@@ -78,48 +74,94 @@
namespace internal {
-inline void PrintInvalidKeyword(const char* keyword) {
- printf("Fail keyword: %s\n", keyword);
+inline void PrintInvalidKeywordData(const char* keyword) {
+ printf(" Fail keyword: '%s'\n", keyword);
}
-inline void PrintInvalidKeyword(const wchar_t* keyword) {
- wprintf(L"Fail keyword: %ls\n", keyword);
+inline void PrintInvalidKeywordData(const wchar_t* keyword) {
+ wprintf(L" Fail keyword: '%ls'\n", keyword);
}
-inline void PrintInvalidDocument(const char* document) {
- printf("Fail document: %s\n\n", document);
+inline void PrintInvalidDocumentData(const char* document) {
+ printf(" Fail document: '%s'\n", document);
}
-inline void PrintInvalidDocument(const wchar_t* document) {
- wprintf(L"Fail document: %ls\n\n", document);
+inline void PrintInvalidDocumentData(const wchar_t* document) {
+ wprintf(L" Fail document: '%ls'\n", document);
}
-inline void PrintValidatorPointers(unsigned depth, const char* s, const char* d) {
- printf("S: %*s%s\nD: %*s%s\n\n", depth * 4, " ", s, depth * 4, " ", d);
+inline void PrintValidatorPointersData(const char* s, const char* d, unsigned depth) {
+ printf(" Sch: %*s'%s'\n Doc: %*s'%s'\n", depth * 4, " ", s, depth * 4, " ", d);
}
-inline void PrintValidatorPointers(unsigned depth, const wchar_t* s, const wchar_t* d) {
- wprintf(L"S: %*ls%ls\nD: %*ls%ls\n\n", depth * 4, L" ", s, depth * 4, L" ", d);
+inline void PrintValidatorPointersData(const wchar_t* s, const wchar_t* d, unsigned depth) {
+ wprintf(L" Sch: %*ls'%ls'\n Doc: %*ls'%ls'\n", depth * 4, L" ", s, depth * 4, L" ", d);
}
+inline void PrintSchemaIdsData(const char* base, const char* local, const char* resolved) {
+ printf(" Resolving id: Base: '%s', Local: '%s', Resolved: '%s'\n", base, local, resolved);
+}
+
+inline void PrintSchemaIdsData(const wchar_t* base, const wchar_t* local, const wchar_t* resolved) {
+ wprintf(L" Resolving id: Base: '%ls', Local: '%ls', Resolved: '%ls'\n", base, local, resolved);
+}
+
+inline void PrintMethodData(const char* method) {
+ printf("%s\n", method);
+}
+
+inline void PrintMethodData(const char* method, bool b) {
+ printf("%s, Data: '%s'\n", method, b ? "true" : "false");
+}
+
+inline void PrintMethodData(const char* method, int64_t i) {
+ printf("%s, Data: '%" PRId64 "'\n", method, i);
+}
+
+inline void PrintMethodData(const char* method, uint64_t u) {
+ printf("%s, Data: '%" PRIu64 "'\n", method, u);
+}
+
+inline void PrintMethodData(const char* method, double d) {
+ printf("%s, Data: '%lf'\n", method, d);
+}
+
+inline void PrintMethodData(const char* method, const char* s) {
+ printf("%s, Data: '%s'\n", method, s);
+}
+
+inline void PrintMethodData(const char* method, const wchar_t* s) {
+ wprintf(L"%hs, Data: '%ls'\n", method, s);
+}
+
+inline void PrintMethodData(const char* method, const char* s1, const char* s2) {
+ printf("%s, Data: '%s', '%s'\n", method, s1, s2);
+}
+
+inline void PrintMethodData(const char* method, const wchar_t* s1, const wchar_t* s2) {
+ wprintf(L"%hs, Data: '%ls', '%ls'\n", method, s1, s2);
+}
+
} // namespace internal
#endif // RAPIDJSON_SCHEMA_VERBOSE
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_INVALID_KEYWORD_RETURN
-
+#ifndef RAPIDJSON_SCHEMA_PRINT
#if RAPIDJSON_SCHEMA_VERBOSE
-#define RAPIDJSON_INVALID_KEYWORD_VERBOSE(keyword) internal::PrintInvalidKeyword(keyword)
+#define RAPIDJSON_SCHEMA_PRINT(name, ...) internal::Print##name##Data(__VA_ARGS__)
#else
-#define RAPIDJSON_INVALID_KEYWORD_VERBOSE(keyword)
+#define RAPIDJSON_SCHEMA_PRINT(name, ...)
#endif
+#endif
+///////////////////////////////////////////////////////////////////////////////
+// RAPIDJSON_INVALID_KEYWORD_RETURN
+
#define RAPIDJSON_INVALID_KEYWORD_RETURN(code)\
RAPIDJSON_MULTILINEMACRO_BEGIN\
context.invalidCode = code;\
context.invalidKeyword = SchemaType::GetValidateErrorKeyword(code).GetString();\
- RAPIDJSON_INVALID_KEYWORD_VERBOSE(context.invalidKeyword);\
+ RAPIDJSON_SCHEMA_PRINT(InvalidKeyword, context.invalidKeyword);\
return false;\
RAPIDJSON_MULTILINEMACRO_END
@@ -142,10 +184,54 @@
enum ValidateFlag {
kValidateNoFlags = 0, //!< No flags are set.
kValidateContinueOnErrorFlag = 1, //!< Don't stop after first validation error.
+ kValidateReadFlag = 2, //!< Validation is for a read semantic.
+ kValidateWriteFlag = 4, //!< Validation is for a write semantic.
kValidateDefaultFlags = RAPIDJSON_VALIDATE_DEFAULT_FLAGS //!< Default validate flags. Can be customized by defining RAPIDJSON_VALIDATE_DEFAULT_FLAGS
};
///////////////////////////////////////////////////////////////////////////////
+// Specification
+enum SchemaDraft {
+ kDraftUnknown = -1,
+ kDraftNone = 0,
+ kDraft03 = 3,
+ kDraftMin = 4, //!< Current minimum supported draft
+ kDraft04 = 4,
+ kDraft05 = 5,
+ kDraftMax = 5, //!< Current maximum supported draft
+ kDraft06 = 6,
+ kDraft07 = 7,
+ kDraft2019_09 = 8,
+ kDraft2020_12 = 9
+};
+
+enum OpenApiVersion {
+ kVersionUnknown = -1,
+ kVersionNone = 0,
+ kVersionMin = 2, //!< Current minimum supported version
+ kVersion20 = 2,
+ kVersion30 = 3,
+ kVersionMax = 3, //!< Current maximum supported version
+ kVersion31 = 4,
+};
+
+struct Specification {
+ Specification(SchemaDraft d) : draft(d), oapi(kVersionNone) {}
+ Specification(OpenApiVersion o) : oapi(o) {
+ if (oapi == kVersion20) draft = kDraft04;
+ else if (oapi == kVersion30) draft = kDraft05;
+ else if (oapi == kVersion31) draft = kDraft2020_12;
+ else draft = kDraft04;
+ }
+ ~Specification() {}
+ bool IsSupported() const {
+ return ((draft >= kDraftMin && draft <= kDraftMax) && ((oapi == kVersionNone) || (oapi >= kVersionMin && oapi <= kVersionMax)));
+ }
+ SchemaDraft draft;
+ OpenApiVersion oapi;
+};
+
+///////////////////////////////////////////////////////////////////////////////
// Forward declarations
template <typename ValueType, typename Allocator>
@@ -234,8 +320,11 @@
virtual void EndDisallowedType(const typename SchemaType::ValueType& actualType) = 0;
virtual void NotAllOf(ISchemaValidator** subvalidators, SizeType count) = 0;
virtual void NoneOf(ISchemaValidator** subvalidators, SizeType count) = 0;
- virtual void NotOneOf(ISchemaValidator** subvalidators, SizeType count, bool matched) = 0;
+ virtual void NotOneOf(ISchemaValidator** subvalidators, SizeType count) = 0;
+ virtual void MultipleOneOf(SizeType index1, SizeType index2) = 0;
virtual void Disallowed() = 0;
+ virtual void DisallowedWhenWriting() = 0;
+ virtual void DisallowedWhenReading() = 0;
};
@@ -353,10 +442,11 @@
kPatternValidatorWithAdditionalProperty
};
- SchemaValidationContext(SchemaValidatorFactoryType& f, ErrorHandlerType& eh, const SchemaType* s) :
+ SchemaValidationContext(SchemaValidatorFactoryType& f, ErrorHandlerType& eh, const SchemaType* s, unsigned fl = 0) :
factory(f),
error_handler(eh),
schema(s),
+ flags(fl),
valueSchema(),
invalidKeyword(),
invalidCode(),
@@ -380,13 +470,19 @@
if (hasher)
factory.DestroryHasher(hasher);
if (validators) {
- for (SizeType i = 0; i < validatorCount; i++)
- factory.DestroySchemaValidator(validators[i]);
+ for (SizeType i = 0; i < validatorCount; i++) {
+ if (validators[i]) {
+ factory.DestroySchemaValidator(validators[i]);
+ }
+ }
factory.FreeState(validators);
}
if (patternPropertiesValidators) {
- for (SizeType i = 0; i < patternPropertiesValidatorCount; i++)
- factory.DestroySchemaValidator(patternPropertiesValidators[i]);
+ for (SizeType i = 0; i < patternPropertiesValidatorCount; i++) {
+ if (patternPropertiesValidators[i]) {
+ factory.DestroySchemaValidator(patternPropertiesValidators[i]);
+ }
+ }
factory.FreeState(patternPropertiesValidators);
}
if (patternPropertiesSchemas)
@@ -398,6 +494,7 @@
SchemaValidatorFactoryType& factory;
ErrorHandlerType& error_handler;
const SchemaType* schema;
+ unsigned flags;
const SchemaType* valueSchema;
const Ch* invalidKeyword;
ValidateErrorCode invalidCode;
@@ -439,7 +536,8 @@
Schema(SchemaDocumentType* schemaDocument, const PointerType& p, const ValueType& value, const ValueType& document, AllocatorType* allocator, const UriType& id = UriType()) :
allocator_(allocator),
uri_(schemaDocument->GetURI(), *allocator),
- id_(id),
+ id_(id, allocator),
+ spec_(schemaDocument->GetSpecification()),
pointer_(p, allocator),
typeless_(schemaDocument->GetTypeless()),
enum_(),
@@ -472,8 +570,15 @@
maxLength_(~SizeType(0)),
exclusiveMinimum_(false),
exclusiveMaximum_(false),
- defaultValueLength_(0)
+ defaultValueLength_(0),
+ readOnly_(false),
+ writeOnly_(false),
+ nullable_(false)
{
+ GenericStringBuffer<EncodingType> sb;
+ p.StringifyUriFragment(sb);
+ RAPIDJSON_SCHEMA_PRINT(Method, "Schema::Schema", sb.GetString(), id.GetString());
+
typedef typename ValueType::ConstValueIterator ConstValueIterator;
typedef typename ValueType::ConstMemberIterator ConstMemberIterator;
@@ -492,10 +597,13 @@
return;
// If we have an id property, resolve it with the in-scope id
+ // Not supported for open api 2.0 or 3.0
+ if (spec_.oapi != kVersion20 && spec_.oapi != kVersion30)
if (const ValueType* v = GetMember(value, GetIdString())) {
if (v->IsString()) {
UriType local(*v, allocator);
id_ = local.Resolve(id_, allocator);
+ RAPIDJSON_SCHEMA_PRINT(SchemaIds, id.GetString(), v->GetString(), id_.GetString());
}
}
@@ -512,9 +620,9 @@
if (v->IsArray() && v->Size() > 0) {
enum_ = static_cast<uint64_t*>(allocator_->Malloc(sizeof(uint64_t) * v->Size()));
for (ConstValueIterator itr = v->Begin(); itr != v->End(); ++itr) {
- typedef Hasher<EncodingType, MemoryPoolAllocator<> > EnumHasherType;
+ typedef Hasher<EncodingType, MemoryPoolAllocator<AllocatorType> > EnumHasherType;
char buffer[256u + 24];
- MemoryPoolAllocator<> hasherAllocator(buffer, sizeof(buffer));
+ MemoryPoolAllocator<AllocatorType> hasherAllocator(buffer, sizeof(buffer));
EnumHasherType h(&hasherAllocator, 256);
itr->Accept(h);
enum_[enumCount_++] = h.GetHashCode();
@@ -522,8 +630,11 @@
}
}
- if (schemaDocument) {
+ if (schemaDocument)
AssignIfExist(allOf_, *schemaDocument, p, value, GetAllOfString(), document);
+
+ // AnyOf, OneOf, Not not supported for open api 2.0
+ if (schemaDocument && spec_.oapi != kVersion20) {
AssignIfExist(anyOf_, *schemaDocument, p, value, GetAnyOfString(), document);
AssignIfExist(oneOf_, *schemaDocument, p, value, GetOneOfString(), document);
@@ -552,6 +663,8 @@
if (itr->IsString())
AddUniqueElement(allProperties, *itr);
+ // Dependencies not supported for open api 2.0 and 3.0
+ if (spec_.oapi != kVersion20 && spec_.oapi != kVersion30)
if (dependencies && dependencies->IsObject())
for (ConstMemberIterator itr = dependencies->MemberBegin(); itr != dependencies->MemberEnd(); ++itr) {
AddUniqueElement(allProperties, itr->name);
@@ -581,6 +694,8 @@
}
}
+ // PatternProperties not supported for open api 2.0 and 3.0
+ if (spec_.oapi != kVersion20 && spec_.oapi != kVersion30)
if (const ValueType* v = GetMember(value, GetPatternPropertiesString())) {
PointerType q = p.Append(GetPatternPropertiesString(), allocator_);
patternProperties_ = static_cast<PatternProperty*>(allocator_->Malloc(sizeof(PatternProperty) * v->MemberCount()));
@@ -588,8 +703,9 @@
for (ConstMemberIterator itr = v->MemberBegin(); itr != v->MemberEnd(); ++itr) {
new (&patternProperties_[patternPropertyCount_]) PatternProperty();
- patternProperties_[patternPropertyCount_].pattern = CreatePattern(itr->name);
- schemaDocument->CreateSchema(&patternProperties_[patternPropertyCount_].schema, q.Append(itr->name, allocator_), itr->value, document, id_);
+ PointerType r = q.Append(itr->name, allocator_);
+ patternProperties_[patternPropertyCount_].pattern = CreatePattern(itr->name, schemaDocument, r);
+ schemaDocument->CreateSchema(&patternProperties_[patternPropertyCount_].schema, r, itr->value, document, id_);
patternPropertyCount_++;
}
}
@@ -604,6 +720,8 @@
}
}
+ // Dependencies not supported for open api 2.0 and 3.0
+ if (spec_.oapi != kVersion20 && spec_.oapi != kVersion30)
if (dependencies && dependencies->IsObject()) {
PointerType q = p.Append(GetDependenciesString(), allocator_);
hasDependencies_ = true;
@@ -655,6 +773,8 @@
AssignIfExist(minItems_, value, GetMinItemsString());
AssignIfExist(maxItems_, value, GetMaxItemsString());
+ // AdditionalItems not supported for openapi 2.0 and 3.0
+ if (spec_.oapi != kVersion20 && spec_.oapi != kVersion30)
if (const ValueType* v = GetMember(value, GetAdditionalItemsString())) {
if (v->IsBool())
additionalItems_ = v->GetBool();
@@ -669,7 +789,7 @@
AssignIfExist(maxLength_, value, GetMaxLengthString());
if (const ValueType* v = GetMember(value, GetPatternString()))
- pattern_ = CreatePattern(*v);
+ pattern_ = CreatePattern(*v, schemaDocument, p.Append(GetPatternString(), allocator_));
// Number
if (const ValueType* v = GetMember(value, GetMinimumString()))
@@ -692,6 +812,23 @@
if (v->IsString())
defaultValueLength_ = v->GetStringLength();
+ // ReadOnly - open api only (until draft 7 supported)
+ // WriteOnly - open api 3 only (until draft 7 supported)
+ // Both can't be true
+ if (spec_.oapi != kVersionNone)
+ AssignIfExist(readOnly_, value, GetReadOnlyString());
+ if (spec_.oapi >= kVersion30)
+ AssignIfExist(writeOnly_, value, GetWriteOnlyString());
+ if (readOnly_ && writeOnly_)
+ schemaDocument->SchemaError(kSchemaErrorReadOnlyAndWriteOnly, p);
+
+ // Nullable - open api 3 only
+ // If true add 'null' as allowable type
+ if (spec_.oapi >= kVersion30) {
+ AssignIfExist(nullable_, value, GetNullableString());
+ if (nullable_)
+ AddType(GetNullString());
+ }
}
~Schema() {
@@ -723,11 +860,16 @@
return id_;
}
+ const Specification& GetSpecification() const {
+ return spec_;
+ }
+
const PointerType& GetPointer() const {
return pointer_;
}
bool BeginValue(Context& context) const {
+ RAPIDJSON_SCHEMA_PRINT(Method, "Schema::BeginValue");
if (context.inArray) {
if (uniqueItems_)
context.valueUniqueness = true;
@@ -759,6 +901,7 @@
}
RAPIDJSON_FORCEINLINE bool EndValue(Context& context) const {
+ RAPIDJSON_SCHEMA_PRINT(Method, "Schema::EndValue");
// Only check pattern properties if we have validators
if (context.patternPropertiesValidatorCount > 0) {
bool otherValid = false;
@@ -822,16 +965,19 @@
if (oneOf_.schemas) {
bool oneValid = false;
+ SizeType firstMatch = 0;
for (SizeType i = oneOf_.begin; i < oneOf_.begin + oneOf_.count; i++)
if (context.validators[i]->IsValid()) {
if (oneValid) {
- context.error_handler.NotOneOf(&context.validators[oneOf_.begin], oneOf_.count, true);
+ context.error_handler.MultipleOneOf(firstMatch, i - oneOf_.begin);
RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorOneOfMatch);
- } else
+ } else {
oneValid = true;
+ firstMatch = i - oneOf_.begin;
+ }
}
if (!oneValid) {
- context.error_handler.NotOneOf(&context.validators[oneOf_.begin], oneOf_.count, false);
+ context.error_handler.NotOneOf(&context.validators[oneOf_.begin], oneOf_.count);
RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorOneOf);
}
}
@@ -846,6 +992,7 @@
}
bool Null(Context& context) const {
+ RAPIDJSON_SCHEMA_PRINT(Method, "Schema::Null");
if (!(type_ & (1 << kNullSchemaType))) {
DisallowedType(context, GetNullString());
RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorType);
@@ -853,15 +1000,15 @@
return CreateParallelValidator(context);
}
- bool Bool(Context& context, bool) const {
- if (!(type_ & (1 << kBooleanSchemaType))) {
- DisallowedType(context, GetBooleanString());
- RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorType);
- }
+ bool Bool(Context& context, bool b) const {
+ RAPIDJSON_SCHEMA_PRINT(Method, "Schema::Bool", b);
+ if (!CheckBool(context, b))
+ return false;
return CreateParallelValidator(context);
}
bool Int(Context& context, int i) const {
+ RAPIDJSON_SCHEMA_PRINT(Method, "Schema::Int", (int64_t)i);
if (!CheckInt(context, i))
return false;
return CreateParallelValidator(context);
@@ -868,6 +1015,7 @@
}
bool Uint(Context& context, unsigned u) const {
+ RAPIDJSON_SCHEMA_PRINT(Method, "Schema::Uint", (uint64_t)u);
if (!CheckUint(context, u))
return false;
return CreateParallelValidator(context);
@@ -874,6 +1022,7 @@
}
bool Int64(Context& context, int64_t i) const {
+ RAPIDJSON_SCHEMA_PRINT(Method, "Schema::Int64", i);
if (!CheckInt(context, i))
return false;
return CreateParallelValidator(context);
@@ -880,6 +1029,7 @@
}
bool Uint64(Context& context, uint64_t u) const {
+ RAPIDJSON_SCHEMA_PRINT(Method, "Schema::Uint64", u);
if (!CheckUint(context, u))
return false;
return CreateParallelValidator(context);
@@ -886,6 +1036,7 @@
}
bool Double(Context& context, double d) const {
+ RAPIDJSON_SCHEMA_PRINT(Method, "Schema::Double", d);
if (!(type_ & (1 << kNumberSchemaType))) {
DisallowedType(context, GetNumberString());
RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorType);
@@ -904,6 +1055,7 @@
}
bool String(Context& context, const Ch* str, SizeType length, bool) const {
+ RAPIDJSON_SCHEMA_PRINT(Method, "Schema::String", str);
if (!(type_ & (1 << kStringSchemaType))) {
DisallowedType(context, GetStringString());
RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorType);
@@ -932,6 +1084,7 @@
}
bool StartObject(Context& context) const {
+ RAPIDJSON_SCHEMA_PRINT(Method, "Schema::StartObject");
if (!(type_ & (1 << kObjectSchemaType))) {
DisallowedType(context, GetObjectString());
RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorType);
@@ -953,6 +1106,8 @@
}
bool Key(Context& context, const Ch* str, SizeType len, bool) const {
+ RAPIDJSON_SCHEMA_PRINT(Method, "Schema::Key", str);
+
if (patternProperties_) {
context.patternPropertiesSchemaCount = 0;
for (SizeType i = 0; i < patternPropertyCount_; i++)
@@ -1004,6 +1159,7 @@
}
bool EndObject(Context& context, SizeType memberCount) const {
+ RAPIDJSON_SCHEMA_PRINT(Method, "Schema::EndObject");
if (hasRequired_) {
context.error_handler.StartMissingProperties();
for (SizeType index = 0; index < propertyCount_; index++)
@@ -1051,6 +1207,7 @@
}
bool StartArray(Context& context) const {
+ RAPIDJSON_SCHEMA_PRINT(Method, "Schema::StartArray");
context.arrayElementIndex = 0;
context.inArray = true; // Ensure we note that we are in an array
@@ -1063,6 +1220,7 @@
}
bool EndArray(Context& context, SizeType elementCount) const {
+ RAPIDJSON_SCHEMA_PRINT(Method, "Schema::EndArray");
context.inArray = false;
if (elementCount < minItems_) {
@@ -1111,6 +1269,9 @@
case kValidateErrorAnyOf: return GetAnyOfString();
case kValidateErrorNot: return GetNotString();
+ case kValidateErrorReadOnly: return GetReadOnlyString();
+ case kValidateErrorWriteOnly: return GetWriteOnlyString();
+
default: return GetNullString();
}
}
@@ -1158,16 +1319,15 @@
RAPIDJSON_STRING_(ExclusiveMaximum, 'e', 'x', 'c', 'l', 'u', 's', 'i', 'v', 'e', 'M', 'a', 'x', 'i', 'm', 'u', 'm')
RAPIDJSON_STRING_(MultipleOf, 'm', 'u', 'l', 't', 'i', 'p', 'l', 'e', 'O', 'f')
RAPIDJSON_STRING_(DefaultValue, 'd', 'e', 'f', 'a', 'u', 'l', 't')
+ RAPIDJSON_STRING_(Schema, '$', 's', 'c', 'h', 'e', 'm', 'a')
RAPIDJSON_STRING_(Ref, '$', 'r', 'e', 'f')
RAPIDJSON_STRING_(Id, 'i', 'd')
+ RAPIDJSON_STRING_(Swagger, 's', 'w', 'a', 'g', 'g', 'e', 'r')
+ RAPIDJSON_STRING_(OpenApi, 'o', 'p', 'e', 'n', 'a', 'p', 'i')
+ RAPIDJSON_STRING_(ReadOnly, 'r', 'e', 'a', 'd', 'O', 'n', 'l', 'y')
+ RAPIDJSON_STRING_(WriteOnly, 'w', 'r', 'i', 't', 'e', 'O', 'n', 'l', 'y')
+ RAPIDJSON_STRING_(Nullable, 'n', 'u', 'l', 'l', 'a', 'b', 'l', 'e')
- RAPIDJSON_STRING_(SchemeEnd, ':')
- RAPIDJSON_STRING_(AuthStart, '/', '/')
- RAPIDJSON_STRING_(QueryStart, '?')
- RAPIDJSON_STRING_(FragStart, '#')
- RAPIDJSON_STRING_(Slash, '/')
- RAPIDJSON_STRING_(Dot, '.')
-
#undef RAPIDJSON_STRING_
private:
@@ -1241,10 +1401,11 @@
#if RAPIDJSON_SCHEMA_USE_INTERNALREGEX
template <typename ValueType>
- RegexType* CreatePattern(const ValueType& value) {
+ RegexType* CreatePattern(const ValueType& value, SchemaDocumentType* sd, const PointerType& p) {
if (value.IsString()) {
RegexType* r = new (allocator_->Malloc(sizeof(RegexType))) RegexType(value.GetString(), allocator_);
if (!r->IsValid()) {
+ sd->SchemaErrorValue(kSchemaErrorRegexInvalid, p, value.GetString(), value.GetStringLength());
r->~RegexType();
AllocatorType::Free(r);
r = 0;
@@ -1260,13 +1421,14 @@
}
#elif RAPIDJSON_SCHEMA_USE_STDREGEX
template <typename ValueType>
- RegexType* CreatePattern(const ValueType& value) {
+ RegexType* CreatePattern(const ValueType& value, SchemaDocumentType* sd, const PointerType& p) {
if (value.IsString()) {
RegexType *r = static_cast<RegexType*>(allocator_->Malloc(sizeof(RegexType)));
try {
return new (r) RegexType(value.GetString(), std::size_t(value.GetStringLength()), std::regex_constants::ECMAScript);
}
- catch (const std::regex_error&) {
+ catch (const std::regex_error& e) {
+ sd->SchemaErrorValue(kSchemaErrorRegexInvalid, p, value.GetString(), value.GetStringLength());
AllocatorType::Free(r);
}
}
@@ -1279,7 +1441,9 @@
}
#else
template <typename ValueType>
- RegexType* CreatePattern(const ValueType&) { return 0; }
+ RegexType* CreatePattern(const ValueType&) {
+ return 0;
+ }
static bool IsPatternMatch(const RegexType*, const Ch *, SizeType) { return true; }
#endif // RAPIDJSON_SCHEMA_USE_STDREGEX
@@ -1294,6 +1458,9 @@
else if (type == GetNumberString() ) type_ |= (1 << kNumberSchemaType) | (1 << kIntegerSchemaType);
}
+ // Creates parallel validators for allOf, anyOf, oneOf, not and schema dependencies, if required.
+ // Also creates a hasher for enums and array uniqueness, if required.
+ // Also a useful place to add type-independent error checks.
bool CreateParallelValidator(Context& context) const {
if (enum_ || context.arrayUniqueness)
context.hasher = context.factory.CreateHasher();
@@ -1301,6 +1468,7 @@
if (validatorCount_) {
RAPIDJSON_ASSERT(context.validators == 0);
context.validators = static_cast<ISchemaValidator**>(context.factory.MallocState(sizeof(ISchemaValidator*) * validatorCount_));
+ std::memset(context.validators, 0, sizeof(ISchemaValidator*) * validatorCount_);
context.validatorCount = validatorCount_;
// Always return after first failure for these sub-validators
@@ -1323,6 +1491,16 @@
}
}
+ // Add any other type-independent checks here
+ if (readOnly_ && (context.flags & kValidateWriteFlag)) {
+ context.error_handler.DisallowedWhenWriting();
+ RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorReadOnly);
+ }
+ if (writeOnly_ && (context.flags & kValidateReadFlag)) {
+ context.error_handler.DisallowedWhenReading();
+ RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorWriteOnly);
+ }
+
return true;
}
@@ -1345,6 +1523,14 @@
return false;
}
+ bool CheckBool(Context& context, bool) const {
+ if (!(type_ & (1 << kBooleanSchemaType))) {
+ DisallowedType(context, GetBooleanString());
+ RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorType);
+ }
+ return true;
+ }
+
bool CheckInt(Context& context, int64_t i) const {
if (!(type_ & ((1 << kIntegerSchemaType) | (1 << kNumberSchemaType)))) {
DisallowedType(context, GetIntegerString());
@@ -1510,6 +1696,7 @@
AllocatorType* allocator_;
SValue uri_;
UriType id_;
+ Specification spec_;
PointerType pointer_;
const SchemaType* typeless_;
uint64_t* enum_;
@@ -1554,6 +1741,10 @@
bool exclusiveMaximum_;
SizeType defaultValueLength_;
+
+ bool readOnly_;
+ bool writeOnly_;
+ bool nullable_;
};
template<typename Stack, typename Ch>
@@ -1600,7 +1791,13 @@
virtual ~IGenericRemoteSchemaDocumentProvider() {}
virtual const SchemaDocumentType* GetRemoteDocument(const Ch* uri, SizeType length) = 0;
- virtual const SchemaDocumentType* GetRemoteDocument(GenericUri<ValueType, AllocatorType> uri) { return GetRemoteDocument(uri.GetBaseString(), uri.GetBaseStringLength()); }
+ virtual const SchemaDocumentType* GetRemoteDocument(const GenericUri<ValueType, AllocatorType> uri, Specification& spec) {
+ // Default implementation just calls through for compatibility
+ // Following line suppresses unused parameter warning
+ (void)spec;
+ // printf("GetRemoteDocument: %d %d\n", spec.draft, spec.oapi);
+ return GetRemoteDocument(uri.GetBaseString(), uri.GetBaseStringLength());
+ }
};
///////////////////////////////////////////////////////////////////////////////
@@ -1625,8 +1822,9 @@
typedef typename EncodingType::Ch Ch;
typedef internal::Schema<GenericSchemaDocument> SchemaType;
typedef GenericPointer<ValueType, Allocator> PointerType;
- typedef GenericValue<EncodingType, AllocatorType> SValue;
+ typedef GenericValue<EncodingType, AllocatorType> GValue;
typedef GenericUri<ValueType, Allocator> UriType;
+ typedef GenericStringRef<Ch> StringRefType;
friend class internal::Schema<GenericSchemaDocument>;
template <typename, typename, typename>
friend class GenericSchemaValidator;
@@ -1641,10 +1839,12 @@
\param remoteProvider An optional remote schema document provider for resolving remote reference. Can be null.
\param allocator An optional allocator instance for allocating memory. Can be null.
\param pointer An optional JSON pointer to the start of the schema document
+ \param spec Optional schema draft or OpenAPI version. Used if no specification in document. Defaults to draft-04.
*/
explicit GenericSchemaDocument(const ValueType& document, const Ch* uri = 0, SizeType uriLength = 0,
IRemoteSchemaDocumentProviderType* remoteProvider = 0, Allocator* allocator = 0,
- const PointerType& pointer = PointerType()) : // PR #1393
+ const PointerType& pointer = PointerType(), // PR #1393
+ const Specification& spec = Specification(kDraft04)) :
remoteProvider_(remoteProvider),
allocator_(allocator),
ownAllocator_(),
@@ -1651,8 +1851,12 @@
root_(),
typeless_(),
schemaMap_(allocator, kInitialSchemaMapSize),
- schemaRef_(allocator, kInitialSchemaRefSize)
+ schemaRef_(allocator, kInitialSchemaRefSize),
+ spec_(spec),
+ error_(kObjectType),
+ currentError_()
{
+ RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaDocument::GenericSchemaDocument");
if (!allocator_)
ownAllocator_ = allocator_ = RAPIDJSON_NEW(Allocator)();
@@ -1663,6 +1867,10 @@
typeless_ = static_cast<SchemaType*>(allocator_->Malloc(sizeof(SchemaType)));
new (typeless_) SchemaType(this, PointerType(), ValueType(kObjectType).Move(), ValueType(kObjectType).Move(), allocator_, docId_);
+ // Establish the schema draft or open api version.
+ // We only ever look for '$schema' or 'swagger' or 'openapi' at the root of the document.
+ SetSchemaSpecification(document);
+
// Generate root schema, it will call CreateSchema() to create sub-schemas,
// And call HandleRefSchema() if there are $ref.
// PR #1393 use input pointer if supplied
@@ -1673,6 +1881,11 @@
else if (const ValueType* v = pointer.Get(document)) {
CreateSchema(&root_, pointer, *v, document, docId_);
}
+ else {
+ GenericStringBuffer<EncodingType> sb;
+ pointer.StringifyUriFragment(sb);
+ SchemaErrorValue(kSchemaErrorStartUnknown, PointerType(), sb.GetString(), static_cast<SizeType>(sb.GetSize() / sizeof(Ch)));
+ }
RAPIDJSON_ASSERT(root_ != 0);
@@ -1690,7 +1903,10 @@
schemaMap_(std::move(rhs.schemaMap_)),
schemaRef_(std::move(rhs.schemaRef_)),
uri_(std::move(rhs.uri_)),
- docId_(rhs.docId_)
+ docId_(std::move(rhs.docId_)),
+ spec_(rhs.spec_),
+ error_(std::move(rhs.error_)),
+ currentError_(std::move(rhs.currentError_))
{
rhs.remoteProvider_ = 0;
rhs.allocator_ = 0;
@@ -1709,15 +1925,81 @@
Allocator::Free(typeless_);
}
+ // these may contain some allocator data so clear before deleting ownAllocator_
+ uri_.SetNull();
+ error_.SetNull();
+ currentError_.SetNull();
+
RAPIDJSON_DELETE(ownAllocator_);
}
- const SValue& GetURI() const { return uri_; }
+ const GValue& GetURI() const { return uri_; }
+ const Specification& GetSpecification() const { return spec_; }
+ bool IsSupportedSpecification() const { return spec_.IsSupported(); }
+
+ //! Static method to get the specification of any schema document
+ // Returns kDraftNone if document is silent
+ static const Specification GetSpecification(const ValueType& document) {
+ SchemaDraft draft = GetSchemaDraft(document);
+ if (draft != kDraftNone)
+ return Specification(draft);
+ else {
+ OpenApiVersion oapi = GetOpenApiVersion(document);
+ if (oapi != kVersionNone)
+ return Specification(oapi);
+ }
+ return Specification(kDraftNone);
+ }
+
//! Get the root schema.
const SchemaType& GetRoot() const { return *root_; }
-private:
+ //! Gets the error object.
+ GValue& GetError() { return error_; }
+ const GValue& GetError() const { return error_; }
+
+ static const StringRefType& GetSchemaErrorKeyword(SchemaErrorCode schemaErrorCode) {
+ switch (schemaErrorCode) {
+ case kSchemaErrorStartUnknown: return GetStartUnknownString();
+ case kSchemaErrorRefPlainName: return GetRefPlainNameString();
+ case kSchemaErrorRefInvalid: return GetRefInvalidString();
+ case kSchemaErrorRefPointerInvalid: return GetRefPointerInvalidString();
+ case kSchemaErrorRefUnknown: return GetRefUnknownString();
+ case kSchemaErrorRefCyclical: return GetRefCyclicalString();
+ case kSchemaErrorRefNoRemoteProvider: return GetRefNoRemoteProviderString();
+ case kSchemaErrorRefNoRemoteSchema: return GetRefNoRemoteSchemaString();
+ case kSchemaErrorRegexInvalid: return GetRegexInvalidString();
+ case kSchemaErrorSpecUnknown: return GetSpecUnknownString();
+ case kSchemaErrorSpecUnsupported: return GetSpecUnsupportedString();
+ case kSchemaErrorSpecIllegal: return GetSpecIllegalString();
+ case kSchemaErrorReadOnlyAndWriteOnly: return GetReadOnlyAndWriteOnlyString();
+ default: return GetNullString();
+ }
+ }
+
+ //! Default error method
+ void SchemaError(const SchemaErrorCode code, const PointerType& location) {
+ currentError_ = GValue(kObjectType);
+ AddCurrentError(code, location);
+ }
+
+ //! Method for error with single string value insert
+ void SchemaErrorValue(const SchemaErrorCode code, const PointerType& location, const Ch* value, SizeType length) {
+ currentError_ = GValue(kObjectType);
+ currentError_.AddMember(GetValueString(), GValue(value, length, *allocator_).Move(), *allocator_);
+ AddCurrentError(code, location);
+ }
+
+ //! Method for error with invalid pointer
+ void SchemaErrorPointer(const SchemaErrorCode code, const PointerType& location, const Ch* value, SizeType length, const PointerType& pointer) {
+ currentError_ = GValue(kObjectType);
+ currentError_.AddMember(GetValueString(), GValue(value, length, *allocator_).Move(), *allocator_);
+ currentError_.AddMember(GetOffsetString(), static_cast<SizeType>(pointer.GetParseErrorOffset() / sizeof(Ch)), *allocator_);
+ AddCurrentError(code, location);
+ }
+
+ private:
//! Prohibit copying
GenericSchemaDocument(const GenericSchemaDocument&);
//! Prohibit assignment
@@ -1738,6 +2020,146 @@
bool owned;
};
+ void AddErrorInstanceLocation(GValue& result, const PointerType& location) {
+ GenericStringBuffer<EncodingType> sb;
+ location.StringifyUriFragment(sb);
+ GValue instanceRef(sb.GetString(), static_cast<SizeType>(sb.GetSize() / sizeof(Ch)), *allocator_);
+ result.AddMember(GetInstanceRefString(), instanceRef, *allocator_);
+ }
+
+ void AddError(GValue& keyword, GValue& error) {
+ typename GValue::MemberIterator member = error_.FindMember(keyword);
+ if (member == error_.MemberEnd())
+ error_.AddMember(keyword, error, *allocator_);
+ else {
+ if (member->value.IsObject()) {
+ GValue errors(kArrayType);
+ errors.PushBack(member->value, *allocator_);
+ member->value = errors;
+ }
+ member->value.PushBack(error, *allocator_);
+ }
+ }
+
+ void AddCurrentError(const SchemaErrorCode code, const PointerType& location) {
+ RAPIDJSON_SCHEMA_PRINT(InvalidKeyword, GetSchemaErrorKeyword(code));
+ currentError_.AddMember(GetErrorCodeString(), code, *allocator_);
+ AddErrorInstanceLocation(currentError_, location);
+ AddError(GValue(GetSchemaErrorKeyword(code)).Move(), currentError_);
+ }
+
+#define RAPIDJSON_STRING_(name, ...) \
+ static const StringRefType& Get##name##String() {\
+ static const Ch s[] = { __VA_ARGS__, '\0' };\
+ static const StringRefType v(s, static_cast<SizeType>(sizeof(s) / sizeof(Ch) - 1)); \
+ return v;\
+ }
+
+ RAPIDJSON_STRING_(InstanceRef, 'i', 'n', 's', 't', 'a', 'n', 'c', 'e', 'R', 'e', 'f')
+ RAPIDJSON_STRING_(ErrorCode, 'e', 'r', 'r', 'o', 'r', 'C', 'o', 'd', 'e')
+ RAPIDJSON_STRING_(Value, 'v', 'a', 'l', 'u', 'e')
+ RAPIDJSON_STRING_(Offset, 'o', 'f', 'f', 's', 'e', 't')
+
+ RAPIDJSON_STRING_(Null, 'n', 'u', 'l', 'l')
+ RAPIDJSON_STRING_(SpecUnknown, 'S', 'p', 'e', 'c', 'U', 'n', 'k', 'n', 'o', 'w', 'n')
+ RAPIDJSON_STRING_(SpecUnsupported, 'S', 'p', 'e', 'c', 'U', 'n', 's', 'u', 'p', 'p', 'o', 'r', 't', 'e', 'd')
+ RAPIDJSON_STRING_(SpecIllegal, 'S', 'p', 'e', 'c', 'I', 'l', 'l', 'e', 'g', 'a', 'l')
+ RAPIDJSON_STRING_(StartUnknown, 'S', 't', 'a', 'r', 't', 'U', 'n', 'k', 'n', 'o', 'w', 'n')
+ RAPIDJSON_STRING_(RefPlainName, 'R', 'e', 'f', 'P', 'l', 'a', 'i', 'n', 'N', 'a', 'm', 'e')
+ RAPIDJSON_STRING_(RefInvalid, 'R', 'e', 'f', 'I', 'n', 'v', 'a', 'l', 'i', 'd')
+ RAPIDJSON_STRING_(RefPointerInvalid, 'R', 'e', 'f', 'P', 'o', 'i', 'n', 't', 'e', 'r', 'I', 'n', 'v', 'a', 'l', 'i', 'd')
+ RAPIDJSON_STRING_(RefUnknown, 'R', 'e', 'f', 'U', 'n', 'k', 'n', 'o', 'w', 'n')
+ RAPIDJSON_STRING_(RefCyclical, 'R', 'e', 'f', 'C', 'y', 'c', 'l', 'i', 'c', 'a', 'l')
+ RAPIDJSON_STRING_(RefNoRemoteProvider, 'R', 'e', 'f', 'N', 'o', 'R', 'e', 'm', 'o', 't', 'e', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r')
+ RAPIDJSON_STRING_(RefNoRemoteSchema, 'R', 'e', 'f', 'N', 'o', 'R', 'e', 'm', 'o', 't', 'e', 'S', 'c', 'h', 'e', 'm', 'a')
+ RAPIDJSON_STRING_(ReadOnlyAndWriteOnly, 'R', 'e', 'a', 'd', 'O', 'n', 'l', 'y', 'A', 'n', 'd', 'W', 'r', 'i', 't', 'e', 'O', 'n', 'l', 'y')
+ RAPIDJSON_STRING_(RegexInvalid, 'R', 'e', 'g', 'e', 'x', 'I', 'n', 'v', 'a', 'l', 'i', 'd')
+
+#undef RAPIDJSON_STRING_
+
+ // Static method to get schema draft of any schema document
+ static SchemaDraft GetSchemaDraft(const ValueType& document) {
+ static const Ch kDraft03String[] = { 'h', 't', 't', 'p', ':', '/', '/', 'j', 's', 'o', 'n', '-', 's', 'c', 'h', 'e', 'm', 'a', '.', 'o', 'r', 'g', '/', 'd', 'r', 'a', 'f', 't', '-', '0', '3', '/', 's', 'c', 'h', 'e', 'm', 'a', '#', '\0' };
+ static const Ch kDraft04String[] = { 'h', 't', 't', 'p', ':', '/', '/', 'j', 's', 'o', 'n', '-', 's', 'c', 'h', 'e', 'm', 'a', '.', 'o', 'r', 'g', '/', 'd', 'r', 'a', 'f', 't', '-', '0', '4', '/', 's', 'c', 'h', 'e', 'm', 'a', '#', '\0' };
+ static const Ch kDraft05String[] = { 'h', 't', 't', 'p', ':', '/', '/', 'j', 's', 'o', 'n', '-', 's', 'c', 'h', 'e', 'm', 'a', '.', 'o', 'r', 'g', '/', 'd', 'r', 'a', 'f', 't', '-', '0', '5', '/', 's', 'c', 'h', 'e', 'm', 'a', '#', '\0' };
+ static const Ch kDraft06String[] = { 'h', 't', 't', 'p', ':', '/', '/', 'j', 's', 'o', 'n', '-', 's', 'c', 'h', 'e', 'm', 'a', '.', 'o', 'r', 'g', '/', 'd', 'r', 'a', 'f', 't', '-', '0', '6', '/', 's', 'c', 'h', 'e', 'm', 'a', '#', '\0' };
+ static const Ch kDraft07String[] = { 'h', 't', 't', 'p', ':', '/', '/', 'j', 's', 'o', 'n', '-', 's', 'c', 'h', 'e', 'm', 'a', '.', 'o', 'r', 'g', '/', 'd', 'r', 'a', 'f', 't', '-', '0', '7', '/', 's', 'c', 'h', 'e', 'm', 'a', '#', '\0' };
+ static const Ch kDraft2019_09String[] = { 'h', 't', 't', 'p', 's', ':', '/', '/', 'j', 's', 'o', 'n', '-', 's', 'c', 'h', 'e', 'm', 'a', '.', 'o', 'r', 'g', '/', 'd', 'r', 'a', 'f', 't', '/', '2', '0', '1', '9', '-', '0', '9', '/', 's', 'c', 'h', 'e', 'm', 'a', '\0' };
+ static const Ch kDraft2020_12String[] = { 'h', 't', 't', 'p', 's', ':', '/', '/', 'j', 's', 'o', 'n', '-', 's', 'c', 'h', 'e', 'm', 'a', '.', 'o', 'r', 'g', '/', 'd', 'r', 'a', 'f', 't', '/', '2', '0', '2', '0', '-', '1', '2', '/', 's', 'c', 'h', 'e', 'm', 'a', '\0' };
+
+ if (!document.IsObject()) {
+ return kDraftNone;
+ }
+
+ // Get the schema draft from the $schema keyword at the supplied location
+ typename ValueType::ConstMemberIterator itr = document.FindMember(SchemaType::GetSchemaString());
+ if (itr != document.MemberEnd()) {
+ if (!itr->value.IsString()) return kDraftUnknown;
+ const UriType draftUri(itr->value);
+ // Check base uri for match
+ if (draftUri.Match(UriType(kDraft04String), false)) return kDraft04;
+ if (draftUri.Match(UriType(kDraft05String), false)) return kDraft05;
+ if (draftUri.Match(UriType(kDraft06String), false)) return kDraft06;
+ if (draftUri.Match(UriType(kDraft07String), false)) return kDraft07;
+ if (draftUri.Match(UriType(kDraft03String), false)) return kDraft03;
+ if (draftUri.Match(UriType(kDraft2019_09String), false)) return kDraft2019_09;
+ if (draftUri.Match(UriType(kDraft2020_12String), false)) return kDraft2020_12;
+ return kDraftUnknown;
+ }
+ // $schema not found
+ return kDraftNone;
+ }
+
+
+ // Get open api version of any schema document
+ static OpenApiVersion GetOpenApiVersion(const ValueType& document) {
+ static const Ch kVersion20String[] = { '2', '.', '0', '\0' };
+ static const Ch kVersion30String[] = { '3', '.', '0', '.', '\0' }; // ignore patch level
+ static const Ch kVersion31String[] = { '3', '.', '1', '.', '\0' }; // ignore patch level
+ static SizeType len = internal::StrLen<Ch>(kVersion30String);
+
+ if (!document.IsObject()) {
+ return kVersionNone;
+ }
+
+ // Get the open api version from the swagger / openapi keyword at the supplied location
+ typename ValueType::ConstMemberIterator itr = document.FindMember(SchemaType::GetSwaggerString());
+ if (itr == document.MemberEnd()) itr = document.FindMember(SchemaType::GetOpenApiString());
+ if (itr != document.MemberEnd()) {
+ if (!itr->value.IsString()) return kVersionUnknown;
+ const ValueType kVersion20Value(kVersion20String);
+ if (kVersion20Value == itr->value) return kVersion20; // must match 2.0 exactly
+ const ValueType kVersion30Value(kVersion30String);
+ if (itr->value.GetStringLength() > len && kVersion30Value == ValueType(itr->value.GetString(), len)) return kVersion30; // must match 3.0.x
+ const ValueType kVersion31Value(kVersion31String);
+ if (itr->value.GetStringLength() > len && kVersion31Value == ValueType(itr->value.GetString(), len)) return kVersion31; // must match 3.1.x
+ return kVersionUnknown;
+ }
+ // swagger or openapi not found
+ return kVersionNone;
+ }
+
+ // Get the draft of the schema or the open api version (which implies the draft).
+ // Report an error if schema draft or open api version not supported or not recognized, or both in document, and carry on.
+ void SetSchemaSpecification(const ValueType& document) {
+ // Look for '$schema', 'swagger' or 'openapi' keyword at document root
+ SchemaDraft docDraft = GetSchemaDraft(document);
+ OpenApiVersion docOapi = GetOpenApiVersion(document);
+ // Error if both in document
+ if (docDraft != kDraftNone && docOapi != kVersionNone)
+ SchemaError(kSchemaErrorSpecIllegal, PointerType());
+ // Use document draft or open api version if present or use spec from constructor
+ if (docDraft != kDraftNone)
+ spec_ = Specification(docDraft);
+ else if (docOapi != kVersionNone)
+ spec_ = Specification(docOapi);
+ // Error if draft or version unknown
+ if (spec_.draft == kDraftUnknown || spec_.oapi == kVersionUnknown)
+ SchemaError(kSchemaErrorSpecUnknown, PointerType());
+ else if (!spec_.IsSupported())
+ SchemaError(kSchemaErrorSpecUnsupported, PointerType());
+ }
+
// Changed by PR #1393
void CreateSchemaRecursive(const SchemaType** schema, const PointerType& pointer, const ValueType& v, const ValueType& document, const UriType& id) {
if (v.GetType() == kObjectType) {
@@ -1754,6 +2176,9 @@
// Changed by PR #1393
const UriType& CreateSchema(const SchemaType** schema, const PointerType& pointer, const ValueType& v, const ValueType& document, const UriType& id) {
RAPIDJSON_ASSERT(pointer.IsValid());
+ GenericStringBuffer<EncodingType> sb;
+ pointer.StringifyUriFragment(sb);
+ RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaDocument::CreateSchema", sb.GetString(), id.GetString());
if (v.IsObject()) {
if (const SchemaType* sc = GetSchema(pointer)) {
if (schema)
@@ -1783,15 +2208,21 @@
if (itr == v.MemberEnd())
return false;
+ GenericStringBuffer<EncodingType> sb;
+ source.StringifyUriFragment(sb);
+ RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaDocument::HandleRefSchema", sb.GetString(), id.GetString());
// Resolve the source pointer to the $ref'ed schema (finally)
new (schemaRef_.template Push<SchemaRefPtr>()) SchemaRefPtr(&source);
if (itr->value.IsString()) {
SizeType len = itr->value.GetStringLength();
- if (len > 0) {
+ if (len == 0)
+ SchemaError(kSchemaErrorRefInvalid, source);
+ else {
// First resolve $ref against the in-scope id
UriType scopeId = UriType(id, allocator_);
UriType ref = UriType(itr->value, allocator_).Resolve(scopeId, allocator_);
+ RAPIDJSON_SCHEMA_PRINT(SchemaIds, id.GetString(), itr->value.GetString(), ref.GetString());
// See if the resolved $ref minus the fragment matches a resolved id in this document
// Search from the root. Returns the subschema in the document and its absolute JSON pointer.
PointerType basePointer = PointerType();
@@ -1798,14 +2229,18 @@
const ValueType *base = FindId(document, ref, basePointer, docId_, false);
if (!base) {
// Remote reference - call the remote document provider
- if (remoteProvider_) {
- if (const GenericSchemaDocument* remoteDocument = remoteProvider_->GetRemoteDocument(ref)) {
+ if (!remoteProvider_)
+ SchemaError(kSchemaErrorRefNoRemoteProvider, source);
+ else {
+ if (const GenericSchemaDocument* remoteDocument = remoteProvider_->GetRemoteDocument(ref, spec_)) {
const Ch* s = ref.GetFragString();
len = ref.GetFragStringLength();
if (len <= 1 || s[1] == '/') {
// JSON pointer fragment, absolute in the remote schema
const PointerType pointer(s, len, allocator_);
- if (pointer.IsValid()) {
+ if (!pointer.IsValid())
+ SchemaErrorPointer(kSchemaErrorRefPointerInvalid, source, s, len, pointer);
+ else {
// Get the subschema
if (const SchemaType *sc = remoteDocument->GetSchema(pointer)) {
if (schema)
@@ -1812,12 +2247,14 @@
*schema = sc;
AddSchemaRefs(const_cast<SchemaType *>(sc));
return true;
- }
+ } else
+ SchemaErrorValue(kSchemaErrorRefUnknown, source, ref.GetString(), ref.GetStringLength());
}
- } else {
- // Plain name fragment, not allowed
- }
- }
+ } else
+ // Plain name fragment, not allowed in remote schema
+ SchemaErrorValue(kSchemaErrorRefPlainName, source, s, len);
+ } else
+ SchemaErrorValue(kSchemaErrorRefNoRemoteSchema, source, ref.GetString(), ref.GetStringLength());
}
}
else { // Local reference
@@ -1826,16 +2263,18 @@
if (len <= 1 || s[1] == '/') {
// JSON pointer fragment, relative to the resolved URI
const PointerType relPointer(s, len, allocator_);
- if (relPointer.IsValid()) {
+ if (!relPointer.IsValid())
+ SchemaErrorPointer(kSchemaErrorRefPointerInvalid, source, s, len, relPointer);
+ else {
// Get the subschema
if (const ValueType *pv = relPointer.Get(*base)) {
// Now get the absolute JSON pointer by adding relative to base
- PointerType pointer(basePointer);
+ PointerType pointer(basePointer, allocator_);
for (SizeType i = 0; i < relPointer.GetTokenCount(); i++)
pointer = pointer.Append(relPointer.GetTokens()[i], allocator_);
- //GenericStringBuffer<EncodingType> sb;
- //pointer.StringifyUriFragment(sb);
- if (pointer.IsValid() && !IsCyclicRef(pointer)) {
+ if (IsCyclicRef(pointer))
+ SchemaErrorValue(kSchemaErrorRefCyclical, source, ref.GetString(), ref.GetStringLength());
+ else {
// Call CreateSchema recursively, but first compute the in-scope id for the $ref target as we have jumped there
// TODO: cache pointer <-> id mapping
size_t unresolvedTokenIndex;
@@ -1843,17 +2282,21 @@
CreateSchema(schema, pointer, *pv, document, scopeId);
return true;
}
- }
+ } else
+ SchemaErrorValue(kSchemaErrorRefUnknown, source, ref.GetString(), ref.GetStringLength());
}
} else {
// Plain name fragment, relative to the resolved URI
+ // Not supported in open api 2.0 and 3.0
+ PointerType pointer(allocator_);
+ if (spec_.oapi == kVersion20 || spec_.oapi == kVersion30)
+ SchemaErrorValue(kSchemaErrorRefPlainName, source, s, len);
// See if the fragment matches an id in this document.
// Search from the base we just established. Returns the subschema in the document and its absolute JSON pointer.
- PointerType pointer = PointerType();
- if (const ValueType *pv = FindId(*base, ref, pointer, UriType(ref.GetBaseString(), ref.GetBaseStringLength(), allocator_), true, basePointer)) {
- if (!IsCyclicRef(pointer)) {
- //GenericStringBuffer<EncodingType> sb;
- //pointer.StringifyUriFragment(sb);
+ else if (const ValueType *pv = FindId(*base, ref, pointer, UriType(ref.GetBaseString(), ref.GetBaseStringLength(), allocator_), true, basePointer)) {
+ if (IsCyclicRef(pointer))
+ SchemaErrorValue(kSchemaErrorRefCyclical, source, ref.GetString(), ref.GetStringLength());
+ else {
// Call CreateSchema recursively, but first compute the in-scope id for the $ref target as we have jumped there
// TODO: cache pointer <-> id mapping
size_t unresolvedTokenIndex;
@@ -1861,7 +2304,8 @@
CreateSchema(schema, pointer, *pv, document, scopeId);
return true;
}
- }
+ } else
+ SchemaErrorValue(kSchemaErrorRefUnknown, source, ref.GetString(), ref.GetStringLength());
}
}
}
@@ -1891,6 +2335,7 @@
}
// See if it matches
if (localuri.Match(finduri, full)) {
+ RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaDocument::FindId (match)", full ? localuri.GetString() : localuri.GetBaseString());
resval = const_cast<ValueType *>(&doc);
resptr = here;
return resval;
@@ -1917,6 +2362,7 @@
// Added by PR #1393
void AddSchemaRefs(SchemaType* schema) {
+ RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaDocument::AddSchemaRefs");
while (!schemaRef_.Empty()) {
SchemaRefPtr *ref = schemaRef_.template Pop<SchemaRefPtr>(1);
SchemaEntry *entry = schemaMap_.template Push<SchemaEntry>();
@@ -1958,8 +2404,11 @@
SchemaType* typeless_;
internal::Stack<Allocator> schemaMap_; // Stores created Pointer -> Schemas
internal::Stack<Allocator> schemaRef_; // Stores Pointer(s) from $ref(s) until resolved
- SValue uri_; // Schema document URI
+ GValue uri_; // Schema document URI
UriType docId_;
+ Specification spec_;
+ GValue error_;
+ GValue currentError_;
};
//! GenericSchemaDocument using Value type.
@@ -2023,11 +2472,10 @@
currentError_(),
missingDependents_(),
valid_(true),
- flags_(kValidateDefaultFlags)
-#if RAPIDJSON_SCHEMA_VERBOSE
- , depth_(0)
-#endif
+ flags_(kValidateDefaultFlags),
+ depth_(0)
{
+ RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaValidator::GenericSchemaValidator");
}
//! Constructor with output handler.
@@ -2055,11 +2503,10 @@
currentError_(),
missingDependents_(),
valid_(true),
- flags_(kValidateDefaultFlags)
-#if RAPIDJSON_SCHEMA_VERBOSE
- , depth_(0)
-#endif
+ flags_(kValidateDefaultFlags),
+ depth_(0)
{
+ RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaValidator::GenericSchemaValidator (output handler)");
}
//! Destructor.
@@ -2092,13 +2539,12 @@
return flags_;
}
- //! Checks whether the current state is valid.
- // Implementation of ISchemaValidator
virtual bool IsValid() const {
if (!valid_) return false;
if (GetContinueOnErrors() && !error_.ObjectEmpty()) return false;
return true;
}
+ //! End of Implementation of ISchemaValidator
//! Gets the error object.
ValueType& GetError() { return error_; }
@@ -2306,13 +2752,29 @@
void NoneOf(ISchemaValidator** subvalidators, SizeType count) {
AddErrorArray(kValidateErrorAnyOf, subvalidators, count);
}
- void NotOneOf(ISchemaValidator** subvalidators, SizeType count, bool matched = false) {
- AddErrorArray(matched ? kValidateErrorOneOfMatch : kValidateErrorOneOf, subvalidators, count);
+ void NotOneOf(ISchemaValidator** subvalidators, SizeType count) {
+ AddErrorArray(kValidateErrorOneOf, subvalidators, count);
}
+ void MultipleOneOf(SizeType index1, SizeType index2) {
+ ValueType matches(kArrayType);
+ matches.PushBack(index1, GetStateAllocator());
+ matches.PushBack(index2, GetStateAllocator());
+ currentError_.SetObject();
+ currentError_.AddMember(GetMatchesString(), matches, GetStateAllocator());
+ AddCurrentError(kValidateErrorOneOfMatch);
+ }
void Disallowed() {
currentError_.SetObject();
AddCurrentError(kValidateErrorNot);
}
+ void DisallowedWhenWriting() {
+ currentError_.SetObject();
+ AddCurrentError(kValidateErrorReadOnly);
+ }
+ void DisallowedWhenReading() {
+ currentError_.SetObject();
+ AddCurrentError(kValidateErrorWriteOnly);
+ }
#define RAPIDJSON_STRING_(name, ...) \
static const StringRefType& Get##name##String() {\
@@ -2331,25 +2793,18 @@
RAPIDJSON_STRING_(ErrorCode, 'e', 'r', 'r', 'o', 'r', 'C', 'o', 'd', 'e')
RAPIDJSON_STRING_(ErrorMessage, 'e', 'r', 'r', 'o', 'r', 'M', 'e', 's', 's', 'a', 'g', 'e')
RAPIDJSON_STRING_(Duplicates, 'd', 'u', 'p', 'l', 'i', 'c', 'a', 't', 'e', 's')
+ RAPIDJSON_STRING_(Matches, 'm', 'a', 't', 'c', 'h', 'e', 's')
#undef RAPIDJSON_STRING_
-#if RAPIDJSON_SCHEMA_VERBOSE
-#define RAPIDJSON_SCHEMA_HANDLE_BEGIN_VERBOSE_() \
-RAPIDJSON_MULTILINEMACRO_BEGIN\
- *documentStack_.template Push<Ch>() = '\0';\
- documentStack_.template Pop<Ch>(1);\
- internal::PrintInvalidDocument(documentStack_.template Bottom<Ch>());\
-RAPIDJSON_MULTILINEMACRO_END
-#else
-#define RAPIDJSON_SCHEMA_HANDLE_BEGIN_VERBOSE_()
-#endif
-
#define RAPIDJSON_SCHEMA_HANDLE_BEGIN_(method, arg1)\
if (!valid_) return false; \
if ((!BeginValue() && !GetContinueOnErrors()) || (!CurrentSchema().method arg1 && !GetContinueOnErrors())) {\
- RAPIDJSON_SCHEMA_HANDLE_BEGIN_VERBOSE_();\
- return valid_ = false;\
+ *documentStack_.template Push<Ch>() = '\0';\
+ documentStack_.template Pop<Ch>(1);\
+ RAPIDJSON_SCHEMA_PRINT(InvalidDocument, documentStack_.template Bottom<Ch>());\
+ valid_ = false;\
+ return valid_;\
}
#define RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(method, arg2)\
@@ -2386,40 +2841,56 @@
{ RAPIDJSON_SCHEMA_HANDLE_VALUE_(String, (CurrentContext(), str, length, copy), (str, length, copy)); }
bool StartObject() {
+ RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaValidator::StartObject");
RAPIDJSON_SCHEMA_HANDLE_BEGIN_(StartObject, (CurrentContext()));
RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(StartObject, ());
- return valid_ = !outputHandler_ || outputHandler_->StartObject();
+ valid_ = !outputHandler_ || outputHandler_->StartObject();
+ return valid_;
}
bool Key(const Ch* str, SizeType len, bool copy) {
+ RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaValidator::Key", str);
if (!valid_) return false;
AppendToken(str, len);
- if (!CurrentSchema().Key(CurrentContext(), str, len, copy) && !GetContinueOnErrors()) return valid_ = false;
+ if (!CurrentSchema().Key(CurrentContext(), str, len, copy) && !GetContinueOnErrors()) {
+ valid_ = false;
+ return valid_;
+ }
RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(Key, (str, len, copy));
- return valid_ = !outputHandler_ || outputHandler_->Key(str, len, copy);
+ valid_ = !outputHandler_ || outputHandler_->Key(str, len, copy);
+ return valid_;
}
bool EndObject(SizeType memberCount) {
+ RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaValidator::EndObject");
if (!valid_) return false;
RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(EndObject, (memberCount));
- if (!CurrentSchema().EndObject(CurrentContext(), memberCount) && !GetContinueOnErrors()) return valid_ = false;
+ if (!CurrentSchema().EndObject(CurrentContext(), memberCount) && !GetContinueOnErrors()) {
+ valid_ = false;
+ return valid_;
+ }
RAPIDJSON_SCHEMA_HANDLE_END_(EndObject, (memberCount));
}
bool StartArray() {
+ RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaValidator::StartArray");
RAPIDJSON_SCHEMA_HANDLE_BEGIN_(StartArray, (CurrentContext()));
RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(StartArray, ());
- return valid_ = !outputHandler_ || outputHandler_->StartArray();
+ valid_ = !outputHandler_ || outputHandler_->StartArray();
+ return valid_;
}
bool EndArray(SizeType elementCount) {
+ RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaValidator::EndArray");
if (!valid_) return false;
RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(EndArray, (elementCount));
- if (!CurrentSchema().EndArray(CurrentContext(), elementCount) && !GetContinueOnErrors()) return valid_ = false;
+ if (!CurrentSchema().EndArray(CurrentContext(), elementCount) && !GetContinueOnErrors()) {
+ valid_ = false;
+ return valid_;
+ }
RAPIDJSON_SCHEMA_HANDLE_END_(EndArray, (elementCount));
}
-#undef RAPIDJSON_SCHEMA_HANDLE_BEGIN_VERBOSE_
#undef RAPIDJSON_SCHEMA_HANDLE_BEGIN_
#undef RAPIDJSON_SCHEMA_HANDLE_PARALLEL_
#undef RAPIDJSON_SCHEMA_HANDLE_VALUE_
@@ -2426,10 +2897,10 @@
// Implementation of ISchemaStateFactory<SchemaType>
virtual ISchemaValidator* CreateSchemaValidator(const SchemaType& root, const bool inheritContinueOnErrors) {
+ *documentStack_.template Push<Ch>() = '\0';
+ documentStack_.template Pop<Ch>(1);
ISchemaValidator* sv = new (GetStateAllocator().Malloc(sizeof(GenericSchemaValidator))) GenericSchemaValidator(*schemaDocument_, root, documentStack_.template Bottom<char>(), documentStack_.GetSize(),
-#if RAPIDJSON_SCHEMA_VERBOSE
depth_ + 1,
-#endif
&GetStateAllocator());
sv->SetValidateFlags(inheritContinueOnErrors ? GetValidateFlags() : GetValidateFlags() & ~(unsigned)kValidateContinueOnErrorFlag);
return sv;
@@ -2462,6 +2933,7 @@
virtual void FreeState(void* p) {
StateAllocator::Free(p);
}
+ // End of implementation of ISchemaStateFactory<SchemaType>
private:
typedef typename SchemaType::Context Context;
@@ -2472,9 +2944,7 @@
const SchemaDocumentType& schemaDocument,
const SchemaType& root,
const char* basePath, size_t basePathSize,
-#if RAPIDJSON_SCHEMA_VERBOSE
unsigned depth,
-#endif
StateAllocator* allocator = 0,
size_t schemaStackCapacity = kDefaultSchemaStackCapacity,
size_t documentStackCapacity = kDefaultDocumentStackCapacity)
@@ -2490,11 +2960,10 @@
currentError_(),
missingDependents_(),
valid_(true),
- flags_(kValidateDefaultFlags)
-#if RAPIDJSON_SCHEMA_VERBOSE
- , depth_(depth)
-#endif
+ flags_(kValidateDefaultFlags),
+ depth_(depth)
{
+ RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaValidator::GenericSchemaValidator (internal)", basePath && basePathSize ? basePath : "");
if (basePath && basePathSize)
memcpy(documentStack_.template Push<char>(basePathSize), basePath, basePathSize);
}
@@ -2510,6 +2979,7 @@
}
bool BeginValue() {
+ RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaValidator::BeginValue");
if (schemaStack_.Empty())
PushSchema(root_);
else {
@@ -2531,6 +3001,7 @@
ISchemaValidator**& va = CurrentContext().patternPropertiesValidators;
SizeType& validatorCount = CurrentContext().patternPropertiesValidatorCount;
va = static_cast<ISchemaValidator**>(MallocState(sizeof(ISchemaValidator*) * count));
+ std::memset(va, 0, sizeof(ISchemaValidator*) * count);
for (SizeType i = 0; i < count; i++)
va[validatorCount++] = CreateSchemaValidator(*sa[i], true); // Inherit continueOnError
}
@@ -2541,17 +3012,15 @@
}
bool EndValue() {
+ RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaValidator::EndValue");
if (!CurrentSchema().EndValue(CurrentContext()) && !GetContinueOnErrors())
return false;
-#if RAPIDJSON_SCHEMA_VERBOSE
GenericStringBuffer<EncodingType> sb;
- schemaDocument_->GetPointer(&CurrentSchema()).Stringify(sb);
-
+ schemaDocument_->GetPointer(&CurrentSchema()).StringifyUriFragment(sb);
*documentStack_.template Push<Ch>() = '\0';
documentStack_.template Pop<Ch>(1);
- internal::PrintValidatorPointers(depth_, sb.GetString(), documentStack_.template Bottom<Ch>());
-#endif
+ RAPIDJSON_SCHEMA_PRINT(ValidatorPointers, sb.GetString(), documentStack_.template Bottom<Ch>(), depth_);
void* hasher = CurrentContext().hasher;
uint64_t h = hasher && CurrentContext().arrayUniqueness ? static_cast<HasherType*>(hasher)->GetHashCode() : 0;
@@ -2602,7 +3071,7 @@
}
}
- RAPIDJSON_FORCEINLINE void PushSchema(const SchemaType& schema) { new (schemaStack_.template Push<Context>()) Context(*this, *this, &schema); }
+ RAPIDJSON_FORCEINLINE void PushSchema(const SchemaType& schema) { new (schemaStack_.template Push<Context>()) Context(*this, *this, &schema, flags_); }
RAPIDJSON_FORCEINLINE void PopSchema() {
Context* c = schemaStack_.template Pop<Context>(1);
@@ -2704,9 +3173,7 @@
ValueType missingDependents_;
bool valid_;
unsigned flags_;
-#if RAPIDJSON_SCHEMA_VERBOSE
unsigned depth_;
-#endif
};
typedef GenericSchemaValidator<SchemaDocument> SchemaValidator;
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/cursorstreamwrappertest.cpp
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/cursorstreamwrappertest.cpp 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/cursorstreamwrappertest.cpp 2024-02-27 20:51:03 UTC (rev 70212)
@@ -20,7 +20,7 @@
// static const char json[] = "{\"string\"\n\n:\"my string\",\"array\"\n:[\"1\", \"2\", \"3\"]}";
-bool testJson(const char *json, size_t &line, size_t &col) {
+static bool testJson(const char *json, size_t &line, size_t &col) {
StringStream ss(json);
CursorStreamWrapper<StringStream> csw(ss);
Document document;
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/encodedstreamtest.cpp
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/encodedstreamtest.cpp 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/encodedstreamtest.cpp 2024-02-27 20:51:03 UTC (rev 70212)
@@ -113,8 +113,8 @@
EXPECT_EQ(expected, actual);
}
EXPECT_EQ('\0', s.Peek());
+ EXPECT_EQ(size, eis.Tell());
free(data);
- EXPECT_EQ(size, eis.Tell());
}
}
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/ostreamwrappertest.cpp
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/ostreamwrappertest.cpp 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/ostreamwrappertest.cpp 2024-02-27 20:51:03 UTC (rev 70212)
@@ -77,7 +77,7 @@
}
fp = fopen(filename, "r");
- ASSERT_TRUE( fp != NULL );
+ ASSERT_TRUE( fp != NULL );
for (const char* p = s; *p; p++)
EXPECT_EQ(*p, static_cast<char>(fgetc(fp)));
fclose(fp);
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/pointertest.cpp
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/pointertest.cpp 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/pointertest.cpp 2024-02-27 20:51:03 UTC (rev 70212)
@@ -303,7 +303,7 @@
}
{
- // Decode UTF-8 perecent encoding to UTF-8
+ // Decode UTF-8 percent encoding to UTF-8
Pointer p("#/%C2%A2");
EXPECT_TRUE(p.IsValid());
EXPECT_EQ(1u, p.GetTokenCount());
@@ -311,7 +311,7 @@
}
{
- // Decode UTF-8 perecent encoding to UTF-16
+ // Decode UTF-8 percent encoding to UTF-16
GenericPointer<GenericValue<UTF16<> > > p(L"#/%C2%A2");
EXPECT_TRUE(p.IsValid());
EXPECT_EQ(1u, p.GetTokenCount());
@@ -320,7 +320,7 @@
}
{
- // Decode UTF-8 perecent encoding to UTF-16
+ // Decode UTF-8 percent encoding to UTF-16
GenericPointer<GenericValue<UTF16<> > > p(L"#/%E2%82%AC");
EXPECT_TRUE(p.IsValid());
EXPECT_EQ(1u, p.GetTokenCount());
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/schematest.cpp
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/schematest.cpp 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/schematest.cpp 2024-02-27 20:51:03 UTC (rev 70212)
@@ -112,6 +112,13 @@
#define VALIDATE(schema, json, expected) \
{\
+ VALIDATE_(schema, json, expected, true) \
+}
+
+#define VALIDATE_(schema, json, expected, expected2) \
+{\
+ EXPECT_TRUE(expected2 == schema.GetError().ObjectEmpty());\
+ EXPECT_TRUE(schema.IsSupportedSpecification());\
SchemaValidator validator(schema);\
Document d;\
/*printf("\n%s\n", json);*/\
@@ -149,6 +156,8 @@
#define INVALIDATE_(schema, json, invalidSchemaPointer, invalidSchemaKeyword, invalidDocumentPointer, error, \
flags, SchemaValidatorType, PointerType) \
{\
+ EXPECT_TRUE(schema.GetError().ObjectEmpty());\
+ EXPECT_TRUE(schema.IsSupportedSpecification());\
SchemaValidatorType validator(schema);\
validator.SetValidateFlags(flags);\
Document d;\
@@ -188,6 +197,20 @@
}\
}
+// Use for checking whether a compiled schema document contains errors
+#define SCHEMAERROR(schema, error) \
+{\
+ Document e;\
+ e.Parse(error);\
+ if (schema.GetError() != e) {\
+ StringBuffer sb;\
+ Writer<StringBuffer> w(sb);\
+ schema.GetError().Accept(w);\
+ printf("GetError() Expected: %s Actual: %s\n", error, sb.GetString());\
+ ADD_FAILURE();\
+ }\
+}
+
TEST(SchemaValidator, Typeless) {
Document sd;
sd.Parse("{}");
@@ -223,7 +246,7 @@
"{ \"enum\": { \"errorCode\": 19, \"instanceRef\": \"#\", \"schemaRef\": \"#\" }}");
}
-TEST(SchemaValidator, Enum_Typless) {
+TEST(SchemaValidator, Enum_Typeless) {
Document sd;
sd.Parse("{ \"enum\": [\"red\", \"amber\", \"green\", null, 42] }");
SchemaDocument s(sd);
@@ -333,7 +356,7 @@
" ]"
"}}");
INVALIDATE(s, "15", "", "oneOf", "",
- "{ \"oneOf\": { \"errorCode\": 22, \"instanceRef\": \"#\", \"schemaRef\": \"#\", \"errors\": [{}, {}]}}");
+ "{ \"oneOf\": { \"errorCode\": 22, \"instanceRef\": \"#\", \"schemaRef\": \"#\", \"matches\": [0,1]}}");
}
TEST(SchemaValidator, Not) {
@@ -502,12 +525,13 @@
TEST(SchemaValidator, String_Pattern_Invalid) {
Document sd;
- sd.Parse("{\"type\":\"string\",\"pattern\":\"a{0}\"}"); // TODO: report regex is invalid somehow
+ sd.Parse("{\"type\":\"string\",\"pattern\":\"a{0}\"}");
SchemaDocument s(sd);
+ SCHEMAERROR(s, "{\"RegexInvalid\":{\"errorCode\":9,\"instanceRef\":\"#/pattern\",\"value\":\"a{0}\"}}");
- VALIDATE(s, "\"\"", true);
- VALIDATE(s, "\"a\"", true);
- VALIDATE(s, "\"aa\"", true);
+ VALIDATE_(s, "\"\"", true, false);
+ VALIDATE_(s, "\"a\"", true, false);
+ VALIDATE_(s, "\"aa\"", true, false);
}
#endif
@@ -1886,12 +1910,6 @@
" },"
" \"f\": {"
" \"type\": \"boolean\""
- " },"
- " \"cyclic_source\": {"
- " \"$ref\": \"#/definitions/Resp_200/properties/cyclic_target\""
- " },"
- " \"cyclic_target\": {"
- " \"$ref\": \"#/definitions/Resp_200/properties/cyclic_source\""
" }"
" },"
" \"type\": \"object\""
@@ -2135,9 +2153,13 @@
}
virtual const SchemaDocumentType* GetRemoteDocument(const char* uri, SizeType length) {
+ //printf("GetRemoteDocument : %s\n", uri);
for (size_t i = 0; i < kCount; i++)
- if (typename SchemaDocumentType::SValue(uri, length) == sd_[i]->GetURI())
+ if (typename SchemaDocumentType::GValue(uri, length) == sd_[i]->GetURI()) {
+ //printf("Matched document");
return sd_[i];
+ }
+ //printf("No matched document");
return 0;
}
@@ -2390,7 +2412,9 @@
Document sd;
sd.Parse("{\"allOf\": [{\"$ref\": \"#/abc\"}]}");
SchemaDocument s(sd);
- VALIDATE(s, "{\"key1\": \"abc\", \"key2\": \"def\"}", true);
+ SCHEMAERROR(s, "{\"RefUnknown\":{\"errorCode\":5,\"instanceRef\":\"#/allOf/0\",\"value\":\"#/abc\"}}");
+
+ VALIDATE_(s, "{\"key1\": \"abc\", \"key2\": \"def\"}", true, false);
}
TEST(SchemaValidator, Issue1017_allOfHandler) {
@@ -2625,7 +2649,7 @@
SchemaDocumentProvider(SchemaDocument** collection) : collection(collection) { }
virtual const SchemaDocument* GetRemoteDocument(const char* uri, SizeType length) {
int i = 0;
- while (collection[i] && SchemaDocument::SValue(uri, length) != collection[i]->GetURI()) ++i;
+ while (collection[i] && SchemaDocument::GValue(uri, length) != collection[i]->GetURI()) ++i;
return collection[i];
}
};
@@ -2656,7 +2680,7 @@
ASSERT_FALSE(sd.HasParseError());
SchemaDocument s(sd);
VALIDATE(s, "{\"version\": 1.0, \"address\": {\"number\": 24, \"street1\": \"The Woodlands\", \"street3\": \"Ham\", \"city\": \"Romsey\", \"area\": \"Kent\", \"country\": \"UK\", \"postcode\": \"SO51 0GP\"}, \"phones\": [\"0111-222333\", \"0777-666888\"], \"names\": [\"Fred\", \"Bloggs\"]}", true);
- INVALIDATE_(s, "{\"version\": 1.01, \"address\": {\"number\": 0, \"street2\": false, \"street3\": \"Ham\", \"city\": \"RomseyTownFC\", \"area\": \"BC\", \"country\": \"USA\", \"postcode\": \"999ABC\"}, \"phones\": [], \"planet\": \"Earth\", \"extra\": {\"S_xxx\": 123}}", "#", "errors", "#",
+ INVALIDATE_(s, "{\"version\": 1.01, \"address\": {\"number\": 0, \"street2\": false, \"street3\": \"Ham\", \"city\": \"RomseyTownFC\", \"area\": \"Narnia\", \"country\": \"USA\", \"postcode\": \"999ABC\"}, \"phones\": [], \"planet\": \"Earth\", \"extra\": {\"S_xxx\": 123}}", "#", "errors", "#",
"{ \"multipleOf\": {"
" \"errorCode\": 1, \"instanceRef\": \"#/version\", \"schemaRef\": \"#/definitions/decimal_type\", \"expected\": 1.0, \"actual\": 1.01"
" },"
@@ -2691,6 +2715,9 @@
" },"
" \"required\": {"
" \"missing\": [\"street1\"], \"errorCode\": 15, \"instanceRef\": \"#/address\", \"schemaRef\": \"#/definitions/address_type\""
+ " },"
+ " \"oneOf\": {"
+ " \"matches\": [0, 1], \"errorCode\": 22, \"instanceRef\": \"#/address/area\", \"schemaRef\": \"#/definitions/address_type/properties/area\""
" }"
"}",
kValidateDefaultFlags | kValidateContinueOnErrorFlag, SchemaValidator, Pointer);
@@ -2917,7 +2944,7 @@
// Test that when kValidateContinueOnErrorFlag is set, an incorrect simple type with a sub-schema is handled correctly.
// This tests that we don't blow up when there is a type mismatch but there is a sub-schema present
-TEST(SchemaValidator, ContinueOnErrors_Issue2) {
+TEST(SchemaValidator, ContinueOnErrors_BadSimpleType) {
Document sd;
sd.Parse("{\"type\":\"string\", \"anyOf\":[{\"maxLength\":2}]}");
ASSERT_FALSE(sd.HasParseError());
@@ -2943,10 +2970,606 @@
kValidateDefaultFlags | kValidateContinueOnErrorFlag, SchemaValidator, Pointer);
}
-TEST(SchemaValidator, Schema_UnknownError) {
+
+TEST(SchemaValidator, UnknownValidationError) {
ASSERT_TRUE(SchemaValidator::SchemaType::GetValidateErrorKeyword(kValidateErrors).GetString() == std::string("null"));
}
+// The first occurrence of a duplicate keyword is taken
+TEST(SchemaValidator, DuplicateKeyword) {
+ Document sd;
+ sd.Parse("{ \"title\": \"test\",\"type\": \"number\", \"type\": \"string\" }");
+ EXPECT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ VALIDATE(s, "42", true);
+ INVALIDATE(s, "\"Life, the universe, and everything\"", "", "type", "",
+ "{ \"type\": {"
+ " \"errorCode\": 20,"
+ " \"instanceRef\": \"#\", \"schemaRef\": \"#\","
+ " \"expected\": [\"number\"], \"actual\": \"string\""
+ "}}");
+}
+
+
+// SchemaDocument tests
+
+// Specification (schema draft, open api version)
+TEST(SchemaValidator, Schema_SupportedNotObject) {
+ Document sd;
+ sd.Parse("true");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_TRUE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft04);
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionNone);
+ EXPECT_TRUE(s.GetError().ObjectEmpty());
+}
+
+TEST(SchemaValidator, Schema_SupportedNoSpec) {
+ Document sd;
+ sd.Parse("{\"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_TRUE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft04);
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionNone);
+ EXPECT_TRUE(s.GetError().ObjectEmpty());
+}
+
+TEST(SchemaValidator, Schema_SupportedNoSpecStatic) {
+ typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+ Document sd;
+ sd.Parse("{\"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ Specification spec = SchemaDocumentType::GetSpecification(sd);
+ ASSERT_FALSE(spec.IsSupported());
+ ASSERT_TRUE(spec.draft == kDraftNone);
+ ASSERT_TRUE(spec.oapi == kVersionNone);
+}
+
+TEST(SchemaValidator, Schema_SupportedDraft5Static) {
+ typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+ Document sd;
+ sd.Parse("{\"$schema\":\"http://json-schema.org/draft-05/schema#\", \"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ Specification spec = SchemaDocumentType::GetSpecification(sd);
+ ASSERT_TRUE(spec.IsSupported());
+ ASSERT_TRUE(spec.draft == kDraft05);
+ ASSERT_TRUE(spec.oapi == kVersionNone);
+}
+
+TEST(SchemaValidator, Schema_SupportedDraft4) {
+ Document sd;
+ sd.Parse("{\"$schema\":\"http://json-schema.org/draft-04/schema#\", \"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_TRUE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft04);
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionNone);
+ EXPECT_TRUE(s.GetError().ObjectEmpty());
+}
+
+TEST(SchemaValidator, Schema_SupportedDraft4NoFrag) {
+ Document sd;
+ sd.Parse("{\"$schema\":\"http://json-schema.org/draft-04/schema\", \"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_TRUE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft04);
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionNone);
+ EXPECT_TRUE(s.GetError().ObjectEmpty());
+}
+
+TEST(SchemaValidator, Schema_SupportedDraft5) {
+ Document sd;
+ sd.Parse("{\"$schema\":\"http://json-schema.org/draft-05/schema#\", \"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_TRUE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft05);
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionNone);
+ EXPECT_TRUE(s.GetError().ObjectEmpty());
+}
+
+TEST(SchemaValidator, Schema_SupportedDraft5NoFrag) {
+ Document sd;
+ sd.Parse("{\"$schema\":\"http://json-schema.org/draft-05/schema\", \"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_TRUE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft05);
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionNone);
+ EXPECT_TRUE(s.GetError().ObjectEmpty());
+}
+
+TEST(SchemaValidator, Schema_IgnoreDraftEmbedded) {
+ Document sd;
+ sd.Parse("{\"root\": {\"$schema\":\"http://json-schema.org/draft-05/schema#\", \"type\": \"integer\"}}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd, 0, 0, 0, 0, SchemaDocument::PointerType("/root"));
+ ASSERT_TRUE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft04);
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionNone);
+ EXPECT_TRUE(s.GetError().ObjectEmpty());
+}
+
+TEST(SchemaValidator, Schema_SupportedDraftOverride) {
+ Document sd;
+ sd.Parse("{\"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd, 0, 0, 0, 0, 0, Specification(kDraft04));
+ ASSERT_TRUE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft04);
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionNone);
+ EXPECT_TRUE(s.GetError().ObjectEmpty());
+}
+
+TEST(SchemaValidator, Schema_UnknownDraftOverride) {
+ Document sd;
+ sd.Parse("{\"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd, 0, 0, 0, 0, 0, Specification(kDraftUnknown));
+ ASSERT_FALSE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().draft == kDraftUnknown);
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionNone);
+ SCHEMAERROR(s, "{\"SpecUnknown\":{\"errorCode\":10,\"instanceRef\":\"#\"}}");
+}
+
+TEST(SchemaValidator, Schema_UnsupportedDraftOverride) {
+ Document sd;
+ sd.Parse("{\"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd, 0, 0, 0, 0, 0, Specification(kDraft03));
+ ASSERT_FALSE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft03);
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionNone);
+ SCHEMAERROR(s, "{\"SpecUnsupported\":{\"errorCode\":11,\"instanceRef\":\"#\"}}");
+}
+
+TEST(SchemaValidator, Schema_UnknownDraft) {
+ Document sd;
+ sd.Parse("{\"$schema\":\"http://json-schema.org/draft-xxx/schema#\", \"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_FALSE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().draft == kDraftUnknown);
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionNone);
+ SCHEMAERROR(s, "{\"SpecUnknown\":{\"errorCode\":10,\"instanceRef\":\"#\"}}");
+}
+
+TEST(SchemaValidator, Schema_UnknownDraftNotString) {
+ Document sd;
+ sd.Parse("{\"$schema\": 4, \"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_FALSE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().draft == kDraftUnknown);
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionNone);
+ SCHEMAERROR(s, "{\"SpecUnknown\":{\"errorCode\":10,\"instanceRef\":\"#\"}}");
+}
+
+TEST(SchemaValidator, Schema_UnsupportedDraft3) {
+ Document sd;
+ sd.Parse("{\"$schema\":\"http://json-schema.org/draft-03/schema#\", \"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_FALSE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft03);
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionNone);
+ SCHEMAERROR(s, "{\"SpecUnsupported\":{\"errorCode\":11,\"instanceRef\":\"#\"}}");
+}
+
+TEST(SchemaValidator, Schema_UnsupportedDraft6) {
+ Document sd;
+ sd.Parse("{\"$schema\":\"http://json-schema.org/draft-06/schema#\", \"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_FALSE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft06);
+ SCHEMAERROR(s, "{\"SpecUnsupported\":{\"errorCode\":11,\"instanceRef\":\"#\"}}");
+}
+
+TEST(SchemaValidator, Schema_UnsupportedDraft7) {
+ Document sd;
+ sd.Parse("{\"$schema\":\"http://json-schema.org/draft-07/schema#\", \"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_FALSE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft07);
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionNone);
+ SCHEMAERROR(s, "{\"SpecUnsupported\":{\"errorCode\":11,\"instanceRef\":\"#\"}}");
+}
+
+TEST(SchemaValidator, Schema_UnsupportedDraft2019_09) {
+ Document sd;
+ sd.Parse("{\"$schema\":\"https://json-schema.org/draft/2019-09/schema\", \"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_FALSE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft2019_09);
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionNone);
+ SCHEMAERROR(s, "{\"SpecUnsupported\":{\"errorCode\":11,\"instanceRef\":\"#\"}}");
+}
+
+TEST(SchemaValidator, Schema_UnsupportedDraft2020_12) {
+ Document sd;
+ sd.Parse("{\"$schema\":\"https://json-schema.org/draft/2020-12/schema\", \"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_FALSE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft2020_12);
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionNone);
+ SCHEMAERROR(s, "{\"SpecUnsupported\":{\"errorCode\":11,\"instanceRef\":\"#\"}}");
+}
+
+TEST(SchemaValidator, Schema_SupportedVersion20Static) {
+ typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+ Document sd;
+ sd.Parse("{\"swagger\":\"2.0\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ Specification spec = SchemaDocumentType::GetSpecification(sd);
+ ASSERT_TRUE(spec.IsSupported());
+ ASSERT_TRUE(spec.draft == kDraft04);
+ ASSERT_TRUE(spec.oapi == kVersion20);
+}
+
+TEST(SchemaValidator, Schema_SupportedVersion20) {
+ Document sd;
+ sd.Parse("{\"swagger\":\"2.0\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_TRUE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersion20);
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft04);
+ EXPECT_TRUE(s.GetError().ObjectEmpty());
+}
+
+TEST(SchemaValidator, Schema_SupportedVersion30x) {
+ Document sd;
+ sd.Parse("{\"openapi\":\"3.0.0\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_TRUE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersion30);
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft05);
+ EXPECT_TRUE(s.GetError().ObjectEmpty());
+}
+
+TEST(SchemaValidator, Schema_SupportedVersionOverride) {
+ Document sd;
+ sd.Parse("{\"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd, 0, 0, 0, 0, 0, Specification(kVersion20));
+ ASSERT_TRUE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersion20);
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft04);
+ EXPECT_TRUE(s.GetError().ObjectEmpty());
+}
+
+TEST(SchemaValidator, Schema_UnknownVersionOverride) {
+ Document sd;
+ sd.Parse("{\"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd, 0, 0, 0, 0, 0, Specification(kVersionUnknown));
+ ASSERT_FALSE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionUnknown);
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft04);
+ SCHEMAERROR(s, "{\"SpecUnknown\":{\"errorCode\":10,\"instanceRef\":\"#\"}}");
+}
+
+TEST(SchemaValidator, Schema_UnsupportedVersionOverride) {
+ Document sd;
+ sd.Parse("{\"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd, 0, 0, 0, 0, 0, Specification(kVersion31));
+ ASSERT_FALSE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersion31);
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft2020_12);
+ SCHEMAERROR(s, "{\"SpecUnsupported\":{\"errorCode\":11,\"instanceRef\":\"#\"}}");
+}
+
+TEST(SchemaValidator, Schema_UnknownVersion) {
+ Document sd;
+ sd.Parse("{\"openapi\":\"1.0\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_FALSE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionUnknown);
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft04);
+ SCHEMAERROR(s, "{\"SpecUnknown\":{\"errorCode\":10,\"instanceRef\":\"#\"}}");
+}
+
+TEST(SchemaValidator, Schema_UnknownVersionShort) {
+ Document sd;
+ sd.Parse("{\"openapi\":\"3.0.\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_FALSE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionUnknown);
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft04);
+ SCHEMAERROR(s, "{\"SpecUnknown\":{\"errorCode\":10,\"instanceRef\":\"#\"}}");
+}
+
+TEST(SchemaValidator, Schema_UnknownVersionNotString) {
+ Document sd;
+ sd.Parse("{\"swagger\": 2}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_FALSE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionUnknown);
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft04);
+ SCHEMAERROR(s, "{\"SpecUnknown\":{\"errorCode\":10,\"instanceRef\":\"#\"}}");
+}
+
+TEST(SchemaValidator, Schema_UnsupportedVersion31) {
+ Document sd;
+ sd.Parse("{\"openapi\":\"3.1.0\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_FALSE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersion31);
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft2020_12);
+ SCHEMAERROR(s, "{\"SpecUnsupported\":{\"errorCode\":11,\"instanceRef\":\"#\"}}");
+}
+
+TEST(SchemaValidator, Schema_DraftAndVersion) {
+ Document sd;
+ sd.Parse("{\"swagger\": \"2.0\", \"$schema\": \"http://json-schema.org/draft-04/schema#\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_TRUE(s.IsSupportedSpecification());
+ SCHEMAERROR(s, "{\"SpecIllegal\":{\"errorCode\":12,\"instanceRef\":\"#\"}}");
+}
+
+TEST(SchemaValidator, Schema_StartUnknown) {
+ Document sd;
+ sd.Parse("{\"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd, 0, 0, 0, 0, SchemaDocument::PointerType("/nowhere"));
+ SCHEMAERROR(s, "{\"StartUnknown\":{\"errorCode\":1,\"instanceRef\":\"#\", \"value\":\"#/nowhere\"}}");
+}
+
+TEST(SchemaValidator, Schema_MultipleErrors) {
+ Document sd;
+ sd.Parse("{\"swagger\": \"foo\", \"$schema\": \"bar\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ SCHEMAERROR(s, "{ \"SpecUnknown\": {\"errorCode\":10,\"instanceRef\":\"#\"},"
+ " \"SpecIllegal\": {\"errorCode\":12,\"instanceRef\":\"#\"}"
+ "}");
+}
+
+// $ref is a non-JSON pointer fragment - not allowed when OpenAPI
+TEST(SchemaValidator, Schema_RefPlainNameOpenApi) {
+ typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+ Document sd;
+ sd.Parse("{\"swagger\": \"2.0\", \"type\": \"object\", \"properties\": {\"myInt1\": {\"$ref\": \"#myId\"}, \"myStr\": {\"type\": \"string\", \"id\": \"#myStrId\"}, \"myInt2\": {\"type\": \"integer\", \"id\": \"#myId\"}}}");
+ SchemaDocumentType s(sd);
+ SCHEMAERROR(s, "{\"RefPlainName\":{\"errorCode\":2,\"instanceRef\":\"#/properties/myInt1\",\"value\":\"#myId\"}}");
+}
+
+// $ref is a non-JSON pointer fragment - not allowed when remote document
+TEST(SchemaValidator, Schema_RefPlainNameRemote) {
+ typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+ RemoteSchemaDocumentProvider<SchemaDocumentType> provider;
+ Document sd;
+ sd.Parse("{\"type\": \"object\", \"properties\": {\"myInt\": {\"$ref\": \"/subSchemas.json#plainname\"}}}");
+ SchemaDocumentType s(sd, "http://localhost:1234/xxxx", 26, &provider);
+ SCHEMAERROR(s, "{\"RefPlainName\":{\"errorCode\":2,\"instanceRef\":\"#/properties/myInt\",\"value\":\"#plainname\"}}");
+}
+
+// $ref is an empty string
+TEST(SchemaValidator, Schema_RefEmptyString) {
+ typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+ Document sd;
+ sd.Parse("{\"type\": \"object\", \"properties\": {\"myInt1\": {\"$ref\": \"\"}}}");
+ SchemaDocumentType s(sd);
+ SCHEMAERROR(s, "{\"RefInvalid\":{\"errorCode\":3,\"instanceRef\":\"#/properties/myInt1\"}}");
+}
+
+// $ref is remote but no provider
+TEST(SchemaValidator, Schema_RefNoRemoteProvider) {
+ typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+ Document sd;
+ sd.Parse("{\"type\": \"object\", \"properties\": {\"myInt\": {\"$ref\": \"/subSchemas.json#plainname\"}}}");
+ SchemaDocumentType s(sd, "http://localhost:1234/xxxx", 26, 0);
+ SCHEMAERROR(s, "{\"RefNoRemoteProvider\":{\"errorCode\":7,\"instanceRef\":\"#/properties/myInt\"}}");
+}
+
+// $ref is remote but no schema returned
+TEST(SchemaValidator, Schema_RefNoRemoteSchema) {
+ typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+ RemoteSchemaDocumentProvider<SchemaDocumentType> provider;
+ Document sd;
+ sd.Parse("{\"type\": \"object\", \"properties\": {\"myInt\": {\"$ref\": \"/will-not-resolve.json\"}}}");
+ SchemaDocumentType s(sd, "http://localhost:1234/xxxx", 26, &provider);
+ SCHEMAERROR(s, "{\"RefNoRemoteSchema\":{\"errorCode\":8,\"instanceRef\":\"#/properties/myInt\",\"value\":\"http://localhost:1234/will-not-resolve.json\"}}");
+}
+
+// $ref pointer is invalid
+TEST(SchemaValidator, Schema_RefPointerInvalid) {
+ typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+ Document sd;
+ sd.Parse("{\"type\": \"object\", \"properties\": {\"myInt\": {\"$ref\": \"#/&&&&&\"}}}");
+ SchemaDocumentType s(sd);
+ SCHEMAERROR(s, "{\"RefPointerInvalid\":{\"errorCode\":4,\"instanceRef\":\"#/properties/myInt\",\"value\":\"#/&&&&&\",\"offset\":2}}");
+}
+
+// $ref is remote and pointer is invalid
+TEST(SchemaValidator, Schema_RefPointerInvalidRemote) {
+ typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+ RemoteSchemaDocumentProvider<SchemaDocumentType> provider;
+ Document sd;
+ sd.Parse("{\"type\": \"object\", \"properties\": {\"myInt\": {\"$ref\": \"/subSchemas.json#/abc&&&&&\"}}}");
+ SchemaDocumentType s(sd, "http://localhost:1234/xxxx", 26, &provider);
+ SCHEMAERROR(s, "{\"RefPointerInvalid\":{\"errorCode\":4,\"instanceRef\":\"#/properties/myInt\",\"value\":\"#/abc&&&&&\",\"offset\":5}}");
+}
+
+// $ref is unknown non-pointer
+TEST(SchemaValidator, Schema_RefUnknownPlainName) {
+ typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+ Document sd;
+ sd.Parse("{\"type\": \"object\", \"properties\": {\"myInt\": {\"$ref\": \"#plainname\"}}}");
+ SchemaDocumentType s(sd);
+ SCHEMAERROR(s, "{\"RefUnknown\":{\"errorCode\":5,\"instanceRef\":\"#/properties/myInt\",\"value\":\"#plainname\"}}");
+}
+
+/// $ref is unknown pointer
+TEST(SchemaValidator, Schema_RefUnknownPointer) {
+ typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+ Document sd;
+ sd.Parse("{\"type\": \"object\", \"properties\": {\"myInt\": {\"$ref\": \"#/a/b\"}}}");
+ SchemaDocumentType s(sd);
+ SCHEMAERROR(s, "{\"RefUnknown\":{\"errorCode\":5,\"instanceRef\":\"#/properties/myInt\",\"value\":\"#/a/b\"}}");
+}
+
+// $ref is remote and unknown pointer
+TEST(SchemaValidator, Schema_RefUnknownPointerRemote) {
+ typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+ RemoteSchemaDocumentProvider<SchemaDocumentType> provider;
+ Document sd;
+ sd.Parse("{\"type\": \"object\", \"properties\": {\"myInt\": {\"$ref\": \"/subSchemas.json#/a/b\"}}}");
+ SchemaDocumentType s(sd, "http://localhost:1234/xxxx", 26, &provider);
+ SCHEMAERROR(s, "{\"RefUnknown\":{\"errorCode\":5,\"instanceRef\":\"#/properties/myInt\",\"value\":\"http://localhost:1234/subSchemas.json#/a/b\"}}");
+}
+
+// $ref is cyclical
+TEST(SchemaValidator, Schema_RefCyclical) {
+ typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+ Document sd;
+ sd.Parse("{\"type\": \"object\", \"properties\": {"
+ " \"cyclic_source\": {"
+ " \"$ref\": \"#/properties/cyclic_target\""
+ " },"
+ " \"cyclic_target\": {"
+ " \"$ref\": \"#/properties/cyclic_source\""
+ " }"
+ "}}");
+ SchemaDocumentType s(sd);
+ SCHEMAERROR(s, "{\"RefCyclical\":{\"errorCode\":6,\"instanceRef\":\"#/properties/cyclic_target\",\"value\":\"#/properties/cyclic_source\"}}");
+}
+
+TEST(SchemaValidator, Schema_ReadOnlyAndWriteOnly) {
+ Document sd;
+ sd.Parse("{\"type\": \"integer\", \"readOnly\": true, \"writeOnly\": true}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s1(sd, 0, 0, 0, 0, 0, Specification(kDraft04));
+ EXPECT_TRUE(s1.GetError().ObjectEmpty());
+ SchemaDocument s2(sd, 0, 0, 0, 0, 0, Specification(kVersion30));
+ SCHEMAERROR(s2, "{\"ReadOnlyAndWriteOnly\":{\"errorCode\":13,\"instanceRef\":\"#\"}}");
+}
+
+TEST(SchemaValidator, ReadOnlyWhenWriting) {
+ Document sd;
+ sd.Parse(
+ "{"
+ " \"type\":\"object\","
+ " \"properties\": {"
+ " \"rprop\" : {"
+ " \"type\": \"string\","
+ " \"readOnly\": true"
+ " }"
+ " }"
+ "}");
+ SchemaDocument s(sd, 0, 0, 0, 0, 0, Specification(kVersion20));
+ VALIDATE(s, "{ \"rprop\": \"hello\" }", true);
+ INVALIDATE_(s, "{ \"rprop\": \"hello\" }", "/properties/rprop", "readOnly", "/rprop",
+ "{ \"readOnly\": {"
+ " \"errorCode\": 26, \"instanceRef\": \"#/rprop\", \"schemaRef\": \"#/properties/rprop\""
+ " }"
+ "}",
+ kValidateDefaultFlags | kValidateWriteFlag, SchemaValidator, Pointer);
+}
+
+TEST(SchemaValidator, WriteOnlyWhenReading) {
+ Document sd;
+ sd.Parse(
+ "{"
+ " \"type\":\"object\","
+ " \"properties\": {"
+ " \"wprop\" : {"
+ " \"type\": \"boolean\","
+ " \"writeOnly\": true"
+ " }"
+ " }"
+ "}");
+ SchemaDocument s(sd, 0, 0, 0, 0, 0, Specification(kVersion30));
+ VALIDATE(s, "{ \"wprop\": true }", true);
+ INVALIDATE_(s, "{ \"wprop\": true }", "/properties/wprop", "writeOnly", "/wprop",
+ "{ \"writeOnly\": {"
+ " \"errorCode\": 27, \"instanceRef\": \"#/wprop\", \"schemaRef\": \"#/properties/wprop\""
+ " }"
+ "}",
+ kValidateDefaultFlags | kValidateReadFlag, SchemaValidator, Pointer);
+}
+
+TEST(SchemaValidator, NullableTrue) {
+ Document sd;
+ sd.Parse("{\"type\": \"string\", \"nullable\": true}");
+ SchemaDocument s(sd, 0, 0, 0, 0, 0, kVersion20);
+
+ VALIDATE(s, "\"hello\"", true);
+ INVALIDATE(s, "null", "", "type", "",
+ "{ \"type\": {"
+ " \"errorCode\": 20,"
+ " \"instanceRef\": \"#\", \"schemaRef\": \"#\","
+ " \"expected\": [\"string\"], \"actual\": \"null\""
+ "}}");
+ INVALIDATE(s, "false", "", "type", "",
+ "{ \"type\": {"
+ " \"errorCode\": 20,"
+ " \"instanceRef\": \"#\", \"schemaRef\": \"#\","
+ " \"expected\": [\"string\"], \"actual\": \"boolean\""
+ "}}");
+
+ SchemaDocument s30(sd, 0, 0, 0, 0, 0, kVersion30);
+
+ VALIDATE(s30, "\"hello\"", true);
+ VALIDATE(s30, "null", true);
+ INVALIDATE(s30, "false", "", "type", "",
+ "{ \"type\": {"
+ " \"errorCode\": 20,"
+ " \"instanceRef\": \"#\", \"schemaRef\": \"#\","
+ " \"expected\": [\"null\", \"string\"], \"actual\": \"boolean\""
+ "}}");
+}
+
+TEST(SchemaValidator, NullableFalse) {
+ Document sd;
+ sd.Parse("{\"type\": \"string\", \"nullable\": false}");
+ SchemaDocument s(sd, 0, 0, 0, 0, 0, kVersion20);
+
+ VALIDATE(s, "\"hello\"", true);
+ INVALIDATE(s, "null", "", "type", "",
+ "{ \"type\": {"
+ " \"errorCode\": 20,"
+ " \"instanceRef\": \"#\", \"schemaRef\": \"#\","
+ " \"expected\": [\"string\"], \"actual\": \"null\""
+ "}}");
+ INVALIDATE(s, "false", "", "type", "",
+ "{ \"type\": {"
+ " \"errorCode\": 20,"
+ " \"instanceRef\": \"#\", \"schemaRef\": \"#\","
+ " \"expected\": [\"string\"], \"actual\": \"boolean\""
+ "}}");
+
+ SchemaDocument s30(sd, 0, 0, 0, 0, 0, kVersion30);
+
+ VALIDATE(s30, "\"hello\"", true);
+ INVALIDATE(s, "null", "", "type", "",
+ "{ \"type\": {"
+ " \"errorCode\": 20,"
+ " \"instanceRef\": \"#\", \"schemaRef\": \"#\","
+ " \"expected\": [\"string\"], \"actual\": \"null\""
+ "}}");
+ INVALIDATE(s30, "false", "", "type", "",
+ "{ \"type\": {"
+ " \"errorCode\": 20,"
+ " \"instanceRef\": \"#\", \"schemaRef\": \"#\","
+ " \"expected\": [\"string\"], \"actual\": \"boolean\""
+ "}}");
+}
+
#if defined(_MSC_VER) || defined(__clang__)
RAPIDJSON_DIAG_POP
#endif
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/simdtest.cpp
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/simdtest.cpp 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/simdtest.cpp 2024-02-27 20:51:03 UTC (rev 70212)
@@ -49,10 +49,12 @@
#define SIMD_SUFFIX(name) name
#endif
+#define SIMD_SIZE_ALIGN(n) ((size_t(n) + 15) & ~size_t(15))
+
template <typename StreamType>
void TestSkipWhitespace() {
for (size_t step = 1; step < 32; step++) {
- char buffer[1025];
+ char buffer[SIMD_SIZE_ALIGN(1025)];
for (size_t i = 0; i < 1024; i++)
buffer[i] = " \t\r\n"[i % 4];
for (size_t i = 0; i < 1024; i += step)
@@ -79,7 +81,7 @@
TEST(SIMD, SIMD_SUFFIX(SkipWhitespace_EncodedMemoryStream)) {
for (size_t step = 1; step < 32; step++) {
- char buffer[1024];
+ char buffer[SIMD_SIZE_ALIGN(1024)];
for (size_t i = 0; i < 1024; i++)
buffer[i] = " \t\r\n"[i % 4];
for (size_t i = 0; i < 1024; i += step)
@@ -87,7 +89,6 @@
MemoryStream ms(buffer, 1024);
EncodedInputStream<UTF8<>, MemoryStream> s(ms);
- size_t i = 0;
for (;;) {
SkipWhitespace(s);
if (s.Peek() == '\0')
@@ -94,7 +95,6 @@
break;
//EXPECT_EQ(i, s.Tell());
EXPECT_EQ('X', s.Take());
- i += step;
}
}
}
@@ -109,8 +109,8 @@
template <unsigned parseFlags, typename StreamType>
void TestScanCopyUnescapedString() {
- char buffer[1024u + 5 + 32];
- char backup[1024u + 5 + 32];
+ char buffer[SIMD_SIZE_ALIGN(1024u + 5 + 32)];
+ char backup[SIMD_SIZE_ALIGN(1024u + 5 + 32)];
// Test "ABCDABCD...\\"
for (size_t offset = 0; offset < 32; offset++) {
@@ -167,7 +167,7 @@
}
TEST(SIMD, SIMD_SUFFIX(ScanWriteUnescapedString)) {
- char buffer[2048 + 1 + 32];
+ char buffer[SIMD_SIZE_ALIGN(2048 + 1 + 32)];
for (size_t offset = 0; offset < 32; offset++) {
for (size_t step = 0; step < 1024; step++) {
char* s = buffer + offset;
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/uritest.cpp
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/uritest.cpp 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/uritest.cpp 2024-02-27 20:51:03 UTC (rev 70212)
@@ -48,7 +48,6 @@
EXPECT_TRUE(u.GetStringLength() == 0);
}
-
TEST(Uri, Parse) {
typedef GenericUri<Value, MemoryPoolAllocator<> > UriType;
MemoryPoolAllocator<CrtAllocator> allocator;
@@ -66,21 +65,8 @@
u.Get(w, allocator);
EXPECT_TRUE(*w.GetString() == *v.GetString());
-#if RAPIDJSON_HAS_STDSTRING
- typedef std::basic_string<Value::Ch> String;
- String str = "http://auth/path/xxx?query#frag";
- const UriType uri = UriType(str);
- EXPECT_TRUE(UriType::GetScheme(uri) == "http:");
- EXPECT_TRUE(UriType::GetAuth(uri) == "//auth");
- EXPECT_TRUE(UriType::GetPath(uri) == "/path/xxx");
- EXPECT_TRUE(UriType::GetBase(uri) == "http://auth/path/xxx?query");
- EXPECT_TRUE(UriType::GetQuery(uri) == "?query");
- EXPECT_TRUE(UriType::GetFrag(uri) == "#frag");
- EXPECT_TRUE(UriType::Get(uri) == str);
-#endif
-
v.SetString("urn:uuid:ee564b8a-7a87-4125-8c96-e9f123d6766f", allocator);
- u = UriType(v);
+ u = UriType(v, &allocator);
EXPECT_TRUE(StrCmp(u.GetSchemeString(), "urn:") == 0);
EXPECT_TRUE(u.GetAuthStringLength() == 0);
EXPECT_TRUE(StrCmp(u.GetPathString(), "uuid:ee564b8a-7a87-4125-8c96-e9f123d6766f") == 0);
@@ -91,7 +77,7 @@
EXPECT_TRUE(*w.GetString() == *v.GetString());
v.SetString("", allocator);
- u = UriType(v);
+ u = UriType(v, &allocator);
EXPECT_TRUE(u.GetSchemeStringLength() == 0);
EXPECT_TRUE(u.GetAuthStringLength() == 0);
EXPECT_TRUE(u.GetPathStringLength() == 0);
@@ -100,7 +86,7 @@
EXPECT_TRUE(u.GetFragStringLength() == 0);
v.SetString("http://auth/", allocator);
- u = UriType(v);
+ u = UriType(v, &allocator);
EXPECT_TRUE(StrCmp(u.GetSchemeString(), "http:") == 0);
EXPECT_TRUE(StrCmp(u.GetAuthString(), "//auth") == 0);
EXPECT_TRUE(StrCmp(u.GetPathString(), "/") == 0);
@@ -162,12 +148,11 @@
EXPECT_TRUE(u.GetFragStringLength() == len);
// Incomplete auth treated as path
- str = "http:/";
- const UriType u2 = UriType(str);
- EXPECT_TRUE(StrCmp(u2.GetSchemeString(), "http:") == 0);
- EXPECT_TRUE(u2.GetAuthStringLength() == 0);
- EXPECT_TRUE(StrCmp(u2.GetPathString(), "/") == 0);
- EXPECT_TRUE(StrCmp(u2.GetBaseString(), "http:/") == 0);
+ u = UriType("http:/");
+ EXPECT_TRUE(StrCmp(u.GetSchemeString(), "http:") == 0);
+ EXPECT_TRUE(u.GetAuthStringLength() == 0);
+ EXPECT_TRUE(StrCmp(u.GetPathString(), "/") == 0);
+ EXPECT_TRUE(StrCmp(u.GetBaseString(), "http:/") == 0);
}
TEST(Uri, Parse_UTF16) {
@@ -188,21 +173,8 @@
u.Get(w, allocator);
EXPECT_TRUE(*w.GetString() == *v.GetString());
-#if RAPIDJSON_HAS_STDSTRING
- typedef std::basic_string<Value16::Ch> String;
- String str = L"http://auth/path/xxx?query#frag";
- const UriType uri = UriType(str);
- EXPECT_TRUE(UriType::GetScheme(uri) == L"http:");
- EXPECT_TRUE(UriType::GetAuth(uri) == L"//auth");
- EXPECT_TRUE(UriType::GetPath(uri) == L"/path/xxx");
- EXPECT_TRUE(UriType::GetBase(uri) == L"http://auth/path/xxx?query");
- EXPECT_TRUE(UriType::GetQuery(uri) == L"?query");
- EXPECT_TRUE(UriType::GetFrag(uri) == L"#frag");
- EXPECT_TRUE(UriType::Get(uri) == str);
-#endif
-
v.SetString(L"urn:uuid:ee564b8a-7a87-4125-8c96-e9f123d6766f", allocator);
- u = UriType(v);
+ u = UriType(v, &allocator);
EXPECT_TRUE(StrCmp(u.GetSchemeString(), L"urn:") == 0);
EXPECT_TRUE(u.GetAuthStringLength() == 0);
EXPECT_TRUE(StrCmp(u.GetPathString(), L"uuid:ee564b8a-7a87-4125-8c96-e9f123d6766f") == 0);
@@ -213,7 +185,7 @@
EXPECT_TRUE(*w.GetString() == *v.GetString());
v.SetString(L"", allocator);
- u = UriType(v);
+ u = UriType(v, &allocator);
EXPECT_TRUE(u.GetSchemeStringLength() == 0);
EXPECT_TRUE(u.GetAuthStringLength() == 0);
EXPECT_TRUE(u.GetPathStringLength() == 0);
@@ -222,7 +194,7 @@
EXPECT_TRUE(u.GetFragStringLength() == 0);
v.SetString(L"http://auth/", allocator);
- u = UriType(v);
+ u = UriType(v, &allocator);
EXPECT_TRUE(StrCmp(u.GetSchemeString(), L"http:") == 0);
EXPECT_TRUE(StrCmp(u.GetAuthString(), L"//auth") == 0);
EXPECT_TRUE(StrCmp(u.GetPathString(), L"/") == 0);
@@ -291,6 +263,41 @@
EXPECT_TRUE(StrCmp(u.GetBaseString(), L"http:/") == 0);
}
+#if RAPIDJSON_HAS_STDSTRING
+TEST(Uri, Parse_Std) {
+ typedef GenericUri<Value, MemoryPoolAllocator<> > UriType;
+ MemoryPoolAllocator<CrtAllocator> allocator;
+ typedef std::basic_string<Value::Ch> String;
+
+ String str = "http://auth/path/xxx?query#frag";
+ const UriType uri = UriType(str, &allocator);
+ EXPECT_TRUE(UriType::GetScheme(uri) == "http:");
+ EXPECT_TRUE(UriType::GetAuth(uri) == "//auth");
+ EXPECT_TRUE(UriType::GetPath(uri) == "/path/xxx");
+ EXPECT_TRUE(UriType::GetBase(uri) == "http://auth/path/xxx?query");
+ EXPECT_TRUE(UriType::GetQuery(uri) == "?query");
+ EXPECT_TRUE(UriType::GetFrag(uri) == "#frag");
+ EXPECT_TRUE(UriType::Get(uri) == str);
+}
+
+TEST(Uri, Parse_UTF16_Std) {
+ typedef GenericValue<UTF16<> > Value16;
+ typedef GenericUri<Value16, MemoryPoolAllocator<> > UriType;
+ MemoryPoolAllocator<CrtAllocator> allocator;
+ typedef std::basic_string<Value16::Ch> String;
+
+ String str = L"http://auth/path/xxx?query#frag";
+ const UriType uri = UriType(str, &allocator);
+ EXPECT_TRUE(UriType::GetScheme(uri) == L"http:");
+ EXPECT_TRUE(UriType::GetAuth(uri) == L"//auth");
+ EXPECT_TRUE(UriType::GetPath(uri) == L"/path/xxx");
+ EXPECT_TRUE(UriType::GetBase(uri) == L"http://auth/path/xxx?query");
+ EXPECT_TRUE(UriType::GetQuery(uri) == L"?query");
+ EXPECT_TRUE(UriType::GetFrag(uri) == L"#frag");
+ EXPECT_TRUE(UriType::Get(uri) == str);
+}
+#endif
+
TEST(Uri, CopyConstructor) {
typedef GenericUri<Value> UriType;
CrtAllocator allocator;
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/valuetest.cpp
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/valuetest.cpp 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/valuetest.cpp 2024-02-27 20:51:03 UTC (rev 70212)
@@ -1581,7 +1581,7 @@
{
int i = 0;
for (auto& m : x.GetObject()) {
- char name[10];
+ char name[11];
sprintf(name, "%d", i);
EXPECT_STREQ(name, m.name.GetString());
EXPECT_EQ(i, m.value.GetInt());
@@ -1592,7 +1592,7 @@
{
int i = 0;
for (const auto& m : const_cast<const Value&>(x).GetObject()) {
- char name[10];
+ char name[11];
sprintf(name, "%d", i);
EXPECT_STREQ(name, m.name.GetString());
EXPECT_EQ(i, m.value.GetInt());
@@ -1717,17 +1717,17 @@
rapidjson::Value val;
val.SetString(str, len, doc.GetAllocator());
- EXPECT_EQ(val.GetStringLength(), len);
- EXPECT_STREQ(val.GetString(), str);
+ EXPECT_EQ(val.GetStringLength(), len);
+ EXPECT_STREQ(val.GetString(), str);
}
TEST(Value, AllocateShortString) {
- TestShortStringOptimization(""); // edge case: empty string
- TestShortStringOptimization("12345678"); // regular case for short strings: 8 chars
- TestShortStringOptimization("12345678901"); // edge case: 11 chars in 32-bit mode (=> short string)
- TestShortStringOptimization("123456789012"); // edge case: 12 chars in 32-bit mode (=> regular string)
- TestShortStringOptimization("123456789012345"); // edge case: 15 chars in 64-bit mode (=> short string)
- TestShortStringOptimization("1234567890123456"); // edge case: 16 chars in 64-bit mode (=> regular string)
+ TestShortStringOptimization(""); // edge case: empty string
+ TestShortStringOptimization("12345678"); // regular case for short strings: 8 chars
+ TestShortStringOptimization("12345678901"); // edge case: 11 chars in 32-bit mode (=> short string)
+ TestShortStringOptimization("123456789012"); // edge case: 12 chars in 32-bit mode (=> regular string)
+ TestShortStringOptimization("123456789012345"); // edge case: 15 chars in 64-bit mode (=> short string)
+ TestShortStringOptimization("1234567890123456"); // edge case: 16 chars in 64-bit mode (=> regular string)
}
template <int e>
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/valgrind.supp
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/valgrind.supp 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/valgrind.supp 2024-02-27 20:51:03 UTC (rev 70212)
@@ -15,3 +15,12 @@
Memcheck:Value8
fun:__wcslen_sse2
}
+
+{
+ Suppress wmemcmp valgrind report 4
+ Memcheck:Addr32
+ fun:__wmemcmp_avx2_movbe
+ ...
+ fun:*Uri*Parse_UTF16_Std*
+}
+
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/CMakeFiles/CMakeDirectoryInformation.cmake
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/CMakeFiles/CMakeDirectoryInformation.cmake 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/CMakeFiles/CMakeDirectoryInformation.cmake 2024-02-27 20:51:03 UTC (rev 70212)
@@ -1,9 +1,9 @@
# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.25
+# Generated by "Unix Makefiles" Generator, CMake Version 3.27
# Relative path conversion top directories.
-set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/usr/local/src/asymptote-2.85/LspCpp")
-set(CMAKE_RELATIVE_PATH_TOP_BINARY "/usr/local/src/asymptote-2.85/LspCpp")
+set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/usr/local/src/asymptote-2.87/LspCpp")
+set(CMAKE_RELATIVE_PATH_TOP_BINARY "/usr/local/src/asymptote-2.87/LspCpp")
# Force unix paths in dependencies.
set(CMAKE_FORCE_UNIX_PATHS 1)
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/CMakeFiles/doc.dir/DependInfo.cmake
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/CMakeFiles/doc.dir/DependInfo.cmake 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/CMakeFiles/doc.dir/DependInfo.cmake 2024-02-27 20:51:03 UTC (rev 70212)
@@ -10,8 +10,8 @@
set(CMAKE_DEPENDS_DEPENDENCY_FILES
)
-# Targets to which this target links.
-set(CMAKE_TARGET_LINKED_INFO_FILES
+# Targets to which this target links which contain Fortran sources.
+set(CMAKE_Fortran_TARGET_LINKED_INFO_FILES
)
# Fortran module output directory.
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/CMakeFiles/doc.dir/build.make
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/CMakeFiles/doc.dir/build.make 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/CMakeFiles/doc.dir/build.make 2024-02-27 20:51:03 UTC (rev 70212)
@@ -1,5 +1,5 @@
# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.25
+# Generated by "Unix Makefiles" Generator, CMake Version 3.27
# Delete rule output on recipe failure.
.DELETE_ON_ERROR:
@@ -56,10 +56,10 @@
EQUALS = =
# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /usr/local/src/asymptote-2.85/LspCpp
+CMAKE_SOURCE_DIR = /usr/local/src/asymptote-2.87/LspCpp
# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /usr/local/src/asymptote-2.85/LspCpp
+CMAKE_BINARY_DIR = /usr/local/src/asymptote-2.87/LspCpp
# Utility rule file for doc.
@@ -70,8 +70,8 @@
include third_party/uri/CMakeFiles/doc.dir/progress.make
third_party/uri/CMakeFiles/doc:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --blue --bold --progress-dir=/usr/local/src/asymptote-2.85/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Generating API documentation with Doxygen"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri && /bin/doxygen /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/Doxyfile
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --blue --bold --progress-dir=/usr/local/src/asymptote-2.87/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Generating API documentation with Doxygen"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri && /bin/doxygen /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/Doxyfile
doc: third_party/uri/CMakeFiles/doc
doc: third_party/uri/CMakeFiles/doc.dir/build.make
@@ -82,10 +82,10 @@
.PHONY : third_party/uri/CMakeFiles/doc.dir/build
third_party/uri/CMakeFiles/doc.dir/clean:
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri && $(CMAKE_COMMAND) -P CMakeFiles/doc.dir/cmake_clean.cmake
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri && $(CMAKE_COMMAND) -P CMakeFiles/doc.dir/cmake_clean.cmake
.PHONY : third_party/uri/CMakeFiles/doc.dir/clean
third_party/uri/CMakeFiles/doc.dir/depend:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /usr/local/src/asymptote-2.85/LspCpp /usr/local/src/asymptote-2.85/LspCpp/third_party/uri /usr/local/src/asymptote-2.85/LspCpp /usr/local/src/asymptote-2.85/LspCpp/third_party/uri /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/CMakeFiles/doc.dir/DependInfo.cmake --color=$(COLOR)
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /usr/local/src/asymptote-2.87/LspCpp /usr/local/src/asymptote-2.87/LspCpp/third_party/uri /usr/local/src/asymptote-2.87/LspCpp /usr/local/src/asymptote-2.87/LspCpp/third_party/uri /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/CMakeFiles/doc.dir/DependInfo.cmake "--color=$(COLOR)"
.PHONY : third_party/uri/CMakeFiles/doc.dir/depend
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/Doxyfile
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/Doxyfile 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/Doxyfile 2024-02-27 20:51:03 UTC (rev 70212)
@@ -128,7 +128,7 @@
# If left blank the directory from which doxygen is run is used as the
# path to strip.
-STRIP_FROM_PATH = /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/
+STRIP_FROM_PATH = /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/
# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
# the path mentioned in the documentation of a class, which tells
@@ -626,7 +626,7 @@
# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
-INPUT = /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include
+INPUT = /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -658,7 +658,7 @@
# Note that relative paths are relative to the directory from which doxygen is
# run.
-EXCLUDE = /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail
+EXCLUDE = /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail
# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
# directories that are symbolic links (a Unix file system feature) are excluded
@@ -821,7 +821,7 @@
# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
# should be ignored while generating the index headers.
-IGNORE_PREFIX = /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/uri/src/
+IGNORE_PREFIX = /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/uri/src/
#---------------------------------------------------------------------------
# configuration options related to the HTML output
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/Makefile
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/Makefile 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/Makefile 2024-02-27 20:51:03 UTC (rev 70212)
@@ -1,5 +1,5 @@
# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.25
+# Generated by "Unix Makefiles" Generator, CMake Version 3.27
# Default target executed when no arguments are given to make.
default_target: all
@@ -60,10 +60,10 @@
EQUALS = =
# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /usr/local/src/asymptote-2.85/LspCpp
+CMAKE_SOURCE_DIR = /usr/local/src/asymptote-2.87/LspCpp
# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /usr/local/src/asymptote-2.85/LspCpp
+CMAKE_BINARY_DIR = /usr/local/src/asymptote-2.87/LspCpp
#=============================================================================
# Targets provided globally by CMake.
@@ -70,7 +70,7 @@
# Special rule for the target edit_cache
edit_cache:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Running CMake cache editor..."
/usr/bin/ccmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : edit_cache
@@ -80,7 +80,7 @@
# Special rule for the target rebuild_cache
rebuild_cache:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Running CMake to regenerate build system..."
/usr/bin/cmake --regenerate-during-build -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : rebuild_cache
@@ -90,7 +90,7 @@
# Special rule for the target list_install_components
list_install_components:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Available install components are: \"Unspecified\""
.PHONY : list_install_components
# Special rule for the target list_install_components
@@ -99,50 +99,50 @@
# Special rule for the target install
install: preinstall
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Install the project..."
/usr/bin/cmake -P cmake_install.cmake
.PHONY : install
# Special rule for the target install
install/fast: preinstall/fast
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Install the project..."
/usr/bin/cmake -P cmake_install.cmake
.PHONY : install/fast
# Special rule for the target install/local
install/local: preinstall
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Installing only the local directory..."
/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
.PHONY : install/local
# Special rule for the target install/local
install/local/fast: preinstall/fast
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Installing only the local directory..."
/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
.PHONY : install/local/fast
# Special rule for the target install/strip
install/strip: preinstall
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Installing the project stripped..."
/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
.PHONY : install/strip
# Special rule for the target install/strip
install/strip/fast: preinstall/fast
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Installing the project stripped..."
/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
.PHONY : install/strip/fast
# The main all target
all: cmake_check_build_system
- cd /usr/local/src/asymptote-2.85/LspCpp && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/src/asymptote-2.85/LspCpp/CMakeFiles /usr/local/src/asymptote-2.85/LspCpp/third_party/uri//CMakeFiles/progress.marks
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/all
- $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/src/asymptote-2.85/LspCpp/CMakeFiles 0
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/src/asymptote-2.87/LspCpp/CMakeFiles /usr/local/src/asymptote-2.87/LspCpp/third_party/uri//CMakeFiles/progress.marks
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/all
+ $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/src/asymptote-2.87/LspCpp/CMakeFiles 0
.PHONY : all
# The main clean target
clean:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/clean
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/clean
.PHONY : clean
# The main clean target
@@ -151,22 +151,22 @@
# Prepare targets for installation.
preinstall: all
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/preinstall
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/preinstall
.PHONY : preinstall
# Prepare targets for installation.
preinstall/fast:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/preinstall
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/preinstall
.PHONY : preinstall/fast
# clear depends
depend:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
.PHONY : depend
# Convenience name for target.
third_party/uri/CMakeFiles/doc.dir/rule:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/CMakeFiles/doc.dir/rule
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/CMakeFiles/doc.dir/rule
.PHONY : third_party/uri/CMakeFiles/doc.dir/rule
# Convenience name for target.
@@ -175,7 +175,7 @@
# fast build rule for target.
doc/fast:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/CMakeFiles/doc.dir/build.make third_party/uri/CMakeFiles/doc.dir/build
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/CMakeFiles/doc.dir/build.make third_party/uri/CMakeFiles/doc.dir/build
.PHONY : doc/fast
# Help Target
@@ -202,6 +202,6 @@
# No rule that depends on this can have commands that come from listfiles
# because they might be regenerated.
cmake_check_build_system:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/cmake_install.cmake
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/cmake_install.cmake 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/cmake_install.cmake 2024-02-27 20:51:03 UTC (rev 70212)
@@ -1,4 +1,4 @@
-# Install script for directory: /usr/local/src/asymptote-2.85/LspCpp/third_party/uri
+# Install script for directory: /usr/local/src/asymptote-2.87/LspCpp/third_party/uri
# Set the install prefix
if(NOT DEFINED CMAKE_INSTALL_PREFIX)
@@ -43,12 +43,12 @@
endif()
if(CMAKE_INSTALL_COMPONENT STREQUAL "Unspecified" OR NOT CMAKE_INSTALL_COMPONENT)
- file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/." TYPE DIRECTORY FILES "/usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include")
+ file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/." TYPE DIRECTORY FILES "/usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include")
endif()
if(NOT CMAKE_INSTALL_LOCAL_ONLY)
# Include the install script for each subdirectory.
- include("/usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/cmake_install.cmake")
+ include("/usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/cmake_install.cmake")
endif()
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/CMakeDirectoryInformation.cmake
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/CMakeDirectoryInformation.cmake 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/CMakeDirectoryInformation.cmake 2024-02-27 20:51:03 UTC (rev 70212)
@@ -1,9 +1,9 @@
# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.25
+# Generated by "Unix Makefiles" Generator, CMake Version 3.27
# Relative path conversion top directories.
-set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/usr/local/src/asymptote-2.85/LspCpp")
-set(CMAKE_RELATIVE_PATH_TOP_BINARY "/usr/local/src/asymptote-2.85/LspCpp")
+set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/usr/local/src/asymptote-2.87/LspCpp")
+set(CMAKE_RELATIVE_PATH_TOP_BINARY "/usr/local/src/asymptote-2.87/LspCpp")
# Force unix paths in dependencies.
set(CMAKE_FORCE_UNIX_PATHS 1)
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/DependInfo.cmake
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/DependInfo.cmake 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/DependInfo.cmake 2024-02-27 20:51:03 UTC (rev 70212)
@@ -8,18 +8,18 @@
# The set of dependency files which are needed:
set(CMAKE_DEPENDS_DEPENDENCY_FILES
- "/usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_advance_parts.cpp" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o" "gcc" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o.d"
- "/usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_normalize.cpp" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o" "gcc" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o.d"
- "/usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_parse.cpp" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o" "gcc" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o.d"
- "/usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_parse_authority.cpp" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o" "gcc" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o.d"
- "/usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_resolve.cpp" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o" "gcc" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o.d"
- "/usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/uri.cpp" "third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o" "gcc" "third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o.d"
- "/usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/uri_builder.cpp" "third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o" "gcc" "third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o.d"
- "/usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/uri_errors.cpp" "third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o" "gcc" "third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o.d"
+ "/usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_advance_parts.cpp" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o" "gcc" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o.d"
+ "/usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_normalize.cpp" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o" "gcc" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o.d"
+ "/usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_parse.cpp" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o" "gcc" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o.d"
+ "/usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_parse_authority.cpp" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o" "gcc" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o.d"
+ "/usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_resolve.cpp" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o" "gcc" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o.d"
+ "/usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/uri.cpp" "third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o" "gcc" "third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o.d"
+ "/usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/uri_builder.cpp" "third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o" "gcc" "third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o.d"
+ "/usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/uri_errors.cpp" "third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o" "gcc" "third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o.d"
)
-# Targets to which this target links.
-set(CMAKE_TARGET_LINKED_INFO_FILES
+# Targets to which this target links which contain Fortran sources.
+set(CMAKE_Fortran_TARGET_LINKED_INFO_FILES
)
# Fortran module output directory.
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/build.make
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/build.make 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/build.make 2024-02-27 20:51:03 UTC (rev 70212)
@@ -1,5 +1,5 @@
# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.25
+# Generated by "Unix Makefiles" Generator, CMake Version 3.27
# Delete rule output on recipe failure.
.DELETE_ON_ERROR:
@@ -56,10 +56,10 @@
EQUALS = =
# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /usr/local/src/asymptote-2.85/LspCpp
+CMAKE_SOURCE_DIR = /usr/local/src/asymptote-2.87/LspCpp
# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /usr/local/src/asymptote-2.85/LspCpp
+CMAKE_BINARY_DIR = /usr/local/src/asymptote-2.87/LspCpp
# Include any dependencies generated for this target.
include third_party/uri/src/CMakeFiles/network-uri.dir/depend.make
@@ -75,114 +75,114 @@
third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o: third_party/uri/src/CMakeFiles/network-uri.dir/flags.make
third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o: third_party/uri/src/uri.cpp
third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o: third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.ts
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/usr/local/src/asymptote-2.85/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building CXX object third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o -MF CMakeFiles/network-uri.dir/uri.cpp.o.d -o CMakeFiles/network-uri.dir/uri.cpp.o -c /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/uri.cpp
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green --progress-dir=/usr/local/src/asymptote-2.87/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building CXX object third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o -MF CMakeFiles/network-uri.dir/uri.cpp.o.d -o CMakeFiles/network-uri.dir/uri.cpp.o -c /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/uri.cpp
third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.i: cmake_force
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/network-uri.dir/uri.cpp.i"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/uri.cpp > CMakeFiles/network-uri.dir/uri.cpp.i
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Preprocessing CXX source to CMakeFiles/network-uri.dir/uri.cpp.i"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/uri.cpp > CMakeFiles/network-uri.dir/uri.cpp.i
third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.s: cmake_force
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/network-uri.dir/uri.cpp.s"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/uri.cpp -o CMakeFiles/network-uri.dir/uri.cpp.s
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Compiling CXX source to assembly CMakeFiles/network-uri.dir/uri.cpp.s"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/uri.cpp -o CMakeFiles/network-uri.dir/uri.cpp.s
third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o: third_party/uri/src/CMakeFiles/network-uri.dir/flags.make
third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o: third_party/uri/src/uri_builder.cpp
third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o: third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.ts
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/usr/local/src/asymptote-2.85/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Building CXX object third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o -MF CMakeFiles/network-uri.dir/uri_builder.cpp.o.d -o CMakeFiles/network-uri.dir/uri_builder.cpp.o -c /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/uri_builder.cpp
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green --progress-dir=/usr/local/src/asymptote-2.87/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Building CXX object third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o -MF CMakeFiles/network-uri.dir/uri_builder.cpp.o.d -o CMakeFiles/network-uri.dir/uri_builder.cpp.o -c /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/uri_builder.cpp
third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.i: cmake_force
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/network-uri.dir/uri_builder.cpp.i"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/uri_builder.cpp > CMakeFiles/network-uri.dir/uri_builder.cpp.i
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Preprocessing CXX source to CMakeFiles/network-uri.dir/uri_builder.cpp.i"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/uri_builder.cpp > CMakeFiles/network-uri.dir/uri_builder.cpp.i
third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.s: cmake_force
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/network-uri.dir/uri_builder.cpp.s"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/uri_builder.cpp -o CMakeFiles/network-uri.dir/uri_builder.cpp.s
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Compiling CXX source to assembly CMakeFiles/network-uri.dir/uri_builder.cpp.s"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/uri_builder.cpp -o CMakeFiles/network-uri.dir/uri_builder.cpp.s
third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o: third_party/uri/src/CMakeFiles/network-uri.dir/flags.make
third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o: third_party/uri/src/uri_errors.cpp
third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o: third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.ts
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/usr/local/src/asymptote-2.85/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_3) "Building CXX object third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o -MF CMakeFiles/network-uri.dir/uri_errors.cpp.o.d -o CMakeFiles/network-uri.dir/uri_errors.cpp.o -c /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/uri_errors.cpp
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green --progress-dir=/usr/local/src/asymptote-2.87/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_3) "Building CXX object third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o -MF CMakeFiles/network-uri.dir/uri_errors.cpp.o.d -o CMakeFiles/network-uri.dir/uri_errors.cpp.o -c /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/uri_errors.cpp
third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.i: cmake_force
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/network-uri.dir/uri_errors.cpp.i"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/uri_errors.cpp > CMakeFiles/network-uri.dir/uri_errors.cpp.i
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Preprocessing CXX source to CMakeFiles/network-uri.dir/uri_errors.cpp.i"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/uri_errors.cpp > CMakeFiles/network-uri.dir/uri_errors.cpp.i
third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.s: cmake_force
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/network-uri.dir/uri_errors.cpp.s"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/uri_errors.cpp -o CMakeFiles/network-uri.dir/uri_errors.cpp.s
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Compiling CXX source to assembly CMakeFiles/network-uri.dir/uri_errors.cpp.s"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/uri_errors.cpp -o CMakeFiles/network-uri.dir/uri_errors.cpp.s
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o: third_party/uri/src/CMakeFiles/network-uri.dir/flags.make
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o: third_party/uri/src/detail/uri_parse.cpp
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o: third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.ts
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/usr/local/src/asymptote-2.85/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_4) "Building CXX object third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o -MF CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o.d -o CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o -c /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_parse.cpp
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green --progress-dir=/usr/local/src/asymptote-2.87/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_4) "Building CXX object third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o -MF CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o.d -o CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o -c /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_parse.cpp
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.i: cmake_force
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/network-uri.dir/detail/uri_parse.cpp.i"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_parse.cpp > CMakeFiles/network-uri.dir/detail/uri_parse.cpp.i
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Preprocessing CXX source to CMakeFiles/network-uri.dir/detail/uri_parse.cpp.i"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_parse.cpp > CMakeFiles/network-uri.dir/detail/uri_parse.cpp.i
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.s: cmake_force
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/network-uri.dir/detail/uri_parse.cpp.s"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_parse.cpp -o CMakeFiles/network-uri.dir/detail/uri_parse.cpp.s
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Compiling CXX source to assembly CMakeFiles/network-uri.dir/detail/uri_parse.cpp.s"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_parse.cpp -o CMakeFiles/network-uri.dir/detail/uri_parse.cpp.s
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o: third_party/uri/src/CMakeFiles/network-uri.dir/flags.make
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o: third_party/uri/src/detail/uri_parse_authority.cpp
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o: third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.ts
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/usr/local/src/asymptote-2.85/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_5) "Building CXX object third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o -MF CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o.d -o CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o -c /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_parse_authority.cpp
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green --progress-dir=/usr/local/src/asymptote-2.87/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_5) "Building CXX object third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o -MF CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o.d -o CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o -c /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_parse_authority.cpp
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.i: cmake_force
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.i"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_parse_authority.cpp > CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.i
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Preprocessing CXX source to CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.i"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_parse_authority.cpp > CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.i
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.s: cmake_force
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.s"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_parse_authority.cpp -o CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.s
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Compiling CXX source to assembly CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.s"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_parse_authority.cpp -o CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.s
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o: third_party/uri/src/CMakeFiles/network-uri.dir/flags.make
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o: third_party/uri/src/detail/uri_advance_parts.cpp
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o: third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.ts
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/usr/local/src/asymptote-2.85/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_6) "Building CXX object third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o -MF CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o.d -o CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o -c /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_advance_parts.cpp
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green --progress-dir=/usr/local/src/asymptote-2.87/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_6) "Building CXX object third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o -MF CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o.d -o CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o -c /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_advance_parts.cpp
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.i: cmake_force
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.i"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_advance_parts.cpp > CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.i
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Preprocessing CXX source to CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.i"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_advance_parts.cpp > CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.i
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.s: cmake_force
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.s"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_advance_parts.cpp -o CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.s
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Compiling CXX source to assembly CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.s"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_advance_parts.cpp -o CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.s
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o: third_party/uri/src/CMakeFiles/network-uri.dir/flags.make
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o: third_party/uri/src/detail/uri_normalize.cpp
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o: third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.ts
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/usr/local/src/asymptote-2.85/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_7) "Building CXX object third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o -MF CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o.d -o CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o -c /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_normalize.cpp
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green --progress-dir=/usr/local/src/asymptote-2.87/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_7) "Building CXX object third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o -MF CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o.d -o CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o -c /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_normalize.cpp
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.i: cmake_force
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.i"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_normalize.cpp > CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.i
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Preprocessing CXX source to CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.i"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_normalize.cpp > CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.i
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.s: cmake_force
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.s"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_normalize.cpp -o CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.s
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Compiling CXX source to assembly CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.s"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_normalize.cpp -o CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.s
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o: third_party/uri/src/CMakeFiles/network-uri.dir/flags.make
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o: third_party/uri/src/detail/uri_resolve.cpp
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o: third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.ts
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/usr/local/src/asymptote-2.85/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_8) "Building CXX object third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o -MF CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o.d -o CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o -c /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_resolve.cpp
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green --progress-dir=/usr/local/src/asymptote-2.87/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_8) "Building CXX object third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o -MF CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o.d -o CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o -c /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_resolve.cpp
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.i: cmake_force
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.i"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_resolve.cpp > CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.i
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Preprocessing CXX source to CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.i"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_resolve.cpp > CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.i
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.s: cmake_force
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.s"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_resolve.cpp -o CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.s
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Compiling CXX source to assembly CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.s"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_resolve.cpp -o CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.s
# Object files for target network-uri
network__uri_OBJECTS = \
@@ -208,9 +208,9 @@
third_party/uri/src/libnetwork-uri.a: third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o
third_party/uri/src/libnetwork-uri.a: third_party/uri/src/CMakeFiles/network-uri.dir/build.make
third_party/uri/src/libnetwork-uri.a: third_party/uri/src/CMakeFiles/network-uri.dir/link.txt
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/usr/local/src/asymptote-2.85/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_9) "Linking CXX static library libnetwork-uri.a"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && $(CMAKE_COMMAND) -P CMakeFiles/network-uri.dir/cmake_clean_target.cmake
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && $(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/network-uri.dir/link.txt --verbose=$(VERBOSE)
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green --bold --progress-dir=/usr/local/src/asymptote-2.87/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_9) "Linking CXX static library libnetwork-uri.a"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && $(CMAKE_COMMAND) -P CMakeFiles/network-uri.dir/cmake_clean_target.cmake
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && $(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/network-uri.dir/link.txt --verbose=$(VERBOSE)
# Rule to build all files generated by this target.
third_party/uri/src/CMakeFiles/network-uri.dir/build: third_party/uri/src/libnetwork-uri.a
@@ -217,10 +217,10 @@
.PHONY : third_party/uri/src/CMakeFiles/network-uri.dir/build
third_party/uri/src/CMakeFiles/network-uri.dir/clean:
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && $(CMAKE_COMMAND) -P CMakeFiles/network-uri.dir/cmake_clean.cmake
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && $(CMAKE_COMMAND) -P CMakeFiles/network-uri.dir/cmake_clean.cmake
.PHONY : third_party/uri/src/CMakeFiles/network-uri.dir/clean
third_party/uri/src/CMakeFiles/network-uri.dir/depend:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /usr/local/src/asymptote-2.85/LspCpp /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src /usr/local/src/asymptote-2.85/LspCpp /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/DependInfo.cmake --color=$(COLOR)
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /usr/local/src/asymptote-2.87/LspCpp /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src /usr/local/src/asymptote-2.87/LspCpp /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/DependInfo.cmake "--color=$(COLOR)"
.PHONY : third_party/uri/src/CMakeFiles/network-uri.dir/depend
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.internal
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.internal 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.internal 2024-02-27 20:51:03 UTC (rev 70212)
@@ -1,1723 +1,1724 @@
# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.25
+# Generated by "Unix Makefiles" Generator, CMake Version 3.27
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_advance_parts.cpp
- /usr/include/stdc-predef.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_advance_parts.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp
- /usr/include/c++/12/string
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++config.h
- /usr/include/bits/wordsize.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/os_defines.h
- /usr/include/features.h
- /usr/include/features-time64.h
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_advance_parts.cpp
+ /usr/include/alloca.h
+ /usr/include/asm-generic/errno-base.h
+ /usr/include/asm-generic/errno.h
+ /usr/include/asm/errno.h
+ /usr/include/assert.h
+ /usr/include/bits/atomic_wide_counter.h
+ /usr/include/bits/byteswap.h
+ /usr/include/bits/cpu-set.h
+ /usr/include/bits/endian.h
+ /usr/include/bits/endianness.h
+ /usr/include/bits/errno.h
+ /usr/include/bits/floatn-common.h
+ /usr/include/bits/floatn.h
+ /usr/include/bits/libc-header-start.h
+ /usr/include/bits/locale.h
+ /usr/include/bits/long-double.h
+ /usr/include/bits/pthread_stack_min-dynamic.h
+ /usr/include/bits/pthreadtypes-arch.h
+ /usr/include/bits/pthreadtypes.h
+ /usr/include/bits/sched.h
+ /usr/include/bits/select.h
+ /usr/include/bits/setjmp.h
+ /usr/include/bits/stdint-intn.h
+ /usr/include/bits/stdint-uintn.h
+ /usr/include/bits/stdio.h
+ /usr/include/bits/stdio_lim.h
+ /usr/include/bits/stdlib-bsearch.h
+ /usr/include/bits/stdlib-float.h
+ /usr/include/bits/struct_mutex.h
+ /usr/include/bits/struct_rwlock.h
+ /usr/include/bits/thread-shared-types.h
+ /usr/include/bits/time.h
+ /usr/include/bits/time64.h
/usr/include/bits/timesize.h
- /usr/include/sys/cdefs.h
- /usr/include/bits/long-double.h
- /usr/include/gnu/stubs.h
- /usr/include/gnu/stubs-64.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h
- /usr/include/c++/12/bits/stringfwd.h
- /usr/include/c++/12/bits/memoryfwd.h
- /usr/include/c++/12/bits/char_traits.h
- /usr/include/c++/12/bits/postypes.h
- /usr/include/c++/12/cwchar
- /usr/include/wchar.h
- /usr/include/bits/libc-header-start.h
- /usr/include/bits/floatn.h
- /usr/include/bits/floatn-common.h
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stddef.h
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdarg.h
- /usr/include/bits/wchar.h
- /usr/include/bits/types/wint_t.h
- /usr/include/bits/types/mbstate_t.h
- /usr/include/bits/types/__mbstate_t.h
+ /usr/include/bits/timex.h
+ /usr/include/bits/types.h
+ /usr/include/bits/types/FILE.h
/usr/include/bits/types/__FILE.h
- /usr/include/bits/types/FILE.h
- /usr/include/bits/types/locale_t.h
+ /usr/include/bits/types/__fpos64_t.h
+ /usr/include/bits/types/__fpos_t.h
/usr/include/bits/types/__locale_t.h
- /usr/include/c++/12/type_traits
- /usr/include/c++/12/cstdint
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdint.h
- /usr/include/stdint.h
- /usr/include/bits/types.h
- /usr/include/bits/typesizes.h
- /usr/include/bits/time64.h
- /usr/include/bits/stdint-intn.h
- /usr/include/bits/stdint-uintn.h
- /usr/include/c++/12/bits/allocator.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++allocator.h
- /usr/include/c++/12/bits/new_allocator.h
- /usr/include/c++/12/new
- /usr/include/c++/12/bits/exception.h
- /usr/include/c++/12/bits/functexcept.h
- /usr/include/c++/12/bits/exception_defines.h
- /usr/include/c++/12/bits/move.h
- /usr/include/c++/12/bits/cpp_type_traits.h
- /usr/include/c++/12/bits/localefwd.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++locale.h
- /usr/include/c++/12/clocale
- /usr/include/locale.h
- /usr/include/bits/locale.h
- /usr/include/c++/12/iosfwd
- /usr/include/c++/12/cctype
- /usr/include/ctype.h
- /usr/include/bits/endian.h
- /usr/include/bits/endianness.h
- /usr/include/c++/12/bits/ostream_insert.h
- /usr/include/c++/12/bits/cxxabi_forced.h
- /usr/include/c++/12/bits/stl_iterator_base_types.h
- /usr/include/c++/12/bits/stl_iterator_base_funcs.h
- /usr/include/c++/12/bits/concept_check.h
- /usr/include/c++/12/debug/assertions.h
- /usr/include/c++/12/bits/stl_iterator.h
- /usr/include/c++/12/ext/type_traits.h
- /usr/include/c++/12/bits/ptr_traits.h
- /usr/include/c++/12/bits/stl_function.h
- /usr/include/c++/12/backward/binders.h
- /usr/include/c++/12/ext/numeric_traits.h
- /usr/include/c++/12/bits/stl_algobase.h
- /usr/include/c++/12/bits/stl_pair.h
- /usr/include/c++/12/bits/utility.h
- /usr/include/c++/12/debug/debug.h
- /usr/include/c++/12/bits/predefined_ops.h
- /usr/include/c++/12/bits/refwrap.h
- /usr/include/c++/12/bits/invoke.h
- /usr/include/c++/12/bits/range_access.h
- /usr/include/c++/12/initializer_list
- /usr/include/c++/12/bits/basic_string.h
- /usr/include/c++/12/ext/alloc_traits.h
- /usr/include/c++/12/bits/alloc_traits.h
- /usr/include/c++/12/bits/stl_construct.h
- /usr/include/c++/12/ext/string_conversions.h
- /usr/include/c++/12/cstdlib
- /usr/include/stdlib.h
- /usr/include/bits/waitflags.h
- /usr/include/bits/waitstatus.h
- /usr/include/sys/types.h
+ /usr/include/bits/types/__mbstate_t.h
+ /usr/include/bits/types/__sigset_t.h
/usr/include/bits/types/clock_t.h
/usr/include/bits/types/clockid_t.h
+ /usr/include/bits/types/cookie_io_functions_t.h
+ /usr/include/bits/types/error_t.h
+ /usr/include/bits/types/locale_t.h
+ /usr/include/bits/types/mbstate_t.h
+ /usr/include/bits/types/sigset_t.h
+ /usr/include/bits/types/struct_FILE.h
+ /usr/include/bits/types/struct___jmp_buf_tag.h
+ /usr/include/bits/types/struct_itimerspec.h
+ /usr/include/bits/types/struct_sched_param.h
+ /usr/include/bits/types/struct_timespec.h
+ /usr/include/bits/types/struct_timeval.h
+ /usr/include/bits/types/struct_tm.h
/usr/include/bits/types/time_t.h
/usr/include/bits/types/timer_t.h
+ /usr/include/bits/types/wint_t.h
+ /usr/include/bits/typesizes.h
+ /usr/include/bits/uintn-identity.h
+ /usr/include/bits/waitflags.h
+ /usr/include/bits/waitstatus.h
+ /usr/include/bits/wchar.h
+ /usr/include/bits/wordsize.h
+ /usr/include/c++/13/algorithm
+ /usr/include/c++/13/backward/auto_ptr.h
+ /usr/include/c++/13/backward/binders.h
+ /usr/include/c++/13/bit
+ /usr/include/c++/13/bits/algorithmfwd.h
+ /usr/include/c++/13/bits/align.h
+ /usr/include/c++/13/bits/alloc_traits.h
+ /usr/include/c++/13/bits/allocated_ptr.h
+ /usr/include/c++/13/bits/allocator.h
+ /usr/include/c++/13/bits/atomic_base.h
+ /usr/include/c++/13/bits/atomic_lockfree_defines.h
+ /usr/include/c++/13/bits/basic_string.h
+ /usr/include/c++/13/bits/basic_string.tcc
+ /usr/include/c++/13/bits/char_traits.h
+ /usr/include/c++/13/bits/charconv.h
+ /usr/include/c++/13/bits/concept_check.h
+ /usr/include/c++/13/bits/cpp_type_traits.h
+ /usr/include/c++/13/bits/cxxabi_forced.h
+ /usr/include/c++/13/bits/cxxabi_init_exception.h
+ /usr/include/c++/13/bits/exception.h
+ /usr/include/c++/13/bits/exception_defines.h
+ /usr/include/c++/13/bits/exception_ptr.h
+ /usr/include/c++/13/bits/functexcept.h
+ /usr/include/c++/13/bits/functional_hash.h
+ /usr/include/c++/13/bits/hash_bytes.h
+ /usr/include/c++/13/bits/invoke.h
+ /usr/include/c++/13/bits/ios_base.h
+ /usr/include/c++/13/bits/locale_classes.h
+ /usr/include/c++/13/bits/locale_classes.tcc
+ /usr/include/c++/13/bits/localefwd.h
+ /usr/include/c++/13/bits/memoryfwd.h
+ /usr/include/c++/13/bits/move.h
+ /usr/include/c++/13/bits/nested_exception.h
+ /usr/include/c++/13/bits/new_allocator.h
+ /usr/include/c++/13/bits/ostream_insert.h
+ /usr/include/c++/13/bits/postypes.h
+ /usr/include/c++/13/bits/predefined_ops.h
+ /usr/include/c++/13/bits/ptr_traits.h
+ /usr/include/c++/13/bits/range_access.h
+ /usr/include/c++/13/bits/refwrap.h
+ /usr/include/c++/13/bits/requires_hosted.h
+ /usr/include/c++/13/bits/shared_ptr.h
+ /usr/include/c++/13/bits/shared_ptr_atomic.h
+ /usr/include/c++/13/bits/shared_ptr_base.h
+ /usr/include/c++/13/bits/std_abs.h
+ /usr/include/c++/13/bits/stl_algo.h
+ /usr/include/c++/13/bits/stl_algobase.h
+ /usr/include/c++/13/bits/stl_construct.h
+ /usr/include/c++/13/bits/stl_function.h
+ /usr/include/c++/13/bits/stl_heap.h
+ /usr/include/c++/13/bits/stl_iterator.h
+ /usr/include/c++/13/bits/stl_iterator_base_funcs.h
+ /usr/include/c++/13/bits/stl_iterator_base_types.h
+ /usr/include/c++/13/bits/stl_pair.h
+ /usr/include/c++/13/bits/stl_raw_storage_iter.h
+ /usr/include/c++/13/bits/stl_relops.h
+ /usr/include/c++/13/bits/stl_tempbuf.h
+ /usr/include/c++/13/bits/stl_uninitialized.h
+ /usr/include/c++/13/bits/stream_iterator.h
+ /usr/include/c++/13/bits/streambuf.tcc
+ /usr/include/c++/13/bits/streambuf_iterator.h
+ /usr/include/c++/13/bits/stringfwd.h
+ /usr/include/c++/13/bits/uniform_int_dist.h
+ /usr/include/c++/13/bits/unique_ptr.h
+ /usr/include/c++/13/bits/uses_allocator.h
+ /usr/include/c++/13/bits/utility.h
+ /usr/include/c++/13/cassert
+ /usr/include/c++/13/cctype
+ /usr/include/c++/13/cerrno
+ /usr/include/c++/13/clocale
+ /usr/include/c++/13/cstdio
+ /usr/include/c++/13/cstdlib
+ /usr/include/c++/13/cwchar
+ /usr/include/c++/13/debug/assertions.h
+ /usr/include/c++/13/debug/debug.h
+ /usr/include/c++/13/exception
+ /usr/include/c++/13/ext/aligned_buffer.h
+ /usr/include/c++/13/ext/alloc_traits.h
+ /usr/include/c++/13/ext/atomicity.h
+ /usr/include/c++/13/ext/concurrence.h
+ /usr/include/c++/13/ext/numeric_traits.h
+ /usr/include/c++/13/ext/string_conversions.h
+ /usr/include/c++/13/ext/type_traits.h
+ /usr/include/c++/13/initializer_list
+ /usr/include/c++/13/iosfwd
+ /usr/include/c++/13/iterator
+ /usr/include/c++/13/limits
+ /usr/include/c++/13/memory
+ /usr/include/c++/13/new
+ /usr/include/c++/13/stdexcept
+ /usr/include/c++/13/streambuf
+ /usr/include/c++/13/string
+ /usr/include/c++/13/system_error
+ /usr/include/c++/13/tuple
+ /usr/include/c++/13/type_traits
+ /usr/include/c++/13/typeinfo
+ /usr/include/c++/13/utility
+ /usr/include/c++/13/x86_64-redhat-linux/bits/atomic_word.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++allocator.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++config.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++locale.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/cpu_defines.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/error_constants.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr-default.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/os_defines.h
+ /usr/include/ctype.h
/usr/include/endian.h
- /usr/include/bits/byteswap.h
- /usr/include/bits/uintn-identity.h
- /usr/include/sys/select.h
- /usr/include/bits/select.h
- /usr/include/bits/types/sigset_t.h
- /usr/include/bits/types/__sigset_t.h
- /usr/include/bits/types/struct_timeval.h
- /usr/include/bits/types/struct_timespec.h
- /usr/include/bits/pthreadtypes.h
- /usr/include/bits/thread-shared-types.h
- /usr/include/bits/pthreadtypes-arch.h
- /usr/include/bits/atomic_wide_counter.h
- /usr/include/bits/struct_mutex.h
- /usr/include/bits/struct_rwlock.h
- /usr/include/alloca.h
- /usr/include/bits/stdlib-bsearch.h
- /usr/include/bits/stdlib-float.h
- /usr/include/c++/12/bits/std_abs.h
- /usr/include/c++/12/cstdio
- /usr/include/stdio.h
- /usr/include/bits/types/__fpos_t.h
- /usr/include/bits/types/__fpos64_t.h
- /usr/include/bits/types/struct_FILE.h
- /usr/include/bits/types/cookie_io_functions_t.h
- /usr/include/bits/stdio_lim.h
- /usr/include/bits/stdio.h
- /usr/include/c++/12/cerrno
/usr/include/errno.h
- /usr/include/bits/errno.h
+ /usr/include/features-time64.h
+ /usr/include/features.h
+ /usr/include/gnu/stubs-64.h
+ /usr/include/gnu/stubs.h
/usr/include/linux/errno.h
- /usr/include/asm/errno.h
- /usr/include/asm-generic/errno.h
- /usr/include/asm-generic/errno-base.h
- /usr/include/bits/types/error_t.h
- /usr/include/c++/12/bits/charconv.h
- /usr/include/c++/12/bits/functional_hash.h
- /usr/include/c++/12/bits/hash_bytes.h
- /usr/include/c++/12/bits/basic_string.tcc
- /usr/include/c++/12/utility
- /usr/include/c++/12/bits/stl_relops.h
- /usr/include/c++/12/iterator
- /usr/include/c++/12/bits/stream_iterator.h
- /usr/include/c++/12/bits/streambuf_iterator.h
- /usr/include/c++/12/streambuf
- /usr/include/c++/12/bits/ios_base.h
- /usr/include/c++/12/ext/atomicity.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr-default.h
+ /usr/include/locale.h
/usr/include/pthread.h
/usr/include/sched.h
- /usr/include/bits/sched.h
- /usr/include/bits/types/struct_sched_param.h
- /usr/include/bits/cpu-set.h
+ /usr/include/stdc-predef.h
+ /usr/include/stdint.h
+ /usr/include/stdio.h
+ /usr/include/stdlib.h
+ /usr/include/sys/cdefs.h
+ /usr/include/sys/select.h
+ /usr/include/sys/single_threaded.h
+ /usr/include/sys/types.h
/usr/include/time.h
- /usr/include/bits/time.h
- /usr/include/bits/timex.h
- /usr/include/bits/types/struct_tm.h
- /usr/include/bits/types/struct_itimerspec.h
- /usr/include/bits/setjmp.h
- /usr/include/bits/types/struct___jmp_buf_tag.h
- /usr/include/bits/pthread_stack_min-dynamic.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/atomic_word.h
- /usr/include/sys/single_threaded.h
- /usr/include/c++/12/bits/locale_classes.h
- /usr/include/c++/12/bits/locale_classes.tcc
- /usr/include/c++/12/system_error
- /usr/include/c++/12/x86_64-redhat-linux/bits/error_constants.h
- /usr/include/c++/12/stdexcept
- /usr/include/c++/12/exception
- /usr/include/c++/12/bits/exception_ptr.h
- /usr/include/c++/12/bits/cxxabi_init_exception.h
- /usr/include/c++/12/typeinfo
- /usr/include/c++/12/bits/nested_exception.h
- /usr/include/c++/12/bits/streambuf.tcc
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/optional.hpp
- /usr/include/c++/12/memory
- /usr/include/c++/12/bits/stl_uninitialized.h
- /usr/include/c++/12/bits/stl_tempbuf.h
- /usr/include/c++/12/bits/stl_raw_storage_iter.h
- /usr/include/c++/12/bits/align.h
- /usr/include/c++/12/bit
- /usr/include/c++/12/bits/uses_allocator.h
- /usr/include/c++/12/bits/unique_ptr.h
- /usr/include/c++/12/tuple
- /usr/include/c++/12/bits/shared_ptr.h
- /usr/include/c++/12/bits/shared_ptr_base.h
- /usr/include/c++/12/bits/allocated_ptr.h
- /usr/include/c++/12/ext/aligned_buffer.h
- /usr/include/c++/12/ext/concurrence.h
- /usr/include/c++/12/bits/shared_ptr_atomic.h
- /usr/include/c++/12/bits/atomic_base.h
- /usr/include/c++/12/bits/atomic_lockfree_defines.h
- /usr/include/c++/12/backward/auto_ptr.h
- /usr/include/c++/12/algorithm
- /usr/include/c++/12/bits/stl_algo.h
- /usr/include/c++/12/bits/algorithmfwd.h
- /usr/include/c++/12/bits/stl_heap.h
- /usr/include/c++/12/bits/uniform_int_dist.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/string_view.hpp
- /usr/include/c++/12/cassert
- /usr/include/assert.h
- /usr/include/c++/12/limits
+ /usr/include/wchar.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdarg.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdint.h
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/optional.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/string_view.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_advance_parts.hpp
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_normalize.cpp
- /usr/include/stdc-predef.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_normalize.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/uri.hpp
- /usr/include/c++/12/iterator
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++config.h
- /usr/include/bits/wordsize.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/os_defines.h
- /usr/include/features.h
- /usr/include/features-time64.h
- /usr/include/bits/timesize.h
- /usr/include/sys/cdefs.h
- /usr/include/bits/long-double.h
- /usr/include/gnu/stubs.h
- /usr/include/gnu/stubs-64.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h
- /usr/include/c++/12/bits/stl_iterator_base_types.h
- /usr/include/c++/12/type_traits
- /usr/include/c++/12/bits/stl_iterator_base_funcs.h
- /usr/include/c++/12/bits/concept_check.h
- /usr/include/c++/12/debug/assertions.h
- /usr/include/c++/12/bits/stl_iterator.h
- /usr/include/c++/12/bits/cpp_type_traits.h
- /usr/include/c++/12/ext/type_traits.h
- /usr/include/c++/12/bits/move.h
- /usr/include/c++/12/bits/ptr_traits.h
- /usr/include/c++/12/iosfwd
- /usr/include/c++/12/bits/stringfwd.h
- /usr/include/c++/12/bits/memoryfwd.h
- /usr/include/c++/12/bits/postypes.h
- /usr/include/c++/12/cwchar
- /usr/include/wchar.h
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_normalize.cpp
+ /usr/include/alloca.h
+ /usr/include/asm-generic/errno-base.h
+ /usr/include/asm-generic/errno.h
+ /usr/include/asm/errno.h
+ /usr/include/assert.h
+ /usr/include/bits/atomic_wide_counter.h
+ /usr/include/bits/byteswap.h
+ /usr/include/bits/cpu-set.h
+ /usr/include/bits/endian.h
+ /usr/include/bits/endianness.h
+ /usr/include/bits/errno.h
+ /usr/include/bits/floatn-common.h
+ /usr/include/bits/floatn.h
/usr/include/bits/libc-header-start.h
- /usr/include/bits/floatn.h
- /usr/include/bits/floatn-common.h
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stddef.h
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdarg.h
- /usr/include/bits/wchar.h
- /usr/include/bits/types/wint_t.h
- /usr/include/bits/types/mbstate_t.h
- /usr/include/bits/types/__mbstate_t.h
- /usr/include/bits/types/__FILE.h
- /usr/include/bits/types/FILE.h
- /usr/include/bits/types/locale_t.h
- /usr/include/bits/types/__locale_t.h
- /usr/include/c++/12/bits/stream_iterator.h
- /usr/include/c++/12/debug/debug.h
- /usr/include/c++/12/bits/streambuf_iterator.h
- /usr/include/c++/12/streambuf
- /usr/include/c++/12/bits/localefwd.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++locale.h
- /usr/include/c++/12/clocale
- /usr/include/locale.h
/usr/include/bits/locale.h
- /usr/include/c++/12/cctype
- /usr/include/ctype.h
- /usr/include/bits/types.h
- /usr/include/bits/typesizes.h
- /usr/include/bits/time64.h
- /usr/include/bits/endian.h
- /usr/include/bits/endianness.h
- /usr/include/c++/12/bits/ios_base.h
- /usr/include/c++/12/ext/atomicity.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr-default.h
- /usr/include/pthread.h
- /usr/include/sched.h
- /usr/include/bits/types/time_t.h
- /usr/include/bits/types/struct_timespec.h
+ /usr/include/bits/long-double.h
+ /usr/include/bits/pthread_stack_min-dynamic.h
+ /usr/include/bits/pthreadtypes-arch.h
+ /usr/include/bits/pthreadtypes.h
/usr/include/bits/sched.h
- /usr/include/bits/types/struct_sched_param.h
- /usr/include/bits/cpu-set.h
- /usr/include/time.h
+ /usr/include/bits/select.h
+ /usr/include/bits/setjmp.h
+ /usr/include/bits/stdint-intn.h
+ /usr/include/bits/stdint-uintn.h
+ /usr/include/bits/stdio.h
+ /usr/include/bits/stdio_lim.h
+ /usr/include/bits/stdlib-bsearch.h
+ /usr/include/bits/stdlib-float.h
+ /usr/include/bits/struct_mutex.h
+ /usr/include/bits/struct_rwlock.h
+ /usr/include/bits/thread-shared-types.h
/usr/include/bits/time.h
+ /usr/include/bits/time64.h
+ /usr/include/bits/timesize.h
/usr/include/bits/timex.h
+ /usr/include/bits/types.h
+ /usr/include/bits/types/FILE.h
+ /usr/include/bits/types/__FILE.h
+ /usr/include/bits/types/__fpos64_t.h
+ /usr/include/bits/types/__fpos_t.h
+ /usr/include/bits/types/__locale_t.h
+ /usr/include/bits/types/__mbstate_t.h
+ /usr/include/bits/types/__sigset_t.h
+ /usr/include/bits/types/clock_t.h
+ /usr/include/bits/types/clockid_t.h
+ /usr/include/bits/types/cookie_io_functions_t.h
+ /usr/include/bits/types/error_t.h
+ /usr/include/bits/types/locale_t.h
+ /usr/include/bits/types/mbstate_t.h
+ /usr/include/bits/types/sigset_t.h
+ /usr/include/bits/types/struct_FILE.h
+ /usr/include/bits/types/struct___jmp_buf_tag.h
+ /usr/include/bits/types/struct_itimerspec.h
+ /usr/include/bits/types/struct_sched_param.h
+ /usr/include/bits/types/struct_timespec.h
/usr/include/bits/types/struct_timeval.h
- /usr/include/bits/types/clock_t.h
/usr/include/bits/types/struct_tm.h
- /usr/include/bits/types/clockid_t.h
+ /usr/include/bits/types/time_t.h
/usr/include/bits/types/timer_t.h
- /usr/include/bits/types/struct_itimerspec.h
- /usr/include/bits/pthreadtypes.h
- /usr/include/bits/thread-shared-types.h
- /usr/include/bits/pthreadtypes-arch.h
- /usr/include/bits/atomic_wide_counter.h
- /usr/include/bits/struct_mutex.h
- /usr/include/bits/struct_rwlock.h
- /usr/include/bits/setjmp.h
- /usr/include/bits/types/__sigset_t.h
- /usr/include/bits/types/struct___jmp_buf_tag.h
- /usr/include/bits/pthread_stack_min-dynamic.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/atomic_word.h
- /usr/include/sys/single_threaded.h
- /usr/include/c++/12/bits/locale_classes.h
- /usr/include/c++/12/string
- /usr/include/c++/12/bits/char_traits.h
- /usr/include/c++/12/cstdint
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdint.h
- /usr/include/stdint.h
- /usr/include/bits/stdint-intn.h
- /usr/include/bits/stdint-uintn.h
- /usr/include/c++/12/bits/allocator.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++allocator.h
- /usr/include/c++/12/bits/new_allocator.h
- /usr/include/c++/12/new
- /usr/include/c++/12/bits/exception.h
- /usr/include/c++/12/bits/functexcept.h
- /usr/include/c++/12/bits/exception_defines.h
- /usr/include/c++/12/bits/ostream_insert.h
- /usr/include/c++/12/bits/cxxabi_forced.h
- /usr/include/c++/12/bits/stl_function.h
- /usr/include/c++/12/backward/binders.h
- /usr/include/c++/12/ext/numeric_traits.h
- /usr/include/c++/12/bits/stl_algobase.h
- /usr/include/c++/12/bits/stl_pair.h
- /usr/include/c++/12/bits/utility.h
- /usr/include/c++/12/bits/predefined_ops.h
- /usr/include/c++/12/bits/refwrap.h
- /usr/include/c++/12/bits/invoke.h
- /usr/include/c++/12/bits/range_access.h
- /usr/include/c++/12/initializer_list
- /usr/include/c++/12/bits/basic_string.h
- /usr/include/c++/12/ext/alloc_traits.h
- /usr/include/c++/12/bits/alloc_traits.h
- /usr/include/c++/12/bits/stl_construct.h
- /usr/include/c++/12/ext/string_conversions.h
- /usr/include/c++/12/cstdlib
- /usr/include/stdlib.h
+ /usr/include/bits/types/wint_t.h
+ /usr/include/bits/typesizes.h
+ /usr/include/bits/uintn-identity.h
/usr/include/bits/waitflags.h
/usr/include/bits/waitstatus.h
- /usr/include/sys/types.h
+ /usr/include/bits/wchar.h
+ /usr/include/bits/wctype-wchar.h
+ /usr/include/bits/wordsize.h
+ /usr/include/c++/13/algorithm
+ /usr/include/c++/13/backward/auto_ptr.h
+ /usr/include/c++/13/backward/binders.h
+ /usr/include/c++/13/bit
+ /usr/include/c++/13/bits/algorithmfwd.h
+ /usr/include/c++/13/bits/align.h
+ /usr/include/c++/13/bits/alloc_traits.h
+ /usr/include/c++/13/bits/allocated_ptr.h
+ /usr/include/c++/13/bits/allocator.h
+ /usr/include/c++/13/bits/atomic_base.h
+ /usr/include/c++/13/bits/atomic_lockfree_defines.h
+ /usr/include/c++/13/bits/basic_string.h
+ /usr/include/c++/13/bits/basic_string.tcc
+ /usr/include/c++/13/bits/char_traits.h
+ /usr/include/c++/13/bits/charconv.h
+ /usr/include/c++/13/bits/codecvt.h
+ /usr/include/c++/13/bits/concept_check.h
+ /usr/include/c++/13/bits/cpp_type_traits.h
+ /usr/include/c++/13/bits/cxxabi_forced.h
+ /usr/include/c++/13/bits/cxxabi_init_exception.h
+ /usr/include/c++/13/bits/exception.h
+ /usr/include/c++/13/bits/exception_defines.h
+ /usr/include/c++/13/bits/exception_ptr.h
+ /usr/include/c++/13/bits/functexcept.h
+ /usr/include/c++/13/bits/functional_hash.h
+ /usr/include/c++/13/bits/hash_bytes.h
+ /usr/include/c++/13/bits/invoke.h
+ /usr/include/c++/13/bits/ios_base.h
+ /usr/include/c++/13/bits/locale_classes.h
+ /usr/include/c++/13/bits/locale_classes.tcc
+ /usr/include/c++/13/bits/locale_conv.h
+ /usr/include/c++/13/bits/locale_facets.h
+ /usr/include/c++/13/bits/locale_facets.tcc
+ /usr/include/c++/13/bits/locale_facets_nonio.h
+ /usr/include/c++/13/bits/locale_facets_nonio.tcc
+ /usr/include/c++/13/bits/localefwd.h
+ /usr/include/c++/13/bits/memoryfwd.h
+ /usr/include/c++/13/bits/move.h
+ /usr/include/c++/13/bits/nested_exception.h
+ /usr/include/c++/13/bits/new_allocator.h
+ /usr/include/c++/13/bits/ostream_insert.h
+ /usr/include/c++/13/bits/postypes.h
+ /usr/include/c++/13/bits/predefined_ops.h
+ /usr/include/c++/13/bits/ptr_traits.h
+ /usr/include/c++/13/bits/range_access.h
+ /usr/include/c++/13/bits/refwrap.h
+ /usr/include/c++/13/bits/requires_hosted.h
+ /usr/include/c++/13/bits/shared_ptr.h
+ /usr/include/c++/13/bits/shared_ptr_atomic.h
+ /usr/include/c++/13/bits/shared_ptr_base.h
+ /usr/include/c++/13/bits/std_abs.h
+ /usr/include/c++/13/bits/std_function.h
+ /usr/include/c++/13/bits/stl_algo.h
+ /usr/include/c++/13/bits/stl_algobase.h
+ /usr/include/c++/13/bits/stl_bvector.h
+ /usr/include/c++/13/bits/stl_construct.h
+ /usr/include/c++/13/bits/stl_function.h
+ /usr/include/c++/13/bits/stl_heap.h
+ /usr/include/c++/13/bits/stl_iterator.h
+ /usr/include/c++/13/bits/stl_iterator_base_funcs.h
+ /usr/include/c++/13/bits/stl_iterator_base_types.h
+ /usr/include/c++/13/bits/stl_pair.h
+ /usr/include/c++/13/bits/stl_raw_storage_iter.h
+ /usr/include/c++/13/bits/stl_relops.h
+ /usr/include/c++/13/bits/stl_tempbuf.h
+ /usr/include/c++/13/bits/stl_uninitialized.h
+ /usr/include/c++/13/bits/stl_vector.h
+ /usr/include/c++/13/bits/stream_iterator.h
+ /usr/include/c++/13/bits/streambuf.tcc
+ /usr/include/c++/13/bits/streambuf_iterator.h
+ /usr/include/c++/13/bits/stringfwd.h
+ /usr/include/c++/13/bits/uniform_int_dist.h
+ /usr/include/c++/13/bits/unique_ptr.h
+ /usr/include/c++/13/bits/uses_allocator.h
+ /usr/include/c++/13/bits/utility.h
+ /usr/include/c++/13/bits/vector.tcc
+ /usr/include/c++/13/cassert
+ /usr/include/c++/13/cctype
+ /usr/include/c++/13/cerrno
+ /usr/include/c++/13/clocale
+ /usr/include/c++/13/cstdint
+ /usr/include/c++/13/cstdio
+ /usr/include/c++/13/cstdlib
+ /usr/include/c++/13/cstring
+ /usr/include/c++/13/ctime
+ /usr/include/c++/13/cwchar
+ /usr/include/c++/13/cwctype
+ /usr/include/c++/13/debug/assertions.h
+ /usr/include/c++/13/debug/debug.h
+ /usr/include/c++/13/exception
+ /usr/include/c++/13/ext/aligned_buffer.h
+ /usr/include/c++/13/ext/alloc_traits.h
+ /usr/include/c++/13/ext/atomicity.h
+ /usr/include/c++/13/ext/concurrence.h
+ /usr/include/c++/13/ext/numeric_traits.h
+ /usr/include/c++/13/ext/string_conversions.h
+ /usr/include/c++/13/ext/type_traits.h
+ /usr/include/c++/13/functional
+ /usr/include/c++/13/initializer_list
+ /usr/include/c++/13/iosfwd
+ /usr/include/c++/13/iterator
+ /usr/include/c++/13/locale
+ /usr/include/c++/13/memory
+ /usr/include/c++/13/new
+ /usr/include/c++/13/stdexcept
+ /usr/include/c++/13/streambuf
+ /usr/include/c++/13/string
+ /usr/include/c++/13/system_error
+ /usr/include/c++/13/tuple
+ /usr/include/c++/13/type_traits
+ /usr/include/c++/13/typeinfo
+ /usr/include/c++/13/utility
+ /usr/include/c++/13/vector
+ /usr/include/c++/13/x86_64-redhat-linux/bits/atomic_word.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++allocator.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++config.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++locale.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/cpu_defines.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_base.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_inline.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/error_constants.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr-default.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/messages_members.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/os_defines.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/time_members.h
+ /usr/include/ctype.h
/usr/include/endian.h
- /usr/include/bits/byteswap.h
- /usr/include/bits/uintn-identity.h
- /usr/include/sys/select.h
- /usr/include/bits/select.h
- /usr/include/bits/types/sigset_t.h
- /usr/include/alloca.h
- /usr/include/bits/stdlib-bsearch.h
- /usr/include/bits/stdlib-float.h
- /usr/include/c++/12/bits/std_abs.h
- /usr/include/c++/12/cstdio
- /usr/include/stdio.h
- /usr/include/bits/types/__fpos_t.h
- /usr/include/bits/types/__fpos64_t.h
- /usr/include/bits/types/struct_FILE.h
- /usr/include/bits/types/cookie_io_functions_t.h
- /usr/include/bits/stdio_lim.h
- /usr/include/bits/stdio.h
- /usr/include/c++/12/cerrno
/usr/include/errno.h
- /usr/include/bits/errno.h
+ /usr/include/features-time64.h
+ /usr/include/features.h
+ /usr/include/gnu/stubs-64.h
+ /usr/include/gnu/stubs.h
+ /usr/include/libintl.h
/usr/include/linux/errno.h
- /usr/include/asm/errno.h
- /usr/include/asm-generic/errno.h
- /usr/include/asm-generic/errno-base.h
- /usr/include/bits/types/error_t.h
- /usr/include/c++/12/bits/charconv.h
- /usr/include/c++/12/bits/functional_hash.h
- /usr/include/c++/12/bits/hash_bytes.h
- /usr/include/c++/12/bits/basic_string.tcc
- /usr/include/c++/12/bits/locale_classes.tcc
- /usr/include/c++/12/system_error
- /usr/include/c++/12/x86_64-redhat-linux/bits/error_constants.h
- /usr/include/c++/12/stdexcept
- /usr/include/c++/12/exception
- /usr/include/c++/12/bits/exception_ptr.h
- /usr/include/c++/12/bits/cxxabi_init_exception.h
- /usr/include/c++/12/typeinfo
- /usr/include/c++/12/bits/nested_exception.h
- /usr/include/c++/12/bits/streambuf.tcc
- /usr/include/c++/12/algorithm
- /usr/include/c++/12/bits/stl_algo.h
- /usr/include/c++/12/bits/algorithmfwd.h
- /usr/include/c++/12/bits/stl_heap.h
- /usr/include/c++/12/bits/stl_tempbuf.h
- /usr/include/c++/12/bits/uniform_int_dist.h
- /usr/include/c++/12/functional
- /usr/include/c++/12/tuple
- /usr/include/c++/12/bits/uses_allocator.h
- /usr/include/c++/12/bits/std_function.h
- /usr/include/c++/12/memory
- /usr/include/c++/12/bits/stl_uninitialized.h
- /usr/include/c++/12/bits/stl_raw_storage_iter.h
- /usr/include/c++/12/bits/align.h
- /usr/include/c++/12/bit
- /usr/include/c++/12/bits/unique_ptr.h
- /usr/include/c++/12/bits/shared_ptr.h
- /usr/include/c++/12/bits/shared_ptr_base.h
- /usr/include/c++/12/bits/allocated_ptr.h
- /usr/include/c++/12/ext/aligned_buffer.h
- /usr/include/c++/12/ext/concurrence.h
- /usr/include/c++/12/bits/shared_ptr_atomic.h
- /usr/include/c++/12/bits/atomic_base.h
- /usr/include/c++/12/bits/atomic_lockfree_defines.h
- /usr/include/c++/12/backward/auto_ptr.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/string_view.hpp
- /usr/include/c++/12/cassert
- /usr/include/assert.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/optional.hpp
- /usr/include/c++/12/utility
- /usr/include/c++/12/bits/stl_relops.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/config.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/uri_errors.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/encode.hpp
- /usr/include/c++/12/cstring
+ /usr/include/locale.h
+ /usr/include/pthread.h
+ /usr/include/sched.h
+ /usr/include/stdc-predef.h
+ /usr/include/stdint.h
+ /usr/include/stdio.h
+ /usr/include/stdlib.h
/usr/include/string.h
/usr/include/strings.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/decode.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/translate.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/uri_builder.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_percent_encode.hpp
- /usr/include/c++/12/vector
- /usr/include/c++/12/bits/stl_vector.h
- /usr/include/c++/12/bits/stl_bvector.h
- /usr/include/c++/12/bits/vector.tcc
- /usr/include/c++/12/locale
- /usr/include/c++/12/bits/locale_facets.h
- /usr/include/c++/12/cwctype
+ /usr/include/sys/cdefs.h
+ /usr/include/sys/select.h
+ /usr/include/sys/single_threaded.h
+ /usr/include/sys/types.h
+ /usr/include/time.h
+ /usr/include/wchar.h
/usr/include/wctype.h
- /usr/include/bits/wctype-wchar.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_base.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_inline.h
- /usr/include/c++/12/bits/locale_facets.tcc
- /usr/include/c++/12/bits/locale_facets_nonio.h
- /usr/include/c++/12/ctime
- /usr/include/c++/12/x86_64-redhat-linux/bits/time_members.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/messages_members.h
- /usr/include/libintl.h
- /usr/include/c++/12/bits/codecvt.h
- /usr/include/c++/12/bits/locale_facets_nonio.tcc
- /usr/include/c++/12/bits/locale_conv.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/algorithm.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/algorithm_split.hpp
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdarg.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdint.h
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/optional.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/string_view.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/config.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/decode.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/encode.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/translate.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/uri.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/uri_builder.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/uri_errors.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/algorithm.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/algorithm_split.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_normalize.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_percent_encode.hpp
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_parse.cpp
- /usr/include/stdc-predef.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_parse.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/string_view.hpp
- /usr/include/c++/12/string
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++config.h
- /usr/include/bits/wordsize.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/os_defines.h
- /usr/include/features.h
- /usr/include/features-time64.h
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_parse.cpp
+ /usr/include/alloca.h
+ /usr/include/asm-generic/errno-base.h
+ /usr/include/asm-generic/errno.h
+ /usr/include/asm/errno.h
+ /usr/include/assert.h
+ /usr/include/bits/atomic_wide_counter.h
+ /usr/include/bits/byteswap.h
+ /usr/include/bits/cpu-set.h
+ /usr/include/bits/endian.h
+ /usr/include/bits/endianness.h
+ /usr/include/bits/errno.h
+ /usr/include/bits/floatn-common.h
+ /usr/include/bits/floatn.h
+ /usr/include/bits/libc-header-start.h
+ /usr/include/bits/locale.h
+ /usr/include/bits/long-double.h
+ /usr/include/bits/pthread_stack_min-dynamic.h
+ /usr/include/bits/pthreadtypes-arch.h
+ /usr/include/bits/pthreadtypes.h
+ /usr/include/bits/sched.h
+ /usr/include/bits/select.h
+ /usr/include/bits/setjmp.h
+ /usr/include/bits/stdint-intn.h
+ /usr/include/bits/stdint-uintn.h
+ /usr/include/bits/stdio.h
+ /usr/include/bits/stdio_lim.h
+ /usr/include/bits/stdlib-bsearch.h
+ /usr/include/bits/stdlib-float.h
+ /usr/include/bits/struct_mutex.h
+ /usr/include/bits/struct_rwlock.h
+ /usr/include/bits/thread-shared-types.h
+ /usr/include/bits/time.h
+ /usr/include/bits/time64.h
/usr/include/bits/timesize.h
- /usr/include/sys/cdefs.h
- /usr/include/bits/long-double.h
- /usr/include/gnu/stubs.h
- /usr/include/gnu/stubs-64.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h
- /usr/include/c++/12/bits/stringfwd.h
- /usr/include/c++/12/bits/memoryfwd.h
- /usr/include/c++/12/bits/char_traits.h
- /usr/include/c++/12/bits/postypes.h
- /usr/include/c++/12/cwchar
- /usr/include/wchar.h
- /usr/include/bits/libc-header-start.h
- /usr/include/bits/floatn.h
- /usr/include/bits/floatn-common.h
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stddef.h
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdarg.h
- /usr/include/bits/wchar.h
- /usr/include/bits/types/wint_t.h
- /usr/include/bits/types/mbstate_t.h
- /usr/include/bits/types/__mbstate_t.h
+ /usr/include/bits/timex.h
+ /usr/include/bits/types.h
+ /usr/include/bits/types/FILE.h
/usr/include/bits/types/__FILE.h
- /usr/include/bits/types/FILE.h
- /usr/include/bits/types/locale_t.h
+ /usr/include/bits/types/__fpos64_t.h
+ /usr/include/bits/types/__fpos_t.h
/usr/include/bits/types/__locale_t.h
- /usr/include/c++/12/type_traits
- /usr/include/c++/12/cstdint
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdint.h
- /usr/include/stdint.h
- /usr/include/bits/types.h
- /usr/include/bits/typesizes.h
- /usr/include/bits/time64.h
- /usr/include/bits/stdint-intn.h
- /usr/include/bits/stdint-uintn.h
- /usr/include/c++/12/bits/allocator.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++allocator.h
- /usr/include/c++/12/bits/new_allocator.h
- /usr/include/c++/12/new
- /usr/include/c++/12/bits/exception.h
- /usr/include/c++/12/bits/functexcept.h
- /usr/include/c++/12/bits/exception_defines.h
- /usr/include/c++/12/bits/move.h
- /usr/include/c++/12/bits/cpp_type_traits.h
- /usr/include/c++/12/bits/localefwd.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++locale.h
- /usr/include/c++/12/clocale
- /usr/include/locale.h
- /usr/include/bits/locale.h
- /usr/include/c++/12/iosfwd
- /usr/include/c++/12/cctype
- /usr/include/ctype.h
- /usr/include/bits/endian.h
- /usr/include/bits/endianness.h
- /usr/include/c++/12/bits/ostream_insert.h
- /usr/include/c++/12/bits/cxxabi_forced.h
- /usr/include/c++/12/bits/stl_iterator_base_types.h
- /usr/include/c++/12/bits/stl_iterator_base_funcs.h
- /usr/include/c++/12/bits/concept_check.h
- /usr/include/c++/12/debug/assertions.h
- /usr/include/c++/12/bits/stl_iterator.h
- /usr/include/c++/12/ext/type_traits.h
- /usr/include/c++/12/bits/ptr_traits.h
- /usr/include/c++/12/bits/stl_function.h
- /usr/include/c++/12/backward/binders.h
- /usr/include/c++/12/ext/numeric_traits.h
- /usr/include/c++/12/bits/stl_algobase.h
- /usr/include/c++/12/bits/stl_pair.h
- /usr/include/c++/12/bits/utility.h
- /usr/include/c++/12/debug/debug.h
- /usr/include/c++/12/bits/predefined_ops.h
- /usr/include/c++/12/bits/refwrap.h
- /usr/include/c++/12/bits/invoke.h
- /usr/include/c++/12/bits/range_access.h
- /usr/include/c++/12/initializer_list
- /usr/include/c++/12/bits/basic_string.h
- /usr/include/c++/12/ext/alloc_traits.h
- /usr/include/c++/12/bits/alloc_traits.h
- /usr/include/c++/12/bits/stl_construct.h
- /usr/include/c++/12/ext/string_conversions.h
- /usr/include/c++/12/cstdlib
- /usr/include/stdlib.h
- /usr/include/bits/waitflags.h
- /usr/include/bits/waitstatus.h
- /usr/include/sys/types.h
+ /usr/include/bits/types/__mbstate_t.h
+ /usr/include/bits/types/__sigset_t.h
/usr/include/bits/types/clock_t.h
/usr/include/bits/types/clockid_t.h
+ /usr/include/bits/types/cookie_io_functions_t.h
+ /usr/include/bits/types/error_t.h
+ /usr/include/bits/types/locale_t.h
+ /usr/include/bits/types/mbstate_t.h
+ /usr/include/bits/types/sigset_t.h
+ /usr/include/bits/types/struct_FILE.h
+ /usr/include/bits/types/struct___jmp_buf_tag.h
+ /usr/include/bits/types/struct_itimerspec.h
+ /usr/include/bits/types/struct_sched_param.h
+ /usr/include/bits/types/struct_timespec.h
+ /usr/include/bits/types/struct_timeval.h
+ /usr/include/bits/types/struct_tm.h
/usr/include/bits/types/time_t.h
/usr/include/bits/types/timer_t.h
+ /usr/include/bits/types/wint_t.h
+ /usr/include/bits/typesizes.h
+ /usr/include/bits/uintn-identity.h
+ /usr/include/bits/waitflags.h
+ /usr/include/bits/waitstatus.h
+ /usr/include/bits/wchar.h
+ /usr/include/bits/wctype-wchar.h
+ /usr/include/bits/wordsize.h
+ /usr/include/c++/13/algorithm
+ /usr/include/c++/13/backward/auto_ptr.h
+ /usr/include/c++/13/backward/binders.h
+ /usr/include/c++/13/bit
+ /usr/include/c++/13/bits/algorithmfwd.h
+ /usr/include/c++/13/bits/align.h
+ /usr/include/c++/13/bits/alloc_traits.h
+ /usr/include/c++/13/bits/allocated_ptr.h
+ /usr/include/c++/13/bits/allocator.h
+ /usr/include/c++/13/bits/atomic_base.h
+ /usr/include/c++/13/bits/atomic_lockfree_defines.h
+ /usr/include/c++/13/bits/basic_string.h
+ /usr/include/c++/13/bits/basic_string.tcc
+ /usr/include/c++/13/bits/char_traits.h
+ /usr/include/c++/13/bits/charconv.h
+ /usr/include/c++/13/bits/codecvt.h
+ /usr/include/c++/13/bits/concept_check.h
+ /usr/include/c++/13/bits/cpp_type_traits.h
+ /usr/include/c++/13/bits/cxxabi_forced.h
+ /usr/include/c++/13/bits/cxxabi_init_exception.h
+ /usr/include/c++/13/bits/exception.h
+ /usr/include/c++/13/bits/exception_defines.h
+ /usr/include/c++/13/bits/exception_ptr.h
+ /usr/include/c++/13/bits/functexcept.h
+ /usr/include/c++/13/bits/functional_hash.h
+ /usr/include/c++/13/bits/hash_bytes.h
+ /usr/include/c++/13/bits/invoke.h
+ /usr/include/c++/13/bits/ios_base.h
+ /usr/include/c++/13/bits/locale_classes.h
+ /usr/include/c++/13/bits/locale_classes.tcc
+ /usr/include/c++/13/bits/locale_conv.h
+ /usr/include/c++/13/bits/locale_facets.h
+ /usr/include/c++/13/bits/locale_facets.tcc
+ /usr/include/c++/13/bits/locale_facets_nonio.h
+ /usr/include/c++/13/bits/locale_facets_nonio.tcc
+ /usr/include/c++/13/bits/localefwd.h
+ /usr/include/c++/13/bits/memoryfwd.h
+ /usr/include/c++/13/bits/move.h
+ /usr/include/c++/13/bits/nested_exception.h
+ /usr/include/c++/13/bits/new_allocator.h
+ /usr/include/c++/13/bits/ostream_insert.h
+ /usr/include/c++/13/bits/postypes.h
+ /usr/include/c++/13/bits/predefined_ops.h
+ /usr/include/c++/13/bits/ptr_traits.h
+ /usr/include/c++/13/bits/range_access.h
+ /usr/include/c++/13/bits/refwrap.h
+ /usr/include/c++/13/bits/requires_hosted.h
+ /usr/include/c++/13/bits/shared_ptr.h
+ /usr/include/c++/13/bits/shared_ptr_atomic.h
+ /usr/include/c++/13/bits/shared_ptr_base.h
+ /usr/include/c++/13/bits/std_abs.h
+ /usr/include/c++/13/bits/stl_algo.h
+ /usr/include/c++/13/bits/stl_algobase.h
+ /usr/include/c++/13/bits/stl_construct.h
+ /usr/include/c++/13/bits/stl_function.h
+ /usr/include/c++/13/bits/stl_heap.h
+ /usr/include/c++/13/bits/stl_iterator.h
+ /usr/include/c++/13/bits/stl_iterator_base_funcs.h
+ /usr/include/c++/13/bits/stl_iterator_base_types.h
+ /usr/include/c++/13/bits/stl_pair.h
+ /usr/include/c++/13/bits/stl_raw_storage_iter.h
+ /usr/include/c++/13/bits/stl_relops.h
+ /usr/include/c++/13/bits/stl_tempbuf.h
+ /usr/include/c++/13/bits/stl_uninitialized.h
+ /usr/include/c++/13/bits/stream_iterator.h
+ /usr/include/c++/13/bits/streambuf.tcc
+ /usr/include/c++/13/bits/streambuf_iterator.h
+ /usr/include/c++/13/bits/stringfwd.h
+ /usr/include/c++/13/bits/uniform_int_dist.h
+ /usr/include/c++/13/bits/unique_ptr.h
+ /usr/include/c++/13/bits/uses_allocator.h
+ /usr/include/c++/13/bits/utility.h
+ /usr/include/c++/13/cassert
+ /usr/include/c++/13/cctype
+ /usr/include/c++/13/cerrno
+ /usr/include/c++/13/clocale
+ /usr/include/c++/13/cstdio
+ /usr/include/c++/13/cstdlib
+ /usr/include/c++/13/cstring
+ /usr/include/c++/13/ctime
+ /usr/include/c++/13/cwchar
+ /usr/include/c++/13/cwctype
+ /usr/include/c++/13/debug/assertions.h
+ /usr/include/c++/13/debug/debug.h
+ /usr/include/c++/13/exception
+ /usr/include/c++/13/ext/aligned_buffer.h
+ /usr/include/c++/13/ext/alloc_traits.h
+ /usr/include/c++/13/ext/atomicity.h
+ /usr/include/c++/13/ext/concurrence.h
+ /usr/include/c++/13/ext/numeric_traits.h
+ /usr/include/c++/13/ext/string_conversions.h
+ /usr/include/c++/13/ext/type_traits.h
+ /usr/include/c++/13/initializer_list
+ /usr/include/c++/13/iosfwd
+ /usr/include/c++/13/iterator
+ /usr/include/c++/13/limits
+ /usr/include/c++/13/locale
+ /usr/include/c++/13/memory
+ /usr/include/c++/13/new
+ /usr/include/c++/13/stdexcept
+ /usr/include/c++/13/streambuf
+ /usr/include/c++/13/string
+ /usr/include/c++/13/system_error
+ /usr/include/c++/13/tuple
+ /usr/include/c++/13/type_traits
+ /usr/include/c++/13/typeinfo
+ /usr/include/c++/13/utility
+ /usr/include/c++/13/x86_64-redhat-linux/bits/atomic_word.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++allocator.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++config.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++locale.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/cpu_defines.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_base.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_inline.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/error_constants.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr-default.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/messages_members.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/os_defines.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/time_members.h
+ /usr/include/ctype.h
/usr/include/endian.h
- /usr/include/bits/byteswap.h
- /usr/include/bits/uintn-identity.h
- /usr/include/sys/select.h
- /usr/include/bits/select.h
- /usr/include/bits/types/sigset_t.h
- /usr/include/bits/types/__sigset_t.h
- /usr/include/bits/types/struct_timeval.h
- /usr/include/bits/types/struct_timespec.h
- /usr/include/bits/pthreadtypes.h
- /usr/include/bits/thread-shared-types.h
- /usr/include/bits/pthreadtypes-arch.h
- /usr/include/bits/atomic_wide_counter.h
- /usr/include/bits/struct_mutex.h
- /usr/include/bits/struct_rwlock.h
- /usr/include/alloca.h
- /usr/include/bits/stdlib-bsearch.h
- /usr/include/bits/stdlib-float.h
- /usr/include/c++/12/bits/std_abs.h
- /usr/include/c++/12/cstdio
- /usr/include/stdio.h
- /usr/include/bits/types/__fpos_t.h
- /usr/include/bits/types/__fpos64_t.h
- /usr/include/bits/types/struct_FILE.h
- /usr/include/bits/types/cookie_io_functions_t.h
- /usr/include/bits/stdio_lim.h
- /usr/include/bits/stdio.h
- /usr/include/c++/12/cerrno
/usr/include/errno.h
- /usr/include/bits/errno.h
+ /usr/include/features-time64.h
+ /usr/include/features.h
+ /usr/include/gnu/stubs-64.h
+ /usr/include/gnu/stubs.h
+ /usr/include/libintl.h
/usr/include/linux/errno.h
- /usr/include/asm/errno.h
- /usr/include/asm-generic/errno.h
- /usr/include/asm-generic/errno-base.h
- /usr/include/bits/types/error_t.h
- /usr/include/c++/12/bits/charconv.h
- /usr/include/c++/12/bits/functional_hash.h
- /usr/include/c++/12/bits/hash_bytes.h
- /usr/include/c++/12/bits/basic_string.tcc
- /usr/include/c++/12/iterator
- /usr/include/c++/12/bits/stream_iterator.h
- /usr/include/c++/12/bits/streambuf_iterator.h
- /usr/include/c++/12/streambuf
- /usr/include/c++/12/bits/ios_base.h
- /usr/include/c++/12/ext/atomicity.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr-default.h
+ /usr/include/locale.h
/usr/include/pthread.h
/usr/include/sched.h
- /usr/include/bits/sched.h
- /usr/include/bits/types/struct_sched_param.h
- /usr/include/bits/cpu-set.h
+ /usr/include/stdc-predef.h
+ /usr/include/stdint.h
+ /usr/include/stdio.h
+ /usr/include/stdlib.h
+ /usr/include/string.h
+ /usr/include/strings.h
+ /usr/include/sys/cdefs.h
+ /usr/include/sys/select.h
+ /usr/include/sys/single_threaded.h
+ /usr/include/sys/types.h
/usr/include/time.h
- /usr/include/bits/time.h
- /usr/include/bits/timex.h
- /usr/include/bits/types/struct_tm.h
- /usr/include/bits/types/struct_itimerspec.h
- /usr/include/bits/setjmp.h
- /usr/include/bits/types/struct___jmp_buf_tag.h
- /usr/include/bits/pthread_stack_min-dynamic.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/atomic_word.h
- /usr/include/sys/single_threaded.h
- /usr/include/c++/12/bits/locale_classes.h
- /usr/include/c++/12/bits/locale_classes.tcc
- /usr/include/c++/12/system_error
- /usr/include/c++/12/x86_64-redhat-linux/bits/error_constants.h
- /usr/include/c++/12/stdexcept
- /usr/include/c++/12/exception
- /usr/include/c++/12/bits/exception_ptr.h
- /usr/include/c++/12/bits/cxxabi_init_exception.h
- /usr/include/c++/12/typeinfo
- /usr/include/c++/12/bits/nested_exception.h
- /usr/include/c++/12/bits/streambuf.tcc
- /usr/include/c++/12/cassert
- /usr/include/assert.h
- /usr/include/c++/12/algorithm
- /usr/include/c++/12/bits/stl_algo.h
- /usr/include/c++/12/bits/algorithmfwd.h
- /usr/include/c++/12/bits/stl_heap.h
- /usr/include/c++/12/bits/stl_tempbuf.h
- /usr/include/c++/12/bits/uniform_int_dist.h
- /usr/include/c++/12/limits
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/grammar.hpp
- /usr/include/c++/12/locale
- /usr/include/c++/12/bits/locale_facets.h
- /usr/include/c++/12/cwctype
+ /usr/include/wchar.h
/usr/include/wctype.h
- /usr/include/bits/wctype-wchar.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_base.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_inline.h
- /usr/include/c++/12/bits/locale_facets.tcc
- /usr/include/c++/12/bits/locale_facets_nonio.h
- /usr/include/c++/12/ctime
- /usr/include/c++/12/x86_64-redhat-linux/bits/time_members.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/messages_members.h
- /usr/include/libintl.h
- /usr/include/c++/12/bits/codecvt.h
- /usr/include/c++/12/bits/locale_facets_nonio.tcc
- /usr/include/c++/12/bits/locale_conv.h
- /usr/include/c++/12/cstring
- /usr/include/string.h
- /usr/include/strings.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp
- /usr/include/c++/12/utility
- /usr/include/c++/12/bits/stl_relops.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/optional.hpp
- /usr/include/c++/12/memory
- /usr/include/c++/12/bits/stl_uninitialized.h
- /usr/include/c++/12/bits/stl_raw_storage_iter.h
- /usr/include/c++/12/bits/align.h
- /usr/include/c++/12/bit
- /usr/include/c++/12/bits/uses_allocator.h
- /usr/include/c++/12/bits/unique_ptr.h
- /usr/include/c++/12/tuple
- /usr/include/c++/12/bits/shared_ptr.h
- /usr/include/c++/12/bits/shared_ptr_base.h
- /usr/include/c++/12/bits/allocated_ptr.h
- /usr/include/c++/12/ext/aligned_buffer.h
- /usr/include/c++/12/ext/concurrence.h
- /usr/include/c++/12/bits/shared_ptr_atomic.h
- /usr/include/c++/12/bits/atomic_base.h
- /usr/include/c++/12/bits/atomic_lockfree_defines.h
- /usr/include/c++/12/backward/auto_ptr.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdarg.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdint.h
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/optional.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/string_view.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/grammar.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_parse.hpp
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_parse_authority.cpp
- /usr/include/stdc-predef.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_parse_authority.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp
- /usr/include/c++/12/string
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++config.h
- /usr/include/bits/wordsize.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/os_defines.h
- /usr/include/features.h
- /usr/include/features-time64.h
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_parse_authority.cpp
+ /usr/include/alloca.h
+ /usr/include/asm-generic/errno-base.h
+ /usr/include/asm-generic/errno.h
+ /usr/include/asm/errno.h
+ /usr/include/assert.h
+ /usr/include/bits/atomic_wide_counter.h
+ /usr/include/bits/byteswap.h
+ /usr/include/bits/cpu-set.h
+ /usr/include/bits/endian.h
+ /usr/include/bits/endianness.h
+ /usr/include/bits/errno.h
+ /usr/include/bits/floatn-common.h
+ /usr/include/bits/floatn.h
+ /usr/include/bits/libc-header-start.h
+ /usr/include/bits/locale.h
+ /usr/include/bits/long-double.h
+ /usr/include/bits/pthread_stack_min-dynamic.h
+ /usr/include/bits/pthreadtypes-arch.h
+ /usr/include/bits/pthreadtypes.h
+ /usr/include/bits/sched.h
+ /usr/include/bits/select.h
+ /usr/include/bits/setjmp.h
+ /usr/include/bits/stdint-intn.h
+ /usr/include/bits/stdint-uintn.h
+ /usr/include/bits/stdio.h
+ /usr/include/bits/stdio_lim.h
+ /usr/include/bits/stdlib-bsearch.h
+ /usr/include/bits/stdlib-float.h
+ /usr/include/bits/struct_mutex.h
+ /usr/include/bits/struct_rwlock.h
+ /usr/include/bits/thread-shared-types.h
+ /usr/include/bits/time.h
+ /usr/include/bits/time64.h
/usr/include/bits/timesize.h
- /usr/include/sys/cdefs.h
- /usr/include/bits/long-double.h
- /usr/include/gnu/stubs.h
- /usr/include/gnu/stubs-64.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h
- /usr/include/c++/12/bits/stringfwd.h
- /usr/include/c++/12/bits/memoryfwd.h
- /usr/include/c++/12/bits/char_traits.h
- /usr/include/c++/12/bits/postypes.h
- /usr/include/c++/12/cwchar
- /usr/include/wchar.h
- /usr/include/bits/libc-header-start.h
- /usr/include/bits/floatn.h
- /usr/include/bits/floatn-common.h
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stddef.h
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdarg.h
- /usr/include/bits/wchar.h
- /usr/include/bits/types/wint_t.h
- /usr/include/bits/types/mbstate_t.h
- /usr/include/bits/types/__mbstate_t.h
+ /usr/include/bits/timex.h
+ /usr/include/bits/types.h
+ /usr/include/bits/types/FILE.h
/usr/include/bits/types/__FILE.h
- /usr/include/bits/types/FILE.h
- /usr/include/bits/types/locale_t.h
+ /usr/include/bits/types/__fpos64_t.h
+ /usr/include/bits/types/__fpos_t.h
/usr/include/bits/types/__locale_t.h
- /usr/include/c++/12/type_traits
- /usr/include/c++/12/cstdint
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdint.h
- /usr/include/stdint.h
- /usr/include/bits/types.h
- /usr/include/bits/typesizes.h
- /usr/include/bits/time64.h
- /usr/include/bits/stdint-intn.h
- /usr/include/bits/stdint-uintn.h
- /usr/include/c++/12/bits/allocator.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++allocator.h
- /usr/include/c++/12/bits/new_allocator.h
- /usr/include/c++/12/new
- /usr/include/c++/12/bits/exception.h
- /usr/include/c++/12/bits/functexcept.h
- /usr/include/c++/12/bits/exception_defines.h
- /usr/include/c++/12/bits/move.h
- /usr/include/c++/12/bits/cpp_type_traits.h
- /usr/include/c++/12/bits/localefwd.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++locale.h
- /usr/include/c++/12/clocale
- /usr/include/locale.h
- /usr/include/bits/locale.h
- /usr/include/c++/12/iosfwd
- /usr/include/c++/12/cctype
- /usr/include/ctype.h
- /usr/include/bits/endian.h
- /usr/include/bits/endianness.h
- /usr/include/c++/12/bits/ostream_insert.h
- /usr/include/c++/12/bits/cxxabi_forced.h
- /usr/include/c++/12/bits/stl_iterator_base_types.h
- /usr/include/c++/12/bits/stl_iterator_base_funcs.h
- /usr/include/c++/12/bits/concept_check.h
- /usr/include/c++/12/debug/assertions.h
- /usr/include/c++/12/bits/stl_iterator.h
- /usr/include/c++/12/ext/type_traits.h
- /usr/include/c++/12/bits/ptr_traits.h
- /usr/include/c++/12/bits/stl_function.h
- /usr/include/c++/12/backward/binders.h
- /usr/include/c++/12/ext/numeric_traits.h
- /usr/include/c++/12/bits/stl_algobase.h
- /usr/include/c++/12/bits/stl_pair.h
- /usr/include/c++/12/bits/utility.h
- /usr/include/c++/12/debug/debug.h
- /usr/include/c++/12/bits/predefined_ops.h
- /usr/include/c++/12/bits/refwrap.h
- /usr/include/c++/12/bits/invoke.h
- /usr/include/c++/12/bits/range_access.h
- /usr/include/c++/12/initializer_list
- /usr/include/c++/12/bits/basic_string.h
- /usr/include/c++/12/ext/alloc_traits.h
- /usr/include/c++/12/bits/alloc_traits.h
- /usr/include/c++/12/bits/stl_construct.h
- /usr/include/c++/12/ext/string_conversions.h
- /usr/include/c++/12/cstdlib
- /usr/include/stdlib.h
- /usr/include/bits/waitflags.h
- /usr/include/bits/waitstatus.h
- /usr/include/sys/types.h
+ /usr/include/bits/types/__mbstate_t.h
+ /usr/include/bits/types/__sigset_t.h
/usr/include/bits/types/clock_t.h
/usr/include/bits/types/clockid_t.h
+ /usr/include/bits/types/cookie_io_functions_t.h
+ /usr/include/bits/types/error_t.h
+ /usr/include/bits/types/locale_t.h
+ /usr/include/bits/types/mbstate_t.h
+ /usr/include/bits/types/sigset_t.h
+ /usr/include/bits/types/struct_FILE.h
+ /usr/include/bits/types/struct___jmp_buf_tag.h
+ /usr/include/bits/types/struct_itimerspec.h
+ /usr/include/bits/types/struct_sched_param.h
+ /usr/include/bits/types/struct_timespec.h
+ /usr/include/bits/types/struct_timeval.h
+ /usr/include/bits/types/struct_tm.h
/usr/include/bits/types/time_t.h
/usr/include/bits/types/timer_t.h
+ /usr/include/bits/types/wint_t.h
+ /usr/include/bits/typesizes.h
+ /usr/include/bits/uintn-identity.h
+ /usr/include/bits/waitflags.h
+ /usr/include/bits/waitstatus.h
+ /usr/include/bits/wchar.h
+ /usr/include/bits/wctype-wchar.h
+ /usr/include/bits/wordsize.h
+ /usr/include/c++/13/algorithm
+ /usr/include/c++/13/backward/auto_ptr.h
+ /usr/include/c++/13/backward/binders.h
+ /usr/include/c++/13/bit
+ /usr/include/c++/13/bits/algorithmfwd.h
+ /usr/include/c++/13/bits/align.h
+ /usr/include/c++/13/bits/alloc_traits.h
+ /usr/include/c++/13/bits/allocated_ptr.h
+ /usr/include/c++/13/bits/allocator.h
+ /usr/include/c++/13/bits/atomic_base.h
+ /usr/include/c++/13/bits/atomic_lockfree_defines.h
+ /usr/include/c++/13/bits/basic_string.h
+ /usr/include/c++/13/bits/basic_string.tcc
+ /usr/include/c++/13/bits/char_traits.h
+ /usr/include/c++/13/bits/charconv.h
+ /usr/include/c++/13/bits/codecvt.h
+ /usr/include/c++/13/bits/concept_check.h
+ /usr/include/c++/13/bits/cpp_type_traits.h
+ /usr/include/c++/13/bits/cxxabi_forced.h
+ /usr/include/c++/13/bits/cxxabi_init_exception.h
+ /usr/include/c++/13/bits/exception.h
+ /usr/include/c++/13/bits/exception_defines.h
+ /usr/include/c++/13/bits/exception_ptr.h
+ /usr/include/c++/13/bits/functexcept.h
+ /usr/include/c++/13/bits/functional_hash.h
+ /usr/include/c++/13/bits/hash_bytes.h
+ /usr/include/c++/13/bits/invoke.h
+ /usr/include/c++/13/bits/ios_base.h
+ /usr/include/c++/13/bits/locale_classes.h
+ /usr/include/c++/13/bits/locale_classes.tcc
+ /usr/include/c++/13/bits/locale_conv.h
+ /usr/include/c++/13/bits/locale_facets.h
+ /usr/include/c++/13/bits/locale_facets.tcc
+ /usr/include/c++/13/bits/locale_facets_nonio.h
+ /usr/include/c++/13/bits/locale_facets_nonio.tcc
+ /usr/include/c++/13/bits/localefwd.h
+ /usr/include/c++/13/bits/memoryfwd.h
+ /usr/include/c++/13/bits/move.h
+ /usr/include/c++/13/bits/nested_exception.h
+ /usr/include/c++/13/bits/new_allocator.h
+ /usr/include/c++/13/bits/ostream_insert.h
+ /usr/include/c++/13/bits/postypes.h
+ /usr/include/c++/13/bits/predefined_ops.h
+ /usr/include/c++/13/bits/ptr_traits.h
+ /usr/include/c++/13/bits/range_access.h
+ /usr/include/c++/13/bits/refwrap.h
+ /usr/include/c++/13/bits/requires_hosted.h
+ /usr/include/c++/13/bits/shared_ptr.h
+ /usr/include/c++/13/bits/shared_ptr_atomic.h
+ /usr/include/c++/13/bits/shared_ptr_base.h
+ /usr/include/c++/13/bits/std_abs.h
+ /usr/include/c++/13/bits/stl_algo.h
+ /usr/include/c++/13/bits/stl_algobase.h
+ /usr/include/c++/13/bits/stl_construct.h
+ /usr/include/c++/13/bits/stl_function.h
+ /usr/include/c++/13/bits/stl_heap.h
+ /usr/include/c++/13/bits/stl_iterator.h
+ /usr/include/c++/13/bits/stl_iterator_base_funcs.h
+ /usr/include/c++/13/bits/stl_iterator_base_types.h
+ /usr/include/c++/13/bits/stl_pair.h
+ /usr/include/c++/13/bits/stl_raw_storage_iter.h
+ /usr/include/c++/13/bits/stl_relops.h
+ /usr/include/c++/13/bits/stl_tempbuf.h
+ /usr/include/c++/13/bits/stl_uninitialized.h
+ /usr/include/c++/13/bits/stream_iterator.h
+ /usr/include/c++/13/bits/streambuf.tcc
+ /usr/include/c++/13/bits/streambuf_iterator.h
+ /usr/include/c++/13/bits/stringfwd.h
+ /usr/include/c++/13/bits/uniform_int_dist.h
+ /usr/include/c++/13/bits/unique_ptr.h
+ /usr/include/c++/13/bits/uses_allocator.h
+ /usr/include/c++/13/bits/utility.h
+ /usr/include/c++/13/cassert
+ /usr/include/c++/13/cctype
+ /usr/include/c++/13/cerrno
+ /usr/include/c++/13/clocale
+ /usr/include/c++/13/cstdio
+ /usr/include/c++/13/cstdlib
+ /usr/include/c++/13/cstring
+ /usr/include/c++/13/ctime
+ /usr/include/c++/13/cwchar
+ /usr/include/c++/13/cwctype
+ /usr/include/c++/13/debug/assertions.h
+ /usr/include/c++/13/debug/debug.h
+ /usr/include/c++/13/exception
+ /usr/include/c++/13/ext/aligned_buffer.h
+ /usr/include/c++/13/ext/alloc_traits.h
+ /usr/include/c++/13/ext/atomicity.h
+ /usr/include/c++/13/ext/concurrence.h
+ /usr/include/c++/13/ext/numeric_traits.h
+ /usr/include/c++/13/ext/string_conversions.h
+ /usr/include/c++/13/ext/type_traits.h
+ /usr/include/c++/13/initializer_list
+ /usr/include/c++/13/iosfwd
+ /usr/include/c++/13/iterator
+ /usr/include/c++/13/limits
+ /usr/include/c++/13/locale
+ /usr/include/c++/13/memory
+ /usr/include/c++/13/new
+ /usr/include/c++/13/stdexcept
+ /usr/include/c++/13/streambuf
+ /usr/include/c++/13/string
+ /usr/include/c++/13/system_error
+ /usr/include/c++/13/tuple
+ /usr/include/c++/13/type_traits
+ /usr/include/c++/13/typeinfo
+ /usr/include/c++/13/utility
+ /usr/include/c++/13/x86_64-redhat-linux/bits/atomic_word.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++allocator.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++config.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++locale.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/cpu_defines.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_base.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_inline.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/error_constants.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr-default.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/messages_members.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/os_defines.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/time_members.h
+ /usr/include/ctype.h
/usr/include/endian.h
- /usr/include/bits/byteswap.h
- /usr/include/bits/uintn-identity.h
- /usr/include/sys/select.h
- /usr/include/bits/select.h
- /usr/include/bits/types/sigset_t.h
- /usr/include/bits/types/__sigset_t.h
- /usr/include/bits/types/struct_timeval.h
- /usr/include/bits/types/struct_timespec.h
- /usr/include/bits/pthreadtypes.h
- /usr/include/bits/thread-shared-types.h
- /usr/include/bits/pthreadtypes-arch.h
- /usr/include/bits/atomic_wide_counter.h
- /usr/include/bits/struct_mutex.h
- /usr/include/bits/struct_rwlock.h
- /usr/include/alloca.h
- /usr/include/bits/stdlib-bsearch.h
- /usr/include/bits/stdlib-float.h
- /usr/include/c++/12/bits/std_abs.h
- /usr/include/c++/12/cstdio
- /usr/include/stdio.h
- /usr/include/bits/types/__fpos_t.h
- /usr/include/bits/types/__fpos64_t.h
- /usr/include/bits/types/struct_FILE.h
- /usr/include/bits/types/cookie_io_functions_t.h
- /usr/include/bits/stdio_lim.h
- /usr/include/bits/stdio.h
- /usr/include/c++/12/cerrno
/usr/include/errno.h
- /usr/include/bits/errno.h
+ /usr/include/features-time64.h
+ /usr/include/features.h
+ /usr/include/gnu/stubs-64.h
+ /usr/include/gnu/stubs.h
+ /usr/include/libintl.h
/usr/include/linux/errno.h
- /usr/include/asm/errno.h
- /usr/include/asm-generic/errno.h
- /usr/include/asm-generic/errno-base.h
- /usr/include/bits/types/error_t.h
- /usr/include/c++/12/bits/charconv.h
- /usr/include/c++/12/bits/functional_hash.h
- /usr/include/c++/12/bits/hash_bytes.h
- /usr/include/c++/12/bits/basic_string.tcc
- /usr/include/c++/12/utility
- /usr/include/c++/12/bits/stl_relops.h
- /usr/include/c++/12/iterator
- /usr/include/c++/12/bits/stream_iterator.h
- /usr/include/c++/12/bits/streambuf_iterator.h
- /usr/include/c++/12/streambuf
- /usr/include/c++/12/bits/ios_base.h
- /usr/include/c++/12/ext/atomicity.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr-default.h
+ /usr/include/locale.h
/usr/include/pthread.h
/usr/include/sched.h
- /usr/include/bits/sched.h
- /usr/include/bits/types/struct_sched_param.h
- /usr/include/bits/cpu-set.h
+ /usr/include/stdc-predef.h
+ /usr/include/stdint.h
+ /usr/include/stdio.h
+ /usr/include/stdlib.h
+ /usr/include/string.h
+ /usr/include/strings.h
+ /usr/include/sys/cdefs.h
+ /usr/include/sys/select.h
+ /usr/include/sys/single_threaded.h
+ /usr/include/sys/types.h
/usr/include/time.h
- /usr/include/bits/time.h
- /usr/include/bits/timex.h
- /usr/include/bits/types/struct_tm.h
- /usr/include/bits/types/struct_itimerspec.h
- /usr/include/bits/setjmp.h
- /usr/include/bits/types/struct___jmp_buf_tag.h
- /usr/include/bits/pthread_stack_min-dynamic.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/atomic_word.h
- /usr/include/sys/single_threaded.h
- /usr/include/c++/12/bits/locale_classes.h
- /usr/include/c++/12/bits/locale_classes.tcc
- /usr/include/c++/12/system_error
- /usr/include/c++/12/x86_64-redhat-linux/bits/error_constants.h
- /usr/include/c++/12/stdexcept
- /usr/include/c++/12/exception
- /usr/include/c++/12/bits/exception_ptr.h
- /usr/include/c++/12/bits/cxxabi_init_exception.h
- /usr/include/c++/12/typeinfo
- /usr/include/c++/12/bits/nested_exception.h
- /usr/include/c++/12/bits/streambuf.tcc
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/optional.hpp
- /usr/include/c++/12/memory
- /usr/include/c++/12/bits/stl_uninitialized.h
- /usr/include/c++/12/bits/stl_tempbuf.h
- /usr/include/c++/12/bits/stl_raw_storage_iter.h
- /usr/include/c++/12/bits/align.h
- /usr/include/c++/12/bit
- /usr/include/c++/12/bits/uses_allocator.h
- /usr/include/c++/12/bits/unique_ptr.h
- /usr/include/c++/12/tuple
- /usr/include/c++/12/bits/shared_ptr.h
- /usr/include/c++/12/bits/shared_ptr_base.h
- /usr/include/c++/12/bits/allocated_ptr.h
- /usr/include/c++/12/ext/aligned_buffer.h
- /usr/include/c++/12/ext/concurrence.h
- /usr/include/c++/12/bits/shared_ptr_atomic.h
- /usr/include/c++/12/bits/atomic_base.h
- /usr/include/c++/12/bits/atomic_lockfree_defines.h
- /usr/include/c++/12/backward/auto_ptr.h
- /usr/include/c++/12/algorithm
- /usr/include/c++/12/bits/stl_algo.h
- /usr/include/c++/12/bits/algorithmfwd.h
- /usr/include/c++/12/bits/stl_heap.h
- /usr/include/c++/12/bits/uniform_int_dist.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/string_view.hpp
- /usr/include/c++/12/cassert
- /usr/include/assert.h
- /usr/include/c++/12/limits
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/grammar.hpp
- /usr/include/c++/12/locale
- /usr/include/c++/12/bits/locale_facets.h
- /usr/include/c++/12/cwctype
+ /usr/include/wchar.h
/usr/include/wctype.h
- /usr/include/bits/wctype-wchar.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_base.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_inline.h
- /usr/include/c++/12/bits/locale_facets.tcc
- /usr/include/c++/12/bits/locale_facets_nonio.h
- /usr/include/c++/12/ctime
- /usr/include/c++/12/x86_64-redhat-linux/bits/time_members.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/messages_members.h
- /usr/include/libintl.h
- /usr/include/c++/12/bits/codecvt.h
- /usr/include/c++/12/bits/locale_facets_nonio.tcc
- /usr/include/c++/12/bits/locale_conv.h
- /usr/include/c++/12/cstring
- /usr/include/string.h
- /usr/include/strings.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdarg.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdint.h
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/optional.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/string_view.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/grammar.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_parse_authority.hpp
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_resolve.cpp
- /usr/include/stdc-predef.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_resolve.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/uri.hpp
- /usr/include/c++/12/iterator
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++config.h
- /usr/include/bits/wordsize.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/os_defines.h
- /usr/include/features.h
- /usr/include/features-time64.h
- /usr/include/bits/timesize.h
- /usr/include/sys/cdefs.h
- /usr/include/bits/long-double.h
- /usr/include/gnu/stubs.h
- /usr/include/gnu/stubs-64.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h
- /usr/include/c++/12/bits/stl_iterator_base_types.h
- /usr/include/c++/12/type_traits
- /usr/include/c++/12/bits/stl_iterator_base_funcs.h
- /usr/include/c++/12/bits/concept_check.h
- /usr/include/c++/12/debug/assertions.h
- /usr/include/c++/12/bits/stl_iterator.h
- /usr/include/c++/12/bits/cpp_type_traits.h
- /usr/include/c++/12/ext/type_traits.h
- /usr/include/c++/12/bits/move.h
- /usr/include/c++/12/bits/ptr_traits.h
- /usr/include/c++/12/iosfwd
- /usr/include/c++/12/bits/stringfwd.h
- /usr/include/c++/12/bits/memoryfwd.h
- /usr/include/c++/12/bits/postypes.h
- /usr/include/c++/12/cwchar
- /usr/include/wchar.h
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_resolve.cpp
+ /usr/include/alloca.h
+ /usr/include/asm-generic/errno-base.h
+ /usr/include/asm-generic/errno.h
+ /usr/include/asm/errno.h
+ /usr/include/assert.h
+ /usr/include/bits/atomic_wide_counter.h
+ /usr/include/bits/byteswap.h
+ /usr/include/bits/cpu-set.h
+ /usr/include/bits/endian.h
+ /usr/include/bits/endianness.h
+ /usr/include/bits/errno.h
+ /usr/include/bits/floatn-common.h
+ /usr/include/bits/floatn.h
/usr/include/bits/libc-header-start.h
- /usr/include/bits/floatn.h
- /usr/include/bits/floatn-common.h
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stddef.h
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdarg.h
- /usr/include/bits/wchar.h
- /usr/include/bits/types/wint_t.h
- /usr/include/bits/types/mbstate_t.h
- /usr/include/bits/types/__mbstate_t.h
- /usr/include/bits/types/__FILE.h
- /usr/include/bits/types/FILE.h
- /usr/include/bits/types/locale_t.h
- /usr/include/bits/types/__locale_t.h
- /usr/include/c++/12/bits/stream_iterator.h
- /usr/include/c++/12/debug/debug.h
- /usr/include/c++/12/bits/streambuf_iterator.h
- /usr/include/c++/12/streambuf
- /usr/include/c++/12/bits/localefwd.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++locale.h
- /usr/include/c++/12/clocale
- /usr/include/locale.h
/usr/include/bits/locale.h
- /usr/include/c++/12/cctype
- /usr/include/ctype.h
- /usr/include/bits/types.h
- /usr/include/bits/typesizes.h
- /usr/include/bits/time64.h
- /usr/include/bits/endian.h
- /usr/include/bits/endianness.h
- /usr/include/c++/12/bits/ios_base.h
- /usr/include/c++/12/ext/atomicity.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr-default.h
- /usr/include/pthread.h
- /usr/include/sched.h
- /usr/include/bits/types/time_t.h
- /usr/include/bits/types/struct_timespec.h
+ /usr/include/bits/long-double.h
+ /usr/include/bits/pthread_stack_min-dynamic.h
+ /usr/include/bits/pthreadtypes-arch.h
+ /usr/include/bits/pthreadtypes.h
/usr/include/bits/sched.h
- /usr/include/bits/types/struct_sched_param.h
- /usr/include/bits/cpu-set.h
- /usr/include/time.h
+ /usr/include/bits/select.h
+ /usr/include/bits/setjmp.h
+ /usr/include/bits/stdint-intn.h
+ /usr/include/bits/stdint-uintn.h
+ /usr/include/bits/stdio.h
+ /usr/include/bits/stdio_lim.h
+ /usr/include/bits/stdlib-bsearch.h
+ /usr/include/bits/stdlib-float.h
+ /usr/include/bits/struct_mutex.h
+ /usr/include/bits/struct_rwlock.h
+ /usr/include/bits/thread-shared-types.h
/usr/include/bits/time.h
+ /usr/include/bits/time64.h
+ /usr/include/bits/timesize.h
/usr/include/bits/timex.h
+ /usr/include/bits/types.h
+ /usr/include/bits/types/FILE.h
+ /usr/include/bits/types/__FILE.h
+ /usr/include/bits/types/__fpos64_t.h
+ /usr/include/bits/types/__fpos_t.h
+ /usr/include/bits/types/__locale_t.h
+ /usr/include/bits/types/__mbstate_t.h
+ /usr/include/bits/types/__sigset_t.h
+ /usr/include/bits/types/clock_t.h
+ /usr/include/bits/types/clockid_t.h
+ /usr/include/bits/types/cookie_io_functions_t.h
+ /usr/include/bits/types/error_t.h
+ /usr/include/bits/types/locale_t.h
+ /usr/include/bits/types/mbstate_t.h
+ /usr/include/bits/types/sigset_t.h
+ /usr/include/bits/types/struct_FILE.h
+ /usr/include/bits/types/struct___jmp_buf_tag.h
+ /usr/include/bits/types/struct_itimerspec.h
+ /usr/include/bits/types/struct_sched_param.h
+ /usr/include/bits/types/struct_timespec.h
/usr/include/bits/types/struct_timeval.h
- /usr/include/bits/types/clock_t.h
/usr/include/bits/types/struct_tm.h
- /usr/include/bits/types/clockid_t.h
+ /usr/include/bits/types/time_t.h
/usr/include/bits/types/timer_t.h
- /usr/include/bits/types/struct_itimerspec.h
- /usr/include/bits/pthreadtypes.h
- /usr/include/bits/thread-shared-types.h
- /usr/include/bits/pthreadtypes-arch.h
- /usr/include/bits/atomic_wide_counter.h
- /usr/include/bits/struct_mutex.h
- /usr/include/bits/struct_rwlock.h
- /usr/include/bits/setjmp.h
- /usr/include/bits/types/__sigset_t.h
- /usr/include/bits/types/struct___jmp_buf_tag.h
- /usr/include/bits/pthread_stack_min-dynamic.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/atomic_word.h
- /usr/include/sys/single_threaded.h
- /usr/include/c++/12/bits/locale_classes.h
- /usr/include/c++/12/string
- /usr/include/c++/12/bits/char_traits.h
- /usr/include/c++/12/cstdint
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdint.h
- /usr/include/stdint.h
- /usr/include/bits/stdint-intn.h
- /usr/include/bits/stdint-uintn.h
- /usr/include/c++/12/bits/allocator.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++allocator.h
- /usr/include/c++/12/bits/new_allocator.h
- /usr/include/c++/12/new
- /usr/include/c++/12/bits/exception.h
- /usr/include/c++/12/bits/functexcept.h
- /usr/include/c++/12/bits/exception_defines.h
- /usr/include/c++/12/bits/ostream_insert.h
- /usr/include/c++/12/bits/cxxabi_forced.h
- /usr/include/c++/12/bits/stl_function.h
- /usr/include/c++/12/backward/binders.h
- /usr/include/c++/12/ext/numeric_traits.h
- /usr/include/c++/12/bits/stl_algobase.h
- /usr/include/c++/12/bits/stl_pair.h
- /usr/include/c++/12/bits/utility.h
- /usr/include/c++/12/bits/predefined_ops.h
- /usr/include/c++/12/bits/refwrap.h
- /usr/include/c++/12/bits/invoke.h
- /usr/include/c++/12/bits/range_access.h
- /usr/include/c++/12/initializer_list
- /usr/include/c++/12/bits/basic_string.h
- /usr/include/c++/12/ext/alloc_traits.h
- /usr/include/c++/12/bits/alloc_traits.h
- /usr/include/c++/12/bits/stl_construct.h
- /usr/include/c++/12/ext/string_conversions.h
- /usr/include/c++/12/cstdlib
- /usr/include/stdlib.h
+ /usr/include/bits/types/wint_t.h
+ /usr/include/bits/typesizes.h
+ /usr/include/bits/uintn-identity.h
/usr/include/bits/waitflags.h
/usr/include/bits/waitstatus.h
- /usr/include/sys/types.h
+ /usr/include/bits/wchar.h
+ /usr/include/bits/wordsize.h
+ /usr/include/c++/13/algorithm
+ /usr/include/c++/13/backward/auto_ptr.h
+ /usr/include/c++/13/backward/binders.h
+ /usr/include/c++/13/bit
+ /usr/include/c++/13/bits/algorithmfwd.h
+ /usr/include/c++/13/bits/align.h
+ /usr/include/c++/13/bits/alloc_traits.h
+ /usr/include/c++/13/bits/allocated_ptr.h
+ /usr/include/c++/13/bits/allocator.h
+ /usr/include/c++/13/bits/atomic_base.h
+ /usr/include/c++/13/bits/atomic_lockfree_defines.h
+ /usr/include/c++/13/bits/basic_string.h
+ /usr/include/c++/13/bits/basic_string.tcc
+ /usr/include/c++/13/bits/char_traits.h
+ /usr/include/c++/13/bits/charconv.h
+ /usr/include/c++/13/bits/concept_check.h
+ /usr/include/c++/13/bits/cpp_type_traits.h
+ /usr/include/c++/13/bits/cxxabi_forced.h
+ /usr/include/c++/13/bits/cxxabi_init_exception.h
+ /usr/include/c++/13/bits/exception.h
+ /usr/include/c++/13/bits/exception_defines.h
+ /usr/include/c++/13/bits/exception_ptr.h
+ /usr/include/c++/13/bits/functexcept.h
+ /usr/include/c++/13/bits/functional_hash.h
+ /usr/include/c++/13/bits/hash_bytes.h
+ /usr/include/c++/13/bits/invoke.h
+ /usr/include/c++/13/bits/ios_base.h
+ /usr/include/c++/13/bits/locale_classes.h
+ /usr/include/c++/13/bits/locale_classes.tcc
+ /usr/include/c++/13/bits/localefwd.h
+ /usr/include/c++/13/bits/memoryfwd.h
+ /usr/include/c++/13/bits/move.h
+ /usr/include/c++/13/bits/nested_exception.h
+ /usr/include/c++/13/bits/new_allocator.h
+ /usr/include/c++/13/bits/ostream_insert.h
+ /usr/include/c++/13/bits/postypes.h
+ /usr/include/c++/13/bits/predefined_ops.h
+ /usr/include/c++/13/bits/ptr_traits.h
+ /usr/include/c++/13/bits/range_access.h
+ /usr/include/c++/13/bits/refwrap.h
+ /usr/include/c++/13/bits/requires_hosted.h
+ /usr/include/c++/13/bits/shared_ptr.h
+ /usr/include/c++/13/bits/shared_ptr_atomic.h
+ /usr/include/c++/13/bits/shared_ptr_base.h
+ /usr/include/c++/13/bits/std_abs.h
+ /usr/include/c++/13/bits/std_function.h
+ /usr/include/c++/13/bits/stl_algo.h
+ /usr/include/c++/13/bits/stl_algobase.h
+ /usr/include/c++/13/bits/stl_construct.h
+ /usr/include/c++/13/bits/stl_function.h
+ /usr/include/c++/13/bits/stl_heap.h
+ /usr/include/c++/13/bits/stl_iterator.h
+ /usr/include/c++/13/bits/stl_iterator_base_funcs.h
+ /usr/include/c++/13/bits/stl_iterator_base_types.h
+ /usr/include/c++/13/bits/stl_pair.h
+ /usr/include/c++/13/bits/stl_raw_storage_iter.h
+ /usr/include/c++/13/bits/stl_relops.h
+ /usr/include/c++/13/bits/stl_tempbuf.h
+ /usr/include/c++/13/bits/stl_uninitialized.h
+ /usr/include/c++/13/bits/stream_iterator.h
+ /usr/include/c++/13/bits/streambuf.tcc
+ /usr/include/c++/13/bits/streambuf_iterator.h
+ /usr/include/c++/13/bits/stringfwd.h
+ /usr/include/c++/13/bits/uniform_int_dist.h
+ /usr/include/c++/13/bits/unique_ptr.h
+ /usr/include/c++/13/bits/uses_allocator.h
+ /usr/include/c++/13/bits/utility.h
+ /usr/include/c++/13/cassert
+ /usr/include/c++/13/cctype
+ /usr/include/c++/13/cerrno
+ /usr/include/c++/13/clocale
+ /usr/include/c++/13/cstddef
+ /usr/include/c++/13/cstdint
+ /usr/include/c++/13/cstdio
+ /usr/include/c++/13/cstdlib
+ /usr/include/c++/13/cstring
+ /usr/include/c++/13/cwchar
+ /usr/include/c++/13/debug/assertions.h
+ /usr/include/c++/13/debug/debug.h
+ /usr/include/c++/13/exception
+ /usr/include/c++/13/ext/aligned_buffer.h
+ /usr/include/c++/13/ext/alloc_traits.h
+ /usr/include/c++/13/ext/atomicity.h
+ /usr/include/c++/13/ext/concurrence.h
+ /usr/include/c++/13/ext/numeric_traits.h
+ /usr/include/c++/13/ext/string_conversions.h
+ /usr/include/c++/13/ext/type_traits.h
+ /usr/include/c++/13/functional
+ /usr/include/c++/13/initializer_list
+ /usr/include/c++/13/iosfwd
+ /usr/include/c++/13/iterator
+ /usr/include/c++/13/memory
+ /usr/include/c++/13/new
+ /usr/include/c++/13/stdexcept
+ /usr/include/c++/13/streambuf
+ /usr/include/c++/13/string
+ /usr/include/c++/13/system_error
+ /usr/include/c++/13/tuple
+ /usr/include/c++/13/type_traits
+ /usr/include/c++/13/typeinfo
+ /usr/include/c++/13/utility
+ /usr/include/c++/13/x86_64-redhat-linux/bits/atomic_word.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++allocator.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++config.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++locale.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/cpu_defines.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/error_constants.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr-default.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/os_defines.h
+ /usr/include/ctype.h
/usr/include/endian.h
- /usr/include/bits/byteswap.h
- /usr/include/bits/uintn-identity.h
- /usr/include/sys/select.h
- /usr/include/bits/select.h
- /usr/include/bits/types/sigset_t.h
- /usr/include/alloca.h
- /usr/include/bits/stdlib-bsearch.h
- /usr/include/bits/stdlib-float.h
- /usr/include/c++/12/bits/std_abs.h
- /usr/include/c++/12/cstdio
- /usr/include/stdio.h
- /usr/include/bits/types/__fpos_t.h
- /usr/include/bits/types/__fpos64_t.h
- /usr/include/bits/types/struct_FILE.h
- /usr/include/bits/types/cookie_io_functions_t.h
- /usr/include/bits/stdio_lim.h
- /usr/include/bits/stdio.h
- /usr/include/c++/12/cerrno
/usr/include/errno.h
- /usr/include/bits/errno.h
+ /usr/include/features-time64.h
+ /usr/include/features.h
+ /usr/include/gnu/stubs-64.h
+ /usr/include/gnu/stubs.h
/usr/include/linux/errno.h
- /usr/include/asm/errno.h
- /usr/include/asm-generic/errno.h
- /usr/include/asm-generic/errno-base.h
- /usr/include/bits/types/error_t.h
- /usr/include/c++/12/bits/charconv.h
- /usr/include/c++/12/bits/functional_hash.h
- /usr/include/c++/12/bits/hash_bytes.h
- /usr/include/c++/12/bits/basic_string.tcc
- /usr/include/c++/12/bits/locale_classes.tcc
- /usr/include/c++/12/system_error
- /usr/include/c++/12/x86_64-redhat-linux/bits/error_constants.h
- /usr/include/c++/12/stdexcept
- /usr/include/c++/12/exception
- /usr/include/c++/12/bits/exception_ptr.h
- /usr/include/c++/12/bits/cxxabi_init_exception.h
- /usr/include/c++/12/typeinfo
- /usr/include/c++/12/bits/nested_exception.h
- /usr/include/c++/12/bits/streambuf.tcc
- /usr/include/c++/12/algorithm
- /usr/include/c++/12/bits/stl_algo.h
- /usr/include/c++/12/bits/algorithmfwd.h
- /usr/include/c++/12/bits/stl_heap.h
- /usr/include/c++/12/bits/stl_tempbuf.h
- /usr/include/c++/12/bits/uniform_int_dist.h
- /usr/include/c++/12/functional
- /usr/include/c++/12/tuple
- /usr/include/c++/12/bits/uses_allocator.h
- /usr/include/c++/12/bits/std_function.h
- /usr/include/c++/12/memory
- /usr/include/c++/12/bits/stl_uninitialized.h
- /usr/include/c++/12/bits/stl_raw_storage_iter.h
- /usr/include/c++/12/bits/align.h
- /usr/include/c++/12/bit
- /usr/include/c++/12/bits/unique_ptr.h
- /usr/include/c++/12/bits/shared_ptr.h
- /usr/include/c++/12/bits/shared_ptr_base.h
- /usr/include/c++/12/bits/allocated_ptr.h
- /usr/include/c++/12/ext/aligned_buffer.h
- /usr/include/c++/12/ext/concurrence.h
- /usr/include/c++/12/bits/shared_ptr_atomic.h
- /usr/include/c++/12/bits/atomic_base.h
- /usr/include/c++/12/bits/atomic_lockfree_defines.h
- /usr/include/c++/12/backward/auto_ptr.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/string_view.hpp
- /usr/include/c++/12/cassert
- /usr/include/assert.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/optional.hpp
- /usr/include/c++/12/utility
- /usr/include/c++/12/bits/stl_relops.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/config.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/uri_errors.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/encode.hpp
- /usr/include/c++/12/cstring
+ /usr/include/locale.h
+ /usr/include/pthread.h
+ /usr/include/sched.h
+ /usr/include/stdc-predef.h
+ /usr/include/stdint.h
+ /usr/include/stdio.h
+ /usr/include/stdlib.h
/usr/include/string.h
/usr/include/strings.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/decode.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/translate.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/uri_builder.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/algorithm_find.hpp
- /usr/include/c++/12/cstddef
+ /usr/include/sys/cdefs.h
+ /usr/include/sys/select.h
+ /usr/include/sys/single_threaded.h
+ /usr/include/sys/types.h
+ /usr/include/time.h
+ /usr/include/wchar.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdarg.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdint.h
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/optional.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/string_view.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/config.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/decode.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/encode.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/translate.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/uri.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/uri_builder.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/uri_errors.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/algorithm_find.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_resolve.hpp
third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/uri.cpp
- /usr/include/stdc-predef.h
- /usr/include/c++/12/cassert
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++config.h
- /usr/include/bits/wordsize.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/os_defines.h
- /usr/include/features.h
- /usr/include/features-time64.h
- /usr/include/bits/timesize.h
- /usr/include/sys/cdefs.h
- /usr/include/bits/long-double.h
- /usr/include/gnu/stubs.h
- /usr/include/gnu/stubs-64.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/uri.cpp
+ /usr/include/alloca.h
+ /usr/include/asm-generic/errno-base.h
+ /usr/include/asm-generic/errno.h
+ /usr/include/asm/errno.h
/usr/include/assert.h
- /usr/include/c++/12/locale
- /usr/include/c++/12/bits/localefwd.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++locale.h
- /usr/include/c++/12/clocale
- /usr/include/locale.h
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stddef.h
- /usr/include/bits/locale.h
- /usr/include/bits/types/locale_t.h
- /usr/include/bits/types/__locale_t.h
- /usr/include/c++/12/iosfwd
- /usr/include/c++/12/bits/stringfwd.h
- /usr/include/c++/12/bits/memoryfwd.h
- /usr/include/c++/12/bits/postypes.h
- /usr/include/c++/12/cwchar
- /usr/include/wchar.h
- /usr/include/bits/libc-header-start.h
- /usr/include/bits/floatn.h
- /usr/include/bits/floatn-common.h
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdarg.h
- /usr/include/bits/wchar.h
- /usr/include/bits/types/wint_t.h
- /usr/include/bits/types/mbstate_t.h
- /usr/include/bits/types/__mbstate_t.h
- /usr/include/bits/types/__FILE.h
- /usr/include/bits/types/FILE.h
- /usr/include/c++/12/cctype
- /usr/include/ctype.h
- /usr/include/bits/types.h
- /usr/include/bits/typesizes.h
- /usr/include/bits/time64.h
+ /usr/include/bits/atomic_wide_counter.h
+ /usr/include/bits/byteswap.h
+ /usr/include/bits/cpu-set.h
/usr/include/bits/endian.h
/usr/include/bits/endianness.h
- /usr/include/c++/12/bits/locale_classes.h
- /usr/include/c++/12/string
- /usr/include/c++/12/bits/char_traits.h
- /usr/include/c++/12/type_traits
- /usr/include/c++/12/cstdint
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdint.h
- /usr/include/stdint.h
+ /usr/include/bits/errno.h
+ /usr/include/bits/floatn-common.h
+ /usr/include/bits/floatn.h
+ /usr/include/bits/libc-header-start.h
+ /usr/include/bits/locale.h
+ /usr/include/bits/long-double.h
+ /usr/include/bits/pthread_stack_min-dynamic.h
+ /usr/include/bits/pthreadtypes-arch.h
+ /usr/include/bits/pthreadtypes.h
+ /usr/include/bits/sched.h
+ /usr/include/bits/select.h
+ /usr/include/bits/setjmp.h
/usr/include/bits/stdint-intn.h
/usr/include/bits/stdint-uintn.h
- /usr/include/c++/12/bits/allocator.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++allocator.h
- /usr/include/c++/12/bits/new_allocator.h
- /usr/include/c++/12/new
- /usr/include/c++/12/bits/exception.h
- /usr/include/c++/12/bits/functexcept.h
- /usr/include/c++/12/bits/exception_defines.h
- /usr/include/c++/12/bits/move.h
- /usr/include/c++/12/bits/cpp_type_traits.h
- /usr/include/c++/12/bits/ostream_insert.h
- /usr/include/c++/12/bits/cxxabi_forced.h
- /usr/include/c++/12/bits/stl_iterator_base_types.h
- /usr/include/c++/12/bits/stl_iterator_base_funcs.h
- /usr/include/c++/12/bits/concept_check.h
- /usr/include/c++/12/debug/assertions.h
- /usr/include/c++/12/bits/stl_iterator.h
- /usr/include/c++/12/ext/type_traits.h
- /usr/include/c++/12/bits/ptr_traits.h
- /usr/include/c++/12/bits/stl_function.h
- /usr/include/c++/12/backward/binders.h
- /usr/include/c++/12/ext/numeric_traits.h
- /usr/include/c++/12/bits/stl_algobase.h
- /usr/include/c++/12/bits/stl_pair.h
- /usr/include/c++/12/bits/utility.h
- /usr/include/c++/12/debug/debug.h
- /usr/include/c++/12/bits/predefined_ops.h
- /usr/include/c++/12/bits/refwrap.h
- /usr/include/c++/12/bits/invoke.h
- /usr/include/c++/12/bits/range_access.h
- /usr/include/c++/12/initializer_list
- /usr/include/c++/12/bits/basic_string.h
- /usr/include/c++/12/ext/alloc_traits.h
- /usr/include/c++/12/bits/alloc_traits.h
- /usr/include/c++/12/bits/stl_construct.h
- /usr/include/c++/12/ext/string_conversions.h
- /usr/include/c++/12/cstdlib
- /usr/include/stdlib.h
- /usr/include/bits/waitflags.h
- /usr/include/bits/waitstatus.h
- /usr/include/sys/types.h
+ /usr/include/bits/stdio.h
+ /usr/include/bits/stdio_lim.h
+ /usr/include/bits/stdlib-bsearch.h
+ /usr/include/bits/stdlib-float.h
+ /usr/include/bits/struct_mutex.h
+ /usr/include/bits/struct_rwlock.h
+ /usr/include/bits/thread-shared-types.h
+ /usr/include/bits/time.h
+ /usr/include/bits/time64.h
+ /usr/include/bits/timesize.h
+ /usr/include/bits/timex.h
+ /usr/include/bits/types.h
+ /usr/include/bits/types/FILE.h
+ /usr/include/bits/types/__FILE.h
+ /usr/include/bits/types/__fpos64_t.h
+ /usr/include/bits/types/__fpos_t.h
+ /usr/include/bits/types/__locale_t.h
+ /usr/include/bits/types/__mbstate_t.h
+ /usr/include/bits/types/__sigset_t.h
/usr/include/bits/types/clock_t.h
/usr/include/bits/types/clockid_t.h
+ /usr/include/bits/types/cookie_io_functions_t.h
+ /usr/include/bits/types/error_t.h
+ /usr/include/bits/types/locale_t.h
+ /usr/include/bits/types/mbstate_t.h
+ /usr/include/bits/types/sigset_t.h
+ /usr/include/bits/types/struct_FILE.h
+ /usr/include/bits/types/struct___jmp_buf_tag.h
+ /usr/include/bits/types/struct_itimerspec.h
+ /usr/include/bits/types/struct_sched_param.h
+ /usr/include/bits/types/struct_timespec.h
+ /usr/include/bits/types/struct_timeval.h
+ /usr/include/bits/types/struct_tm.h
/usr/include/bits/types/time_t.h
/usr/include/bits/types/timer_t.h
+ /usr/include/bits/types/wint_t.h
+ /usr/include/bits/typesizes.h
+ /usr/include/bits/uintn-identity.h
+ /usr/include/bits/waitflags.h
+ /usr/include/bits/waitstatus.h
+ /usr/include/bits/wchar.h
+ /usr/include/bits/wctype-wchar.h
+ /usr/include/bits/wordsize.h
+ /usr/include/c++/13/algorithm
+ /usr/include/c++/13/backward/auto_ptr.h
+ /usr/include/c++/13/backward/binders.h
+ /usr/include/c++/13/bit
+ /usr/include/c++/13/bits/algorithmfwd.h
+ /usr/include/c++/13/bits/align.h
+ /usr/include/c++/13/bits/alloc_traits.h
+ /usr/include/c++/13/bits/allocated_ptr.h
+ /usr/include/c++/13/bits/allocator.h
+ /usr/include/c++/13/bits/atomic_base.h
+ /usr/include/c++/13/bits/atomic_lockfree_defines.h
+ /usr/include/c++/13/bits/basic_string.h
+ /usr/include/c++/13/bits/basic_string.tcc
+ /usr/include/c++/13/bits/char_traits.h
+ /usr/include/c++/13/bits/charconv.h
+ /usr/include/c++/13/bits/codecvt.h
+ /usr/include/c++/13/bits/concept_check.h
+ /usr/include/c++/13/bits/cpp_type_traits.h
+ /usr/include/c++/13/bits/cxxabi_forced.h
+ /usr/include/c++/13/bits/cxxabi_init_exception.h
+ /usr/include/c++/13/bits/exception.h
+ /usr/include/c++/13/bits/exception_defines.h
+ /usr/include/c++/13/bits/exception_ptr.h
+ /usr/include/c++/13/bits/functexcept.h
+ /usr/include/c++/13/bits/functional_hash.h
+ /usr/include/c++/13/bits/hash_bytes.h
+ /usr/include/c++/13/bits/invoke.h
+ /usr/include/c++/13/bits/ios_base.h
+ /usr/include/c++/13/bits/locale_classes.h
+ /usr/include/c++/13/bits/locale_classes.tcc
+ /usr/include/c++/13/bits/locale_conv.h
+ /usr/include/c++/13/bits/locale_facets.h
+ /usr/include/c++/13/bits/locale_facets.tcc
+ /usr/include/c++/13/bits/locale_facets_nonio.h
+ /usr/include/c++/13/bits/locale_facets_nonio.tcc
+ /usr/include/c++/13/bits/localefwd.h
+ /usr/include/c++/13/bits/memoryfwd.h
+ /usr/include/c++/13/bits/move.h
+ /usr/include/c++/13/bits/nested_exception.h
+ /usr/include/c++/13/bits/new_allocator.h
+ /usr/include/c++/13/bits/ostream_insert.h
+ /usr/include/c++/13/bits/postypes.h
+ /usr/include/c++/13/bits/predefined_ops.h
+ /usr/include/c++/13/bits/ptr_traits.h
+ /usr/include/c++/13/bits/range_access.h
+ /usr/include/c++/13/bits/refwrap.h
+ /usr/include/c++/13/bits/requires_hosted.h
+ /usr/include/c++/13/bits/shared_ptr.h
+ /usr/include/c++/13/bits/shared_ptr_atomic.h
+ /usr/include/c++/13/bits/shared_ptr_base.h
+ /usr/include/c++/13/bits/std_abs.h
+ /usr/include/c++/13/bits/std_function.h
+ /usr/include/c++/13/bits/stl_algo.h
+ /usr/include/c++/13/bits/stl_algobase.h
+ /usr/include/c++/13/bits/stl_bvector.h
+ /usr/include/c++/13/bits/stl_construct.h
+ /usr/include/c++/13/bits/stl_function.h
+ /usr/include/c++/13/bits/stl_heap.h
+ /usr/include/c++/13/bits/stl_iterator.h
+ /usr/include/c++/13/bits/stl_iterator_base_funcs.h
+ /usr/include/c++/13/bits/stl_iterator_base_types.h
+ /usr/include/c++/13/bits/stl_pair.h
+ /usr/include/c++/13/bits/stl_raw_storage_iter.h
+ /usr/include/c++/13/bits/stl_relops.h
+ /usr/include/c++/13/bits/stl_tempbuf.h
+ /usr/include/c++/13/bits/stl_uninitialized.h
+ /usr/include/c++/13/bits/stl_vector.h
+ /usr/include/c++/13/bits/stream_iterator.h
+ /usr/include/c++/13/bits/streambuf.tcc
+ /usr/include/c++/13/bits/streambuf_iterator.h
+ /usr/include/c++/13/bits/stringfwd.h
+ /usr/include/c++/13/bits/uniform_int_dist.h
+ /usr/include/c++/13/bits/unique_ptr.h
+ /usr/include/c++/13/bits/uses_allocator.h
+ /usr/include/c++/13/bits/utility.h
+ /usr/include/c++/13/bits/vector.tcc
+ /usr/include/c++/13/cassert
+ /usr/include/c++/13/cctype
+ /usr/include/c++/13/cerrno
+ /usr/include/c++/13/clocale
+ /usr/include/c++/13/cstdint
+ /usr/include/c++/13/cstdio
+ /usr/include/c++/13/cstdlib
+ /usr/include/c++/13/cstring
+ /usr/include/c++/13/ctime
+ /usr/include/c++/13/cwchar
+ /usr/include/c++/13/cwctype
+ /usr/include/c++/13/debug/assertions.h
+ /usr/include/c++/13/debug/debug.h
+ /usr/include/c++/13/exception
+ /usr/include/c++/13/ext/aligned_buffer.h
+ /usr/include/c++/13/ext/alloc_traits.h
+ /usr/include/c++/13/ext/atomicity.h
+ /usr/include/c++/13/ext/concurrence.h
+ /usr/include/c++/13/ext/numeric_traits.h
+ /usr/include/c++/13/ext/string_conversions.h
+ /usr/include/c++/13/ext/type_traits.h
+ /usr/include/c++/13/functional
+ /usr/include/c++/13/initializer_list
+ /usr/include/c++/13/iosfwd
+ /usr/include/c++/13/iterator
+ /usr/include/c++/13/locale
+ /usr/include/c++/13/memory
+ /usr/include/c++/13/new
+ /usr/include/c++/13/stdexcept
+ /usr/include/c++/13/streambuf
+ /usr/include/c++/13/string
+ /usr/include/c++/13/system_error
+ /usr/include/c++/13/tuple
+ /usr/include/c++/13/type_traits
+ /usr/include/c++/13/typeinfo
+ /usr/include/c++/13/utility
+ /usr/include/c++/13/vector
+ /usr/include/c++/13/x86_64-redhat-linux/bits/atomic_word.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++allocator.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++config.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++locale.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/cpu_defines.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_base.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_inline.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/error_constants.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr-default.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/messages_members.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/os_defines.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/time_members.h
+ /usr/include/ctype.h
/usr/include/endian.h
- /usr/include/bits/byteswap.h
- /usr/include/bits/uintn-identity.h
- /usr/include/sys/select.h
- /usr/include/bits/select.h
- /usr/include/bits/types/sigset_t.h
- /usr/include/bits/types/__sigset_t.h
- /usr/include/bits/types/struct_timeval.h
- /usr/include/bits/types/struct_timespec.h
- /usr/include/bits/pthreadtypes.h
- /usr/include/bits/thread-shared-types.h
- /usr/include/bits/pthreadtypes-arch.h
- /usr/include/bits/atomic_wide_counter.h
- /usr/include/bits/struct_mutex.h
- /usr/include/bits/struct_rwlock.h
- /usr/include/alloca.h
- /usr/include/bits/stdlib-bsearch.h
- /usr/include/bits/stdlib-float.h
- /usr/include/c++/12/bits/std_abs.h
- /usr/include/c++/12/cstdio
- /usr/include/stdio.h
- /usr/include/bits/types/__fpos_t.h
- /usr/include/bits/types/__fpos64_t.h
- /usr/include/bits/types/struct_FILE.h
- /usr/include/bits/types/cookie_io_functions_t.h
- /usr/include/bits/stdio_lim.h
- /usr/include/bits/stdio.h
- /usr/include/c++/12/cerrno
/usr/include/errno.h
- /usr/include/bits/errno.h
+ /usr/include/features-time64.h
+ /usr/include/features.h
+ /usr/include/gnu/stubs-64.h
+ /usr/include/gnu/stubs.h
+ /usr/include/libintl.h
/usr/include/linux/errno.h
- /usr/include/asm/errno.h
- /usr/include/asm-generic/errno.h
- /usr/include/asm-generic/errno-base.h
- /usr/include/bits/types/error_t.h
- /usr/include/c++/12/bits/charconv.h
- /usr/include/c++/12/bits/functional_hash.h
- /usr/include/c++/12/bits/hash_bytes.h
- /usr/include/c++/12/bits/basic_string.tcc
- /usr/include/c++/12/ext/atomicity.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr-default.h
+ /usr/include/locale.h
/usr/include/pthread.h
/usr/include/sched.h
- /usr/include/bits/sched.h
- /usr/include/bits/types/struct_sched_param.h
- /usr/include/bits/cpu-set.h
+ /usr/include/stdc-predef.h
+ /usr/include/stdint.h
+ /usr/include/stdio.h
+ /usr/include/stdlib.h
+ /usr/include/string.h
+ /usr/include/strings.h
+ /usr/include/sys/cdefs.h
+ /usr/include/sys/select.h
+ /usr/include/sys/single_threaded.h
+ /usr/include/sys/types.h
/usr/include/time.h
- /usr/include/bits/time.h
- /usr/include/bits/timex.h
- /usr/include/bits/types/struct_tm.h
- /usr/include/bits/types/struct_itimerspec.h
- /usr/include/bits/setjmp.h
- /usr/include/bits/types/struct___jmp_buf_tag.h
- /usr/include/bits/pthread_stack_min-dynamic.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/atomic_word.h
- /usr/include/sys/single_threaded.h
- /usr/include/c++/12/bits/locale_classes.tcc
- /usr/include/c++/12/bits/locale_facets.h
- /usr/include/c++/12/cwctype
+ /usr/include/wchar.h
/usr/include/wctype.h
- /usr/include/bits/wctype-wchar.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_base.h
- /usr/include/c++/12/bits/ios_base.h
- /usr/include/c++/12/system_error
- /usr/include/c++/12/x86_64-redhat-linux/bits/error_constants.h
- /usr/include/c++/12/stdexcept
- /usr/include/c++/12/exception
- /usr/include/c++/12/bits/exception_ptr.h
- /usr/include/c++/12/bits/cxxabi_init_exception.h
- /usr/include/c++/12/typeinfo
- /usr/include/c++/12/bits/nested_exception.h
- /usr/include/c++/12/streambuf
- /usr/include/c++/12/bits/streambuf.tcc
- /usr/include/c++/12/bits/streambuf_iterator.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_inline.h
- /usr/include/c++/12/bits/locale_facets.tcc
- /usr/include/c++/12/bits/locale_facets_nonio.h
- /usr/include/c++/12/ctime
- /usr/include/c++/12/x86_64-redhat-linux/bits/time_members.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/messages_members.h
- /usr/include/libintl.h
- /usr/include/c++/12/bits/codecvt.h
- /usr/include/c++/12/bits/locale_facets_nonio.tcc
- /usr/include/c++/12/bits/locale_conv.h
- /usr/include/c++/12/algorithm
- /usr/include/c++/12/bits/stl_algo.h
- /usr/include/c++/12/bits/algorithmfwd.h
- /usr/include/c++/12/bits/stl_heap.h
- /usr/include/c++/12/bits/stl_tempbuf.h
- /usr/include/c++/12/bits/uniform_int_dist.h
- /usr/include/c++/12/functional
- /usr/include/c++/12/tuple
- /usr/include/c++/12/bits/uses_allocator.h
- /usr/include/c++/12/bits/std_function.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/uri.hpp
- /usr/include/c++/12/iterator
- /usr/include/c++/12/bits/stream_iterator.h
- /usr/include/c++/12/memory
- /usr/include/c++/12/bits/stl_uninitialized.h
- /usr/include/c++/12/bits/stl_raw_storage_iter.h
- /usr/include/c++/12/bits/align.h
- /usr/include/c++/12/bit
- /usr/include/c++/12/bits/unique_ptr.h
- /usr/include/c++/12/bits/shared_ptr.h
- /usr/include/c++/12/bits/shared_ptr_base.h
- /usr/include/c++/12/bits/allocated_ptr.h
- /usr/include/c++/12/ext/aligned_buffer.h
- /usr/include/c++/12/ext/concurrence.h
- /usr/include/c++/12/bits/shared_ptr_atomic.h
- /usr/include/c++/12/bits/atomic_base.h
- /usr/include/c++/12/bits/atomic_lockfree_defines.h
- /usr/include/c++/12/backward/auto_ptr.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/string_view.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/optional.hpp
- /usr/include/c++/12/utility
- /usr/include/c++/12/bits/stl_relops.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/config.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/uri_errors.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/encode.hpp
- /usr/include/c++/12/cstring
- /usr/include/string.h
- /usr/include/strings.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/decode.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/translate.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/uri_builder.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_parse.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_advance_parts.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_percent_encode.hpp
- /usr/include/c++/12/vector
- /usr/include/c++/12/bits/stl_vector.h
- /usr/include/c++/12/bits/stl_bvector.h
- /usr/include/c++/12/bits/vector.tcc
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_normalize.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_resolve.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/algorithm.hpp
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdarg.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdint.h
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/optional.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/string_view.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/config.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/decode.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/encode.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/translate.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/uri.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/uri_builder.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/uri_errors.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/algorithm.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_advance_parts.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_normalize.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_parse.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_percent_encode.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_resolve.hpp
third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/uri_builder.cpp
- /usr/include/stdc-predef.h
- /usr/include/c++/12/locale
- /usr/include/c++/12/bits/localefwd.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++config.h
- /usr/include/bits/wordsize.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/os_defines.h
- /usr/include/features.h
- /usr/include/features-time64.h
- /usr/include/bits/timesize.h
- /usr/include/sys/cdefs.h
- /usr/include/bits/long-double.h
- /usr/include/gnu/stubs.h
- /usr/include/gnu/stubs-64.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++locale.h
- /usr/include/c++/12/clocale
- /usr/include/locale.h
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stddef.h
- /usr/include/bits/locale.h
- /usr/include/bits/types/locale_t.h
- /usr/include/bits/types/__locale_t.h
- /usr/include/c++/12/iosfwd
- /usr/include/c++/12/bits/stringfwd.h
- /usr/include/c++/12/bits/memoryfwd.h
- /usr/include/c++/12/bits/postypes.h
- /usr/include/c++/12/cwchar
- /usr/include/wchar.h
- /usr/include/bits/libc-header-start.h
- /usr/include/bits/floatn.h
- /usr/include/bits/floatn-common.h
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdarg.h
- /usr/include/bits/wchar.h
- /usr/include/bits/types/wint_t.h
- /usr/include/bits/types/mbstate_t.h
- /usr/include/bits/types/__mbstate_t.h
- /usr/include/bits/types/__FILE.h
- /usr/include/bits/types/FILE.h
- /usr/include/c++/12/cctype
- /usr/include/ctype.h
- /usr/include/bits/types.h
- /usr/include/bits/typesizes.h
- /usr/include/bits/time64.h
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/uri_builder.cpp
+ /usr/include/alloca.h
+ /usr/include/asm-generic/errno-base.h
+ /usr/include/asm-generic/errno.h
+ /usr/include/asm/errno.h
+ /usr/include/assert.h
+ /usr/include/bits/atomic_wide_counter.h
+ /usr/include/bits/byteswap.h
+ /usr/include/bits/cpu-set.h
/usr/include/bits/endian.h
/usr/include/bits/endianness.h
- /usr/include/c++/12/bits/locale_classes.h
- /usr/include/c++/12/string
- /usr/include/c++/12/bits/char_traits.h
- /usr/include/c++/12/type_traits
- /usr/include/c++/12/cstdint
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdint.h
- /usr/include/stdint.h
+ /usr/include/bits/errno.h
+ /usr/include/bits/floatn-common.h
+ /usr/include/bits/floatn.h
+ /usr/include/bits/libc-header-start.h
+ /usr/include/bits/locale.h
+ /usr/include/bits/long-double.h
+ /usr/include/bits/pthread_stack_min-dynamic.h
+ /usr/include/bits/pthreadtypes-arch.h
+ /usr/include/bits/pthreadtypes.h
+ /usr/include/bits/sched.h
+ /usr/include/bits/select.h
+ /usr/include/bits/setjmp.h
/usr/include/bits/stdint-intn.h
/usr/include/bits/stdint-uintn.h
- /usr/include/c++/12/bits/allocator.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++allocator.h
- /usr/include/c++/12/bits/new_allocator.h
- /usr/include/c++/12/new
- /usr/include/c++/12/bits/exception.h
- /usr/include/c++/12/bits/functexcept.h
- /usr/include/c++/12/bits/exception_defines.h
- /usr/include/c++/12/bits/move.h
- /usr/include/c++/12/bits/cpp_type_traits.h
- /usr/include/c++/12/bits/ostream_insert.h
- /usr/include/c++/12/bits/cxxabi_forced.h
- /usr/include/c++/12/bits/stl_iterator_base_types.h
- /usr/include/c++/12/bits/stl_iterator_base_funcs.h
- /usr/include/c++/12/bits/concept_check.h
- /usr/include/c++/12/debug/assertions.h
- /usr/include/c++/12/bits/stl_iterator.h
- /usr/include/c++/12/ext/type_traits.h
- /usr/include/c++/12/bits/ptr_traits.h
- /usr/include/c++/12/bits/stl_function.h
- /usr/include/c++/12/backward/binders.h
- /usr/include/c++/12/ext/numeric_traits.h
- /usr/include/c++/12/bits/stl_algobase.h
- /usr/include/c++/12/bits/stl_pair.h
- /usr/include/c++/12/bits/utility.h
- /usr/include/c++/12/debug/debug.h
- /usr/include/c++/12/bits/predefined_ops.h
- /usr/include/c++/12/bits/refwrap.h
- /usr/include/c++/12/bits/invoke.h
- /usr/include/c++/12/bits/range_access.h
- /usr/include/c++/12/initializer_list
- /usr/include/c++/12/bits/basic_string.h
- /usr/include/c++/12/ext/alloc_traits.h
- /usr/include/c++/12/bits/alloc_traits.h
- /usr/include/c++/12/bits/stl_construct.h
- /usr/include/c++/12/ext/string_conversions.h
- /usr/include/c++/12/cstdlib
- /usr/include/stdlib.h
- /usr/include/bits/waitflags.h
- /usr/include/bits/waitstatus.h
- /usr/include/sys/types.h
+ /usr/include/bits/stdio.h
+ /usr/include/bits/stdio_lim.h
+ /usr/include/bits/stdlib-bsearch.h
+ /usr/include/bits/stdlib-float.h
+ /usr/include/bits/struct_mutex.h
+ /usr/include/bits/struct_rwlock.h
+ /usr/include/bits/thread-shared-types.h
+ /usr/include/bits/time.h
+ /usr/include/bits/time64.h
+ /usr/include/bits/timesize.h
+ /usr/include/bits/timex.h
+ /usr/include/bits/types.h
+ /usr/include/bits/types/FILE.h
+ /usr/include/bits/types/__FILE.h
+ /usr/include/bits/types/__fpos64_t.h
+ /usr/include/bits/types/__fpos_t.h
+ /usr/include/bits/types/__locale_t.h
+ /usr/include/bits/types/__mbstate_t.h
+ /usr/include/bits/types/__sigset_t.h
/usr/include/bits/types/clock_t.h
/usr/include/bits/types/clockid_t.h
+ /usr/include/bits/types/cookie_io_functions_t.h
+ /usr/include/bits/types/error_t.h
+ /usr/include/bits/types/locale_t.h
+ /usr/include/bits/types/mbstate_t.h
+ /usr/include/bits/types/sigset_t.h
+ /usr/include/bits/types/struct_FILE.h
+ /usr/include/bits/types/struct___jmp_buf_tag.h
+ /usr/include/bits/types/struct_itimerspec.h
+ /usr/include/bits/types/struct_sched_param.h
+ /usr/include/bits/types/struct_timespec.h
+ /usr/include/bits/types/struct_timeval.h
+ /usr/include/bits/types/struct_tm.h
/usr/include/bits/types/time_t.h
/usr/include/bits/types/timer_t.h
+ /usr/include/bits/types/wint_t.h
+ /usr/include/bits/typesizes.h
+ /usr/include/bits/uintn-identity.h
+ /usr/include/bits/waitflags.h
+ /usr/include/bits/waitstatus.h
+ /usr/include/bits/wchar.h
+ /usr/include/bits/wctype-wchar.h
+ /usr/include/bits/wordsize.h
+ /usr/include/c++/13/algorithm
+ /usr/include/c++/13/backward/auto_ptr.h
+ /usr/include/c++/13/backward/binders.h
+ /usr/include/c++/13/bit
+ /usr/include/c++/13/bits/algorithmfwd.h
+ /usr/include/c++/13/bits/align.h
+ /usr/include/c++/13/bits/alloc_traits.h
+ /usr/include/c++/13/bits/allocated_ptr.h
+ /usr/include/c++/13/bits/allocator.h
+ /usr/include/c++/13/bits/atomic_base.h
+ /usr/include/c++/13/bits/atomic_lockfree_defines.h
+ /usr/include/c++/13/bits/basic_string.h
+ /usr/include/c++/13/bits/basic_string.tcc
+ /usr/include/c++/13/bits/char_traits.h
+ /usr/include/c++/13/bits/charconv.h
+ /usr/include/c++/13/bits/codecvt.h
+ /usr/include/c++/13/bits/concept_check.h
+ /usr/include/c++/13/bits/cpp_type_traits.h
+ /usr/include/c++/13/bits/cxxabi_forced.h
+ /usr/include/c++/13/bits/cxxabi_init_exception.h
+ /usr/include/c++/13/bits/exception.h
+ /usr/include/c++/13/bits/exception_defines.h
+ /usr/include/c++/13/bits/exception_ptr.h
+ /usr/include/c++/13/bits/functexcept.h
+ /usr/include/c++/13/bits/functional_hash.h
+ /usr/include/c++/13/bits/hash_bytes.h
+ /usr/include/c++/13/bits/invoke.h
+ /usr/include/c++/13/bits/ios_base.h
+ /usr/include/c++/13/bits/locale_classes.h
+ /usr/include/c++/13/bits/locale_classes.tcc
+ /usr/include/c++/13/bits/locale_conv.h
+ /usr/include/c++/13/bits/locale_facets.h
+ /usr/include/c++/13/bits/locale_facets.tcc
+ /usr/include/c++/13/bits/locale_facets_nonio.h
+ /usr/include/c++/13/bits/locale_facets_nonio.tcc
+ /usr/include/c++/13/bits/localefwd.h
+ /usr/include/c++/13/bits/memoryfwd.h
+ /usr/include/c++/13/bits/move.h
+ /usr/include/c++/13/bits/nested_exception.h
+ /usr/include/c++/13/bits/new_allocator.h
+ /usr/include/c++/13/bits/ostream_insert.h
+ /usr/include/c++/13/bits/postypes.h
+ /usr/include/c++/13/bits/predefined_ops.h
+ /usr/include/c++/13/bits/ptr_traits.h
+ /usr/include/c++/13/bits/range_access.h
+ /usr/include/c++/13/bits/refwrap.h
+ /usr/include/c++/13/bits/requires_hosted.h
+ /usr/include/c++/13/bits/shared_ptr.h
+ /usr/include/c++/13/bits/shared_ptr_atomic.h
+ /usr/include/c++/13/bits/shared_ptr_base.h
+ /usr/include/c++/13/bits/std_abs.h
+ /usr/include/c++/13/bits/std_function.h
+ /usr/include/c++/13/bits/stl_algo.h
+ /usr/include/c++/13/bits/stl_algobase.h
+ /usr/include/c++/13/bits/stl_construct.h
+ /usr/include/c++/13/bits/stl_function.h
+ /usr/include/c++/13/bits/stl_heap.h
+ /usr/include/c++/13/bits/stl_iterator.h
+ /usr/include/c++/13/bits/stl_iterator_base_funcs.h
+ /usr/include/c++/13/bits/stl_iterator_base_types.h
+ /usr/include/c++/13/bits/stl_pair.h
+ /usr/include/c++/13/bits/stl_raw_storage_iter.h
+ /usr/include/c++/13/bits/stl_relops.h
+ /usr/include/c++/13/bits/stl_tempbuf.h
+ /usr/include/c++/13/bits/stl_uninitialized.h
+ /usr/include/c++/13/bits/stream_iterator.h
+ /usr/include/c++/13/bits/streambuf.tcc
+ /usr/include/c++/13/bits/streambuf_iterator.h
+ /usr/include/c++/13/bits/stringfwd.h
+ /usr/include/c++/13/bits/uniform_int_dist.h
+ /usr/include/c++/13/bits/unique_ptr.h
+ /usr/include/c++/13/bits/uses_allocator.h
+ /usr/include/c++/13/bits/utility.h
+ /usr/include/c++/13/cassert
+ /usr/include/c++/13/cctype
+ /usr/include/c++/13/cerrno
+ /usr/include/c++/13/clocale
+ /usr/include/c++/13/cstdint
+ /usr/include/c++/13/cstdio
+ /usr/include/c++/13/cstdlib
+ /usr/include/c++/13/cstring
+ /usr/include/c++/13/ctime
+ /usr/include/c++/13/cwchar
+ /usr/include/c++/13/cwctype
+ /usr/include/c++/13/debug/assertions.h
+ /usr/include/c++/13/debug/debug.h
+ /usr/include/c++/13/exception
+ /usr/include/c++/13/ext/aligned_buffer.h
+ /usr/include/c++/13/ext/alloc_traits.h
+ /usr/include/c++/13/ext/atomicity.h
+ /usr/include/c++/13/ext/concurrence.h
+ /usr/include/c++/13/ext/numeric_traits.h
+ /usr/include/c++/13/ext/string_conversions.h
+ /usr/include/c++/13/ext/type_traits.h
+ /usr/include/c++/13/functional
+ /usr/include/c++/13/initializer_list
+ /usr/include/c++/13/iosfwd
+ /usr/include/c++/13/iterator
+ /usr/include/c++/13/locale
+ /usr/include/c++/13/memory
+ /usr/include/c++/13/new
+ /usr/include/c++/13/stdexcept
+ /usr/include/c++/13/streambuf
+ /usr/include/c++/13/string
+ /usr/include/c++/13/system_error
+ /usr/include/c++/13/tuple
+ /usr/include/c++/13/type_traits
+ /usr/include/c++/13/typeinfo
+ /usr/include/c++/13/utility
+ /usr/include/c++/13/x86_64-redhat-linux/bits/atomic_word.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++allocator.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++config.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++locale.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/cpu_defines.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_base.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_inline.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/error_constants.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr-default.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/messages_members.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/os_defines.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/time_members.h
+ /usr/include/ctype.h
/usr/include/endian.h
- /usr/include/bits/byteswap.h
- /usr/include/bits/uintn-identity.h
- /usr/include/sys/select.h
- /usr/include/bits/select.h
- /usr/include/bits/types/sigset_t.h
- /usr/include/bits/types/__sigset_t.h
- /usr/include/bits/types/struct_timeval.h
- /usr/include/bits/types/struct_timespec.h
- /usr/include/bits/pthreadtypes.h
- /usr/include/bits/thread-shared-types.h
- /usr/include/bits/pthreadtypes-arch.h
- /usr/include/bits/atomic_wide_counter.h
- /usr/include/bits/struct_mutex.h
- /usr/include/bits/struct_rwlock.h
- /usr/include/alloca.h
- /usr/include/bits/stdlib-bsearch.h
- /usr/include/bits/stdlib-float.h
- /usr/include/c++/12/bits/std_abs.h
- /usr/include/c++/12/cstdio
- /usr/include/stdio.h
- /usr/include/bits/types/__fpos_t.h
- /usr/include/bits/types/__fpos64_t.h
- /usr/include/bits/types/struct_FILE.h
- /usr/include/bits/types/cookie_io_functions_t.h
- /usr/include/bits/stdio_lim.h
- /usr/include/bits/stdio.h
- /usr/include/c++/12/cerrno
/usr/include/errno.h
- /usr/include/bits/errno.h
+ /usr/include/features-time64.h
+ /usr/include/features.h
+ /usr/include/gnu/stubs-64.h
+ /usr/include/gnu/stubs.h
+ /usr/include/libintl.h
/usr/include/linux/errno.h
- /usr/include/asm/errno.h
- /usr/include/asm-generic/errno.h
- /usr/include/asm-generic/errno-base.h
- /usr/include/bits/types/error_t.h
- /usr/include/c++/12/bits/charconv.h
- /usr/include/c++/12/bits/functional_hash.h
- /usr/include/c++/12/bits/hash_bytes.h
- /usr/include/c++/12/bits/basic_string.tcc
- /usr/include/c++/12/ext/atomicity.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr-default.h
+ /usr/include/locale.h
/usr/include/pthread.h
/usr/include/sched.h
- /usr/include/bits/sched.h
- /usr/include/bits/types/struct_sched_param.h
- /usr/include/bits/cpu-set.h
+ /usr/include/stdc-predef.h
+ /usr/include/stdint.h
+ /usr/include/stdio.h
+ /usr/include/stdlib.h
+ /usr/include/string.h
+ /usr/include/strings.h
+ /usr/include/sys/cdefs.h
+ /usr/include/sys/select.h
+ /usr/include/sys/single_threaded.h
+ /usr/include/sys/types.h
/usr/include/time.h
- /usr/include/bits/time.h
- /usr/include/bits/timex.h
- /usr/include/bits/types/struct_tm.h
- /usr/include/bits/types/struct_itimerspec.h
- /usr/include/bits/setjmp.h
- /usr/include/bits/types/struct___jmp_buf_tag.h
- /usr/include/bits/pthread_stack_min-dynamic.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/atomic_word.h
- /usr/include/sys/single_threaded.h
- /usr/include/c++/12/bits/locale_classes.tcc
- /usr/include/c++/12/bits/locale_facets.h
- /usr/include/c++/12/cwctype
+ /usr/include/wchar.h
/usr/include/wctype.h
- /usr/include/bits/wctype-wchar.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_base.h
- /usr/include/c++/12/bits/ios_base.h
- /usr/include/c++/12/system_error
- /usr/include/c++/12/x86_64-redhat-linux/bits/error_constants.h
- /usr/include/c++/12/stdexcept
- /usr/include/c++/12/exception
- /usr/include/c++/12/bits/exception_ptr.h
- /usr/include/c++/12/bits/cxxabi_init_exception.h
- /usr/include/c++/12/typeinfo
- /usr/include/c++/12/bits/nested_exception.h
- /usr/include/c++/12/streambuf
- /usr/include/c++/12/bits/streambuf.tcc
- /usr/include/c++/12/bits/streambuf_iterator.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_inline.h
- /usr/include/c++/12/bits/locale_facets.tcc
- /usr/include/c++/12/bits/locale_facets_nonio.h
- /usr/include/c++/12/ctime
- /usr/include/c++/12/x86_64-redhat-linux/bits/time_members.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/messages_members.h
- /usr/include/libintl.h
- /usr/include/c++/12/bits/codecvt.h
- /usr/include/c++/12/bits/locale_facets_nonio.tcc
- /usr/include/c++/12/bits/locale_conv.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/uri_builder.hpp
- /usr/include/c++/12/utility
- /usr/include/c++/12/bits/stl_relops.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/uri.hpp
- /usr/include/c++/12/iterator
- /usr/include/c++/12/bits/stream_iterator.h
- /usr/include/c++/12/algorithm
- /usr/include/c++/12/bits/stl_algo.h
- /usr/include/c++/12/bits/algorithmfwd.h
- /usr/include/c++/12/bits/stl_heap.h
- /usr/include/c++/12/bits/stl_tempbuf.h
- /usr/include/c++/12/bits/uniform_int_dist.h
- /usr/include/c++/12/functional
- /usr/include/c++/12/tuple
- /usr/include/c++/12/bits/uses_allocator.h
- /usr/include/c++/12/bits/std_function.h
- /usr/include/c++/12/memory
- /usr/include/c++/12/bits/stl_uninitialized.h
- /usr/include/c++/12/bits/stl_raw_storage_iter.h
- /usr/include/c++/12/bits/align.h
- /usr/include/c++/12/bit
- /usr/include/c++/12/bits/unique_ptr.h
- /usr/include/c++/12/bits/shared_ptr.h
- /usr/include/c++/12/bits/shared_ptr_base.h
- /usr/include/c++/12/bits/allocated_ptr.h
- /usr/include/c++/12/ext/aligned_buffer.h
- /usr/include/c++/12/ext/concurrence.h
- /usr/include/c++/12/bits/shared_ptr_atomic.h
- /usr/include/c++/12/bits/atomic_base.h
- /usr/include/c++/12/bits/atomic_lockfree_defines.h
- /usr/include/c++/12/backward/auto_ptr.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/string_view.hpp
- /usr/include/c++/12/cassert
- /usr/include/assert.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/optional.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/config.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/uri_errors.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/encode.hpp
- /usr/include/c++/12/cstring
- /usr/include/string.h
- /usr/include/strings.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/decode.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/translate.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_normalize.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_parse_authority.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/algorithm.hpp
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdarg.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdint.h
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/optional.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/string_view.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/config.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/decode.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/encode.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/translate.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/uri.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/uri_builder.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/uri_errors.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/algorithm.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_normalize.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_parse_authority.hpp
third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/uri_errors.cpp
- /usr/include/stdc-predef.h
- /usr/include/c++/12/string
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++config.h
- /usr/include/bits/wordsize.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/os_defines.h
- /usr/include/features.h
- /usr/include/features-time64.h
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/uri_errors.cpp
+ /usr/include/alloca.h
+ /usr/include/asm-generic/errno-base.h
+ /usr/include/asm-generic/errno.h
+ /usr/include/asm/errno.h
+ /usr/include/bits/atomic_wide_counter.h
+ /usr/include/bits/byteswap.h
+ /usr/include/bits/endian.h
+ /usr/include/bits/endianness.h
+ /usr/include/bits/errno.h
+ /usr/include/bits/floatn-common.h
+ /usr/include/bits/floatn.h
+ /usr/include/bits/libc-header-start.h
+ /usr/include/bits/locale.h
+ /usr/include/bits/long-double.h
+ /usr/include/bits/pthreadtypes-arch.h
+ /usr/include/bits/pthreadtypes.h
+ /usr/include/bits/select.h
+ /usr/include/bits/stdint-intn.h
+ /usr/include/bits/stdio.h
+ /usr/include/bits/stdio_lim.h
+ /usr/include/bits/stdlib-bsearch.h
+ /usr/include/bits/stdlib-float.h
+ /usr/include/bits/struct_mutex.h
+ /usr/include/bits/struct_rwlock.h
+ /usr/include/bits/thread-shared-types.h
+ /usr/include/bits/time64.h
/usr/include/bits/timesize.h
- /usr/include/sys/cdefs.h
- /usr/include/bits/long-double.h
- /usr/include/gnu/stubs.h
- /usr/include/gnu/stubs-64.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h
- /usr/include/c++/12/bits/stringfwd.h
- /usr/include/c++/12/bits/memoryfwd.h
- /usr/include/c++/12/bits/char_traits.h
- /usr/include/c++/12/bits/postypes.h
- /usr/include/c++/12/cwchar
- /usr/include/wchar.h
- /usr/include/bits/libc-header-start.h
- /usr/include/bits/floatn.h
- /usr/include/bits/floatn-common.h
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stddef.h
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdarg.h
- /usr/include/bits/wchar.h
- /usr/include/bits/types/wint_t.h
- /usr/include/bits/types/mbstate_t.h
- /usr/include/bits/types/__mbstate_t.h
+ /usr/include/bits/types.h
+ /usr/include/bits/types/FILE.h
/usr/include/bits/types/__FILE.h
- /usr/include/bits/types/FILE.h
- /usr/include/bits/types/locale_t.h
+ /usr/include/bits/types/__fpos64_t.h
+ /usr/include/bits/types/__fpos_t.h
/usr/include/bits/types/__locale_t.h
- /usr/include/c++/12/type_traits
- /usr/include/c++/12/cstdint
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdint.h
- /usr/include/stdint.h
- /usr/include/bits/types.h
- /usr/include/bits/typesizes.h
- /usr/include/bits/time64.h
- /usr/include/bits/stdint-intn.h
- /usr/include/bits/stdint-uintn.h
- /usr/include/c++/12/bits/allocator.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++allocator.h
- /usr/include/c++/12/bits/new_allocator.h
- /usr/include/c++/12/new
- /usr/include/c++/12/bits/exception.h
- /usr/include/c++/12/bits/functexcept.h
- /usr/include/c++/12/bits/exception_defines.h
- /usr/include/c++/12/bits/move.h
- /usr/include/c++/12/bits/cpp_type_traits.h
- /usr/include/c++/12/bits/localefwd.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++locale.h
- /usr/include/c++/12/clocale
- /usr/include/locale.h
- /usr/include/bits/locale.h
- /usr/include/c++/12/iosfwd
- /usr/include/c++/12/cctype
- /usr/include/ctype.h
- /usr/include/bits/endian.h
- /usr/include/bits/endianness.h
- /usr/include/c++/12/bits/ostream_insert.h
- /usr/include/c++/12/bits/cxxabi_forced.h
- /usr/include/c++/12/bits/stl_iterator_base_types.h
- /usr/include/c++/12/bits/stl_iterator_base_funcs.h
- /usr/include/c++/12/bits/concept_check.h
- /usr/include/c++/12/debug/assertions.h
- /usr/include/c++/12/bits/stl_iterator.h
- /usr/include/c++/12/ext/type_traits.h
- /usr/include/c++/12/bits/ptr_traits.h
- /usr/include/c++/12/bits/stl_function.h
- /usr/include/c++/12/backward/binders.h
- /usr/include/c++/12/ext/numeric_traits.h
- /usr/include/c++/12/bits/stl_algobase.h
- /usr/include/c++/12/bits/stl_pair.h
- /usr/include/c++/12/bits/utility.h
- /usr/include/c++/12/debug/debug.h
- /usr/include/c++/12/bits/predefined_ops.h
- /usr/include/c++/12/bits/refwrap.h
- /usr/include/c++/12/bits/invoke.h
- /usr/include/c++/12/bits/range_access.h
- /usr/include/c++/12/initializer_list
- /usr/include/c++/12/bits/basic_string.h
- /usr/include/c++/12/ext/alloc_traits.h
- /usr/include/c++/12/bits/alloc_traits.h
- /usr/include/c++/12/bits/stl_construct.h
- /usr/include/c++/12/ext/string_conversions.h
- /usr/include/c++/12/cstdlib
- /usr/include/stdlib.h
- /usr/include/bits/waitflags.h
- /usr/include/bits/waitstatus.h
- /usr/include/sys/types.h
+ /usr/include/bits/types/__mbstate_t.h
+ /usr/include/bits/types/__sigset_t.h
/usr/include/bits/types/clock_t.h
/usr/include/bits/types/clockid_t.h
+ /usr/include/bits/types/cookie_io_functions_t.h
+ /usr/include/bits/types/error_t.h
+ /usr/include/bits/types/locale_t.h
+ /usr/include/bits/types/mbstate_t.h
+ /usr/include/bits/types/sigset_t.h
+ /usr/include/bits/types/struct_FILE.h
+ /usr/include/bits/types/struct_timespec.h
+ /usr/include/bits/types/struct_timeval.h
/usr/include/bits/types/time_t.h
/usr/include/bits/types/timer_t.h
+ /usr/include/bits/types/wint_t.h
+ /usr/include/bits/typesizes.h
+ /usr/include/bits/uintn-identity.h
+ /usr/include/bits/waitflags.h
+ /usr/include/bits/waitstatus.h
+ /usr/include/bits/wchar.h
+ /usr/include/bits/wordsize.h
+ /usr/include/c++/13/backward/binders.h
+ /usr/include/c++/13/bits/alloc_traits.h
+ /usr/include/c++/13/bits/allocator.h
+ /usr/include/c++/13/bits/basic_string.h
+ /usr/include/c++/13/bits/basic_string.tcc
+ /usr/include/c++/13/bits/char_traits.h
+ /usr/include/c++/13/bits/charconv.h
+ /usr/include/c++/13/bits/concept_check.h
+ /usr/include/c++/13/bits/cpp_type_traits.h
+ /usr/include/c++/13/bits/cxxabi_forced.h
+ /usr/include/c++/13/bits/cxxabi_init_exception.h
+ /usr/include/c++/13/bits/exception.h
+ /usr/include/c++/13/bits/exception_defines.h
+ /usr/include/c++/13/bits/exception_ptr.h
+ /usr/include/c++/13/bits/functexcept.h
+ /usr/include/c++/13/bits/functional_hash.h
+ /usr/include/c++/13/bits/hash_bytes.h
+ /usr/include/c++/13/bits/invoke.h
+ /usr/include/c++/13/bits/localefwd.h
+ /usr/include/c++/13/bits/memoryfwd.h
+ /usr/include/c++/13/bits/move.h
+ /usr/include/c++/13/bits/nested_exception.h
+ /usr/include/c++/13/bits/new_allocator.h
+ /usr/include/c++/13/bits/ostream_insert.h
+ /usr/include/c++/13/bits/postypes.h
+ /usr/include/c++/13/bits/predefined_ops.h
+ /usr/include/c++/13/bits/ptr_traits.h
+ /usr/include/c++/13/bits/range_access.h
+ /usr/include/c++/13/bits/refwrap.h
+ /usr/include/c++/13/bits/requires_hosted.h
+ /usr/include/c++/13/bits/std_abs.h
+ /usr/include/c++/13/bits/stl_algobase.h
+ /usr/include/c++/13/bits/stl_construct.h
+ /usr/include/c++/13/bits/stl_function.h
+ /usr/include/c++/13/bits/stl_iterator.h
+ /usr/include/c++/13/bits/stl_iterator_base_funcs.h
+ /usr/include/c++/13/bits/stl_iterator_base_types.h
+ /usr/include/c++/13/bits/stl_pair.h
+ /usr/include/c++/13/bits/stringfwd.h
+ /usr/include/c++/13/bits/utility.h
+ /usr/include/c++/13/cctype
+ /usr/include/c++/13/cerrno
+ /usr/include/c++/13/clocale
+ /usr/include/c++/13/cstdio
+ /usr/include/c++/13/cstdlib
+ /usr/include/c++/13/cwchar
+ /usr/include/c++/13/debug/assertions.h
+ /usr/include/c++/13/debug/debug.h
+ /usr/include/c++/13/exception
+ /usr/include/c++/13/ext/alloc_traits.h
+ /usr/include/c++/13/ext/numeric_traits.h
+ /usr/include/c++/13/ext/string_conversions.h
+ /usr/include/c++/13/ext/type_traits.h
+ /usr/include/c++/13/initializer_list
+ /usr/include/c++/13/iosfwd
+ /usr/include/c++/13/new
+ /usr/include/c++/13/stdexcept
+ /usr/include/c++/13/string
+ /usr/include/c++/13/system_error
+ /usr/include/c++/13/type_traits
+ /usr/include/c++/13/typeinfo
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++allocator.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++config.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++locale.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/cpu_defines.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/error_constants.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/os_defines.h
+ /usr/include/ctype.h
/usr/include/endian.h
- /usr/include/bits/byteswap.h
- /usr/include/bits/uintn-identity.h
- /usr/include/sys/select.h
- /usr/include/bits/select.h
- /usr/include/bits/types/sigset_t.h
- /usr/include/bits/types/__sigset_t.h
- /usr/include/bits/types/struct_timeval.h
- /usr/include/bits/types/struct_timespec.h
- /usr/include/bits/pthreadtypes.h
- /usr/include/bits/thread-shared-types.h
- /usr/include/bits/pthreadtypes-arch.h
- /usr/include/bits/atomic_wide_counter.h
- /usr/include/bits/struct_mutex.h
- /usr/include/bits/struct_rwlock.h
- /usr/include/alloca.h
- /usr/include/bits/stdlib-bsearch.h
- /usr/include/bits/stdlib-float.h
- /usr/include/c++/12/bits/std_abs.h
- /usr/include/c++/12/cstdio
- /usr/include/stdio.h
- /usr/include/bits/types/__fpos_t.h
- /usr/include/bits/types/__fpos64_t.h
- /usr/include/bits/types/struct_FILE.h
- /usr/include/bits/types/cookie_io_functions_t.h
- /usr/include/bits/stdio_lim.h
- /usr/include/bits/stdio.h
- /usr/include/c++/12/cerrno
/usr/include/errno.h
- /usr/include/bits/errno.h
+ /usr/include/features-time64.h
+ /usr/include/features.h
+ /usr/include/gnu/stubs-64.h
+ /usr/include/gnu/stubs.h
/usr/include/linux/errno.h
- /usr/include/asm/errno.h
- /usr/include/asm-generic/errno.h
- /usr/include/asm-generic/errno-base.h
- /usr/include/bits/types/error_t.h
- /usr/include/c++/12/bits/charconv.h
- /usr/include/c++/12/bits/functional_hash.h
- /usr/include/c++/12/bits/hash_bytes.h
- /usr/include/c++/12/bits/basic_string.tcc
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/uri_errors.hpp
- /usr/include/c++/12/system_error
- /usr/include/c++/12/x86_64-redhat-linux/bits/error_constants.h
- /usr/include/c++/12/stdexcept
- /usr/include/c++/12/exception
- /usr/include/c++/12/bits/exception_ptr.h
- /usr/include/c++/12/bits/cxxabi_init_exception.h
- /usr/include/c++/12/typeinfo
- /usr/include/c++/12/bits/nested_exception.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/config.hpp
+ /usr/include/locale.h
+ /usr/include/stdc-predef.h
+ /usr/include/stdio.h
+ /usr/include/stdlib.h
+ /usr/include/sys/cdefs.h
+ /usr/include/sys/select.h
+ /usr/include/sys/types.h
+ /usr/include/wchar.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdarg.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/config.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/uri_errors.hpp
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.make
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.make 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.make 2024-02-27 20:51:03 UTC (rev 70212)
@@ -1,1717 +1,1718 @@
# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.25
+# Generated by "Unix Makefiles" Generator, CMake Version 3.27
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o: third_party/uri/src/detail/uri_advance_parts.cpp \
- /usr/include/stdc-predef.h \
- third_party/uri/src/detail/uri_advance_parts.hpp \
- third_party/uri/include/network/uri/detail/uri_parts.hpp \
- /usr/include/c++/12/string \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++config.h \
- /usr/include/bits/wordsize.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/os_defines.h \
- /usr/include/features.h \
- /usr/include/features-time64.h \
+ /usr/include/alloca.h \
+ /usr/include/asm-generic/errno-base.h \
+ /usr/include/asm-generic/errno.h \
+ /usr/include/asm/errno.h \
+ /usr/include/assert.h \
+ /usr/include/bits/atomic_wide_counter.h \
+ /usr/include/bits/byteswap.h \
+ /usr/include/bits/cpu-set.h \
+ /usr/include/bits/endian.h \
+ /usr/include/bits/endianness.h \
+ /usr/include/bits/errno.h \
+ /usr/include/bits/floatn-common.h \
+ /usr/include/bits/floatn.h \
+ /usr/include/bits/libc-header-start.h \
+ /usr/include/bits/locale.h \
+ /usr/include/bits/long-double.h \
+ /usr/include/bits/pthread_stack_min-dynamic.h \
+ /usr/include/bits/pthreadtypes-arch.h \
+ /usr/include/bits/pthreadtypes.h \
+ /usr/include/bits/sched.h \
+ /usr/include/bits/select.h \
+ /usr/include/bits/setjmp.h \
+ /usr/include/bits/stdint-intn.h \
+ /usr/include/bits/stdint-uintn.h \
+ /usr/include/bits/stdio.h \
+ /usr/include/bits/stdio_lim.h \
+ /usr/include/bits/stdlib-bsearch.h \
+ /usr/include/bits/stdlib-float.h \
+ /usr/include/bits/struct_mutex.h \
+ /usr/include/bits/struct_rwlock.h \
+ /usr/include/bits/thread-shared-types.h \
+ /usr/include/bits/time.h \
+ /usr/include/bits/time64.h \
/usr/include/bits/timesize.h \
- /usr/include/sys/cdefs.h \
- /usr/include/bits/long-double.h \
- /usr/include/gnu/stubs.h \
- /usr/include/gnu/stubs-64.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h \
- /usr/include/c++/12/bits/stringfwd.h \
- /usr/include/c++/12/bits/memoryfwd.h \
- /usr/include/c++/12/bits/char_traits.h \
- /usr/include/c++/12/bits/postypes.h \
- /usr/include/c++/12/cwchar \
- /usr/include/wchar.h \
- /usr/include/bits/libc-header-start.h \
- /usr/include/bits/floatn.h \
- /usr/include/bits/floatn-common.h \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stddef.h \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdarg.h \
- /usr/include/bits/wchar.h \
- /usr/include/bits/types/wint_t.h \
- /usr/include/bits/types/mbstate_t.h \
- /usr/include/bits/types/__mbstate_t.h \
+ /usr/include/bits/timex.h \
+ /usr/include/bits/types.h \
+ /usr/include/bits/types/FILE.h \
/usr/include/bits/types/__FILE.h \
- /usr/include/bits/types/FILE.h \
- /usr/include/bits/types/locale_t.h \
+ /usr/include/bits/types/__fpos64_t.h \
+ /usr/include/bits/types/__fpos_t.h \
/usr/include/bits/types/__locale_t.h \
- /usr/include/c++/12/type_traits \
- /usr/include/c++/12/cstdint \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdint.h \
- /usr/include/stdint.h \
- /usr/include/bits/types.h \
- /usr/include/bits/typesizes.h \
- /usr/include/bits/time64.h \
- /usr/include/bits/stdint-intn.h \
- /usr/include/bits/stdint-uintn.h \
- /usr/include/c++/12/bits/allocator.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++allocator.h \
- /usr/include/c++/12/bits/new_allocator.h \
- /usr/include/c++/12/new \
- /usr/include/c++/12/bits/exception.h \
- /usr/include/c++/12/bits/functexcept.h \
- /usr/include/c++/12/bits/exception_defines.h \
- /usr/include/c++/12/bits/move.h \
- /usr/include/c++/12/bits/cpp_type_traits.h \
- /usr/include/c++/12/bits/localefwd.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++locale.h \
- /usr/include/c++/12/clocale \
- /usr/include/locale.h \
- /usr/include/bits/locale.h \
- /usr/include/c++/12/iosfwd \
- /usr/include/c++/12/cctype \
- /usr/include/ctype.h \
- /usr/include/bits/endian.h \
- /usr/include/bits/endianness.h \
- /usr/include/c++/12/bits/ostream_insert.h \
- /usr/include/c++/12/bits/cxxabi_forced.h \
- /usr/include/c++/12/bits/stl_iterator_base_types.h \
- /usr/include/c++/12/bits/stl_iterator_base_funcs.h \
- /usr/include/c++/12/bits/concept_check.h \
- /usr/include/c++/12/debug/assertions.h \
- /usr/include/c++/12/bits/stl_iterator.h \
- /usr/include/c++/12/ext/type_traits.h \
- /usr/include/c++/12/bits/ptr_traits.h \
- /usr/include/c++/12/bits/stl_function.h \
- /usr/include/c++/12/backward/binders.h \
- /usr/include/c++/12/ext/numeric_traits.h \
- /usr/include/c++/12/bits/stl_algobase.h \
- /usr/include/c++/12/bits/stl_pair.h \
- /usr/include/c++/12/bits/utility.h \
- /usr/include/c++/12/debug/debug.h \
- /usr/include/c++/12/bits/predefined_ops.h \
- /usr/include/c++/12/bits/refwrap.h \
- /usr/include/c++/12/bits/invoke.h \
- /usr/include/c++/12/bits/range_access.h \
- /usr/include/c++/12/initializer_list \
- /usr/include/c++/12/bits/basic_string.h \
- /usr/include/c++/12/ext/alloc_traits.h \
- /usr/include/c++/12/bits/alloc_traits.h \
- /usr/include/c++/12/bits/stl_construct.h \
- /usr/include/c++/12/ext/string_conversions.h \
- /usr/include/c++/12/cstdlib \
- /usr/include/stdlib.h \
- /usr/include/bits/waitflags.h \
- /usr/include/bits/waitstatus.h \
- /usr/include/sys/types.h \
+ /usr/include/bits/types/__mbstate_t.h \
+ /usr/include/bits/types/__sigset_t.h \
/usr/include/bits/types/clock_t.h \
/usr/include/bits/types/clockid_t.h \
+ /usr/include/bits/types/cookie_io_functions_t.h \
+ /usr/include/bits/types/error_t.h \
+ /usr/include/bits/types/locale_t.h \
+ /usr/include/bits/types/mbstate_t.h \
+ /usr/include/bits/types/sigset_t.h \
+ /usr/include/bits/types/struct_FILE.h \
+ /usr/include/bits/types/struct___jmp_buf_tag.h \
+ /usr/include/bits/types/struct_itimerspec.h \
+ /usr/include/bits/types/struct_sched_param.h \
+ /usr/include/bits/types/struct_timespec.h \
+ /usr/include/bits/types/struct_timeval.h \
+ /usr/include/bits/types/struct_tm.h \
/usr/include/bits/types/time_t.h \
/usr/include/bits/types/timer_t.h \
+ /usr/include/bits/types/wint_t.h \
+ /usr/include/bits/typesizes.h \
+ /usr/include/bits/uintn-identity.h \
+ /usr/include/bits/waitflags.h \
+ /usr/include/bits/waitstatus.h \
+ /usr/include/bits/wchar.h \
+ /usr/include/bits/wordsize.h \
+ /usr/include/c++/13/algorithm \
+ /usr/include/c++/13/backward/auto_ptr.h \
+ /usr/include/c++/13/backward/binders.h \
+ /usr/include/c++/13/bit \
+ /usr/include/c++/13/bits/algorithmfwd.h \
+ /usr/include/c++/13/bits/align.h \
+ /usr/include/c++/13/bits/alloc_traits.h \
+ /usr/include/c++/13/bits/allocated_ptr.h \
+ /usr/include/c++/13/bits/allocator.h \
+ /usr/include/c++/13/bits/atomic_base.h \
+ /usr/include/c++/13/bits/atomic_lockfree_defines.h \
+ /usr/include/c++/13/bits/basic_string.h \
+ /usr/include/c++/13/bits/basic_string.tcc \
+ /usr/include/c++/13/bits/char_traits.h \
+ /usr/include/c++/13/bits/charconv.h \
+ /usr/include/c++/13/bits/concept_check.h \
+ /usr/include/c++/13/bits/cpp_type_traits.h \
+ /usr/include/c++/13/bits/cxxabi_forced.h \
+ /usr/include/c++/13/bits/cxxabi_init_exception.h \
+ /usr/include/c++/13/bits/exception.h \
+ /usr/include/c++/13/bits/exception_defines.h \
+ /usr/include/c++/13/bits/exception_ptr.h \
+ /usr/include/c++/13/bits/functexcept.h \
+ /usr/include/c++/13/bits/functional_hash.h \
+ /usr/include/c++/13/bits/hash_bytes.h \
+ /usr/include/c++/13/bits/invoke.h \
+ /usr/include/c++/13/bits/ios_base.h \
+ /usr/include/c++/13/bits/locale_classes.h \
+ /usr/include/c++/13/bits/locale_classes.tcc \
+ /usr/include/c++/13/bits/localefwd.h \
+ /usr/include/c++/13/bits/memoryfwd.h \
+ /usr/include/c++/13/bits/move.h \
+ /usr/include/c++/13/bits/nested_exception.h \
+ /usr/include/c++/13/bits/new_allocator.h \
+ /usr/include/c++/13/bits/ostream_insert.h \
+ /usr/include/c++/13/bits/postypes.h \
+ /usr/include/c++/13/bits/predefined_ops.h \
+ /usr/include/c++/13/bits/ptr_traits.h \
+ /usr/include/c++/13/bits/range_access.h \
+ /usr/include/c++/13/bits/refwrap.h \
+ /usr/include/c++/13/bits/requires_hosted.h \
+ /usr/include/c++/13/bits/shared_ptr.h \
+ /usr/include/c++/13/bits/shared_ptr_atomic.h \
+ /usr/include/c++/13/bits/shared_ptr_base.h \
+ /usr/include/c++/13/bits/std_abs.h \
+ /usr/include/c++/13/bits/stl_algo.h \
+ /usr/include/c++/13/bits/stl_algobase.h \
+ /usr/include/c++/13/bits/stl_construct.h \
+ /usr/include/c++/13/bits/stl_function.h \
+ /usr/include/c++/13/bits/stl_heap.h \
+ /usr/include/c++/13/bits/stl_iterator.h \
+ /usr/include/c++/13/bits/stl_iterator_base_funcs.h \
+ /usr/include/c++/13/bits/stl_iterator_base_types.h \
+ /usr/include/c++/13/bits/stl_pair.h \
+ /usr/include/c++/13/bits/stl_raw_storage_iter.h \
+ /usr/include/c++/13/bits/stl_relops.h \
+ /usr/include/c++/13/bits/stl_tempbuf.h \
+ /usr/include/c++/13/bits/stl_uninitialized.h \
+ /usr/include/c++/13/bits/stream_iterator.h \
+ /usr/include/c++/13/bits/streambuf.tcc \
+ /usr/include/c++/13/bits/streambuf_iterator.h \
+ /usr/include/c++/13/bits/stringfwd.h \
+ /usr/include/c++/13/bits/uniform_int_dist.h \
+ /usr/include/c++/13/bits/unique_ptr.h \
+ /usr/include/c++/13/bits/uses_allocator.h \
+ /usr/include/c++/13/bits/utility.h \
+ /usr/include/c++/13/cassert \
+ /usr/include/c++/13/cctype \
+ /usr/include/c++/13/cerrno \
+ /usr/include/c++/13/clocale \
+ /usr/include/c++/13/cstdio \
+ /usr/include/c++/13/cstdlib \
+ /usr/include/c++/13/cwchar \
+ /usr/include/c++/13/debug/assertions.h \
+ /usr/include/c++/13/debug/debug.h \
+ /usr/include/c++/13/exception \
+ /usr/include/c++/13/ext/aligned_buffer.h \
+ /usr/include/c++/13/ext/alloc_traits.h \
+ /usr/include/c++/13/ext/atomicity.h \
+ /usr/include/c++/13/ext/concurrence.h \
+ /usr/include/c++/13/ext/numeric_traits.h \
+ /usr/include/c++/13/ext/string_conversions.h \
+ /usr/include/c++/13/ext/type_traits.h \
+ /usr/include/c++/13/initializer_list \
+ /usr/include/c++/13/iosfwd \
+ /usr/include/c++/13/iterator \
+ /usr/include/c++/13/limits \
+ /usr/include/c++/13/memory \
+ /usr/include/c++/13/new \
+ /usr/include/c++/13/stdexcept \
+ /usr/include/c++/13/streambuf \
+ /usr/include/c++/13/string \
+ /usr/include/c++/13/system_error \
+ /usr/include/c++/13/tuple \
+ /usr/include/c++/13/type_traits \
+ /usr/include/c++/13/typeinfo \
+ /usr/include/c++/13/utility \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/atomic_word.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++allocator.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++config.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++locale.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/cpu_defines.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/error_constants.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr-default.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/os_defines.h \
+ /usr/include/ctype.h \
/usr/include/endian.h \
- /usr/include/bits/byteswap.h \
- /usr/include/bits/uintn-identity.h \
- /usr/include/sys/select.h \
- /usr/include/bits/select.h \
- /usr/include/bits/types/sigset_t.h \
- /usr/include/bits/types/__sigset_t.h \
- /usr/include/bits/types/struct_timeval.h \
- /usr/include/bits/types/struct_timespec.h \
- /usr/include/bits/pthreadtypes.h \
- /usr/include/bits/thread-shared-types.h \
- /usr/include/bits/pthreadtypes-arch.h \
- /usr/include/bits/atomic_wide_counter.h \
- /usr/include/bits/struct_mutex.h \
- /usr/include/bits/struct_rwlock.h \
- /usr/include/alloca.h \
- /usr/include/bits/stdlib-bsearch.h \
- /usr/include/bits/stdlib-float.h \
- /usr/include/c++/12/bits/std_abs.h \
- /usr/include/c++/12/cstdio \
- /usr/include/stdio.h \
- /usr/include/bits/types/__fpos_t.h \
- /usr/include/bits/types/__fpos64_t.h \
- /usr/include/bits/types/struct_FILE.h \
- /usr/include/bits/types/cookie_io_functions_t.h \
- /usr/include/bits/stdio_lim.h \
- /usr/include/bits/stdio.h \
- /usr/include/c++/12/cerrno \
/usr/include/errno.h \
- /usr/include/bits/errno.h \
+ /usr/include/features-time64.h \
+ /usr/include/features.h \
+ /usr/include/gnu/stubs-64.h \
+ /usr/include/gnu/stubs.h \
/usr/include/linux/errno.h \
- /usr/include/asm/errno.h \
- /usr/include/asm-generic/errno.h \
- /usr/include/asm-generic/errno-base.h \
- /usr/include/bits/types/error_t.h \
- /usr/include/c++/12/bits/charconv.h \
- /usr/include/c++/12/bits/functional_hash.h \
- /usr/include/c++/12/bits/hash_bytes.h \
- /usr/include/c++/12/bits/basic_string.tcc \
- /usr/include/c++/12/utility \
- /usr/include/c++/12/bits/stl_relops.h \
- /usr/include/c++/12/iterator \
- /usr/include/c++/12/bits/stream_iterator.h \
- /usr/include/c++/12/bits/streambuf_iterator.h \
- /usr/include/c++/12/streambuf \
- /usr/include/c++/12/bits/ios_base.h \
- /usr/include/c++/12/ext/atomicity.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr-default.h \
+ /usr/include/locale.h \
/usr/include/pthread.h \
/usr/include/sched.h \
- /usr/include/bits/sched.h \
- /usr/include/bits/types/struct_sched_param.h \
- /usr/include/bits/cpu-set.h \
+ /usr/include/stdc-predef.h \
+ /usr/include/stdint.h \
+ /usr/include/stdio.h \
+ /usr/include/stdlib.h \
+ /usr/include/sys/cdefs.h \
+ /usr/include/sys/select.h \
+ /usr/include/sys/single_threaded.h \
+ /usr/include/sys/types.h \
/usr/include/time.h \
- /usr/include/bits/time.h \
- /usr/include/bits/timex.h \
- /usr/include/bits/types/struct_tm.h \
- /usr/include/bits/types/struct_itimerspec.h \
- /usr/include/bits/setjmp.h \
- /usr/include/bits/types/struct___jmp_buf_tag.h \
- /usr/include/bits/pthread_stack_min-dynamic.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/atomic_word.h \
- /usr/include/sys/single_threaded.h \
- /usr/include/c++/12/bits/locale_classes.h \
- /usr/include/c++/12/bits/locale_classes.tcc \
- /usr/include/c++/12/system_error \
- /usr/include/c++/12/x86_64-redhat-linux/bits/error_constants.h \
- /usr/include/c++/12/stdexcept \
- /usr/include/c++/12/exception \
- /usr/include/c++/12/bits/exception_ptr.h \
- /usr/include/c++/12/bits/cxxabi_init_exception.h \
- /usr/include/c++/12/typeinfo \
- /usr/include/c++/12/bits/nested_exception.h \
- /usr/include/c++/12/bits/streambuf.tcc \
+ /usr/include/wchar.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdarg.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdint.h \
third_party/uri/include/network/optional.hpp \
- /usr/include/c++/12/memory \
- /usr/include/c++/12/bits/stl_uninitialized.h \
- /usr/include/c++/12/bits/stl_tempbuf.h \
- /usr/include/c++/12/bits/stl_raw_storage_iter.h \
- /usr/include/c++/12/bits/align.h \
- /usr/include/c++/12/bit \
- /usr/include/c++/12/bits/uses_allocator.h \
- /usr/include/c++/12/bits/unique_ptr.h \
- /usr/include/c++/12/tuple \
- /usr/include/c++/12/bits/shared_ptr.h \
- /usr/include/c++/12/bits/shared_ptr_base.h \
- /usr/include/c++/12/bits/allocated_ptr.h \
- /usr/include/c++/12/ext/aligned_buffer.h \
- /usr/include/c++/12/ext/concurrence.h \
- /usr/include/c++/12/bits/shared_ptr_atomic.h \
- /usr/include/c++/12/bits/atomic_base.h \
- /usr/include/c++/12/bits/atomic_lockfree_defines.h \
- /usr/include/c++/12/backward/auto_ptr.h \
- /usr/include/c++/12/algorithm \
- /usr/include/c++/12/bits/stl_algo.h \
- /usr/include/c++/12/bits/algorithmfwd.h \
- /usr/include/c++/12/bits/stl_heap.h \
- /usr/include/c++/12/bits/uniform_int_dist.h \
third_party/uri/include/network/string_view.hpp \
- /usr/include/c++/12/cassert \
- /usr/include/assert.h \
- /usr/include/c++/12/limits
+ third_party/uri/include/network/uri/detail/uri_parts.hpp \
+ third_party/uri/src/detail/uri_advance_parts.hpp
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o: third_party/uri/src/detail/uri_normalize.cpp \
- /usr/include/stdc-predef.h \
- third_party/uri/src/detail/uri_normalize.hpp \
- third_party/uri/include/network/uri/uri.hpp \
- /usr/include/c++/12/iterator \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++config.h \
- /usr/include/bits/wordsize.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/os_defines.h \
- /usr/include/features.h \
- /usr/include/features-time64.h \
- /usr/include/bits/timesize.h \
- /usr/include/sys/cdefs.h \
- /usr/include/bits/long-double.h \
- /usr/include/gnu/stubs.h \
- /usr/include/gnu/stubs-64.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h \
- /usr/include/c++/12/bits/stl_iterator_base_types.h \
- /usr/include/c++/12/type_traits \
- /usr/include/c++/12/bits/stl_iterator_base_funcs.h \
- /usr/include/c++/12/bits/concept_check.h \
- /usr/include/c++/12/debug/assertions.h \
- /usr/include/c++/12/bits/stl_iterator.h \
- /usr/include/c++/12/bits/cpp_type_traits.h \
- /usr/include/c++/12/ext/type_traits.h \
- /usr/include/c++/12/bits/move.h \
- /usr/include/c++/12/bits/ptr_traits.h \
- /usr/include/c++/12/iosfwd \
- /usr/include/c++/12/bits/stringfwd.h \
- /usr/include/c++/12/bits/memoryfwd.h \
- /usr/include/c++/12/bits/postypes.h \
- /usr/include/c++/12/cwchar \
- /usr/include/wchar.h \
+ /usr/include/alloca.h \
+ /usr/include/asm-generic/errno-base.h \
+ /usr/include/asm-generic/errno.h \
+ /usr/include/asm/errno.h \
+ /usr/include/assert.h \
+ /usr/include/bits/atomic_wide_counter.h \
+ /usr/include/bits/byteswap.h \
+ /usr/include/bits/cpu-set.h \
+ /usr/include/bits/endian.h \
+ /usr/include/bits/endianness.h \
+ /usr/include/bits/errno.h \
+ /usr/include/bits/floatn-common.h \
+ /usr/include/bits/floatn.h \
/usr/include/bits/libc-header-start.h \
- /usr/include/bits/floatn.h \
- /usr/include/bits/floatn-common.h \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stddef.h \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdarg.h \
- /usr/include/bits/wchar.h \
- /usr/include/bits/types/wint_t.h \
- /usr/include/bits/types/mbstate_t.h \
- /usr/include/bits/types/__mbstate_t.h \
- /usr/include/bits/types/__FILE.h \
- /usr/include/bits/types/FILE.h \
- /usr/include/bits/types/locale_t.h \
- /usr/include/bits/types/__locale_t.h \
- /usr/include/c++/12/bits/stream_iterator.h \
- /usr/include/c++/12/debug/debug.h \
- /usr/include/c++/12/bits/streambuf_iterator.h \
- /usr/include/c++/12/streambuf \
- /usr/include/c++/12/bits/localefwd.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++locale.h \
- /usr/include/c++/12/clocale \
- /usr/include/locale.h \
/usr/include/bits/locale.h \
- /usr/include/c++/12/cctype \
- /usr/include/ctype.h \
- /usr/include/bits/types.h \
- /usr/include/bits/typesizes.h \
- /usr/include/bits/time64.h \
- /usr/include/bits/endian.h \
- /usr/include/bits/endianness.h \
- /usr/include/c++/12/bits/ios_base.h \
- /usr/include/c++/12/ext/atomicity.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr-default.h \
- /usr/include/pthread.h \
- /usr/include/sched.h \
- /usr/include/bits/types/time_t.h \
- /usr/include/bits/types/struct_timespec.h \
+ /usr/include/bits/long-double.h \
+ /usr/include/bits/pthread_stack_min-dynamic.h \
+ /usr/include/bits/pthreadtypes-arch.h \
+ /usr/include/bits/pthreadtypes.h \
/usr/include/bits/sched.h \
- /usr/include/bits/types/struct_sched_param.h \
- /usr/include/bits/cpu-set.h \
- /usr/include/time.h \
+ /usr/include/bits/select.h \
+ /usr/include/bits/setjmp.h \
+ /usr/include/bits/stdint-intn.h \
+ /usr/include/bits/stdint-uintn.h \
+ /usr/include/bits/stdio.h \
+ /usr/include/bits/stdio_lim.h \
+ /usr/include/bits/stdlib-bsearch.h \
+ /usr/include/bits/stdlib-float.h \
+ /usr/include/bits/struct_mutex.h \
+ /usr/include/bits/struct_rwlock.h \
+ /usr/include/bits/thread-shared-types.h \
/usr/include/bits/time.h \
+ /usr/include/bits/time64.h \
+ /usr/include/bits/timesize.h \
/usr/include/bits/timex.h \
+ /usr/include/bits/types.h \
+ /usr/include/bits/types/FILE.h \
+ /usr/include/bits/types/__FILE.h \
+ /usr/include/bits/types/__fpos64_t.h \
+ /usr/include/bits/types/__fpos_t.h \
+ /usr/include/bits/types/__locale_t.h \
+ /usr/include/bits/types/__mbstate_t.h \
+ /usr/include/bits/types/__sigset_t.h \
+ /usr/include/bits/types/clock_t.h \
+ /usr/include/bits/types/clockid_t.h \
+ /usr/include/bits/types/cookie_io_functions_t.h \
+ /usr/include/bits/types/error_t.h \
+ /usr/include/bits/types/locale_t.h \
+ /usr/include/bits/types/mbstate_t.h \
+ /usr/include/bits/types/sigset_t.h \
+ /usr/include/bits/types/struct_FILE.h \
+ /usr/include/bits/types/struct___jmp_buf_tag.h \
+ /usr/include/bits/types/struct_itimerspec.h \
+ /usr/include/bits/types/struct_sched_param.h \
+ /usr/include/bits/types/struct_timespec.h \
/usr/include/bits/types/struct_timeval.h \
- /usr/include/bits/types/clock_t.h \
/usr/include/bits/types/struct_tm.h \
- /usr/include/bits/types/clockid_t.h \
+ /usr/include/bits/types/time_t.h \
/usr/include/bits/types/timer_t.h \
- /usr/include/bits/types/struct_itimerspec.h \
- /usr/include/bits/pthreadtypes.h \
- /usr/include/bits/thread-shared-types.h \
- /usr/include/bits/pthreadtypes-arch.h \
- /usr/include/bits/atomic_wide_counter.h \
- /usr/include/bits/struct_mutex.h \
- /usr/include/bits/struct_rwlock.h \
- /usr/include/bits/setjmp.h \
- /usr/include/bits/types/__sigset_t.h \
- /usr/include/bits/types/struct___jmp_buf_tag.h \
- /usr/include/bits/pthread_stack_min-dynamic.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/atomic_word.h \
- /usr/include/sys/single_threaded.h \
- /usr/include/c++/12/bits/locale_classes.h \
- /usr/include/c++/12/string \
- /usr/include/c++/12/bits/char_traits.h \
- /usr/include/c++/12/cstdint \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdint.h \
- /usr/include/stdint.h \
- /usr/include/bits/stdint-intn.h \
- /usr/include/bits/stdint-uintn.h \
- /usr/include/c++/12/bits/allocator.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++allocator.h \
- /usr/include/c++/12/bits/new_allocator.h \
- /usr/include/c++/12/new \
- /usr/include/c++/12/bits/exception.h \
- /usr/include/c++/12/bits/functexcept.h \
- /usr/include/c++/12/bits/exception_defines.h \
- /usr/include/c++/12/bits/ostream_insert.h \
- /usr/include/c++/12/bits/cxxabi_forced.h \
- /usr/include/c++/12/bits/stl_function.h \
- /usr/include/c++/12/backward/binders.h \
- /usr/include/c++/12/ext/numeric_traits.h \
- /usr/include/c++/12/bits/stl_algobase.h \
- /usr/include/c++/12/bits/stl_pair.h \
- /usr/include/c++/12/bits/utility.h \
- /usr/include/c++/12/bits/predefined_ops.h \
- /usr/include/c++/12/bits/refwrap.h \
- /usr/include/c++/12/bits/invoke.h \
- /usr/include/c++/12/bits/range_access.h \
- /usr/include/c++/12/initializer_list \
- /usr/include/c++/12/bits/basic_string.h \
- /usr/include/c++/12/ext/alloc_traits.h \
- /usr/include/c++/12/bits/alloc_traits.h \
- /usr/include/c++/12/bits/stl_construct.h \
- /usr/include/c++/12/ext/string_conversions.h \
- /usr/include/c++/12/cstdlib \
- /usr/include/stdlib.h \
+ /usr/include/bits/types/wint_t.h \
+ /usr/include/bits/typesizes.h \
+ /usr/include/bits/uintn-identity.h \
/usr/include/bits/waitflags.h \
/usr/include/bits/waitstatus.h \
- /usr/include/sys/types.h \
+ /usr/include/bits/wchar.h \
+ /usr/include/bits/wctype-wchar.h \
+ /usr/include/bits/wordsize.h \
+ /usr/include/c++/13/algorithm \
+ /usr/include/c++/13/backward/auto_ptr.h \
+ /usr/include/c++/13/backward/binders.h \
+ /usr/include/c++/13/bit \
+ /usr/include/c++/13/bits/algorithmfwd.h \
+ /usr/include/c++/13/bits/align.h \
+ /usr/include/c++/13/bits/alloc_traits.h \
+ /usr/include/c++/13/bits/allocated_ptr.h \
+ /usr/include/c++/13/bits/allocator.h \
+ /usr/include/c++/13/bits/atomic_base.h \
+ /usr/include/c++/13/bits/atomic_lockfree_defines.h \
+ /usr/include/c++/13/bits/basic_string.h \
+ /usr/include/c++/13/bits/basic_string.tcc \
+ /usr/include/c++/13/bits/char_traits.h \
+ /usr/include/c++/13/bits/charconv.h \
+ /usr/include/c++/13/bits/codecvt.h \
+ /usr/include/c++/13/bits/concept_check.h \
+ /usr/include/c++/13/bits/cpp_type_traits.h \
+ /usr/include/c++/13/bits/cxxabi_forced.h \
+ /usr/include/c++/13/bits/cxxabi_init_exception.h \
+ /usr/include/c++/13/bits/exception.h \
+ /usr/include/c++/13/bits/exception_defines.h \
+ /usr/include/c++/13/bits/exception_ptr.h \
+ /usr/include/c++/13/bits/functexcept.h \
+ /usr/include/c++/13/bits/functional_hash.h \
+ /usr/include/c++/13/bits/hash_bytes.h \
+ /usr/include/c++/13/bits/invoke.h \
+ /usr/include/c++/13/bits/ios_base.h \
+ /usr/include/c++/13/bits/locale_classes.h \
+ /usr/include/c++/13/bits/locale_classes.tcc \
+ /usr/include/c++/13/bits/locale_conv.h \
+ /usr/include/c++/13/bits/locale_facets.h \
+ /usr/include/c++/13/bits/locale_facets.tcc \
+ /usr/include/c++/13/bits/locale_facets_nonio.h \
+ /usr/include/c++/13/bits/locale_facets_nonio.tcc \
+ /usr/include/c++/13/bits/localefwd.h \
+ /usr/include/c++/13/bits/memoryfwd.h \
+ /usr/include/c++/13/bits/move.h \
+ /usr/include/c++/13/bits/nested_exception.h \
+ /usr/include/c++/13/bits/new_allocator.h \
+ /usr/include/c++/13/bits/ostream_insert.h \
+ /usr/include/c++/13/bits/postypes.h \
+ /usr/include/c++/13/bits/predefined_ops.h \
+ /usr/include/c++/13/bits/ptr_traits.h \
+ /usr/include/c++/13/bits/range_access.h \
+ /usr/include/c++/13/bits/refwrap.h \
+ /usr/include/c++/13/bits/requires_hosted.h \
+ /usr/include/c++/13/bits/shared_ptr.h \
+ /usr/include/c++/13/bits/shared_ptr_atomic.h \
+ /usr/include/c++/13/bits/shared_ptr_base.h \
+ /usr/include/c++/13/bits/std_abs.h \
+ /usr/include/c++/13/bits/std_function.h \
+ /usr/include/c++/13/bits/stl_algo.h \
+ /usr/include/c++/13/bits/stl_algobase.h \
+ /usr/include/c++/13/bits/stl_bvector.h \
+ /usr/include/c++/13/bits/stl_construct.h \
+ /usr/include/c++/13/bits/stl_function.h \
+ /usr/include/c++/13/bits/stl_heap.h \
+ /usr/include/c++/13/bits/stl_iterator.h \
+ /usr/include/c++/13/bits/stl_iterator_base_funcs.h \
+ /usr/include/c++/13/bits/stl_iterator_base_types.h \
+ /usr/include/c++/13/bits/stl_pair.h \
+ /usr/include/c++/13/bits/stl_raw_storage_iter.h \
+ /usr/include/c++/13/bits/stl_relops.h \
+ /usr/include/c++/13/bits/stl_tempbuf.h \
+ /usr/include/c++/13/bits/stl_uninitialized.h \
+ /usr/include/c++/13/bits/stl_vector.h \
+ /usr/include/c++/13/bits/stream_iterator.h \
+ /usr/include/c++/13/bits/streambuf.tcc \
+ /usr/include/c++/13/bits/streambuf_iterator.h \
+ /usr/include/c++/13/bits/stringfwd.h \
+ /usr/include/c++/13/bits/uniform_int_dist.h \
+ /usr/include/c++/13/bits/unique_ptr.h \
+ /usr/include/c++/13/bits/uses_allocator.h \
+ /usr/include/c++/13/bits/utility.h \
+ /usr/include/c++/13/bits/vector.tcc \
+ /usr/include/c++/13/cassert \
+ /usr/include/c++/13/cctype \
+ /usr/include/c++/13/cerrno \
+ /usr/include/c++/13/clocale \
+ /usr/include/c++/13/cstdint \
+ /usr/include/c++/13/cstdio \
+ /usr/include/c++/13/cstdlib \
+ /usr/include/c++/13/cstring \
+ /usr/include/c++/13/ctime \
+ /usr/include/c++/13/cwchar \
+ /usr/include/c++/13/cwctype \
+ /usr/include/c++/13/debug/assertions.h \
+ /usr/include/c++/13/debug/debug.h \
+ /usr/include/c++/13/exception \
+ /usr/include/c++/13/ext/aligned_buffer.h \
+ /usr/include/c++/13/ext/alloc_traits.h \
+ /usr/include/c++/13/ext/atomicity.h \
+ /usr/include/c++/13/ext/concurrence.h \
+ /usr/include/c++/13/ext/numeric_traits.h \
+ /usr/include/c++/13/ext/string_conversions.h \
+ /usr/include/c++/13/ext/type_traits.h \
+ /usr/include/c++/13/functional \
+ /usr/include/c++/13/initializer_list \
+ /usr/include/c++/13/iosfwd \
+ /usr/include/c++/13/iterator \
+ /usr/include/c++/13/locale \
+ /usr/include/c++/13/memory \
+ /usr/include/c++/13/new \
+ /usr/include/c++/13/stdexcept \
+ /usr/include/c++/13/streambuf \
+ /usr/include/c++/13/string \
+ /usr/include/c++/13/system_error \
+ /usr/include/c++/13/tuple \
+ /usr/include/c++/13/type_traits \
+ /usr/include/c++/13/typeinfo \
+ /usr/include/c++/13/utility \
+ /usr/include/c++/13/vector \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/atomic_word.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++allocator.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++config.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++locale.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/cpu_defines.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_base.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_inline.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/error_constants.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr-default.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/messages_members.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/os_defines.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/time_members.h \
+ /usr/include/ctype.h \
/usr/include/endian.h \
- /usr/include/bits/byteswap.h \
- /usr/include/bits/uintn-identity.h \
- /usr/include/sys/select.h \
- /usr/include/bits/select.h \
- /usr/include/bits/types/sigset_t.h \
- /usr/include/alloca.h \
- /usr/include/bits/stdlib-bsearch.h \
- /usr/include/bits/stdlib-float.h \
- /usr/include/c++/12/bits/std_abs.h \
- /usr/include/c++/12/cstdio \
- /usr/include/stdio.h \
- /usr/include/bits/types/__fpos_t.h \
- /usr/include/bits/types/__fpos64_t.h \
- /usr/include/bits/types/struct_FILE.h \
- /usr/include/bits/types/cookie_io_functions_t.h \
- /usr/include/bits/stdio_lim.h \
- /usr/include/bits/stdio.h \
- /usr/include/c++/12/cerrno \
/usr/include/errno.h \
- /usr/include/bits/errno.h \
+ /usr/include/features-time64.h \
+ /usr/include/features.h \
+ /usr/include/gnu/stubs-64.h \
+ /usr/include/gnu/stubs.h \
+ /usr/include/libintl.h \
/usr/include/linux/errno.h \
- /usr/include/asm/errno.h \
- /usr/include/asm-generic/errno.h \
- /usr/include/asm-generic/errno-base.h \
- /usr/include/bits/types/error_t.h \
- /usr/include/c++/12/bits/charconv.h \
- /usr/include/c++/12/bits/functional_hash.h \
- /usr/include/c++/12/bits/hash_bytes.h \
- /usr/include/c++/12/bits/basic_string.tcc \
- /usr/include/c++/12/bits/locale_classes.tcc \
- /usr/include/c++/12/system_error \
- /usr/include/c++/12/x86_64-redhat-linux/bits/error_constants.h \
- /usr/include/c++/12/stdexcept \
- /usr/include/c++/12/exception \
- /usr/include/c++/12/bits/exception_ptr.h \
- /usr/include/c++/12/bits/cxxabi_init_exception.h \
- /usr/include/c++/12/typeinfo \
- /usr/include/c++/12/bits/nested_exception.h \
- /usr/include/c++/12/bits/streambuf.tcc \
- /usr/include/c++/12/algorithm \
- /usr/include/c++/12/bits/stl_algo.h \
- /usr/include/c++/12/bits/algorithmfwd.h \
- /usr/include/c++/12/bits/stl_heap.h \
- /usr/include/c++/12/bits/stl_tempbuf.h \
- /usr/include/c++/12/bits/uniform_int_dist.h \
- /usr/include/c++/12/functional \
- /usr/include/c++/12/tuple \
- /usr/include/c++/12/bits/uses_allocator.h \
- /usr/include/c++/12/bits/std_function.h \
- /usr/include/c++/12/memory \
- /usr/include/c++/12/bits/stl_uninitialized.h \
- /usr/include/c++/12/bits/stl_raw_storage_iter.h \
- /usr/include/c++/12/bits/align.h \
- /usr/include/c++/12/bit \
- /usr/include/c++/12/bits/unique_ptr.h \
- /usr/include/c++/12/bits/shared_ptr.h \
- /usr/include/c++/12/bits/shared_ptr_base.h \
- /usr/include/c++/12/bits/allocated_ptr.h \
- /usr/include/c++/12/ext/aligned_buffer.h \
- /usr/include/c++/12/ext/concurrence.h \
- /usr/include/c++/12/bits/shared_ptr_atomic.h \
- /usr/include/c++/12/bits/atomic_base.h \
- /usr/include/c++/12/bits/atomic_lockfree_defines.h \
- /usr/include/c++/12/backward/auto_ptr.h \
+ /usr/include/locale.h \
+ /usr/include/pthread.h \
+ /usr/include/sched.h \
+ /usr/include/stdc-predef.h \
+ /usr/include/stdint.h \
+ /usr/include/stdio.h \
+ /usr/include/stdlib.h \
+ /usr/include/string.h \
+ /usr/include/strings.h \
+ /usr/include/sys/cdefs.h \
+ /usr/include/sys/select.h \
+ /usr/include/sys/single_threaded.h \
+ /usr/include/sys/types.h \
+ /usr/include/time.h \
+ /usr/include/wchar.h \
+ /usr/include/wctype.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdarg.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdint.h \
+ third_party/uri/include/network/optional.hpp \
third_party/uri/include/network/string_view.hpp \
- /usr/include/c++/12/cassert \
- /usr/include/assert.h \
- third_party/uri/include/network/optional.hpp \
- /usr/include/c++/12/utility \
- /usr/include/c++/12/bits/stl_relops.h \
third_party/uri/include/network/uri/config.hpp \
- third_party/uri/include/network/uri/uri_errors.hpp \
- third_party/uri/include/network/uri/detail/uri_parts.hpp \
+ third_party/uri/include/network/uri/detail/decode.hpp \
third_party/uri/include/network/uri/detail/encode.hpp \
- /usr/include/c++/12/cstring \
- /usr/include/string.h \
- /usr/include/strings.h \
- third_party/uri/include/network/uri/detail/decode.hpp \
third_party/uri/include/network/uri/detail/translate.hpp \
+ third_party/uri/include/network/uri/detail/uri_parts.hpp \
+ third_party/uri/include/network/uri/uri.hpp \
third_party/uri/include/network/uri/uri_builder.hpp \
- third_party/uri/src/detail/uri_percent_encode.hpp \
- /usr/include/c++/12/vector \
- /usr/include/c++/12/bits/stl_vector.h \
- /usr/include/c++/12/bits/stl_bvector.h \
- /usr/include/c++/12/bits/vector.tcc \
- /usr/include/c++/12/locale \
- /usr/include/c++/12/bits/locale_facets.h \
- /usr/include/c++/12/cwctype \
- /usr/include/wctype.h \
- /usr/include/bits/wctype-wchar.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_base.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_inline.h \
- /usr/include/c++/12/bits/locale_facets.tcc \
- /usr/include/c++/12/bits/locale_facets_nonio.h \
- /usr/include/c++/12/ctime \
- /usr/include/c++/12/x86_64-redhat-linux/bits/time_members.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/messages_members.h \
- /usr/include/libintl.h \
- /usr/include/c++/12/bits/codecvt.h \
- /usr/include/c++/12/bits/locale_facets_nonio.tcc \
- /usr/include/c++/12/bits/locale_conv.h \
+ third_party/uri/include/network/uri/uri_errors.hpp \
third_party/uri/src/detail/algorithm.hpp \
- third_party/uri/src/detail/algorithm_split.hpp
+ third_party/uri/src/detail/algorithm_split.hpp \
+ third_party/uri/src/detail/uri_normalize.hpp \
+ third_party/uri/src/detail/uri_percent_encode.hpp
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o: third_party/uri/src/detail/uri_parse.cpp \
- /usr/include/stdc-predef.h \
- third_party/uri/src/detail/uri_parse.hpp \
- third_party/uri/include/network/string_view.hpp \
- /usr/include/c++/12/string \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++config.h \
- /usr/include/bits/wordsize.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/os_defines.h \
- /usr/include/features.h \
- /usr/include/features-time64.h \
+ /usr/include/alloca.h \
+ /usr/include/asm-generic/errno-base.h \
+ /usr/include/asm-generic/errno.h \
+ /usr/include/asm/errno.h \
+ /usr/include/assert.h \
+ /usr/include/bits/atomic_wide_counter.h \
+ /usr/include/bits/byteswap.h \
+ /usr/include/bits/cpu-set.h \
+ /usr/include/bits/endian.h \
+ /usr/include/bits/endianness.h \
+ /usr/include/bits/errno.h \
+ /usr/include/bits/floatn-common.h \
+ /usr/include/bits/floatn.h \
+ /usr/include/bits/libc-header-start.h \
+ /usr/include/bits/locale.h \
+ /usr/include/bits/long-double.h \
+ /usr/include/bits/pthread_stack_min-dynamic.h \
+ /usr/include/bits/pthreadtypes-arch.h \
+ /usr/include/bits/pthreadtypes.h \
+ /usr/include/bits/sched.h \
+ /usr/include/bits/select.h \
+ /usr/include/bits/setjmp.h \
+ /usr/include/bits/stdint-intn.h \
+ /usr/include/bits/stdint-uintn.h \
+ /usr/include/bits/stdio.h \
+ /usr/include/bits/stdio_lim.h \
+ /usr/include/bits/stdlib-bsearch.h \
+ /usr/include/bits/stdlib-float.h \
+ /usr/include/bits/struct_mutex.h \
+ /usr/include/bits/struct_rwlock.h \
+ /usr/include/bits/thread-shared-types.h \
+ /usr/include/bits/time.h \
+ /usr/include/bits/time64.h \
/usr/include/bits/timesize.h \
- /usr/include/sys/cdefs.h \
- /usr/include/bits/long-double.h \
- /usr/include/gnu/stubs.h \
- /usr/include/gnu/stubs-64.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h \
- /usr/include/c++/12/bits/stringfwd.h \
- /usr/include/c++/12/bits/memoryfwd.h \
- /usr/include/c++/12/bits/char_traits.h \
- /usr/include/c++/12/bits/postypes.h \
- /usr/include/c++/12/cwchar \
- /usr/include/wchar.h \
- /usr/include/bits/libc-header-start.h \
- /usr/include/bits/floatn.h \
- /usr/include/bits/floatn-common.h \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stddef.h \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdarg.h \
- /usr/include/bits/wchar.h \
- /usr/include/bits/types/wint_t.h \
- /usr/include/bits/types/mbstate_t.h \
- /usr/include/bits/types/__mbstate_t.h \
+ /usr/include/bits/timex.h \
+ /usr/include/bits/types.h \
+ /usr/include/bits/types/FILE.h \
/usr/include/bits/types/__FILE.h \
- /usr/include/bits/types/FILE.h \
- /usr/include/bits/types/locale_t.h \
+ /usr/include/bits/types/__fpos64_t.h \
+ /usr/include/bits/types/__fpos_t.h \
/usr/include/bits/types/__locale_t.h \
- /usr/include/c++/12/type_traits \
- /usr/include/c++/12/cstdint \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdint.h \
- /usr/include/stdint.h \
- /usr/include/bits/types.h \
- /usr/include/bits/typesizes.h \
- /usr/include/bits/time64.h \
- /usr/include/bits/stdint-intn.h \
- /usr/include/bits/stdint-uintn.h \
- /usr/include/c++/12/bits/allocator.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++allocator.h \
- /usr/include/c++/12/bits/new_allocator.h \
- /usr/include/c++/12/new \
- /usr/include/c++/12/bits/exception.h \
- /usr/include/c++/12/bits/functexcept.h \
- /usr/include/c++/12/bits/exception_defines.h \
- /usr/include/c++/12/bits/move.h \
- /usr/include/c++/12/bits/cpp_type_traits.h \
- /usr/include/c++/12/bits/localefwd.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++locale.h \
- /usr/include/c++/12/clocale \
- /usr/include/locale.h \
- /usr/include/bits/locale.h \
- /usr/include/c++/12/iosfwd \
- /usr/include/c++/12/cctype \
- /usr/include/ctype.h \
- /usr/include/bits/endian.h \
- /usr/include/bits/endianness.h \
- /usr/include/c++/12/bits/ostream_insert.h \
- /usr/include/c++/12/bits/cxxabi_forced.h \
- /usr/include/c++/12/bits/stl_iterator_base_types.h \
- /usr/include/c++/12/bits/stl_iterator_base_funcs.h \
- /usr/include/c++/12/bits/concept_check.h \
- /usr/include/c++/12/debug/assertions.h \
- /usr/include/c++/12/bits/stl_iterator.h \
- /usr/include/c++/12/ext/type_traits.h \
- /usr/include/c++/12/bits/ptr_traits.h \
- /usr/include/c++/12/bits/stl_function.h \
- /usr/include/c++/12/backward/binders.h \
- /usr/include/c++/12/ext/numeric_traits.h \
- /usr/include/c++/12/bits/stl_algobase.h \
- /usr/include/c++/12/bits/stl_pair.h \
- /usr/include/c++/12/bits/utility.h \
- /usr/include/c++/12/debug/debug.h \
- /usr/include/c++/12/bits/predefined_ops.h \
- /usr/include/c++/12/bits/refwrap.h \
- /usr/include/c++/12/bits/invoke.h \
- /usr/include/c++/12/bits/range_access.h \
- /usr/include/c++/12/initializer_list \
- /usr/include/c++/12/bits/basic_string.h \
- /usr/include/c++/12/ext/alloc_traits.h \
- /usr/include/c++/12/bits/alloc_traits.h \
- /usr/include/c++/12/bits/stl_construct.h \
- /usr/include/c++/12/ext/string_conversions.h \
- /usr/include/c++/12/cstdlib \
- /usr/include/stdlib.h \
- /usr/include/bits/waitflags.h \
- /usr/include/bits/waitstatus.h \
- /usr/include/sys/types.h \
+ /usr/include/bits/types/__mbstate_t.h \
+ /usr/include/bits/types/__sigset_t.h \
/usr/include/bits/types/clock_t.h \
/usr/include/bits/types/clockid_t.h \
+ /usr/include/bits/types/cookie_io_functions_t.h \
+ /usr/include/bits/types/error_t.h \
+ /usr/include/bits/types/locale_t.h \
+ /usr/include/bits/types/mbstate_t.h \
+ /usr/include/bits/types/sigset_t.h \
+ /usr/include/bits/types/struct_FILE.h \
+ /usr/include/bits/types/struct___jmp_buf_tag.h \
+ /usr/include/bits/types/struct_itimerspec.h \
+ /usr/include/bits/types/struct_sched_param.h \
+ /usr/include/bits/types/struct_timespec.h \
+ /usr/include/bits/types/struct_timeval.h \
+ /usr/include/bits/types/struct_tm.h \
/usr/include/bits/types/time_t.h \
/usr/include/bits/types/timer_t.h \
+ /usr/include/bits/types/wint_t.h \
+ /usr/include/bits/typesizes.h \
+ /usr/include/bits/uintn-identity.h \
+ /usr/include/bits/waitflags.h \
+ /usr/include/bits/waitstatus.h \
+ /usr/include/bits/wchar.h \
+ /usr/include/bits/wctype-wchar.h \
+ /usr/include/bits/wordsize.h \
+ /usr/include/c++/13/algorithm \
+ /usr/include/c++/13/backward/auto_ptr.h \
+ /usr/include/c++/13/backward/binders.h \
+ /usr/include/c++/13/bit \
+ /usr/include/c++/13/bits/algorithmfwd.h \
+ /usr/include/c++/13/bits/align.h \
+ /usr/include/c++/13/bits/alloc_traits.h \
+ /usr/include/c++/13/bits/allocated_ptr.h \
+ /usr/include/c++/13/bits/allocator.h \
+ /usr/include/c++/13/bits/atomic_base.h \
+ /usr/include/c++/13/bits/atomic_lockfree_defines.h \
+ /usr/include/c++/13/bits/basic_string.h \
+ /usr/include/c++/13/bits/basic_string.tcc \
+ /usr/include/c++/13/bits/char_traits.h \
+ /usr/include/c++/13/bits/charconv.h \
+ /usr/include/c++/13/bits/codecvt.h \
+ /usr/include/c++/13/bits/concept_check.h \
+ /usr/include/c++/13/bits/cpp_type_traits.h \
+ /usr/include/c++/13/bits/cxxabi_forced.h \
+ /usr/include/c++/13/bits/cxxabi_init_exception.h \
+ /usr/include/c++/13/bits/exception.h \
+ /usr/include/c++/13/bits/exception_defines.h \
+ /usr/include/c++/13/bits/exception_ptr.h \
+ /usr/include/c++/13/bits/functexcept.h \
+ /usr/include/c++/13/bits/functional_hash.h \
+ /usr/include/c++/13/bits/hash_bytes.h \
+ /usr/include/c++/13/bits/invoke.h \
+ /usr/include/c++/13/bits/ios_base.h \
+ /usr/include/c++/13/bits/locale_classes.h \
+ /usr/include/c++/13/bits/locale_classes.tcc \
+ /usr/include/c++/13/bits/locale_conv.h \
+ /usr/include/c++/13/bits/locale_facets.h \
+ /usr/include/c++/13/bits/locale_facets.tcc \
+ /usr/include/c++/13/bits/locale_facets_nonio.h \
+ /usr/include/c++/13/bits/locale_facets_nonio.tcc \
+ /usr/include/c++/13/bits/localefwd.h \
+ /usr/include/c++/13/bits/memoryfwd.h \
+ /usr/include/c++/13/bits/move.h \
+ /usr/include/c++/13/bits/nested_exception.h \
+ /usr/include/c++/13/bits/new_allocator.h \
+ /usr/include/c++/13/bits/ostream_insert.h \
+ /usr/include/c++/13/bits/postypes.h \
+ /usr/include/c++/13/bits/predefined_ops.h \
+ /usr/include/c++/13/bits/ptr_traits.h \
+ /usr/include/c++/13/bits/range_access.h \
+ /usr/include/c++/13/bits/refwrap.h \
+ /usr/include/c++/13/bits/requires_hosted.h \
+ /usr/include/c++/13/bits/shared_ptr.h \
+ /usr/include/c++/13/bits/shared_ptr_atomic.h \
+ /usr/include/c++/13/bits/shared_ptr_base.h \
+ /usr/include/c++/13/bits/std_abs.h \
+ /usr/include/c++/13/bits/stl_algo.h \
+ /usr/include/c++/13/bits/stl_algobase.h \
+ /usr/include/c++/13/bits/stl_construct.h \
+ /usr/include/c++/13/bits/stl_function.h \
+ /usr/include/c++/13/bits/stl_heap.h \
+ /usr/include/c++/13/bits/stl_iterator.h \
+ /usr/include/c++/13/bits/stl_iterator_base_funcs.h \
+ /usr/include/c++/13/bits/stl_iterator_base_types.h \
+ /usr/include/c++/13/bits/stl_pair.h \
+ /usr/include/c++/13/bits/stl_raw_storage_iter.h \
+ /usr/include/c++/13/bits/stl_relops.h \
+ /usr/include/c++/13/bits/stl_tempbuf.h \
+ /usr/include/c++/13/bits/stl_uninitialized.h \
+ /usr/include/c++/13/bits/stream_iterator.h \
+ /usr/include/c++/13/bits/streambuf.tcc \
+ /usr/include/c++/13/bits/streambuf_iterator.h \
+ /usr/include/c++/13/bits/stringfwd.h \
+ /usr/include/c++/13/bits/uniform_int_dist.h \
+ /usr/include/c++/13/bits/unique_ptr.h \
+ /usr/include/c++/13/bits/uses_allocator.h \
+ /usr/include/c++/13/bits/utility.h \
+ /usr/include/c++/13/cassert \
+ /usr/include/c++/13/cctype \
+ /usr/include/c++/13/cerrno \
+ /usr/include/c++/13/clocale \
+ /usr/include/c++/13/cstdio \
+ /usr/include/c++/13/cstdlib \
+ /usr/include/c++/13/cstring \
+ /usr/include/c++/13/ctime \
+ /usr/include/c++/13/cwchar \
+ /usr/include/c++/13/cwctype \
+ /usr/include/c++/13/debug/assertions.h \
+ /usr/include/c++/13/debug/debug.h \
+ /usr/include/c++/13/exception \
+ /usr/include/c++/13/ext/aligned_buffer.h \
+ /usr/include/c++/13/ext/alloc_traits.h \
+ /usr/include/c++/13/ext/atomicity.h \
+ /usr/include/c++/13/ext/concurrence.h \
+ /usr/include/c++/13/ext/numeric_traits.h \
+ /usr/include/c++/13/ext/string_conversions.h \
+ /usr/include/c++/13/ext/type_traits.h \
+ /usr/include/c++/13/initializer_list \
+ /usr/include/c++/13/iosfwd \
+ /usr/include/c++/13/iterator \
+ /usr/include/c++/13/limits \
+ /usr/include/c++/13/locale \
+ /usr/include/c++/13/memory \
+ /usr/include/c++/13/new \
+ /usr/include/c++/13/stdexcept \
+ /usr/include/c++/13/streambuf \
+ /usr/include/c++/13/string \
+ /usr/include/c++/13/system_error \
+ /usr/include/c++/13/tuple \
+ /usr/include/c++/13/type_traits \
+ /usr/include/c++/13/typeinfo \
+ /usr/include/c++/13/utility \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/atomic_word.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++allocator.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++config.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++locale.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/cpu_defines.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_base.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_inline.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/error_constants.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr-default.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/messages_members.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/os_defines.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/time_members.h \
+ /usr/include/ctype.h \
/usr/include/endian.h \
- /usr/include/bits/byteswap.h \
- /usr/include/bits/uintn-identity.h \
- /usr/include/sys/select.h \
- /usr/include/bits/select.h \
- /usr/include/bits/types/sigset_t.h \
- /usr/include/bits/types/__sigset_t.h \
- /usr/include/bits/types/struct_timeval.h \
- /usr/include/bits/types/struct_timespec.h \
- /usr/include/bits/pthreadtypes.h \
- /usr/include/bits/thread-shared-types.h \
- /usr/include/bits/pthreadtypes-arch.h \
- /usr/include/bits/atomic_wide_counter.h \
- /usr/include/bits/struct_mutex.h \
- /usr/include/bits/struct_rwlock.h \
- /usr/include/alloca.h \
- /usr/include/bits/stdlib-bsearch.h \
- /usr/include/bits/stdlib-float.h \
- /usr/include/c++/12/bits/std_abs.h \
- /usr/include/c++/12/cstdio \
- /usr/include/stdio.h \
- /usr/include/bits/types/__fpos_t.h \
- /usr/include/bits/types/__fpos64_t.h \
- /usr/include/bits/types/struct_FILE.h \
- /usr/include/bits/types/cookie_io_functions_t.h \
- /usr/include/bits/stdio_lim.h \
- /usr/include/bits/stdio.h \
- /usr/include/c++/12/cerrno \
/usr/include/errno.h \
- /usr/include/bits/errno.h \
+ /usr/include/features-time64.h \
+ /usr/include/features.h \
+ /usr/include/gnu/stubs-64.h \
+ /usr/include/gnu/stubs.h \
+ /usr/include/libintl.h \
/usr/include/linux/errno.h \
- /usr/include/asm/errno.h \
- /usr/include/asm-generic/errno.h \
- /usr/include/asm-generic/errno-base.h \
- /usr/include/bits/types/error_t.h \
- /usr/include/c++/12/bits/charconv.h \
- /usr/include/c++/12/bits/functional_hash.h \
- /usr/include/c++/12/bits/hash_bytes.h \
- /usr/include/c++/12/bits/basic_string.tcc \
- /usr/include/c++/12/iterator \
- /usr/include/c++/12/bits/stream_iterator.h \
- /usr/include/c++/12/bits/streambuf_iterator.h \
- /usr/include/c++/12/streambuf \
- /usr/include/c++/12/bits/ios_base.h \
- /usr/include/c++/12/ext/atomicity.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr-default.h \
+ /usr/include/locale.h \
/usr/include/pthread.h \
/usr/include/sched.h \
- /usr/include/bits/sched.h \
- /usr/include/bits/types/struct_sched_param.h \
- /usr/include/bits/cpu-set.h \
+ /usr/include/stdc-predef.h \
+ /usr/include/stdint.h \
+ /usr/include/stdio.h \
+ /usr/include/stdlib.h \
+ /usr/include/string.h \
+ /usr/include/strings.h \
+ /usr/include/sys/cdefs.h \
+ /usr/include/sys/select.h \
+ /usr/include/sys/single_threaded.h \
+ /usr/include/sys/types.h \
/usr/include/time.h \
- /usr/include/bits/time.h \
- /usr/include/bits/timex.h \
- /usr/include/bits/types/struct_tm.h \
- /usr/include/bits/types/struct_itimerspec.h \
- /usr/include/bits/setjmp.h \
- /usr/include/bits/types/struct___jmp_buf_tag.h \
- /usr/include/bits/pthread_stack_min-dynamic.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/atomic_word.h \
- /usr/include/sys/single_threaded.h \
- /usr/include/c++/12/bits/locale_classes.h \
- /usr/include/c++/12/bits/locale_classes.tcc \
- /usr/include/c++/12/system_error \
- /usr/include/c++/12/x86_64-redhat-linux/bits/error_constants.h \
- /usr/include/c++/12/stdexcept \
- /usr/include/c++/12/exception \
- /usr/include/c++/12/bits/exception_ptr.h \
- /usr/include/c++/12/bits/cxxabi_init_exception.h \
- /usr/include/c++/12/typeinfo \
- /usr/include/c++/12/bits/nested_exception.h \
- /usr/include/c++/12/bits/streambuf.tcc \
- /usr/include/c++/12/cassert \
- /usr/include/assert.h \
- /usr/include/c++/12/algorithm \
- /usr/include/c++/12/bits/stl_algo.h \
- /usr/include/c++/12/bits/algorithmfwd.h \
- /usr/include/c++/12/bits/stl_heap.h \
- /usr/include/c++/12/bits/stl_tempbuf.h \
- /usr/include/c++/12/bits/uniform_int_dist.h \
- /usr/include/c++/12/limits \
- third_party/uri/src/detail/grammar.hpp \
- /usr/include/c++/12/locale \
- /usr/include/c++/12/bits/locale_facets.h \
- /usr/include/c++/12/cwctype \
+ /usr/include/wchar.h \
/usr/include/wctype.h \
- /usr/include/bits/wctype-wchar.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_base.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_inline.h \
- /usr/include/c++/12/bits/locale_facets.tcc \
- /usr/include/c++/12/bits/locale_facets_nonio.h \
- /usr/include/c++/12/ctime \
- /usr/include/c++/12/x86_64-redhat-linux/bits/time_members.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/messages_members.h \
- /usr/include/libintl.h \
- /usr/include/c++/12/bits/codecvt.h \
- /usr/include/c++/12/bits/locale_facets_nonio.tcc \
- /usr/include/c++/12/bits/locale_conv.h \
- /usr/include/c++/12/cstring \
- /usr/include/string.h \
- /usr/include/strings.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdarg.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdint.h \
+ third_party/uri/include/network/optional.hpp \
+ third_party/uri/include/network/string_view.hpp \
third_party/uri/include/network/uri/detail/uri_parts.hpp \
- /usr/include/c++/12/utility \
- /usr/include/c++/12/bits/stl_relops.h \
- third_party/uri/include/network/optional.hpp \
- /usr/include/c++/12/memory \
- /usr/include/c++/12/bits/stl_uninitialized.h \
- /usr/include/c++/12/bits/stl_raw_storage_iter.h \
- /usr/include/c++/12/bits/align.h \
- /usr/include/c++/12/bit \
- /usr/include/c++/12/bits/uses_allocator.h \
- /usr/include/c++/12/bits/unique_ptr.h \
- /usr/include/c++/12/tuple \
- /usr/include/c++/12/bits/shared_ptr.h \
- /usr/include/c++/12/bits/shared_ptr_base.h \
- /usr/include/c++/12/bits/allocated_ptr.h \
- /usr/include/c++/12/ext/aligned_buffer.h \
- /usr/include/c++/12/ext/concurrence.h \
- /usr/include/c++/12/bits/shared_ptr_atomic.h \
- /usr/include/c++/12/bits/atomic_base.h \
- /usr/include/c++/12/bits/atomic_lockfree_defines.h \
- /usr/include/c++/12/backward/auto_ptr.h
+ third_party/uri/src/detail/grammar.hpp \
+ third_party/uri/src/detail/uri_parse.hpp
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o: third_party/uri/src/detail/uri_parse_authority.cpp \
- /usr/include/stdc-predef.h \
- third_party/uri/src/detail/uri_parse_authority.hpp \
- third_party/uri/include/network/uri/detail/uri_parts.hpp \
- /usr/include/c++/12/string \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++config.h \
- /usr/include/bits/wordsize.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/os_defines.h \
- /usr/include/features.h \
- /usr/include/features-time64.h \
+ /usr/include/alloca.h \
+ /usr/include/asm-generic/errno-base.h \
+ /usr/include/asm-generic/errno.h \
+ /usr/include/asm/errno.h \
+ /usr/include/assert.h \
+ /usr/include/bits/atomic_wide_counter.h \
+ /usr/include/bits/byteswap.h \
+ /usr/include/bits/cpu-set.h \
+ /usr/include/bits/endian.h \
+ /usr/include/bits/endianness.h \
+ /usr/include/bits/errno.h \
+ /usr/include/bits/floatn-common.h \
+ /usr/include/bits/floatn.h \
+ /usr/include/bits/libc-header-start.h \
+ /usr/include/bits/locale.h \
+ /usr/include/bits/long-double.h \
+ /usr/include/bits/pthread_stack_min-dynamic.h \
+ /usr/include/bits/pthreadtypes-arch.h \
+ /usr/include/bits/pthreadtypes.h \
+ /usr/include/bits/sched.h \
+ /usr/include/bits/select.h \
+ /usr/include/bits/setjmp.h \
+ /usr/include/bits/stdint-intn.h \
+ /usr/include/bits/stdint-uintn.h \
+ /usr/include/bits/stdio.h \
+ /usr/include/bits/stdio_lim.h \
+ /usr/include/bits/stdlib-bsearch.h \
+ /usr/include/bits/stdlib-float.h \
+ /usr/include/bits/struct_mutex.h \
+ /usr/include/bits/struct_rwlock.h \
+ /usr/include/bits/thread-shared-types.h \
+ /usr/include/bits/time.h \
+ /usr/include/bits/time64.h \
/usr/include/bits/timesize.h \
- /usr/include/sys/cdefs.h \
- /usr/include/bits/long-double.h \
- /usr/include/gnu/stubs.h \
- /usr/include/gnu/stubs-64.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h \
- /usr/include/c++/12/bits/stringfwd.h \
- /usr/include/c++/12/bits/memoryfwd.h \
- /usr/include/c++/12/bits/char_traits.h \
- /usr/include/c++/12/bits/postypes.h \
- /usr/include/c++/12/cwchar \
- /usr/include/wchar.h \
- /usr/include/bits/libc-header-start.h \
- /usr/include/bits/floatn.h \
- /usr/include/bits/floatn-common.h \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stddef.h \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdarg.h \
- /usr/include/bits/wchar.h \
- /usr/include/bits/types/wint_t.h \
- /usr/include/bits/types/mbstate_t.h \
- /usr/include/bits/types/__mbstate_t.h \
+ /usr/include/bits/timex.h \
+ /usr/include/bits/types.h \
+ /usr/include/bits/types/FILE.h \
/usr/include/bits/types/__FILE.h \
- /usr/include/bits/types/FILE.h \
- /usr/include/bits/types/locale_t.h \
+ /usr/include/bits/types/__fpos64_t.h \
+ /usr/include/bits/types/__fpos_t.h \
/usr/include/bits/types/__locale_t.h \
- /usr/include/c++/12/type_traits \
- /usr/include/c++/12/cstdint \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdint.h \
- /usr/include/stdint.h \
- /usr/include/bits/types.h \
- /usr/include/bits/typesizes.h \
- /usr/include/bits/time64.h \
- /usr/include/bits/stdint-intn.h \
- /usr/include/bits/stdint-uintn.h \
- /usr/include/c++/12/bits/allocator.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++allocator.h \
- /usr/include/c++/12/bits/new_allocator.h \
- /usr/include/c++/12/new \
- /usr/include/c++/12/bits/exception.h \
- /usr/include/c++/12/bits/functexcept.h \
- /usr/include/c++/12/bits/exception_defines.h \
- /usr/include/c++/12/bits/move.h \
- /usr/include/c++/12/bits/cpp_type_traits.h \
- /usr/include/c++/12/bits/localefwd.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++locale.h \
- /usr/include/c++/12/clocale \
- /usr/include/locale.h \
- /usr/include/bits/locale.h \
- /usr/include/c++/12/iosfwd \
- /usr/include/c++/12/cctype \
- /usr/include/ctype.h \
- /usr/include/bits/endian.h \
- /usr/include/bits/endianness.h \
- /usr/include/c++/12/bits/ostream_insert.h \
- /usr/include/c++/12/bits/cxxabi_forced.h \
- /usr/include/c++/12/bits/stl_iterator_base_types.h \
- /usr/include/c++/12/bits/stl_iterator_base_funcs.h \
- /usr/include/c++/12/bits/concept_check.h \
- /usr/include/c++/12/debug/assertions.h \
- /usr/include/c++/12/bits/stl_iterator.h \
- /usr/include/c++/12/ext/type_traits.h \
- /usr/include/c++/12/bits/ptr_traits.h \
- /usr/include/c++/12/bits/stl_function.h \
- /usr/include/c++/12/backward/binders.h \
- /usr/include/c++/12/ext/numeric_traits.h \
- /usr/include/c++/12/bits/stl_algobase.h \
- /usr/include/c++/12/bits/stl_pair.h \
- /usr/include/c++/12/bits/utility.h \
- /usr/include/c++/12/debug/debug.h \
- /usr/include/c++/12/bits/predefined_ops.h \
- /usr/include/c++/12/bits/refwrap.h \
- /usr/include/c++/12/bits/invoke.h \
- /usr/include/c++/12/bits/range_access.h \
- /usr/include/c++/12/initializer_list \
- /usr/include/c++/12/bits/basic_string.h \
- /usr/include/c++/12/ext/alloc_traits.h \
- /usr/include/c++/12/bits/alloc_traits.h \
- /usr/include/c++/12/bits/stl_construct.h \
- /usr/include/c++/12/ext/string_conversions.h \
- /usr/include/c++/12/cstdlib \
- /usr/include/stdlib.h \
- /usr/include/bits/waitflags.h \
- /usr/include/bits/waitstatus.h \
- /usr/include/sys/types.h \
+ /usr/include/bits/types/__mbstate_t.h \
+ /usr/include/bits/types/__sigset_t.h \
/usr/include/bits/types/clock_t.h \
/usr/include/bits/types/clockid_t.h \
+ /usr/include/bits/types/cookie_io_functions_t.h \
+ /usr/include/bits/types/error_t.h \
+ /usr/include/bits/types/locale_t.h \
+ /usr/include/bits/types/mbstate_t.h \
+ /usr/include/bits/types/sigset_t.h \
+ /usr/include/bits/types/struct_FILE.h \
+ /usr/include/bits/types/struct___jmp_buf_tag.h \
+ /usr/include/bits/types/struct_itimerspec.h \
+ /usr/include/bits/types/struct_sched_param.h \
+ /usr/include/bits/types/struct_timespec.h \
+ /usr/include/bits/types/struct_timeval.h \
+ /usr/include/bits/types/struct_tm.h \
/usr/include/bits/types/time_t.h \
/usr/include/bits/types/timer_t.h \
+ /usr/include/bits/types/wint_t.h \
+ /usr/include/bits/typesizes.h \
+ /usr/include/bits/uintn-identity.h \
+ /usr/include/bits/waitflags.h \
+ /usr/include/bits/waitstatus.h \
+ /usr/include/bits/wchar.h \
+ /usr/include/bits/wctype-wchar.h \
+ /usr/include/bits/wordsize.h \
+ /usr/include/c++/13/algorithm \
+ /usr/include/c++/13/backward/auto_ptr.h \
+ /usr/include/c++/13/backward/binders.h \
+ /usr/include/c++/13/bit \
+ /usr/include/c++/13/bits/algorithmfwd.h \
+ /usr/include/c++/13/bits/align.h \
+ /usr/include/c++/13/bits/alloc_traits.h \
+ /usr/include/c++/13/bits/allocated_ptr.h \
+ /usr/include/c++/13/bits/allocator.h \
+ /usr/include/c++/13/bits/atomic_base.h \
+ /usr/include/c++/13/bits/atomic_lockfree_defines.h \
+ /usr/include/c++/13/bits/basic_string.h \
+ /usr/include/c++/13/bits/basic_string.tcc \
+ /usr/include/c++/13/bits/char_traits.h \
+ /usr/include/c++/13/bits/charconv.h \
+ /usr/include/c++/13/bits/codecvt.h \
+ /usr/include/c++/13/bits/concept_check.h \
+ /usr/include/c++/13/bits/cpp_type_traits.h \
+ /usr/include/c++/13/bits/cxxabi_forced.h \
+ /usr/include/c++/13/bits/cxxabi_init_exception.h \
+ /usr/include/c++/13/bits/exception.h \
+ /usr/include/c++/13/bits/exception_defines.h \
+ /usr/include/c++/13/bits/exception_ptr.h \
+ /usr/include/c++/13/bits/functexcept.h \
+ /usr/include/c++/13/bits/functional_hash.h \
+ /usr/include/c++/13/bits/hash_bytes.h \
+ /usr/include/c++/13/bits/invoke.h \
+ /usr/include/c++/13/bits/ios_base.h \
+ /usr/include/c++/13/bits/locale_classes.h \
+ /usr/include/c++/13/bits/locale_classes.tcc \
+ /usr/include/c++/13/bits/locale_conv.h \
+ /usr/include/c++/13/bits/locale_facets.h \
+ /usr/include/c++/13/bits/locale_facets.tcc \
+ /usr/include/c++/13/bits/locale_facets_nonio.h \
+ /usr/include/c++/13/bits/locale_facets_nonio.tcc \
+ /usr/include/c++/13/bits/localefwd.h \
+ /usr/include/c++/13/bits/memoryfwd.h \
+ /usr/include/c++/13/bits/move.h \
+ /usr/include/c++/13/bits/nested_exception.h \
+ /usr/include/c++/13/bits/new_allocator.h \
+ /usr/include/c++/13/bits/ostream_insert.h \
+ /usr/include/c++/13/bits/postypes.h \
+ /usr/include/c++/13/bits/predefined_ops.h \
+ /usr/include/c++/13/bits/ptr_traits.h \
+ /usr/include/c++/13/bits/range_access.h \
+ /usr/include/c++/13/bits/refwrap.h \
+ /usr/include/c++/13/bits/requires_hosted.h \
+ /usr/include/c++/13/bits/shared_ptr.h \
+ /usr/include/c++/13/bits/shared_ptr_atomic.h \
+ /usr/include/c++/13/bits/shared_ptr_base.h \
+ /usr/include/c++/13/bits/std_abs.h \
+ /usr/include/c++/13/bits/stl_algo.h \
+ /usr/include/c++/13/bits/stl_algobase.h \
+ /usr/include/c++/13/bits/stl_construct.h \
+ /usr/include/c++/13/bits/stl_function.h \
+ /usr/include/c++/13/bits/stl_heap.h \
+ /usr/include/c++/13/bits/stl_iterator.h \
+ /usr/include/c++/13/bits/stl_iterator_base_funcs.h \
+ /usr/include/c++/13/bits/stl_iterator_base_types.h \
+ /usr/include/c++/13/bits/stl_pair.h \
+ /usr/include/c++/13/bits/stl_raw_storage_iter.h \
+ /usr/include/c++/13/bits/stl_relops.h \
+ /usr/include/c++/13/bits/stl_tempbuf.h \
+ /usr/include/c++/13/bits/stl_uninitialized.h \
+ /usr/include/c++/13/bits/stream_iterator.h \
+ /usr/include/c++/13/bits/streambuf.tcc \
+ /usr/include/c++/13/bits/streambuf_iterator.h \
+ /usr/include/c++/13/bits/stringfwd.h \
+ /usr/include/c++/13/bits/uniform_int_dist.h \
+ /usr/include/c++/13/bits/unique_ptr.h \
+ /usr/include/c++/13/bits/uses_allocator.h \
+ /usr/include/c++/13/bits/utility.h \
+ /usr/include/c++/13/cassert \
+ /usr/include/c++/13/cctype \
+ /usr/include/c++/13/cerrno \
+ /usr/include/c++/13/clocale \
+ /usr/include/c++/13/cstdio \
+ /usr/include/c++/13/cstdlib \
+ /usr/include/c++/13/cstring \
+ /usr/include/c++/13/ctime \
+ /usr/include/c++/13/cwchar \
+ /usr/include/c++/13/cwctype \
+ /usr/include/c++/13/debug/assertions.h \
+ /usr/include/c++/13/debug/debug.h \
+ /usr/include/c++/13/exception \
+ /usr/include/c++/13/ext/aligned_buffer.h \
+ /usr/include/c++/13/ext/alloc_traits.h \
+ /usr/include/c++/13/ext/atomicity.h \
+ /usr/include/c++/13/ext/concurrence.h \
+ /usr/include/c++/13/ext/numeric_traits.h \
+ /usr/include/c++/13/ext/string_conversions.h \
+ /usr/include/c++/13/ext/type_traits.h \
+ /usr/include/c++/13/initializer_list \
+ /usr/include/c++/13/iosfwd \
+ /usr/include/c++/13/iterator \
+ /usr/include/c++/13/limits \
+ /usr/include/c++/13/locale \
+ /usr/include/c++/13/memory \
+ /usr/include/c++/13/new \
+ /usr/include/c++/13/stdexcept \
+ /usr/include/c++/13/streambuf \
+ /usr/include/c++/13/string \
+ /usr/include/c++/13/system_error \
+ /usr/include/c++/13/tuple \
+ /usr/include/c++/13/type_traits \
+ /usr/include/c++/13/typeinfo \
+ /usr/include/c++/13/utility \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/atomic_word.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++allocator.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++config.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++locale.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/cpu_defines.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_base.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_inline.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/error_constants.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr-default.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/messages_members.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/os_defines.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/time_members.h \
+ /usr/include/ctype.h \
/usr/include/endian.h \
- /usr/include/bits/byteswap.h \
- /usr/include/bits/uintn-identity.h \
- /usr/include/sys/select.h \
- /usr/include/bits/select.h \
- /usr/include/bits/types/sigset_t.h \
- /usr/include/bits/types/__sigset_t.h \
- /usr/include/bits/types/struct_timeval.h \
- /usr/include/bits/types/struct_timespec.h \
- /usr/include/bits/pthreadtypes.h \
- /usr/include/bits/thread-shared-types.h \
- /usr/include/bits/pthreadtypes-arch.h \
- /usr/include/bits/atomic_wide_counter.h \
- /usr/include/bits/struct_mutex.h \
- /usr/include/bits/struct_rwlock.h \
- /usr/include/alloca.h \
- /usr/include/bits/stdlib-bsearch.h \
- /usr/include/bits/stdlib-float.h \
- /usr/include/c++/12/bits/std_abs.h \
- /usr/include/c++/12/cstdio \
- /usr/include/stdio.h \
- /usr/include/bits/types/__fpos_t.h \
- /usr/include/bits/types/__fpos64_t.h \
- /usr/include/bits/types/struct_FILE.h \
- /usr/include/bits/types/cookie_io_functions_t.h \
- /usr/include/bits/stdio_lim.h \
- /usr/include/bits/stdio.h \
- /usr/include/c++/12/cerrno \
/usr/include/errno.h \
- /usr/include/bits/errno.h \
+ /usr/include/features-time64.h \
+ /usr/include/features.h \
+ /usr/include/gnu/stubs-64.h \
+ /usr/include/gnu/stubs.h \
+ /usr/include/libintl.h \
/usr/include/linux/errno.h \
- /usr/include/asm/errno.h \
- /usr/include/asm-generic/errno.h \
- /usr/include/asm-generic/errno-base.h \
- /usr/include/bits/types/error_t.h \
- /usr/include/c++/12/bits/charconv.h \
- /usr/include/c++/12/bits/functional_hash.h \
- /usr/include/c++/12/bits/hash_bytes.h \
- /usr/include/c++/12/bits/basic_string.tcc \
- /usr/include/c++/12/utility \
- /usr/include/c++/12/bits/stl_relops.h \
- /usr/include/c++/12/iterator \
- /usr/include/c++/12/bits/stream_iterator.h \
- /usr/include/c++/12/bits/streambuf_iterator.h \
- /usr/include/c++/12/streambuf \
- /usr/include/c++/12/bits/ios_base.h \
- /usr/include/c++/12/ext/atomicity.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr-default.h \
+ /usr/include/locale.h \
/usr/include/pthread.h \
/usr/include/sched.h \
- /usr/include/bits/sched.h \
- /usr/include/bits/types/struct_sched_param.h \
- /usr/include/bits/cpu-set.h \
+ /usr/include/stdc-predef.h \
+ /usr/include/stdint.h \
+ /usr/include/stdio.h \
+ /usr/include/stdlib.h \
+ /usr/include/string.h \
+ /usr/include/strings.h \
+ /usr/include/sys/cdefs.h \
+ /usr/include/sys/select.h \
+ /usr/include/sys/single_threaded.h \
+ /usr/include/sys/types.h \
/usr/include/time.h \
- /usr/include/bits/time.h \
- /usr/include/bits/timex.h \
- /usr/include/bits/types/struct_tm.h \
- /usr/include/bits/types/struct_itimerspec.h \
- /usr/include/bits/setjmp.h \
- /usr/include/bits/types/struct___jmp_buf_tag.h \
- /usr/include/bits/pthread_stack_min-dynamic.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/atomic_word.h \
- /usr/include/sys/single_threaded.h \
- /usr/include/c++/12/bits/locale_classes.h \
- /usr/include/c++/12/bits/locale_classes.tcc \
- /usr/include/c++/12/system_error \
- /usr/include/c++/12/x86_64-redhat-linux/bits/error_constants.h \
- /usr/include/c++/12/stdexcept \
- /usr/include/c++/12/exception \
- /usr/include/c++/12/bits/exception_ptr.h \
- /usr/include/c++/12/bits/cxxabi_init_exception.h \
- /usr/include/c++/12/typeinfo \
- /usr/include/c++/12/bits/nested_exception.h \
- /usr/include/c++/12/bits/streambuf.tcc \
+ /usr/include/wchar.h \
+ /usr/include/wctype.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdarg.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdint.h \
third_party/uri/include/network/optional.hpp \
- /usr/include/c++/12/memory \
- /usr/include/c++/12/bits/stl_uninitialized.h \
- /usr/include/c++/12/bits/stl_tempbuf.h \
- /usr/include/c++/12/bits/stl_raw_storage_iter.h \
- /usr/include/c++/12/bits/align.h \
- /usr/include/c++/12/bit \
- /usr/include/c++/12/bits/uses_allocator.h \
- /usr/include/c++/12/bits/unique_ptr.h \
- /usr/include/c++/12/tuple \
- /usr/include/c++/12/bits/shared_ptr.h \
- /usr/include/c++/12/bits/shared_ptr_base.h \
- /usr/include/c++/12/bits/allocated_ptr.h \
- /usr/include/c++/12/ext/aligned_buffer.h \
- /usr/include/c++/12/ext/concurrence.h \
- /usr/include/c++/12/bits/shared_ptr_atomic.h \
- /usr/include/c++/12/bits/atomic_base.h \
- /usr/include/c++/12/bits/atomic_lockfree_defines.h \
- /usr/include/c++/12/backward/auto_ptr.h \
- /usr/include/c++/12/algorithm \
- /usr/include/c++/12/bits/stl_algo.h \
- /usr/include/c++/12/bits/algorithmfwd.h \
- /usr/include/c++/12/bits/stl_heap.h \
- /usr/include/c++/12/bits/uniform_int_dist.h \
third_party/uri/include/network/string_view.hpp \
- /usr/include/c++/12/cassert \
- /usr/include/assert.h \
- /usr/include/c++/12/limits \
+ third_party/uri/include/network/uri/detail/uri_parts.hpp \
third_party/uri/src/detail/grammar.hpp \
- /usr/include/c++/12/locale \
- /usr/include/c++/12/bits/locale_facets.h \
- /usr/include/c++/12/cwctype \
- /usr/include/wctype.h \
- /usr/include/bits/wctype-wchar.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_base.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_inline.h \
- /usr/include/c++/12/bits/locale_facets.tcc \
- /usr/include/c++/12/bits/locale_facets_nonio.h \
- /usr/include/c++/12/ctime \
- /usr/include/c++/12/x86_64-redhat-linux/bits/time_members.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/messages_members.h \
- /usr/include/libintl.h \
- /usr/include/c++/12/bits/codecvt.h \
- /usr/include/c++/12/bits/locale_facets_nonio.tcc \
- /usr/include/c++/12/bits/locale_conv.h \
- /usr/include/c++/12/cstring \
- /usr/include/string.h \
- /usr/include/strings.h
+ third_party/uri/src/detail/uri_parse_authority.hpp
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o: third_party/uri/src/detail/uri_resolve.cpp \
- /usr/include/stdc-predef.h \
- third_party/uri/src/detail/uri_resolve.hpp \
- third_party/uri/include/network/uri/uri.hpp \
- /usr/include/c++/12/iterator \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++config.h \
- /usr/include/bits/wordsize.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/os_defines.h \
- /usr/include/features.h \
- /usr/include/features-time64.h \
- /usr/include/bits/timesize.h \
- /usr/include/sys/cdefs.h \
- /usr/include/bits/long-double.h \
- /usr/include/gnu/stubs.h \
- /usr/include/gnu/stubs-64.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h \
- /usr/include/c++/12/bits/stl_iterator_base_types.h \
- /usr/include/c++/12/type_traits \
- /usr/include/c++/12/bits/stl_iterator_base_funcs.h \
- /usr/include/c++/12/bits/concept_check.h \
- /usr/include/c++/12/debug/assertions.h \
- /usr/include/c++/12/bits/stl_iterator.h \
- /usr/include/c++/12/bits/cpp_type_traits.h \
- /usr/include/c++/12/ext/type_traits.h \
- /usr/include/c++/12/bits/move.h \
- /usr/include/c++/12/bits/ptr_traits.h \
- /usr/include/c++/12/iosfwd \
- /usr/include/c++/12/bits/stringfwd.h \
- /usr/include/c++/12/bits/memoryfwd.h \
- /usr/include/c++/12/bits/postypes.h \
- /usr/include/c++/12/cwchar \
- /usr/include/wchar.h \
+ /usr/include/alloca.h \
+ /usr/include/asm-generic/errno-base.h \
+ /usr/include/asm-generic/errno.h \
+ /usr/include/asm/errno.h \
+ /usr/include/assert.h \
+ /usr/include/bits/atomic_wide_counter.h \
+ /usr/include/bits/byteswap.h \
+ /usr/include/bits/cpu-set.h \
+ /usr/include/bits/endian.h \
+ /usr/include/bits/endianness.h \
+ /usr/include/bits/errno.h \
+ /usr/include/bits/floatn-common.h \
+ /usr/include/bits/floatn.h \
/usr/include/bits/libc-header-start.h \
- /usr/include/bits/floatn.h \
- /usr/include/bits/floatn-common.h \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stddef.h \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdarg.h \
- /usr/include/bits/wchar.h \
- /usr/include/bits/types/wint_t.h \
- /usr/include/bits/types/mbstate_t.h \
- /usr/include/bits/types/__mbstate_t.h \
- /usr/include/bits/types/__FILE.h \
- /usr/include/bits/types/FILE.h \
- /usr/include/bits/types/locale_t.h \
- /usr/include/bits/types/__locale_t.h \
- /usr/include/c++/12/bits/stream_iterator.h \
- /usr/include/c++/12/debug/debug.h \
- /usr/include/c++/12/bits/streambuf_iterator.h \
- /usr/include/c++/12/streambuf \
- /usr/include/c++/12/bits/localefwd.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++locale.h \
- /usr/include/c++/12/clocale \
- /usr/include/locale.h \
/usr/include/bits/locale.h \
- /usr/include/c++/12/cctype \
- /usr/include/ctype.h \
- /usr/include/bits/types.h \
- /usr/include/bits/typesizes.h \
- /usr/include/bits/time64.h \
- /usr/include/bits/endian.h \
- /usr/include/bits/endianness.h \
- /usr/include/c++/12/bits/ios_base.h \
- /usr/include/c++/12/ext/atomicity.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr-default.h \
- /usr/include/pthread.h \
- /usr/include/sched.h \
- /usr/include/bits/types/time_t.h \
- /usr/include/bits/types/struct_timespec.h \
+ /usr/include/bits/long-double.h \
+ /usr/include/bits/pthread_stack_min-dynamic.h \
+ /usr/include/bits/pthreadtypes-arch.h \
+ /usr/include/bits/pthreadtypes.h \
/usr/include/bits/sched.h \
- /usr/include/bits/types/struct_sched_param.h \
- /usr/include/bits/cpu-set.h \
- /usr/include/time.h \
+ /usr/include/bits/select.h \
+ /usr/include/bits/setjmp.h \
+ /usr/include/bits/stdint-intn.h \
+ /usr/include/bits/stdint-uintn.h \
+ /usr/include/bits/stdio.h \
+ /usr/include/bits/stdio_lim.h \
+ /usr/include/bits/stdlib-bsearch.h \
+ /usr/include/bits/stdlib-float.h \
+ /usr/include/bits/struct_mutex.h \
+ /usr/include/bits/struct_rwlock.h \
+ /usr/include/bits/thread-shared-types.h \
/usr/include/bits/time.h \
+ /usr/include/bits/time64.h \
+ /usr/include/bits/timesize.h \
/usr/include/bits/timex.h \
+ /usr/include/bits/types.h \
+ /usr/include/bits/types/FILE.h \
+ /usr/include/bits/types/__FILE.h \
+ /usr/include/bits/types/__fpos64_t.h \
+ /usr/include/bits/types/__fpos_t.h \
+ /usr/include/bits/types/__locale_t.h \
+ /usr/include/bits/types/__mbstate_t.h \
+ /usr/include/bits/types/__sigset_t.h \
+ /usr/include/bits/types/clock_t.h \
+ /usr/include/bits/types/clockid_t.h \
+ /usr/include/bits/types/cookie_io_functions_t.h \
+ /usr/include/bits/types/error_t.h \
+ /usr/include/bits/types/locale_t.h \
+ /usr/include/bits/types/mbstate_t.h \
+ /usr/include/bits/types/sigset_t.h \
+ /usr/include/bits/types/struct_FILE.h \
+ /usr/include/bits/types/struct___jmp_buf_tag.h \
+ /usr/include/bits/types/struct_itimerspec.h \
+ /usr/include/bits/types/struct_sched_param.h \
+ /usr/include/bits/types/struct_timespec.h \
/usr/include/bits/types/struct_timeval.h \
- /usr/include/bits/types/clock_t.h \
/usr/include/bits/types/struct_tm.h \
- /usr/include/bits/types/clockid_t.h \
+ /usr/include/bits/types/time_t.h \
/usr/include/bits/types/timer_t.h \
- /usr/include/bits/types/struct_itimerspec.h \
- /usr/include/bits/pthreadtypes.h \
- /usr/include/bits/thread-shared-types.h \
- /usr/include/bits/pthreadtypes-arch.h \
- /usr/include/bits/atomic_wide_counter.h \
- /usr/include/bits/struct_mutex.h \
- /usr/include/bits/struct_rwlock.h \
- /usr/include/bits/setjmp.h \
- /usr/include/bits/types/__sigset_t.h \
- /usr/include/bits/types/struct___jmp_buf_tag.h \
- /usr/include/bits/pthread_stack_min-dynamic.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/atomic_word.h \
- /usr/include/sys/single_threaded.h \
- /usr/include/c++/12/bits/locale_classes.h \
- /usr/include/c++/12/string \
- /usr/include/c++/12/bits/char_traits.h \
- /usr/include/c++/12/cstdint \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdint.h \
- /usr/include/stdint.h \
- /usr/include/bits/stdint-intn.h \
- /usr/include/bits/stdint-uintn.h \
- /usr/include/c++/12/bits/allocator.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++allocator.h \
- /usr/include/c++/12/bits/new_allocator.h \
- /usr/include/c++/12/new \
- /usr/include/c++/12/bits/exception.h \
- /usr/include/c++/12/bits/functexcept.h \
- /usr/include/c++/12/bits/exception_defines.h \
- /usr/include/c++/12/bits/ostream_insert.h \
- /usr/include/c++/12/bits/cxxabi_forced.h \
- /usr/include/c++/12/bits/stl_function.h \
- /usr/include/c++/12/backward/binders.h \
- /usr/include/c++/12/ext/numeric_traits.h \
- /usr/include/c++/12/bits/stl_algobase.h \
- /usr/include/c++/12/bits/stl_pair.h \
- /usr/include/c++/12/bits/utility.h \
- /usr/include/c++/12/bits/predefined_ops.h \
- /usr/include/c++/12/bits/refwrap.h \
- /usr/include/c++/12/bits/invoke.h \
- /usr/include/c++/12/bits/range_access.h \
- /usr/include/c++/12/initializer_list \
- /usr/include/c++/12/bits/basic_string.h \
- /usr/include/c++/12/ext/alloc_traits.h \
- /usr/include/c++/12/bits/alloc_traits.h \
- /usr/include/c++/12/bits/stl_construct.h \
- /usr/include/c++/12/ext/string_conversions.h \
- /usr/include/c++/12/cstdlib \
- /usr/include/stdlib.h \
+ /usr/include/bits/types/wint_t.h \
+ /usr/include/bits/typesizes.h \
+ /usr/include/bits/uintn-identity.h \
/usr/include/bits/waitflags.h \
/usr/include/bits/waitstatus.h \
- /usr/include/sys/types.h \
+ /usr/include/bits/wchar.h \
+ /usr/include/bits/wordsize.h \
+ /usr/include/c++/13/algorithm \
+ /usr/include/c++/13/backward/auto_ptr.h \
+ /usr/include/c++/13/backward/binders.h \
+ /usr/include/c++/13/bit \
+ /usr/include/c++/13/bits/algorithmfwd.h \
+ /usr/include/c++/13/bits/align.h \
+ /usr/include/c++/13/bits/alloc_traits.h \
+ /usr/include/c++/13/bits/allocated_ptr.h \
+ /usr/include/c++/13/bits/allocator.h \
+ /usr/include/c++/13/bits/atomic_base.h \
+ /usr/include/c++/13/bits/atomic_lockfree_defines.h \
+ /usr/include/c++/13/bits/basic_string.h \
+ /usr/include/c++/13/bits/basic_string.tcc \
+ /usr/include/c++/13/bits/char_traits.h \
+ /usr/include/c++/13/bits/charconv.h \
+ /usr/include/c++/13/bits/concept_check.h \
+ /usr/include/c++/13/bits/cpp_type_traits.h \
+ /usr/include/c++/13/bits/cxxabi_forced.h \
+ /usr/include/c++/13/bits/cxxabi_init_exception.h \
+ /usr/include/c++/13/bits/exception.h \
+ /usr/include/c++/13/bits/exception_defines.h \
+ /usr/include/c++/13/bits/exception_ptr.h \
+ /usr/include/c++/13/bits/functexcept.h \
+ /usr/include/c++/13/bits/functional_hash.h \
+ /usr/include/c++/13/bits/hash_bytes.h \
+ /usr/include/c++/13/bits/invoke.h \
+ /usr/include/c++/13/bits/ios_base.h \
+ /usr/include/c++/13/bits/locale_classes.h \
+ /usr/include/c++/13/bits/locale_classes.tcc \
+ /usr/include/c++/13/bits/localefwd.h \
+ /usr/include/c++/13/bits/memoryfwd.h \
+ /usr/include/c++/13/bits/move.h \
+ /usr/include/c++/13/bits/nested_exception.h \
+ /usr/include/c++/13/bits/new_allocator.h \
+ /usr/include/c++/13/bits/ostream_insert.h \
+ /usr/include/c++/13/bits/postypes.h \
+ /usr/include/c++/13/bits/predefined_ops.h \
+ /usr/include/c++/13/bits/ptr_traits.h \
+ /usr/include/c++/13/bits/range_access.h \
+ /usr/include/c++/13/bits/refwrap.h \
+ /usr/include/c++/13/bits/requires_hosted.h \
+ /usr/include/c++/13/bits/shared_ptr.h \
+ /usr/include/c++/13/bits/shared_ptr_atomic.h \
+ /usr/include/c++/13/bits/shared_ptr_base.h \
+ /usr/include/c++/13/bits/std_abs.h \
+ /usr/include/c++/13/bits/std_function.h \
+ /usr/include/c++/13/bits/stl_algo.h \
+ /usr/include/c++/13/bits/stl_algobase.h \
+ /usr/include/c++/13/bits/stl_construct.h \
+ /usr/include/c++/13/bits/stl_function.h \
+ /usr/include/c++/13/bits/stl_heap.h \
+ /usr/include/c++/13/bits/stl_iterator.h \
+ /usr/include/c++/13/bits/stl_iterator_base_funcs.h \
+ /usr/include/c++/13/bits/stl_iterator_base_types.h \
+ /usr/include/c++/13/bits/stl_pair.h \
+ /usr/include/c++/13/bits/stl_raw_storage_iter.h \
+ /usr/include/c++/13/bits/stl_relops.h \
+ /usr/include/c++/13/bits/stl_tempbuf.h \
+ /usr/include/c++/13/bits/stl_uninitialized.h \
+ /usr/include/c++/13/bits/stream_iterator.h \
+ /usr/include/c++/13/bits/streambuf.tcc \
+ /usr/include/c++/13/bits/streambuf_iterator.h \
+ /usr/include/c++/13/bits/stringfwd.h \
+ /usr/include/c++/13/bits/uniform_int_dist.h \
+ /usr/include/c++/13/bits/unique_ptr.h \
+ /usr/include/c++/13/bits/uses_allocator.h \
+ /usr/include/c++/13/bits/utility.h \
+ /usr/include/c++/13/cassert \
+ /usr/include/c++/13/cctype \
+ /usr/include/c++/13/cerrno \
+ /usr/include/c++/13/clocale \
+ /usr/include/c++/13/cstddef \
+ /usr/include/c++/13/cstdint \
+ /usr/include/c++/13/cstdio \
+ /usr/include/c++/13/cstdlib \
+ /usr/include/c++/13/cstring \
+ /usr/include/c++/13/cwchar \
+ /usr/include/c++/13/debug/assertions.h \
+ /usr/include/c++/13/debug/debug.h \
+ /usr/include/c++/13/exception \
+ /usr/include/c++/13/ext/aligned_buffer.h \
+ /usr/include/c++/13/ext/alloc_traits.h \
+ /usr/include/c++/13/ext/atomicity.h \
+ /usr/include/c++/13/ext/concurrence.h \
+ /usr/include/c++/13/ext/numeric_traits.h \
+ /usr/include/c++/13/ext/string_conversions.h \
+ /usr/include/c++/13/ext/type_traits.h \
+ /usr/include/c++/13/functional \
+ /usr/include/c++/13/initializer_list \
+ /usr/include/c++/13/iosfwd \
+ /usr/include/c++/13/iterator \
+ /usr/include/c++/13/memory \
+ /usr/include/c++/13/new \
+ /usr/include/c++/13/stdexcept \
+ /usr/include/c++/13/streambuf \
+ /usr/include/c++/13/string \
+ /usr/include/c++/13/system_error \
+ /usr/include/c++/13/tuple \
+ /usr/include/c++/13/type_traits \
+ /usr/include/c++/13/typeinfo \
+ /usr/include/c++/13/utility \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/atomic_word.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++allocator.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++config.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++locale.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/cpu_defines.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/error_constants.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr-default.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/os_defines.h \
+ /usr/include/ctype.h \
/usr/include/endian.h \
- /usr/include/bits/byteswap.h \
- /usr/include/bits/uintn-identity.h \
- /usr/include/sys/select.h \
- /usr/include/bits/select.h \
- /usr/include/bits/types/sigset_t.h \
- /usr/include/alloca.h \
- /usr/include/bits/stdlib-bsearch.h \
- /usr/include/bits/stdlib-float.h \
- /usr/include/c++/12/bits/std_abs.h \
- /usr/include/c++/12/cstdio \
- /usr/include/stdio.h \
- /usr/include/bits/types/__fpos_t.h \
- /usr/include/bits/types/__fpos64_t.h \
- /usr/include/bits/types/struct_FILE.h \
- /usr/include/bits/types/cookie_io_functions_t.h \
- /usr/include/bits/stdio_lim.h \
- /usr/include/bits/stdio.h \
- /usr/include/c++/12/cerrno \
/usr/include/errno.h \
- /usr/include/bits/errno.h \
+ /usr/include/features-time64.h \
+ /usr/include/features.h \
+ /usr/include/gnu/stubs-64.h \
+ /usr/include/gnu/stubs.h \
/usr/include/linux/errno.h \
- /usr/include/asm/errno.h \
- /usr/include/asm-generic/errno.h \
- /usr/include/asm-generic/errno-base.h \
- /usr/include/bits/types/error_t.h \
- /usr/include/c++/12/bits/charconv.h \
- /usr/include/c++/12/bits/functional_hash.h \
- /usr/include/c++/12/bits/hash_bytes.h \
- /usr/include/c++/12/bits/basic_string.tcc \
- /usr/include/c++/12/bits/locale_classes.tcc \
- /usr/include/c++/12/system_error \
- /usr/include/c++/12/x86_64-redhat-linux/bits/error_constants.h \
- /usr/include/c++/12/stdexcept \
- /usr/include/c++/12/exception \
- /usr/include/c++/12/bits/exception_ptr.h \
- /usr/include/c++/12/bits/cxxabi_init_exception.h \
- /usr/include/c++/12/typeinfo \
- /usr/include/c++/12/bits/nested_exception.h \
- /usr/include/c++/12/bits/streambuf.tcc \
- /usr/include/c++/12/algorithm \
- /usr/include/c++/12/bits/stl_algo.h \
- /usr/include/c++/12/bits/algorithmfwd.h \
- /usr/include/c++/12/bits/stl_heap.h \
- /usr/include/c++/12/bits/stl_tempbuf.h \
- /usr/include/c++/12/bits/uniform_int_dist.h \
- /usr/include/c++/12/functional \
- /usr/include/c++/12/tuple \
- /usr/include/c++/12/bits/uses_allocator.h \
- /usr/include/c++/12/bits/std_function.h \
- /usr/include/c++/12/memory \
- /usr/include/c++/12/bits/stl_uninitialized.h \
- /usr/include/c++/12/bits/stl_raw_storage_iter.h \
- /usr/include/c++/12/bits/align.h \
- /usr/include/c++/12/bit \
- /usr/include/c++/12/bits/unique_ptr.h \
- /usr/include/c++/12/bits/shared_ptr.h \
- /usr/include/c++/12/bits/shared_ptr_base.h \
- /usr/include/c++/12/bits/allocated_ptr.h \
- /usr/include/c++/12/ext/aligned_buffer.h \
- /usr/include/c++/12/ext/concurrence.h \
- /usr/include/c++/12/bits/shared_ptr_atomic.h \
- /usr/include/c++/12/bits/atomic_base.h \
- /usr/include/c++/12/bits/atomic_lockfree_defines.h \
- /usr/include/c++/12/backward/auto_ptr.h \
+ /usr/include/locale.h \
+ /usr/include/pthread.h \
+ /usr/include/sched.h \
+ /usr/include/stdc-predef.h \
+ /usr/include/stdint.h \
+ /usr/include/stdio.h \
+ /usr/include/stdlib.h \
+ /usr/include/string.h \
+ /usr/include/strings.h \
+ /usr/include/sys/cdefs.h \
+ /usr/include/sys/select.h \
+ /usr/include/sys/single_threaded.h \
+ /usr/include/sys/types.h \
+ /usr/include/time.h \
+ /usr/include/wchar.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdarg.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdint.h \
+ third_party/uri/include/network/optional.hpp \
third_party/uri/include/network/string_view.hpp \
- /usr/include/c++/12/cassert \
- /usr/include/assert.h \
- third_party/uri/include/network/optional.hpp \
- /usr/include/c++/12/utility \
- /usr/include/c++/12/bits/stl_relops.h \
third_party/uri/include/network/uri/config.hpp \
- third_party/uri/include/network/uri/uri_errors.hpp \
- third_party/uri/include/network/uri/detail/uri_parts.hpp \
+ third_party/uri/include/network/uri/detail/decode.hpp \
third_party/uri/include/network/uri/detail/encode.hpp \
- /usr/include/c++/12/cstring \
- /usr/include/string.h \
- /usr/include/strings.h \
- third_party/uri/include/network/uri/detail/decode.hpp \
third_party/uri/include/network/uri/detail/translate.hpp \
+ third_party/uri/include/network/uri/detail/uri_parts.hpp \
+ third_party/uri/include/network/uri/uri.hpp \
third_party/uri/include/network/uri/uri_builder.hpp \
+ third_party/uri/include/network/uri/uri_errors.hpp \
third_party/uri/src/detail/algorithm_find.hpp \
- /usr/include/c++/12/cstddef
+ third_party/uri/src/detail/uri_resolve.hpp
third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o: third_party/uri/src/uri.cpp \
- /usr/include/stdc-predef.h \
- /usr/include/c++/12/cassert \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++config.h \
- /usr/include/bits/wordsize.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/os_defines.h \
- /usr/include/features.h \
- /usr/include/features-time64.h \
- /usr/include/bits/timesize.h \
- /usr/include/sys/cdefs.h \
- /usr/include/bits/long-double.h \
- /usr/include/gnu/stubs.h \
- /usr/include/gnu/stubs-64.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h \
+ /usr/include/alloca.h \
+ /usr/include/asm-generic/errno-base.h \
+ /usr/include/asm-generic/errno.h \
+ /usr/include/asm/errno.h \
/usr/include/assert.h \
- /usr/include/c++/12/locale \
- /usr/include/c++/12/bits/localefwd.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++locale.h \
- /usr/include/c++/12/clocale \
- /usr/include/locale.h \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stddef.h \
- /usr/include/bits/locale.h \
- /usr/include/bits/types/locale_t.h \
- /usr/include/bits/types/__locale_t.h \
- /usr/include/c++/12/iosfwd \
- /usr/include/c++/12/bits/stringfwd.h \
- /usr/include/c++/12/bits/memoryfwd.h \
- /usr/include/c++/12/bits/postypes.h \
- /usr/include/c++/12/cwchar \
- /usr/include/wchar.h \
- /usr/include/bits/libc-header-start.h \
- /usr/include/bits/floatn.h \
- /usr/include/bits/floatn-common.h \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdarg.h \
- /usr/include/bits/wchar.h \
- /usr/include/bits/types/wint_t.h \
- /usr/include/bits/types/mbstate_t.h \
- /usr/include/bits/types/__mbstate_t.h \
- /usr/include/bits/types/__FILE.h \
- /usr/include/bits/types/FILE.h \
- /usr/include/c++/12/cctype \
- /usr/include/ctype.h \
- /usr/include/bits/types.h \
- /usr/include/bits/typesizes.h \
- /usr/include/bits/time64.h \
+ /usr/include/bits/atomic_wide_counter.h \
+ /usr/include/bits/byteswap.h \
+ /usr/include/bits/cpu-set.h \
/usr/include/bits/endian.h \
/usr/include/bits/endianness.h \
- /usr/include/c++/12/bits/locale_classes.h \
- /usr/include/c++/12/string \
- /usr/include/c++/12/bits/char_traits.h \
- /usr/include/c++/12/type_traits \
- /usr/include/c++/12/cstdint \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdint.h \
- /usr/include/stdint.h \
+ /usr/include/bits/errno.h \
+ /usr/include/bits/floatn-common.h \
+ /usr/include/bits/floatn.h \
+ /usr/include/bits/libc-header-start.h \
+ /usr/include/bits/locale.h \
+ /usr/include/bits/long-double.h \
+ /usr/include/bits/pthread_stack_min-dynamic.h \
+ /usr/include/bits/pthreadtypes-arch.h \
+ /usr/include/bits/pthreadtypes.h \
+ /usr/include/bits/sched.h \
+ /usr/include/bits/select.h \
+ /usr/include/bits/setjmp.h \
/usr/include/bits/stdint-intn.h \
/usr/include/bits/stdint-uintn.h \
- /usr/include/c++/12/bits/allocator.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++allocator.h \
- /usr/include/c++/12/bits/new_allocator.h \
- /usr/include/c++/12/new \
- /usr/include/c++/12/bits/exception.h \
- /usr/include/c++/12/bits/functexcept.h \
- /usr/include/c++/12/bits/exception_defines.h \
- /usr/include/c++/12/bits/move.h \
- /usr/include/c++/12/bits/cpp_type_traits.h \
- /usr/include/c++/12/bits/ostream_insert.h \
- /usr/include/c++/12/bits/cxxabi_forced.h \
- /usr/include/c++/12/bits/stl_iterator_base_types.h \
- /usr/include/c++/12/bits/stl_iterator_base_funcs.h \
- /usr/include/c++/12/bits/concept_check.h \
- /usr/include/c++/12/debug/assertions.h \
- /usr/include/c++/12/bits/stl_iterator.h \
- /usr/include/c++/12/ext/type_traits.h \
- /usr/include/c++/12/bits/ptr_traits.h \
- /usr/include/c++/12/bits/stl_function.h \
- /usr/include/c++/12/backward/binders.h \
- /usr/include/c++/12/ext/numeric_traits.h \
- /usr/include/c++/12/bits/stl_algobase.h \
- /usr/include/c++/12/bits/stl_pair.h \
- /usr/include/c++/12/bits/utility.h \
- /usr/include/c++/12/debug/debug.h \
- /usr/include/c++/12/bits/predefined_ops.h \
- /usr/include/c++/12/bits/refwrap.h \
- /usr/include/c++/12/bits/invoke.h \
- /usr/include/c++/12/bits/range_access.h \
- /usr/include/c++/12/initializer_list \
- /usr/include/c++/12/bits/basic_string.h \
- /usr/include/c++/12/ext/alloc_traits.h \
- /usr/include/c++/12/bits/alloc_traits.h \
- /usr/include/c++/12/bits/stl_construct.h \
- /usr/include/c++/12/ext/string_conversions.h \
- /usr/include/c++/12/cstdlib \
- /usr/include/stdlib.h \
- /usr/include/bits/waitflags.h \
- /usr/include/bits/waitstatus.h \
- /usr/include/sys/types.h \
+ /usr/include/bits/stdio.h \
+ /usr/include/bits/stdio_lim.h \
+ /usr/include/bits/stdlib-bsearch.h \
+ /usr/include/bits/stdlib-float.h \
+ /usr/include/bits/struct_mutex.h \
+ /usr/include/bits/struct_rwlock.h \
+ /usr/include/bits/thread-shared-types.h \
+ /usr/include/bits/time.h \
+ /usr/include/bits/time64.h \
+ /usr/include/bits/timesize.h \
+ /usr/include/bits/timex.h \
+ /usr/include/bits/types.h \
+ /usr/include/bits/types/FILE.h \
+ /usr/include/bits/types/__FILE.h \
+ /usr/include/bits/types/__fpos64_t.h \
+ /usr/include/bits/types/__fpos_t.h \
+ /usr/include/bits/types/__locale_t.h \
+ /usr/include/bits/types/__mbstate_t.h \
+ /usr/include/bits/types/__sigset_t.h \
/usr/include/bits/types/clock_t.h \
/usr/include/bits/types/clockid_t.h \
+ /usr/include/bits/types/cookie_io_functions_t.h \
+ /usr/include/bits/types/error_t.h \
+ /usr/include/bits/types/locale_t.h \
+ /usr/include/bits/types/mbstate_t.h \
+ /usr/include/bits/types/sigset_t.h \
+ /usr/include/bits/types/struct_FILE.h \
+ /usr/include/bits/types/struct___jmp_buf_tag.h \
+ /usr/include/bits/types/struct_itimerspec.h \
+ /usr/include/bits/types/struct_sched_param.h \
+ /usr/include/bits/types/struct_timespec.h \
+ /usr/include/bits/types/struct_timeval.h \
+ /usr/include/bits/types/struct_tm.h \
/usr/include/bits/types/time_t.h \
/usr/include/bits/types/timer_t.h \
+ /usr/include/bits/types/wint_t.h \
+ /usr/include/bits/typesizes.h \
+ /usr/include/bits/uintn-identity.h \
+ /usr/include/bits/waitflags.h \
+ /usr/include/bits/waitstatus.h \
+ /usr/include/bits/wchar.h \
+ /usr/include/bits/wctype-wchar.h \
+ /usr/include/bits/wordsize.h \
+ /usr/include/c++/13/algorithm \
+ /usr/include/c++/13/backward/auto_ptr.h \
+ /usr/include/c++/13/backward/binders.h \
+ /usr/include/c++/13/bit \
+ /usr/include/c++/13/bits/algorithmfwd.h \
+ /usr/include/c++/13/bits/align.h \
+ /usr/include/c++/13/bits/alloc_traits.h \
+ /usr/include/c++/13/bits/allocated_ptr.h \
+ /usr/include/c++/13/bits/allocator.h \
+ /usr/include/c++/13/bits/atomic_base.h \
+ /usr/include/c++/13/bits/atomic_lockfree_defines.h \
+ /usr/include/c++/13/bits/basic_string.h \
+ /usr/include/c++/13/bits/basic_string.tcc \
+ /usr/include/c++/13/bits/char_traits.h \
+ /usr/include/c++/13/bits/charconv.h \
+ /usr/include/c++/13/bits/codecvt.h \
+ /usr/include/c++/13/bits/concept_check.h \
+ /usr/include/c++/13/bits/cpp_type_traits.h \
+ /usr/include/c++/13/bits/cxxabi_forced.h \
+ /usr/include/c++/13/bits/cxxabi_init_exception.h \
+ /usr/include/c++/13/bits/exception.h \
+ /usr/include/c++/13/bits/exception_defines.h \
+ /usr/include/c++/13/bits/exception_ptr.h \
+ /usr/include/c++/13/bits/functexcept.h \
+ /usr/include/c++/13/bits/functional_hash.h \
+ /usr/include/c++/13/bits/hash_bytes.h \
+ /usr/include/c++/13/bits/invoke.h \
+ /usr/include/c++/13/bits/ios_base.h \
+ /usr/include/c++/13/bits/locale_classes.h \
+ /usr/include/c++/13/bits/locale_classes.tcc \
+ /usr/include/c++/13/bits/locale_conv.h \
+ /usr/include/c++/13/bits/locale_facets.h \
+ /usr/include/c++/13/bits/locale_facets.tcc \
+ /usr/include/c++/13/bits/locale_facets_nonio.h \
+ /usr/include/c++/13/bits/locale_facets_nonio.tcc \
+ /usr/include/c++/13/bits/localefwd.h \
+ /usr/include/c++/13/bits/memoryfwd.h \
+ /usr/include/c++/13/bits/move.h \
+ /usr/include/c++/13/bits/nested_exception.h \
+ /usr/include/c++/13/bits/new_allocator.h \
+ /usr/include/c++/13/bits/ostream_insert.h \
+ /usr/include/c++/13/bits/postypes.h \
+ /usr/include/c++/13/bits/predefined_ops.h \
+ /usr/include/c++/13/bits/ptr_traits.h \
+ /usr/include/c++/13/bits/range_access.h \
+ /usr/include/c++/13/bits/refwrap.h \
+ /usr/include/c++/13/bits/requires_hosted.h \
+ /usr/include/c++/13/bits/shared_ptr.h \
+ /usr/include/c++/13/bits/shared_ptr_atomic.h \
+ /usr/include/c++/13/bits/shared_ptr_base.h \
+ /usr/include/c++/13/bits/std_abs.h \
+ /usr/include/c++/13/bits/std_function.h \
+ /usr/include/c++/13/bits/stl_algo.h \
+ /usr/include/c++/13/bits/stl_algobase.h \
+ /usr/include/c++/13/bits/stl_bvector.h \
+ /usr/include/c++/13/bits/stl_construct.h \
+ /usr/include/c++/13/bits/stl_function.h \
+ /usr/include/c++/13/bits/stl_heap.h \
+ /usr/include/c++/13/bits/stl_iterator.h \
+ /usr/include/c++/13/bits/stl_iterator_base_funcs.h \
+ /usr/include/c++/13/bits/stl_iterator_base_types.h \
+ /usr/include/c++/13/bits/stl_pair.h \
+ /usr/include/c++/13/bits/stl_raw_storage_iter.h \
+ /usr/include/c++/13/bits/stl_relops.h \
+ /usr/include/c++/13/bits/stl_tempbuf.h \
+ /usr/include/c++/13/bits/stl_uninitialized.h \
+ /usr/include/c++/13/bits/stl_vector.h \
+ /usr/include/c++/13/bits/stream_iterator.h \
+ /usr/include/c++/13/bits/streambuf.tcc \
+ /usr/include/c++/13/bits/streambuf_iterator.h \
+ /usr/include/c++/13/bits/stringfwd.h \
+ /usr/include/c++/13/bits/uniform_int_dist.h \
+ /usr/include/c++/13/bits/unique_ptr.h \
+ /usr/include/c++/13/bits/uses_allocator.h \
+ /usr/include/c++/13/bits/utility.h \
+ /usr/include/c++/13/bits/vector.tcc \
+ /usr/include/c++/13/cassert \
+ /usr/include/c++/13/cctype \
+ /usr/include/c++/13/cerrno \
+ /usr/include/c++/13/clocale \
+ /usr/include/c++/13/cstdint \
+ /usr/include/c++/13/cstdio \
+ /usr/include/c++/13/cstdlib \
+ /usr/include/c++/13/cstring \
+ /usr/include/c++/13/ctime \
+ /usr/include/c++/13/cwchar \
+ /usr/include/c++/13/cwctype \
+ /usr/include/c++/13/debug/assertions.h \
+ /usr/include/c++/13/debug/debug.h \
+ /usr/include/c++/13/exception \
+ /usr/include/c++/13/ext/aligned_buffer.h \
+ /usr/include/c++/13/ext/alloc_traits.h \
+ /usr/include/c++/13/ext/atomicity.h \
+ /usr/include/c++/13/ext/concurrence.h \
+ /usr/include/c++/13/ext/numeric_traits.h \
+ /usr/include/c++/13/ext/string_conversions.h \
+ /usr/include/c++/13/ext/type_traits.h \
+ /usr/include/c++/13/functional \
+ /usr/include/c++/13/initializer_list \
+ /usr/include/c++/13/iosfwd \
+ /usr/include/c++/13/iterator \
+ /usr/include/c++/13/locale \
+ /usr/include/c++/13/memory \
+ /usr/include/c++/13/new \
+ /usr/include/c++/13/stdexcept \
+ /usr/include/c++/13/streambuf \
+ /usr/include/c++/13/string \
+ /usr/include/c++/13/system_error \
+ /usr/include/c++/13/tuple \
+ /usr/include/c++/13/type_traits \
+ /usr/include/c++/13/typeinfo \
+ /usr/include/c++/13/utility \
+ /usr/include/c++/13/vector \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/atomic_word.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++allocator.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++config.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++locale.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/cpu_defines.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_base.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_inline.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/error_constants.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr-default.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/messages_members.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/os_defines.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/time_members.h \
+ /usr/include/ctype.h \
/usr/include/endian.h \
- /usr/include/bits/byteswap.h \
- /usr/include/bits/uintn-identity.h \
- /usr/include/sys/select.h \
- /usr/include/bits/select.h \
- /usr/include/bits/types/sigset_t.h \
- /usr/include/bits/types/__sigset_t.h \
- /usr/include/bits/types/struct_timeval.h \
- /usr/include/bits/types/struct_timespec.h \
- /usr/include/bits/pthreadtypes.h \
- /usr/include/bits/thread-shared-types.h \
- /usr/include/bits/pthreadtypes-arch.h \
- /usr/include/bits/atomic_wide_counter.h \
- /usr/include/bits/struct_mutex.h \
- /usr/include/bits/struct_rwlock.h \
- /usr/include/alloca.h \
- /usr/include/bits/stdlib-bsearch.h \
- /usr/include/bits/stdlib-float.h \
- /usr/include/c++/12/bits/std_abs.h \
- /usr/include/c++/12/cstdio \
- /usr/include/stdio.h \
- /usr/include/bits/types/__fpos_t.h \
- /usr/include/bits/types/__fpos64_t.h \
- /usr/include/bits/types/struct_FILE.h \
- /usr/include/bits/types/cookie_io_functions_t.h \
- /usr/include/bits/stdio_lim.h \
- /usr/include/bits/stdio.h \
- /usr/include/c++/12/cerrno \
/usr/include/errno.h \
- /usr/include/bits/errno.h \
+ /usr/include/features-time64.h \
+ /usr/include/features.h \
+ /usr/include/gnu/stubs-64.h \
+ /usr/include/gnu/stubs.h \
+ /usr/include/libintl.h \
/usr/include/linux/errno.h \
- /usr/include/asm/errno.h \
- /usr/include/asm-generic/errno.h \
- /usr/include/asm-generic/errno-base.h \
- /usr/include/bits/types/error_t.h \
- /usr/include/c++/12/bits/charconv.h \
- /usr/include/c++/12/bits/functional_hash.h \
- /usr/include/c++/12/bits/hash_bytes.h \
- /usr/include/c++/12/bits/basic_string.tcc \
- /usr/include/c++/12/ext/atomicity.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr-default.h \
+ /usr/include/locale.h \
/usr/include/pthread.h \
/usr/include/sched.h \
- /usr/include/bits/sched.h \
- /usr/include/bits/types/struct_sched_param.h \
- /usr/include/bits/cpu-set.h \
+ /usr/include/stdc-predef.h \
+ /usr/include/stdint.h \
+ /usr/include/stdio.h \
+ /usr/include/stdlib.h \
+ /usr/include/string.h \
+ /usr/include/strings.h \
+ /usr/include/sys/cdefs.h \
+ /usr/include/sys/select.h \
+ /usr/include/sys/single_threaded.h \
+ /usr/include/sys/types.h \
/usr/include/time.h \
- /usr/include/bits/time.h \
- /usr/include/bits/timex.h \
- /usr/include/bits/types/struct_tm.h \
- /usr/include/bits/types/struct_itimerspec.h \
- /usr/include/bits/setjmp.h \
- /usr/include/bits/types/struct___jmp_buf_tag.h \
- /usr/include/bits/pthread_stack_min-dynamic.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/atomic_word.h \
- /usr/include/sys/single_threaded.h \
- /usr/include/c++/12/bits/locale_classes.tcc \
- /usr/include/c++/12/bits/locale_facets.h \
- /usr/include/c++/12/cwctype \
+ /usr/include/wchar.h \
/usr/include/wctype.h \
- /usr/include/bits/wctype-wchar.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_base.h \
- /usr/include/c++/12/bits/ios_base.h \
- /usr/include/c++/12/system_error \
- /usr/include/c++/12/x86_64-redhat-linux/bits/error_constants.h \
- /usr/include/c++/12/stdexcept \
- /usr/include/c++/12/exception \
- /usr/include/c++/12/bits/exception_ptr.h \
- /usr/include/c++/12/bits/cxxabi_init_exception.h \
- /usr/include/c++/12/typeinfo \
- /usr/include/c++/12/bits/nested_exception.h \
- /usr/include/c++/12/streambuf \
- /usr/include/c++/12/bits/streambuf.tcc \
- /usr/include/c++/12/bits/streambuf_iterator.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_inline.h \
- /usr/include/c++/12/bits/locale_facets.tcc \
- /usr/include/c++/12/bits/locale_facets_nonio.h \
- /usr/include/c++/12/ctime \
- /usr/include/c++/12/x86_64-redhat-linux/bits/time_members.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/messages_members.h \
- /usr/include/libintl.h \
- /usr/include/c++/12/bits/codecvt.h \
- /usr/include/c++/12/bits/locale_facets_nonio.tcc \
- /usr/include/c++/12/bits/locale_conv.h \
- /usr/include/c++/12/algorithm \
- /usr/include/c++/12/bits/stl_algo.h \
- /usr/include/c++/12/bits/algorithmfwd.h \
- /usr/include/c++/12/bits/stl_heap.h \
- /usr/include/c++/12/bits/stl_tempbuf.h \
- /usr/include/c++/12/bits/uniform_int_dist.h \
- /usr/include/c++/12/functional \
- /usr/include/c++/12/tuple \
- /usr/include/c++/12/bits/uses_allocator.h \
- /usr/include/c++/12/bits/std_function.h \
- third_party/uri/include/network/uri/uri.hpp \
- /usr/include/c++/12/iterator \
- /usr/include/c++/12/bits/stream_iterator.h \
- /usr/include/c++/12/memory \
- /usr/include/c++/12/bits/stl_uninitialized.h \
- /usr/include/c++/12/bits/stl_raw_storage_iter.h \
- /usr/include/c++/12/bits/align.h \
- /usr/include/c++/12/bit \
- /usr/include/c++/12/bits/unique_ptr.h \
- /usr/include/c++/12/bits/shared_ptr.h \
- /usr/include/c++/12/bits/shared_ptr_base.h \
- /usr/include/c++/12/bits/allocated_ptr.h \
- /usr/include/c++/12/ext/aligned_buffer.h \
- /usr/include/c++/12/ext/concurrence.h \
- /usr/include/c++/12/bits/shared_ptr_atomic.h \
- /usr/include/c++/12/bits/atomic_base.h \
- /usr/include/c++/12/bits/atomic_lockfree_defines.h \
- /usr/include/c++/12/backward/auto_ptr.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdarg.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdint.h \
+ third_party/uri/include/network/optional.hpp \
third_party/uri/include/network/string_view.hpp \
- third_party/uri/include/network/optional.hpp \
- /usr/include/c++/12/utility \
- /usr/include/c++/12/bits/stl_relops.h \
third_party/uri/include/network/uri/config.hpp \
- third_party/uri/include/network/uri/uri_errors.hpp \
- third_party/uri/include/network/uri/detail/uri_parts.hpp \
+ third_party/uri/include/network/uri/detail/decode.hpp \
third_party/uri/include/network/uri/detail/encode.hpp \
- /usr/include/c++/12/cstring \
- /usr/include/string.h \
- /usr/include/strings.h \
- third_party/uri/include/network/uri/detail/decode.hpp \
third_party/uri/include/network/uri/detail/translate.hpp \
+ third_party/uri/include/network/uri/detail/uri_parts.hpp \
+ third_party/uri/include/network/uri/uri.hpp \
third_party/uri/include/network/uri/uri_builder.hpp \
+ third_party/uri/include/network/uri/uri_errors.hpp \
+ third_party/uri/src/detail/algorithm.hpp \
+ third_party/uri/src/detail/uri_advance_parts.hpp \
+ third_party/uri/src/detail/uri_normalize.hpp \
third_party/uri/src/detail/uri_parse.hpp \
- third_party/uri/src/detail/uri_advance_parts.hpp \
third_party/uri/src/detail/uri_percent_encode.hpp \
- /usr/include/c++/12/vector \
- /usr/include/c++/12/bits/stl_vector.h \
- /usr/include/c++/12/bits/stl_bvector.h \
- /usr/include/c++/12/bits/vector.tcc \
- third_party/uri/src/detail/uri_normalize.hpp \
- third_party/uri/src/detail/uri_resolve.hpp \
- third_party/uri/src/detail/algorithm.hpp
+ third_party/uri/src/detail/uri_resolve.hpp
third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o: third_party/uri/src/uri_builder.cpp \
- /usr/include/stdc-predef.h \
- /usr/include/c++/12/locale \
- /usr/include/c++/12/bits/localefwd.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++config.h \
- /usr/include/bits/wordsize.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/os_defines.h \
- /usr/include/features.h \
- /usr/include/features-time64.h \
- /usr/include/bits/timesize.h \
- /usr/include/sys/cdefs.h \
- /usr/include/bits/long-double.h \
- /usr/include/gnu/stubs.h \
- /usr/include/gnu/stubs-64.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++locale.h \
- /usr/include/c++/12/clocale \
- /usr/include/locale.h \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stddef.h \
- /usr/include/bits/locale.h \
- /usr/include/bits/types/locale_t.h \
- /usr/include/bits/types/__locale_t.h \
- /usr/include/c++/12/iosfwd \
- /usr/include/c++/12/bits/stringfwd.h \
- /usr/include/c++/12/bits/memoryfwd.h \
- /usr/include/c++/12/bits/postypes.h \
- /usr/include/c++/12/cwchar \
- /usr/include/wchar.h \
- /usr/include/bits/libc-header-start.h \
- /usr/include/bits/floatn.h \
- /usr/include/bits/floatn-common.h \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdarg.h \
- /usr/include/bits/wchar.h \
- /usr/include/bits/types/wint_t.h \
- /usr/include/bits/types/mbstate_t.h \
- /usr/include/bits/types/__mbstate_t.h \
- /usr/include/bits/types/__FILE.h \
- /usr/include/bits/types/FILE.h \
- /usr/include/c++/12/cctype \
- /usr/include/ctype.h \
- /usr/include/bits/types.h \
- /usr/include/bits/typesizes.h \
- /usr/include/bits/time64.h \
+ /usr/include/alloca.h \
+ /usr/include/asm-generic/errno-base.h \
+ /usr/include/asm-generic/errno.h \
+ /usr/include/asm/errno.h \
+ /usr/include/assert.h \
+ /usr/include/bits/atomic_wide_counter.h \
+ /usr/include/bits/byteswap.h \
+ /usr/include/bits/cpu-set.h \
/usr/include/bits/endian.h \
/usr/include/bits/endianness.h \
- /usr/include/c++/12/bits/locale_classes.h \
- /usr/include/c++/12/string \
- /usr/include/c++/12/bits/char_traits.h \
- /usr/include/c++/12/type_traits \
- /usr/include/c++/12/cstdint \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdint.h \
- /usr/include/stdint.h \
+ /usr/include/bits/errno.h \
+ /usr/include/bits/floatn-common.h \
+ /usr/include/bits/floatn.h \
+ /usr/include/bits/libc-header-start.h \
+ /usr/include/bits/locale.h \
+ /usr/include/bits/long-double.h \
+ /usr/include/bits/pthread_stack_min-dynamic.h \
+ /usr/include/bits/pthreadtypes-arch.h \
+ /usr/include/bits/pthreadtypes.h \
+ /usr/include/bits/sched.h \
+ /usr/include/bits/select.h \
+ /usr/include/bits/setjmp.h \
/usr/include/bits/stdint-intn.h \
/usr/include/bits/stdint-uintn.h \
- /usr/include/c++/12/bits/allocator.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++allocator.h \
- /usr/include/c++/12/bits/new_allocator.h \
- /usr/include/c++/12/new \
- /usr/include/c++/12/bits/exception.h \
- /usr/include/c++/12/bits/functexcept.h \
- /usr/include/c++/12/bits/exception_defines.h \
- /usr/include/c++/12/bits/move.h \
- /usr/include/c++/12/bits/cpp_type_traits.h \
- /usr/include/c++/12/bits/ostream_insert.h \
- /usr/include/c++/12/bits/cxxabi_forced.h \
- /usr/include/c++/12/bits/stl_iterator_base_types.h \
- /usr/include/c++/12/bits/stl_iterator_base_funcs.h \
- /usr/include/c++/12/bits/concept_check.h \
- /usr/include/c++/12/debug/assertions.h \
- /usr/include/c++/12/bits/stl_iterator.h \
- /usr/include/c++/12/ext/type_traits.h \
- /usr/include/c++/12/bits/ptr_traits.h \
- /usr/include/c++/12/bits/stl_function.h \
- /usr/include/c++/12/backward/binders.h \
- /usr/include/c++/12/ext/numeric_traits.h \
- /usr/include/c++/12/bits/stl_algobase.h \
- /usr/include/c++/12/bits/stl_pair.h \
- /usr/include/c++/12/bits/utility.h \
- /usr/include/c++/12/debug/debug.h \
- /usr/include/c++/12/bits/predefined_ops.h \
- /usr/include/c++/12/bits/refwrap.h \
- /usr/include/c++/12/bits/invoke.h \
- /usr/include/c++/12/bits/range_access.h \
- /usr/include/c++/12/initializer_list \
- /usr/include/c++/12/bits/basic_string.h \
- /usr/include/c++/12/ext/alloc_traits.h \
- /usr/include/c++/12/bits/alloc_traits.h \
- /usr/include/c++/12/bits/stl_construct.h \
- /usr/include/c++/12/ext/string_conversions.h \
- /usr/include/c++/12/cstdlib \
- /usr/include/stdlib.h \
- /usr/include/bits/waitflags.h \
- /usr/include/bits/waitstatus.h \
- /usr/include/sys/types.h \
+ /usr/include/bits/stdio.h \
+ /usr/include/bits/stdio_lim.h \
+ /usr/include/bits/stdlib-bsearch.h \
+ /usr/include/bits/stdlib-float.h \
+ /usr/include/bits/struct_mutex.h \
+ /usr/include/bits/struct_rwlock.h \
+ /usr/include/bits/thread-shared-types.h \
+ /usr/include/bits/time.h \
+ /usr/include/bits/time64.h \
+ /usr/include/bits/timesize.h \
+ /usr/include/bits/timex.h \
+ /usr/include/bits/types.h \
+ /usr/include/bits/types/FILE.h \
+ /usr/include/bits/types/__FILE.h \
+ /usr/include/bits/types/__fpos64_t.h \
+ /usr/include/bits/types/__fpos_t.h \
+ /usr/include/bits/types/__locale_t.h \
+ /usr/include/bits/types/__mbstate_t.h \
+ /usr/include/bits/types/__sigset_t.h \
/usr/include/bits/types/clock_t.h \
/usr/include/bits/types/clockid_t.h \
+ /usr/include/bits/types/cookie_io_functions_t.h \
+ /usr/include/bits/types/error_t.h \
+ /usr/include/bits/types/locale_t.h \
+ /usr/include/bits/types/mbstate_t.h \
+ /usr/include/bits/types/sigset_t.h \
+ /usr/include/bits/types/struct_FILE.h \
+ /usr/include/bits/types/struct___jmp_buf_tag.h \
+ /usr/include/bits/types/struct_itimerspec.h \
+ /usr/include/bits/types/struct_sched_param.h \
+ /usr/include/bits/types/struct_timespec.h \
+ /usr/include/bits/types/struct_timeval.h \
+ /usr/include/bits/types/struct_tm.h \
/usr/include/bits/types/time_t.h \
/usr/include/bits/types/timer_t.h \
+ /usr/include/bits/types/wint_t.h \
+ /usr/include/bits/typesizes.h \
+ /usr/include/bits/uintn-identity.h \
+ /usr/include/bits/waitflags.h \
+ /usr/include/bits/waitstatus.h \
+ /usr/include/bits/wchar.h \
+ /usr/include/bits/wctype-wchar.h \
+ /usr/include/bits/wordsize.h \
+ /usr/include/c++/13/algorithm \
+ /usr/include/c++/13/backward/auto_ptr.h \
+ /usr/include/c++/13/backward/binders.h \
+ /usr/include/c++/13/bit \
+ /usr/include/c++/13/bits/algorithmfwd.h \
+ /usr/include/c++/13/bits/align.h \
+ /usr/include/c++/13/bits/alloc_traits.h \
+ /usr/include/c++/13/bits/allocated_ptr.h \
+ /usr/include/c++/13/bits/allocator.h \
+ /usr/include/c++/13/bits/atomic_base.h \
+ /usr/include/c++/13/bits/atomic_lockfree_defines.h \
+ /usr/include/c++/13/bits/basic_string.h \
+ /usr/include/c++/13/bits/basic_string.tcc \
+ /usr/include/c++/13/bits/char_traits.h \
+ /usr/include/c++/13/bits/charconv.h \
+ /usr/include/c++/13/bits/codecvt.h \
+ /usr/include/c++/13/bits/concept_check.h \
+ /usr/include/c++/13/bits/cpp_type_traits.h \
+ /usr/include/c++/13/bits/cxxabi_forced.h \
+ /usr/include/c++/13/bits/cxxabi_init_exception.h \
+ /usr/include/c++/13/bits/exception.h \
+ /usr/include/c++/13/bits/exception_defines.h \
+ /usr/include/c++/13/bits/exception_ptr.h \
+ /usr/include/c++/13/bits/functexcept.h \
+ /usr/include/c++/13/bits/functional_hash.h \
+ /usr/include/c++/13/bits/hash_bytes.h \
+ /usr/include/c++/13/bits/invoke.h \
+ /usr/include/c++/13/bits/ios_base.h \
+ /usr/include/c++/13/bits/locale_classes.h \
+ /usr/include/c++/13/bits/locale_classes.tcc \
+ /usr/include/c++/13/bits/locale_conv.h \
+ /usr/include/c++/13/bits/locale_facets.h \
+ /usr/include/c++/13/bits/locale_facets.tcc \
+ /usr/include/c++/13/bits/locale_facets_nonio.h \
+ /usr/include/c++/13/bits/locale_facets_nonio.tcc \
+ /usr/include/c++/13/bits/localefwd.h \
+ /usr/include/c++/13/bits/memoryfwd.h \
+ /usr/include/c++/13/bits/move.h \
+ /usr/include/c++/13/bits/nested_exception.h \
+ /usr/include/c++/13/bits/new_allocator.h \
+ /usr/include/c++/13/bits/ostream_insert.h \
+ /usr/include/c++/13/bits/postypes.h \
+ /usr/include/c++/13/bits/predefined_ops.h \
+ /usr/include/c++/13/bits/ptr_traits.h \
+ /usr/include/c++/13/bits/range_access.h \
+ /usr/include/c++/13/bits/refwrap.h \
+ /usr/include/c++/13/bits/requires_hosted.h \
+ /usr/include/c++/13/bits/shared_ptr.h \
+ /usr/include/c++/13/bits/shared_ptr_atomic.h \
+ /usr/include/c++/13/bits/shared_ptr_base.h \
+ /usr/include/c++/13/bits/std_abs.h \
+ /usr/include/c++/13/bits/std_function.h \
+ /usr/include/c++/13/bits/stl_algo.h \
+ /usr/include/c++/13/bits/stl_algobase.h \
+ /usr/include/c++/13/bits/stl_construct.h \
+ /usr/include/c++/13/bits/stl_function.h \
+ /usr/include/c++/13/bits/stl_heap.h \
+ /usr/include/c++/13/bits/stl_iterator.h \
+ /usr/include/c++/13/bits/stl_iterator_base_funcs.h \
+ /usr/include/c++/13/bits/stl_iterator_base_types.h \
+ /usr/include/c++/13/bits/stl_pair.h \
+ /usr/include/c++/13/bits/stl_raw_storage_iter.h \
+ /usr/include/c++/13/bits/stl_relops.h \
+ /usr/include/c++/13/bits/stl_tempbuf.h \
+ /usr/include/c++/13/bits/stl_uninitialized.h \
+ /usr/include/c++/13/bits/stream_iterator.h \
+ /usr/include/c++/13/bits/streambuf.tcc \
+ /usr/include/c++/13/bits/streambuf_iterator.h \
+ /usr/include/c++/13/bits/stringfwd.h \
+ /usr/include/c++/13/bits/uniform_int_dist.h \
+ /usr/include/c++/13/bits/unique_ptr.h \
+ /usr/include/c++/13/bits/uses_allocator.h \
+ /usr/include/c++/13/bits/utility.h \
+ /usr/include/c++/13/cassert \
+ /usr/include/c++/13/cctype \
+ /usr/include/c++/13/cerrno \
+ /usr/include/c++/13/clocale \
+ /usr/include/c++/13/cstdint \
+ /usr/include/c++/13/cstdio \
+ /usr/include/c++/13/cstdlib \
+ /usr/include/c++/13/cstring \
+ /usr/include/c++/13/ctime \
+ /usr/include/c++/13/cwchar \
+ /usr/include/c++/13/cwctype \
+ /usr/include/c++/13/debug/assertions.h \
+ /usr/include/c++/13/debug/debug.h \
+ /usr/include/c++/13/exception \
+ /usr/include/c++/13/ext/aligned_buffer.h \
+ /usr/include/c++/13/ext/alloc_traits.h \
+ /usr/include/c++/13/ext/atomicity.h \
+ /usr/include/c++/13/ext/concurrence.h \
+ /usr/include/c++/13/ext/numeric_traits.h \
+ /usr/include/c++/13/ext/string_conversions.h \
+ /usr/include/c++/13/ext/type_traits.h \
+ /usr/include/c++/13/functional \
+ /usr/include/c++/13/initializer_list \
+ /usr/include/c++/13/iosfwd \
+ /usr/include/c++/13/iterator \
+ /usr/include/c++/13/locale \
+ /usr/include/c++/13/memory \
+ /usr/include/c++/13/new \
+ /usr/include/c++/13/stdexcept \
+ /usr/include/c++/13/streambuf \
+ /usr/include/c++/13/string \
+ /usr/include/c++/13/system_error \
+ /usr/include/c++/13/tuple \
+ /usr/include/c++/13/type_traits \
+ /usr/include/c++/13/typeinfo \
+ /usr/include/c++/13/utility \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/atomic_word.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++allocator.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++config.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++locale.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/cpu_defines.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_base.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_inline.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/error_constants.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr-default.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/messages_members.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/os_defines.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/time_members.h \
+ /usr/include/ctype.h \
/usr/include/endian.h \
- /usr/include/bits/byteswap.h \
- /usr/include/bits/uintn-identity.h \
- /usr/include/sys/select.h \
- /usr/include/bits/select.h \
- /usr/include/bits/types/sigset_t.h \
- /usr/include/bits/types/__sigset_t.h \
- /usr/include/bits/types/struct_timeval.h \
- /usr/include/bits/types/struct_timespec.h \
- /usr/include/bits/pthreadtypes.h \
- /usr/include/bits/thread-shared-types.h \
- /usr/include/bits/pthreadtypes-arch.h \
- /usr/include/bits/atomic_wide_counter.h \
- /usr/include/bits/struct_mutex.h \
- /usr/include/bits/struct_rwlock.h \
- /usr/include/alloca.h \
- /usr/include/bits/stdlib-bsearch.h \
- /usr/include/bits/stdlib-float.h \
- /usr/include/c++/12/bits/std_abs.h \
- /usr/include/c++/12/cstdio \
- /usr/include/stdio.h \
- /usr/include/bits/types/__fpos_t.h \
- /usr/include/bits/types/__fpos64_t.h \
- /usr/include/bits/types/struct_FILE.h \
- /usr/include/bits/types/cookie_io_functions_t.h \
- /usr/include/bits/stdio_lim.h \
- /usr/include/bits/stdio.h \
- /usr/include/c++/12/cerrno \
/usr/include/errno.h \
- /usr/include/bits/errno.h \
+ /usr/include/features-time64.h \
+ /usr/include/features.h \
+ /usr/include/gnu/stubs-64.h \
+ /usr/include/gnu/stubs.h \
+ /usr/include/libintl.h \
/usr/include/linux/errno.h \
- /usr/include/asm/errno.h \
- /usr/include/asm-generic/errno.h \
- /usr/include/asm-generic/errno-base.h \
- /usr/include/bits/types/error_t.h \
- /usr/include/c++/12/bits/charconv.h \
- /usr/include/c++/12/bits/functional_hash.h \
- /usr/include/c++/12/bits/hash_bytes.h \
- /usr/include/c++/12/bits/basic_string.tcc \
- /usr/include/c++/12/ext/atomicity.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr-default.h \
+ /usr/include/locale.h \
/usr/include/pthread.h \
/usr/include/sched.h \
- /usr/include/bits/sched.h \
- /usr/include/bits/types/struct_sched_param.h \
- /usr/include/bits/cpu-set.h \
+ /usr/include/stdc-predef.h \
+ /usr/include/stdint.h \
+ /usr/include/stdio.h \
+ /usr/include/stdlib.h \
+ /usr/include/string.h \
+ /usr/include/strings.h \
+ /usr/include/sys/cdefs.h \
+ /usr/include/sys/select.h \
+ /usr/include/sys/single_threaded.h \
+ /usr/include/sys/types.h \
/usr/include/time.h \
- /usr/include/bits/time.h \
- /usr/include/bits/timex.h \
- /usr/include/bits/types/struct_tm.h \
- /usr/include/bits/types/struct_itimerspec.h \
- /usr/include/bits/setjmp.h \
- /usr/include/bits/types/struct___jmp_buf_tag.h \
- /usr/include/bits/pthread_stack_min-dynamic.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/atomic_word.h \
- /usr/include/sys/single_threaded.h \
- /usr/include/c++/12/bits/locale_classes.tcc \
- /usr/include/c++/12/bits/locale_facets.h \
- /usr/include/c++/12/cwctype \
+ /usr/include/wchar.h \
/usr/include/wctype.h \
- /usr/include/bits/wctype-wchar.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_base.h \
- /usr/include/c++/12/bits/ios_base.h \
- /usr/include/c++/12/system_error \
- /usr/include/c++/12/x86_64-redhat-linux/bits/error_constants.h \
- /usr/include/c++/12/stdexcept \
- /usr/include/c++/12/exception \
- /usr/include/c++/12/bits/exception_ptr.h \
- /usr/include/c++/12/bits/cxxabi_init_exception.h \
- /usr/include/c++/12/typeinfo \
- /usr/include/c++/12/bits/nested_exception.h \
- /usr/include/c++/12/streambuf \
- /usr/include/c++/12/bits/streambuf.tcc \
- /usr/include/c++/12/bits/streambuf_iterator.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_inline.h \
- /usr/include/c++/12/bits/locale_facets.tcc \
- /usr/include/c++/12/bits/locale_facets_nonio.h \
- /usr/include/c++/12/ctime \
- /usr/include/c++/12/x86_64-redhat-linux/bits/time_members.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/messages_members.h \
- /usr/include/libintl.h \
- /usr/include/c++/12/bits/codecvt.h \
- /usr/include/c++/12/bits/locale_facets_nonio.tcc \
- /usr/include/c++/12/bits/locale_conv.h \
- third_party/uri/include/network/uri/uri_builder.hpp \
- /usr/include/c++/12/utility \
- /usr/include/c++/12/bits/stl_relops.h \
- third_party/uri/include/network/uri/uri.hpp \
- /usr/include/c++/12/iterator \
- /usr/include/c++/12/bits/stream_iterator.h \
- /usr/include/c++/12/algorithm \
- /usr/include/c++/12/bits/stl_algo.h \
- /usr/include/c++/12/bits/algorithmfwd.h \
- /usr/include/c++/12/bits/stl_heap.h \
- /usr/include/c++/12/bits/stl_tempbuf.h \
- /usr/include/c++/12/bits/uniform_int_dist.h \
- /usr/include/c++/12/functional \
- /usr/include/c++/12/tuple \
- /usr/include/c++/12/bits/uses_allocator.h \
- /usr/include/c++/12/bits/std_function.h \
- /usr/include/c++/12/memory \
- /usr/include/c++/12/bits/stl_uninitialized.h \
- /usr/include/c++/12/bits/stl_raw_storage_iter.h \
- /usr/include/c++/12/bits/align.h \
- /usr/include/c++/12/bit \
- /usr/include/c++/12/bits/unique_ptr.h \
- /usr/include/c++/12/bits/shared_ptr.h \
- /usr/include/c++/12/bits/shared_ptr_base.h \
- /usr/include/c++/12/bits/allocated_ptr.h \
- /usr/include/c++/12/ext/aligned_buffer.h \
- /usr/include/c++/12/ext/concurrence.h \
- /usr/include/c++/12/bits/shared_ptr_atomic.h \
- /usr/include/c++/12/bits/atomic_base.h \
- /usr/include/c++/12/bits/atomic_lockfree_defines.h \
- /usr/include/c++/12/backward/auto_ptr.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdarg.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdint.h \
+ third_party/uri/include/network/optional.hpp \
third_party/uri/include/network/string_view.hpp \
- /usr/include/c++/12/cassert \
- /usr/include/assert.h \
- third_party/uri/include/network/optional.hpp \
third_party/uri/include/network/uri/config.hpp \
- third_party/uri/include/network/uri/uri_errors.hpp \
- third_party/uri/include/network/uri/detail/uri_parts.hpp \
+ third_party/uri/include/network/uri/detail/decode.hpp \
third_party/uri/include/network/uri/detail/encode.hpp \
- /usr/include/c++/12/cstring \
- /usr/include/string.h \
- /usr/include/strings.h \
- third_party/uri/include/network/uri/detail/decode.hpp \
third_party/uri/include/network/uri/detail/translate.hpp \
+ third_party/uri/include/network/uri/detail/uri_parts.hpp \
+ third_party/uri/include/network/uri/uri.hpp \
+ third_party/uri/include/network/uri/uri_builder.hpp \
+ third_party/uri/include/network/uri/uri_errors.hpp \
+ third_party/uri/src/detail/algorithm.hpp \
third_party/uri/src/detail/uri_normalize.hpp \
- third_party/uri/src/detail/uri_parse_authority.hpp \
- third_party/uri/src/detail/algorithm.hpp
+ third_party/uri/src/detail/uri_parse_authority.hpp
third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o: third_party/uri/src/uri_errors.cpp \
- /usr/include/stdc-predef.h \
- /usr/include/c++/12/string \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++config.h \
- /usr/include/bits/wordsize.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/os_defines.h \
- /usr/include/features.h \
- /usr/include/features-time64.h \
+ /usr/include/alloca.h \
+ /usr/include/asm-generic/errno-base.h \
+ /usr/include/asm-generic/errno.h \
+ /usr/include/asm/errno.h \
+ /usr/include/bits/atomic_wide_counter.h \
+ /usr/include/bits/byteswap.h \
+ /usr/include/bits/endian.h \
+ /usr/include/bits/endianness.h \
+ /usr/include/bits/errno.h \
+ /usr/include/bits/floatn-common.h \
+ /usr/include/bits/floatn.h \
+ /usr/include/bits/libc-header-start.h \
+ /usr/include/bits/locale.h \
+ /usr/include/bits/long-double.h \
+ /usr/include/bits/pthreadtypes-arch.h \
+ /usr/include/bits/pthreadtypes.h \
+ /usr/include/bits/select.h \
+ /usr/include/bits/stdint-intn.h \
+ /usr/include/bits/stdio.h \
+ /usr/include/bits/stdio_lim.h \
+ /usr/include/bits/stdlib-bsearch.h \
+ /usr/include/bits/stdlib-float.h \
+ /usr/include/bits/struct_mutex.h \
+ /usr/include/bits/struct_rwlock.h \
+ /usr/include/bits/thread-shared-types.h \
+ /usr/include/bits/time64.h \
/usr/include/bits/timesize.h \
- /usr/include/sys/cdefs.h \
- /usr/include/bits/long-double.h \
- /usr/include/gnu/stubs.h \
- /usr/include/gnu/stubs-64.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h \
- /usr/include/c++/12/bits/stringfwd.h \
- /usr/include/c++/12/bits/memoryfwd.h \
- /usr/include/c++/12/bits/char_traits.h \
- /usr/include/c++/12/bits/postypes.h \
- /usr/include/c++/12/cwchar \
- /usr/include/wchar.h \
- /usr/include/bits/libc-header-start.h \
- /usr/include/bits/floatn.h \
- /usr/include/bits/floatn-common.h \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stddef.h \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdarg.h \
- /usr/include/bits/wchar.h \
- /usr/include/bits/types/wint_t.h \
- /usr/include/bits/types/mbstate_t.h \
- /usr/include/bits/types/__mbstate_t.h \
+ /usr/include/bits/types.h \
+ /usr/include/bits/types/FILE.h \
/usr/include/bits/types/__FILE.h \
- /usr/include/bits/types/FILE.h \
- /usr/include/bits/types/locale_t.h \
+ /usr/include/bits/types/__fpos64_t.h \
+ /usr/include/bits/types/__fpos_t.h \
/usr/include/bits/types/__locale_t.h \
- /usr/include/c++/12/type_traits \
- /usr/include/c++/12/cstdint \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdint.h \
- /usr/include/stdint.h \
- /usr/include/bits/types.h \
- /usr/include/bits/typesizes.h \
- /usr/include/bits/time64.h \
- /usr/include/bits/stdint-intn.h \
- /usr/include/bits/stdint-uintn.h \
- /usr/include/c++/12/bits/allocator.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++allocator.h \
- /usr/include/c++/12/bits/new_allocator.h \
- /usr/include/c++/12/new \
- /usr/include/c++/12/bits/exception.h \
- /usr/include/c++/12/bits/functexcept.h \
- /usr/include/c++/12/bits/exception_defines.h \
- /usr/include/c++/12/bits/move.h \
- /usr/include/c++/12/bits/cpp_type_traits.h \
- /usr/include/c++/12/bits/localefwd.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++locale.h \
- /usr/include/c++/12/clocale \
- /usr/include/locale.h \
- /usr/include/bits/locale.h \
- /usr/include/c++/12/iosfwd \
- /usr/include/c++/12/cctype \
- /usr/include/ctype.h \
- /usr/include/bits/endian.h \
- /usr/include/bits/endianness.h \
- /usr/include/c++/12/bits/ostream_insert.h \
- /usr/include/c++/12/bits/cxxabi_forced.h \
- /usr/include/c++/12/bits/stl_iterator_base_types.h \
- /usr/include/c++/12/bits/stl_iterator_base_funcs.h \
- /usr/include/c++/12/bits/concept_check.h \
- /usr/include/c++/12/debug/assertions.h \
- /usr/include/c++/12/bits/stl_iterator.h \
- /usr/include/c++/12/ext/type_traits.h \
- /usr/include/c++/12/bits/ptr_traits.h \
- /usr/include/c++/12/bits/stl_function.h \
- /usr/include/c++/12/backward/binders.h \
- /usr/include/c++/12/ext/numeric_traits.h \
- /usr/include/c++/12/bits/stl_algobase.h \
- /usr/include/c++/12/bits/stl_pair.h \
- /usr/include/c++/12/bits/utility.h \
- /usr/include/c++/12/debug/debug.h \
- /usr/include/c++/12/bits/predefined_ops.h \
- /usr/include/c++/12/bits/refwrap.h \
- /usr/include/c++/12/bits/invoke.h \
- /usr/include/c++/12/bits/range_access.h \
- /usr/include/c++/12/initializer_list \
- /usr/include/c++/12/bits/basic_string.h \
- /usr/include/c++/12/ext/alloc_traits.h \
- /usr/include/c++/12/bits/alloc_traits.h \
- /usr/include/c++/12/bits/stl_construct.h \
- /usr/include/c++/12/ext/string_conversions.h \
- /usr/include/c++/12/cstdlib \
- /usr/include/stdlib.h \
- /usr/include/bits/waitflags.h \
- /usr/include/bits/waitstatus.h \
- /usr/include/sys/types.h \
+ /usr/include/bits/types/__mbstate_t.h \
+ /usr/include/bits/types/__sigset_t.h \
/usr/include/bits/types/clock_t.h \
/usr/include/bits/types/clockid_t.h \
+ /usr/include/bits/types/cookie_io_functions_t.h \
+ /usr/include/bits/types/error_t.h \
+ /usr/include/bits/types/locale_t.h \
+ /usr/include/bits/types/mbstate_t.h \
+ /usr/include/bits/types/sigset_t.h \
+ /usr/include/bits/types/struct_FILE.h \
+ /usr/include/bits/types/struct_timespec.h \
+ /usr/include/bits/types/struct_timeval.h \
/usr/include/bits/types/time_t.h \
/usr/include/bits/types/timer_t.h \
+ /usr/include/bits/types/wint_t.h \
+ /usr/include/bits/typesizes.h \
+ /usr/include/bits/uintn-identity.h \
+ /usr/include/bits/waitflags.h \
+ /usr/include/bits/waitstatus.h \
+ /usr/include/bits/wchar.h \
+ /usr/include/bits/wordsize.h \
+ /usr/include/c++/13/backward/binders.h \
+ /usr/include/c++/13/bits/alloc_traits.h \
+ /usr/include/c++/13/bits/allocator.h \
+ /usr/include/c++/13/bits/basic_string.h \
+ /usr/include/c++/13/bits/basic_string.tcc \
+ /usr/include/c++/13/bits/char_traits.h \
+ /usr/include/c++/13/bits/charconv.h \
+ /usr/include/c++/13/bits/concept_check.h \
+ /usr/include/c++/13/bits/cpp_type_traits.h \
+ /usr/include/c++/13/bits/cxxabi_forced.h \
+ /usr/include/c++/13/bits/cxxabi_init_exception.h \
+ /usr/include/c++/13/bits/exception.h \
+ /usr/include/c++/13/bits/exception_defines.h \
+ /usr/include/c++/13/bits/exception_ptr.h \
+ /usr/include/c++/13/bits/functexcept.h \
+ /usr/include/c++/13/bits/functional_hash.h \
+ /usr/include/c++/13/bits/hash_bytes.h \
+ /usr/include/c++/13/bits/invoke.h \
+ /usr/include/c++/13/bits/localefwd.h \
+ /usr/include/c++/13/bits/memoryfwd.h \
+ /usr/include/c++/13/bits/move.h \
+ /usr/include/c++/13/bits/nested_exception.h \
+ /usr/include/c++/13/bits/new_allocator.h \
+ /usr/include/c++/13/bits/ostream_insert.h \
+ /usr/include/c++/13/bits/postypes.h \
+ /usr/include/c++/13/bits/predefined_ops.h \
+ /usr/include/c++/13/bits/ptr_traits.h \
+ /usr/include/c++/13/bits/range_access.h \
+ /usr/include/c++/13/bits/refwrap.h \
+ /usr/include/c++/13/bits/requires_hosted.h \
+ /usr/include/c++/13/bits/std_abs.h \
+ /usr/include/c++/13/bits/stl_algobase.h \
+ /usr/include/c++/13/bits/stl_construct.h \
+ /usr/include/c++/13/bits/stl_function.h \
+ /usr/include/c++/13/bits/stl_iterator.h \
+ /usr/include/c++/13/bits/stl_iterator_base_funcs.h \
+ /usr/include/c++/13/bits/stl_iterator_base_types.h \
+ /usr/include/c++/13/bits/stl_pair.h \
+ /usr/include/c++/13/bits/stringfwd.h \
+ /usr/include/c++/13/bits/utility.h \
+ /usr/include/c++/13/cctype \
+ /usr/include/c++/13/cerrno \
+ /usr/include/c++/13/clocale \
+ /usr/include/c++/13/cstdio \
+ /usr/include/c++/13/cstdlib \
+ /usr/include/c++/13/cwchar \
+ /usr/include/c++/13/debug/assertions.h \
+ /usr/include/c++/13/debug/debug.h \
+ /usr/include/c++/13/exception \
+ /usr/include/c++/13/ext/alloc_traits.h \
+ /usr/include/c++/13/ext/numeric_traits.h \
+ /usr/include/c++/13/ext/string_conversions.h \
+ /usr/include/c++/13/ext/type_traits.h \
+ /usr/include/c++/13/initializer_list \
+ /usr/include/c++/13/iosfwd \
+ /usr/include/c++/13/new \
+ /usr/include/c++/13/stdexcept \
+ /usr/include/c++/13/string \
+ /usr/include/c++/13/system_error \
+ /usr/include/c++/13/type_traits \
+ /usr/include/c++/13/typeinfo \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++allocator.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++config.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++locale.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/cpu_defines.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/error_constants.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/os_defines.h \
+ /usr/include/ctype.h \
/usr/include/endian.h \
- /usr/include/bits/byteswap.h \
- /usr/include/bits/uintn-identity.h \
- /usr/include/sys/select.h \
- /usr/include/bits/select.h \
- /usr/include/bits/types/sigset_t.h \
- /usr/include/bits/types/__sigset_t.h \
- /usr/include/bits/types/struct_timeval.h \
- /usr/include/bits/types/struct_timespec.h \
- /usr/include/bits/pthreadtypes.h \
- /usr/include/bits/thread-shared-types.h \
- /usr/include/bits/pthreadtypes-arch.h \
- /usr/include/bits/atomic_wide_counter.h \
- /usr/include/bits/struct_mutex.h \
- /usr/include/bits/struct_rwlock.h \
- /usr/include/alloca.h \
- /usr/include/bits/stdlib-bsearch.h \
- /usr/include/bits/stdlib-float.h \
- /usr/include/c++/12/bits/std_abs.h \
- /usr/include/c++/12/cstdio \
- /usr/include/stdio.h \
- /usr/include/bits/types/__fpos_t.h \
- /usr/include/bits/types/__fpos64_t.h \
- /usr/include/bits/types/struct_FILE.h \
- /usr/include/bits/types/cookie_io_functions_t.h \
- /usr/include/bits/stdio_lim.h \
- /usr/include/bits/stdio.h \
- /usr/include/c++/12/cerrno \
/usr/include/errno.h \
- /usr/include/bits/errno.h \
+ /usr/include/features-time64.h \
+ /usr/include/features.h \
+ /usr/include/gnu/stubs-64.h \
+ /usr/include/gnu/stubs.h \
/usr/include/linux/errno.h \
- /usr/include/asm/errno.h \
- /usr/include/asm-generic/errno.h \
- /usr/include/asm-generic/errno-base.h \
- /usr/include/bits/types/error_t.h \
- /usr/include/c++/12/bits/charconv.h \
- /usr/include/c++/12/bits/functional_hash.h \
- /usr/include/c++/12/bits/hash_bytes.h \
- /usr/include/c++/12/bits/basic_string.tcc \
- third_party/uri/include/network/uri/uri_errors.hpp \
- /usr/include/c++/12/system_error \
- /usr/include/c++/12/x86_64-redhat-linux/bits/error_constants.h \
- /usr/include/c++/12/stdexcept \
- /usr/include/c++/12/exception \
- /usr/include/c++/12/bits/exception_ptr.h \
- /usr/include/c++/12/bits/cxxabi_init_exception.h \
- /usr/include/c++/12/typeinfo \
- /usr/include/c++/12/bits/nested_exception.h \
- third_party/uri/include/network/uri/config.hpp
+ /usr/include/locale.h \
+ /usr/include/stdc-predef.h \
+ /usr/include/stdio.h \
+ /usr/include/stdlib.h \
+ /usr/include/sys/cdefs.h \
+ /usr/include/sys/select.h \
+ /usr/include/sys/types.h \
+ /usr/include/wchar.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdarg.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h \
+ third_party/uri/include/network/uri/config.hpp \
+ third_party/uri/include/network/uri/uri_errors.hpp
third_party/uri/src/uri_errors.cpp:
@@ -1728,488 +1729,490 @@
third_party/uri/src/detail/uri_parse.cpp:
-/usr/include/c++/12/bits/locale_conv.h:
+third_party/uri/src/detail/uri_percent_encode.hpp:
-/usr/include/c++/12/bits/locale_facets_nonio.tcc:
+third_party/uri/src/detail/algorithm_split.hpp:
-/usr/include/c++/12/bits/codecvt.h:
+third_party/uri/include/network/uri/uri_errors.hpp:
-/usr/include/libintl.h:
+third_party/uri/include/network/uri/uri.hpp:
-/usr/include/c++/12/x86_64-redhat-linux/bits/time_members.h:
+third_party/uri/include/network/uri/config.hpp:
-/usr/include/c++/12/ctime:
+/usr/include/string.h:
-/usr/include/c++/12/bits/locale_facets.tcc:
+/usr/include/c++/13/x86_64-redhat-linux/bits/ctype_inline.h:
-/usr/include/c++/12/locale:
+/usr/include/c++/13/x86_64-redhat-linux/bits/ctype_base.h:
-/usr/include/c++/12/bits/stl_bvector.h:
+/usr/include/c++/13/vector:
-/usr/include/c++/12/bits/stl_vector.h:
+third_party/uri/src/detail/algorithm.hpp:
-third_party/uri/src/detail/uri_percent_encode.hpp:
+/usr/include/c++/13/ctime:
-/usr/include/c++/12/cstring:
+/usr/include/c++/13/cstring:
-third_party/uri/include/network/uri/detail/encode.hpp:
+/usr/include/c++/13/bits/locale_facets_nonio.h:
-third_party/uri/include/network/uri/config.hpp:
+/usr/include/c++/13/bits/locale_facets.h:
-/usr/include/c++/12/functional:
+/usr/include/c++/13/bits/locale_conv.h:
-third_party/uri/include/network/uri/uri.hpp:
+third_party/uri/src/detail/uri_normalize.cpp:
-/usr/include/c++/12/limits:
+/usr/include/c++/13/x86_64-redhat-linux/bits/time_members.h:
-/usr/include/assert.h:
+third_party/uri/include/network/uri/detail/uri_parts.hpp:
-/usr/include/c++/12/cassert:
+third_party/uri/include/network/optional.hpp:
-/usr/include/c++/12/bits/stl_heap.h:
+/usr/lib/gcc/x86_64-redhat-linux/13/include/stdint.h:
-/usr/include/c++/12/bits/stl_algo.h:
+/usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h:
-/usr/include/c++/12/algorithm:
+/usr/lib/gcc/x86_64-redhat-linux/13/include/stdarg.h:
-/usr/include/c++/12/bits/atomic_lockfree_defines.h:
+/usr/include/wchar.h:
-/usr/include/c++/12/bits/shared_ptr_atomic.h:
+/usr/include/sys/single_threaded.h:
-/usr/include/c++/12/ext/aligned_buffer.h:
+/usr/include/sys/cdefs.h:
-/usr/include/c++/12/bits/locale_facets.h:
+/usr/include/stdlib.h:
-/usr/include/c++/12/tuple:
+/usr/include/stdio.h:
-/usr/include/c++/12/cwctype:
+/usr/include/stdint.h:
-/usr/include/c++/12/bits/unique_ptr.h:
+/usr/include/stdc-predef.h:
-/usr/include/c++/12/bit:
+/usr/include/sched.h:
-/usr/include/c++/12/bits/stl_raw_storage_iter.h:
+/usr/include/pthread.h:
-/usr/include/c++/12/bits/stl_tempbuf.h:
+/usr/include/linux/errno.h:
-/usr/include/string.h:
+/usr/include/features-time64.h:
-/usr/include/c++/12/bits/stl_uninitialized.h:
+/usr/include/c++/13/x86_64-redhat-linux/bits/gthr-default.h:
-/usr/include/c++/12/bits/streambuf.tcc:
+/usr/include/c++/13/x86_64-redhat-linux/bits/cpu_defines.h:
-third_party/uri/src/detail/uri_resolve.hpp:
+/usr/include/strings.h:
-/usr/include/c++/12/bits/nested_exception.h:
+/usr/include/c++/13/x86_64-redhat-linux/bits/c++locale.h:
-/usr/include/c++/12/bits/cxxabi_init_exception.h:
+/usr/include/bits/wctype-wchar.h:
-/usr/include/c++/12/bits/exception_ptr.h:
+/usr/include/sys/types.h:
-/usr/include/c++/12/system_error:
+/usr/include/c++/13/x86_64-redhat-linux/bits/atomic_word.h:
-/usr/include/c++/12/bits/locale_classes.h:
+/usr/include/c++/13/bits/locale_facets_nonio.tcc:
-/usr/include/sys/single_threaded.h:
+/usr/include/c++/13/utility:
-/usr/include/bits/pthread_stack_min-dynamic.h:
+/usr/include/c++/13/type_traits:
-/usr/include/c++/12/bits/allocated_ptr.h:
+third_party/uri/include/network/uri/detail/encode.hpp:
-/usr/include/bits/types/struct___jmp_buf_tag.h:
+/usr/include/c++/13/tuple:
-third_party/uri/src/detail/uri_parse_authority.cpp:
+/usr/include/c++/13/stdexcept:
-/usr/include/bits/setjmp.h:
+/usr/include/c++/13/memory:
-/usr/include/bits/types/struct_tm.h:
+/usr/include/c++/13/limits:
-/usr/include/c++/12/typeinfo:
+/usr/include/c++/13/iterator:
-/usr/include/bits/cpu-set.h:
+/usr/include/c++/13/initializer_list:
-/usr/include/bits/types/struct_sched_param.h:
+/usr/include/c++/13/ext/type_traits.h:
-/usr/include/c++/12/backward/auto_ptr.h:
+/usr/include/c++/13/x86_64-redhat-linux/bits/c++allocator.h:
-/usr/include/sched.h:
+/usr/include/c++/13/ext/string_conversions.h:
-/usr/include/pthread.h:
+/usr/include/c++/13/ext/numeric_traits.h:
-/usr/include/c++/12/bits/ios_base.h:
+third_party/uri/src/detail/uri_resolve.hpp:
-/usr/include/c++/12/streambuf:
+/usr/include/c++/13/ext/concurrence.h:
-/usr/include/c++/12/vector:
+/usr/include/c++/13/new:
-/usr/include/bits/sched.h:
+/usr/include/c++/13/ext/alloc_traits.h:
-/usr/include/c++/12/bits/streambuf_iterator.h:
+/usr/include/locale.h:
-/usr/include/c++/12/bits/stream_iterator.h:
+/usr/include/c++/13/ext/aligned_buffer.h:
-/usr/include/c++/12/iterator:
+/usr/include/gnu/stubs-64.h:
-/usr/include/c++/12/bits/hash_bytes.h:
+/usr/include/c++/13/debug/debug.h:
-/usr/include/bits/types/error_t.h:
+/usr/include/c++/13/debug/assertions.h:
-/usr/include/asm-generic/errno-base.h:
+/usr/include/c++/13/cwchar:
-/usr/include/asm-generic/errno.h:
+/usr/include/c++/13/cstdint:
-third_party/uri/include/network/uri/detail/translate.hpp:
+/usr/include/c++/13/bits/std_function.h:
-/usr/include/asm/errno.h:
+/usr/include/c++/13/cstdlib:
-/usr/include/linux/errno.h:
+/usr/include/c++/13/bits/uniform_int_dist.h:
-/usr/include/wctype.h:
+/usr/include/c++/13/bits/stringfwd.h:
-/usr/include/bits/timex.h:
+/usr/include/c++/13/cassert:
-/usr/include/bits/errno.h:
+/usr/include/bits/types/time_t.h:
-/usr/include/c++/12/backward/binders.h:
+/usr/include/c++/13/cerrno:
-/usr/include/c++/12/x86_64-redhat-linux/bits/c++locale.h:
+/usr/include/bits/types/struct_tm.h:
-/usr/include/c++/12/bits/localefwd.h:
+/usr/include/c++/13/ext/atomicity.h:
-/usr/include/c++/12/bits/cpp_type_traits.h:
+/usr/include/c++/13/cctype:
-/usr/include/c++/12/bits/allocator.h:
+/usr/include/bits/wchar.h:
-/usr/include/c++/12/bits/exception_defines.h:
+/usr/include/bits/types/struct_timespec.h:
-/usr/include/locale.h:
+/usr/include/c++/13/bits/stl_bvector.h:
-/usr/include/bits/types/wint_t.h:
+/usr/include/sys/select.h:
-third_party/uri/include/network/uri/uri_errors.hpp:
+/usr/include/c++/13/bits/allocator.h:
-/usr/include/c++/12/bits/locale_classes.tcc:
+/usr/include/c++/13/bits/locale_classes.tcc:
-/usr/include/c++/12/bits/exception.h:
+/usr/include/bits/types/struct_sched_param.h:
-/usr/include/bits/stdint-uintn.h:
+/usr/include/ctype.h:
-/usr/include/c++/12/ext/concurrence.h:
+/usr/include/bits/waitflags.h:
-/usr/include/endian.h:
+third_party/uri/src/uri_builder.cpp:
-/usr/include/bits/types/cookie_io_functions_t.h:
+/usr/include/c++/13/locale:
-/usr/include/c++/12/memory:
+/usr/include/c++/13/bits/stl_uninitialized.h:
-/usr/include/bits/stdint-intn.h:
+/usr/include/bits/types/struct_FILE.h:
-/usr/include/strings.h:
+/usr/include/bits/types/locale_t.h:
-/usr/include/c++/12/ext/atomicity.h:
+/usr/include/c++/13/x86_64-redhat-linux/bits/os_defines.h:
-/usr/include/c++/12/string:
+/usr/include/c++/13/bits/stl_heap.h:
-/usr/include/c++/12/bits/shared_ptr.h:
+/usr/include/bits/types/cookie_io_functions_t.h:
-/usr/include/c++/12/initializer_list:
+/usr/include/bits/sched.h:
-third_party/uri/src/uri_builder.cpp:
+/usr/include/bits/types/clockid_t.h:
-/usr/include/c++/12/new:
+/usr/include/bits/atomic_wide_counter.h:
-/usr/include/bits/typesizes.h:
+/usr/include/c++/13/clocale:
-/usr/include/bits/uintn-identity.h:
+/usr/include/c++/13/bits/allocated_ptr.h:
-/usr/include/bits/types.h:
+/usr/include/bits/types/__locale_t.h:
-/usr/include/stdint.h:
+/usr/include/bits/types/__FILE.h:
-/usr/include/c++/12/bits/char_traits.h:
+/usr/include/c++/13/bits/char_traits.h:
-/usr/include/c++/12/bits/stl_relops.h:
+/usr/include/c++/13/bits/codecvt.h:
-/usr/include/c++/12/cstdint:
-
/usr/include/bits/types/FILE.h:
-/usr/include/c++/12/x86_64-redhat-linux/bits/os_defines.h:
+/usr/include/bits/types.h:
-/usr/include/c++/12/exception:
+/usr/include/bits/types/error_t.h:
-/usr/lib/gcc/x86_64-redhat-linux/12/include/stddef.h:
+/usr/include/bits/stdint-intn.h:
-/usr/include/c++/12/x86_64-redhat-linux/bits/gthr-default.h:
+third_party/uri/include/network/uri/detail/translate.hpp:
-/usr/include/gnu/stubs-64.h:
+/usr/include/asm/errno.h:
-/usr/include/bits/long-double.h:
+/usr/include/bits/thread-shared-types.h:
-/usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h:
+/usr/include/features.h:
-/usr/include/c++/12/bits/algorithmfwd.h:
+/usr/include/bits/endianness.h:
-/usr/include/bits/stdlib-float.h:
+/usr/include/c++/13/bits/unique_ptr.h:
-/usr/include/bits/time64.h:
+/usr/include/c++/13/bits/align.h:
-/usr/include/bits/types/__sigset_t.h:
+/usr/include/bits/struct_mutex.h:
-third_party/uri/include/network/uri/detail/uri_parts.hpp:
+/usr/include/c++/13/bits/stl_vector.h:
-/usr/include/c++/12/cstddef:
+/usr/include/bits/cpu-set.h:
-/usr/include/c++/12/bits/new_allocator.h:
+/usr/include/bits/typesizes.h:
-/usr/include/bits/wordsize.h:
+/usr/include/bits/uintn-identity.h:
-/usr/include/c++/12/bits/postypes.h:
+/usr/include/c++/13/iosfwd:
-/usr/lib/gcc/x86_64-redhat-linux/12/include/stdint.h:
+/usr/include/c++/13/bits/predefined_ops.h:
-third_party/uri/include/network/string_view.hpp:
+/usr/include/bits/long-double.h:
-/usr/include/bits/types/sigset_t.h:
+/usr/include/bits/stdlib-float.h:
-/usr/include/c++/12/x86_64-redhat-linux/bits/gthr.h:
+/usr/include/bits/time64.h:
-/usr/include/c++/12/type_traits:
+/usr/include/bits/stdio_lim.h:
-/usr/include/c++/12/x86_64-redhat-linux/bits/ctype_base.h:
+/usr/include/bits/types/__mbstate_t.h:
-/usr/include/bits/endian.h:
+/usr/include/bits/time.h:
-/usr/include/c++/12/cstdio:
+third_party/uri/src/detail/uri_advance_parts.hpp:
-/usr/include/c++/12/ext/string_conversions.h:
+/usr/include/c++/13/string:
-third_party/uri/include/network/uri/detail/decode.hpp:
+/usr/include/bits/byteswap.h:
-/usr/include/c++/12/bits/align.h:
+/usr/include/bits/struct_rwlock.h:
-/usr/include/gnu/stubs.h:
+/usr/include/bits/types/struct_itimerspec.h:
-/usr/include/bits/pthreadtypes-arch.h:
+/usr/include/c++/13/bits/ptr_traits.h:
-/usr/include/c++/12/iosfwd:
+/usr/include/c++/13/bits/stl_construct.h:
-/usr/include/c++/12/utility:
+/usr/include/c++/13/x86_64-redhat-linux/bits/c++config.h:
-/usr/include/stdc-predef.h:
+/usr/include/alloca.h:
-/usr/include/c++/12/bits/move.h:
+/usr/include/c++/13/x86_64-redhat-linux/bits/messages_members.h:
-/usr/include/c++/12/x86_64-redhat-linux/bits/c++allocator.h:
+/usr/include/c++/13/bit:
-/usr/include/c++/12/bits/charconv.h:
+/usr/include/c++/13/bits/basic_string.tcc:
-/usr/include/bits/pthreadtypes.h:
+/usr/include/c++/13/bits/vector.tcc:
-third_party/uri/src/detail/uri_normalize.hpp:
+/usr/include/bits/locale.h:
-/usr/include/c++/12/ext/alloc_traits.h:
+/usr/include/c++/13/algorithm:
-third_party/uri/src/detail/uri_advance_parts.cpp:
+/usr/include/c++/13/bits/stl_raw_storage_iter.h:
-third_party/uri/src/detail/algorithm.hpp:
+/usr/include/c++/13/bits/stream_iterator.h:
-/usr/include/c++/12/bits/stringfwd.h:
+third_party/uri/src/detail/uri_parse_authority.cpp:
-/usr/include/bits/floatn.h:
+/usr/include/c++/13/functional:
-/usr/include/c++/12/x86_64-redhat-linux/bits/atomic_word.h:
+/usr/include/bits/setjmp.h:
-/usr/include/c++/12/bits/memoryfwd.h:
+/usr/include/bits/types/struct___jmp_buf_tag.h:
-/usr/include/bits/wctype-wchar.h:
+/usr/include/bits/types/clock_t.h:
-/usr/include/sys/types.h:
+/usr/include/bits/types/__fpos_t.h:
-/usr/include/bits/locale.h:
+/usr/include/c++/13/bits/stl_iterator_base_types.h:
-/usr/include/c++/12/cwchar:
+/usr/include/asm-generic/errno-base.h:
-/usr/include/wchar.h:
+/usr/include/c++/13/bits/hash_bytes.h:
-/usr/include/c++/12/x86_64-redhat-linux/bits/messages_members.h:
+/usr/include/assert.h:
-/usr/include/c++/12/bits/alloc_traits.h:
+/usr/include/bits/types/__sigset_t.h:
-/usr/include/bits/types/mbstate_t.h:
+/usr/include/c++/13/backward/auto_ptr.h:
-third_party/uri/src/detail/algorithm_split.hpp:
+third_party/uri/src/detail/uri_normalize.hpp:
-/usr/include/c++/12/bits/stl_iterator.h:
+third_party/uri/src/detail/uri_advance_parts.cpp:
-/usr/include/c++/12/bits/utility.h:
+/usr/include/c++/13/bits/ios_base.h:
-/usr/include/bits/floatn-common.h:
+/usr/include/bits/floatn.h:
-/usr/include/c++/12/bits/uses_allocator.h:
+/usr/include/bits/pthreadtypes.h:
-/usr/include/sys/cdefs.h:
+/usr/include/bits/libc-header-start.h:
-/usr/include/c++/12/bits/stl_iterator_base_funcs.h:
+/usr/include/wctype.h:
-/usr/include/bits/libc-header-start.h:
+/usr/include/c++/13/exception:
-third_party/uri/include/network/optional.hpp:
+/usr/include/bits/errno.h:
-/usr/lib/gcc/x86_64-redhat-linux/12/include/stdarg.h:
+/usr/include/bits/timex.h:
-/usr/include/bits/wchar.h:
+/usr/include/c++/13/bits/shared_ptr_atomic.h:
-/usr/include/bits/types/locale_t.h:
+/usr/include/bits/pthread_stack_min-dynamic.h:
-/usr/include/c++/12/bits/atomic_base.h:
+/usr/include/endian.h:
-/usr/include/c++/12/stdexcept:
+/usr/include/c++/13/bits/streambuf.tcc:
-/usr/include/features-time64.h:
+third_party/uri/include/network/uri/detail/decode.hpp:
-/usr/include/c++/12/cctype:
+/usr/include/gnu/stubs.h:
-/usr/include/bits/waitflags.h:
+/usr/include/bits/pthreadtypes-arch.h:
-/usr/include/ctype.h:
+/usr/include/libintl.h:
-/usr/include/bits/types/__locale_t.h:
+/usr/include/c++/13/bits/basic_string.h:
-/usr/include/c++/12/bits/stl_algobase.h:
+/usr/include/bits/stdio.h:
-/usr/include/features.h:
+/usr/include/bits/types/timer_t.h:
-/usr/include/bits/endianness.h:
+/usr/include/c++/13/cwctype:
-third_party/uri/src/detail/uri_normalize.cpp:
+/usr/include/bits/types/wint_t.h:
-/usr/include/c++/12/bits/ostream_insert.h:
+/usr/include/bits/timesize.h:
-/usr/include/c++/12/bits/cxxabi_forced.h:
+/usr/include/c++/13/bits/shared_ptr.h:
-/usr/include/c++/12/bits/stl_iterator_base_types.h:
+/usr/include/bits/waitstatus.h:
-/usr/include/bits/struct_mutex.h:
+/usr/include/c++/13/bits/streambuf_iterator.h:
-/usr/include/bits/types/__FILE.h:
+/usr/include/bits/wordsize.h:
-/usr/include/c++/12/bits/concept_check.h:
+third_party/uri/include/network/string_view.hpp:
-/usr/include/c++/12/debug/debug.h:
+/usr/include/bits/types/sigset_t.h:
-/usr/include/c++/12/bits/uniform_int_dist.h:
+/usr/include/c++/13/bits/move.h:
-/usr/include/c++/12/x86_64-redhat-linux/bits/error_constants.h:
+third_party/uri/src/detail/uri_parse.hpp:
-/usr/include/c++/12/bits/std_abs.h:
+/usr/include/c++/13/bits/utility.h:
-/usr/include/c++/12/debug/assertions.h:
+/usr/include/c++/13/bits/stl_function.h:
-/usr/include/c++/12/bits/ptr_traits.h:
+/usr/include/bits/select.h:
-/usr/include/bits/types/time_t.h:
+/usr/include/c++/13/backward/binders.h:
-/usr/include/bits/types/struct_itimerspec.h:
+/usr/include/c++/13/bits/algorithmfwd.h:
-/usr/include/bits/struct_rwlock.h:
+/usr/include/bits/types/struct_timeval.h:
-/usr/include/c++/12/bits/std_function.h:
+/usr/include/c++/13/bits/concept_check.h:
-/usr/include/c++/12/bits/stl_function.h:
+/usr/include/c++/13/bits/alloc_traits.h:
-third_party/uri/include/network/uri/uri_builder.hpp:
+/usr/include/c++/13/x86_64-redhat-linux/bits/gthr.h:
-/usr/include/c++/12/ext/numeric_traits.h:
+/usr/include/bits/types/mbstate_t.h:
-/usr/include/c++/12/x86_64-redhat-linux/bits/ctype_inline.h:
+/usr/include/c++/13/bits/atomic_lockfree_defines.h:
-/usr/include/c++/12/bits/stl_pair.h:
+/usr/include/c++/13/bits/cpp_type_traits.h:
-/usr/include/c++/12/cstdlib:
+/usr/include/c++/13/bits/cxxabi_forced.h:
-/usr/include/bits/thread-shared-types.h:
+/usr/include/c++/13/typeinfo:
-/usr/include/c++/12/bits/stl_construct.h:
+/usr/include/c++/13/bits/cxxabi_init_exception.h:
-/usr/include/c++/12/bits/vector.tcc:
+/usr/include/c++/13/streambuf:
-/usr/include/c++/12/bits/functexcept.h:
+/usr/include/c++/13/bits/exception.h:
-/usr/include/c++/12/bits/predefined_ops.h:
+/usr/include/c++/13/cstdio:
-/usr/include/c++/12/bits/invoke.h:
+/usr/include/c++/13/bits/charconv.h:
-/usr/include/time.h:
+/usr/include/c++/13/bits/stl_pair.h:
-/usr/include/c++/12/bits/range_access.h:
+third_party/uri/include/network/uri/uri_builder.hpp:
-third_party/uri/src/detail/uri_parse.hpp:
+/usr/include/c++/13/bits/exception_defines.h:
-/usr/include/c++/12/ext/type_traits.h:
+/usr/include/c++/13/bits/localefwd.h:
-/usr/include/c++/12/bits/basic_string.h:
+/usr/include/c++/13/bits/exception_ptr.h:
-/usr/include/stdlib.h:
+/usr/include/c++/13/bits/stl_iterator.h:
-/usr/include/bits/timesize.h:
+/usr/include/bits/types/__fpos64_t.h:
-/usr/include/bits/waitstatus.h:
+/usr/include/c++/13/bits/functexcept.h:
-/usr/include/bits/types/clockid_t.h:
+/usr/include/errno.h:
-/usr/include/bits/atomic_wide_counter.h:
+/usr/include/c++/13/bits/functional_hash.h:
-/usr/include/c++/12/x86_64-redhat-linux/bits/c++config.h:
+/usr/include/c++/13/bits/invoke.h:
-/usr/include/errno.h:
+/usr/include/c++/13/bits/locale_classes.h:
-/usr/include/bits/types/timer_t.h:
+/usr/include/time.h:
-/usr/include/c++/12/bits/functional_hash.h:
+/usr/include/c++/13/bits/memoryfwd.h:
-/usr/include/stdio.h:
+/usr/include/c++/13/bits/nested_exception.h:
-third_party/uri/src/detail/uri_advance_parts.hpp:
+/usr/include/c++/13/bits/atomic_base.h:
-/usr/include/bits/byteswap.h:
+/usr/include/c++/13/bits/new_allocator.h:
-/usr/include/sys/select.h:
+/usr/include/c++/13/bits/ostream_insert.h:
-/usr/include/c++/12/bits/locale_facets_nonio.h:
+/usr/include/c++/13/system_error:
-/usr/include/bits/select.h:
+/usr/include/c++/13/bits/range_access.h:
-/usr/include/c++/12/bits/basic_string.tcc:
+/usr/include/bits/stdint-uintn.h:
-/usr/include/bits/types/struct_timeval.h:
+/usr/include/c++/13/bits/refwrap.h:
-/usr/include/bits/time.h:
+/usr/include/c++/13/bits/locale_facets.tcc:
-/usr/include/bits/types/__mbstate_t.h:
+/usr/include/bits/stdlib-bsearch.h:
-/usr/include/bits/stdio_lim.h:
+/usr/include/c++/13/bits/requires_hosted.h:
-/usr/include/bits/types/struct_timespec.h:
+/usr/include/bits/floatn-common.h:
-/usr/include/alloca.h:
+/usr/include/c++/13/bits/shared_ptr_base.h:
-/usr/include/bits/stdlib-bsearch.h:
+/usr/include/c++/13/x86_64-redhat-linux/bits/error_constants.h:
-/usr/include/c++/12/bits/shared_ptr_base.h:
+/usr/include/c++/13/bits/uses_allocator.h:
-/usr/include/bits/types/clock_t.h:
+/usr/include/c++/13/bits/postypes.h:
-/usr/include/bits/types/__fpos_t.h:
+/usr/include/c++/13/bits/std_abs.h:
-/usr/include/c++/12/clocale:
+/usr/include/c++/13/cstddef:
-/usr/include/bits/types/__fpos64_t.h:
+/usr/include/c++/13/bits/stl_algo.h:
-/usr/include/bits/types/struct_FILE.h:
+/usr/include/c++/13/bits/stl_algobase.h:
-/usr/include/bits/stdio.h:
+/usr/include/asm-generic/errno.h:
-/usr/include/c++/12/bits/refwrap.h:
+/usr/include/c++/13/bits/stl_iterator_base_funcs.h:
-/usr/include/c++/12/cerrno:
+/usr/include/c++/13/bits/stl_relops.h:
+
+/usr/include/bits/endian.h:
+
+/usr/include/c++/13/bits/stl_tempbuf.h:
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/flags.make
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/flags.make 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/flags.make 2024-02-27 20:51:03 UTC (rev 70212)
@@ -1,10 +1,10 @@
# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.25
+# Generated by "Unix Makefiles" Generator, CMake Version 3.27
# compile CXX with /bin/c++
CXX_DEFINES =
-CXX_INCLUDES = -I/usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src -I/usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include
+CXX_INCLUDES = -I/usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src -I/usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include
-CXX_FLAGS = -fPIE -D_FILE_OFFSET_BIS=64 -DUSEGC -I../gc-8.2.0/include -std=c++11 -Wall -Werror -Wno-parentheses -O2 -g -DNDEBUG
+CXX_FLAGS = -fPIE -D_FILE_OFFSET_BIS=64 -DUSEGC -DLSPCPP_USEGC -I../gc-8.2.4/include -std=c++11 -Wall -Werror -Wno-parentheses -O2 -g -DNDEBUG
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/src/Makefile
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/src/Makefile 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/src/Makefile 2024-02-27 20:51:03 UTC (rev 70212)
@@ -1,5 +1,5 @@
# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.25
+# Generated by "Unix Makefiles" Generator, CMake Version 3.27
# Default target executed when no arguments are given to make.
default_target: all
@@ -60,10 +60,10 @@
EQUALS = =
# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /usr/local/src/asymptote-2.85/LspCpp
+CMAKE_SOURCE_DIR = /usr/local/src/asymptote-2.87/LspCpp
# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /usr/local/src/asymptote-2.85/LspCpp
+CMAKE_BINARY_DIR = /usr/local/src/asymptote-2.87/LspCpp
#=============================================================================
# Targets provided globally by CMake.
@@ -70,7 +70,7 @@
# Special rule for the target edit_cache
edit_cache:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Running CMake cache editor..."
/usr/bin/ccmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : edit_cache
@@ -80,7 +80,7 @@
# Special rule for the target rebuild_cache
rebuild_cache:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Running CMake to regenerate build system..."
/usr/bin/cmake --regenerate-during-build -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : rebuild_cache
@@ -90,7 +90,7 @@
# Special rule for the target list_install_components
list_install_components:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Available install components are: \"Unspecified\""
.PHONY : list_install_components
# Special rule for the target list_install_components
@@ -99,50 +99,50 @@
# Special rule for the target install
install: preinstall
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Install the project..."
/usr/bin/cmake -P cmake_install.cmake
.PHONY : install
# Special rule for the target install
install/fast: preinstall/fast
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Install the project..."
/usr/bin/cmake -P cmake_install.cmake
.PHONY : install/fast
# Special rule for the target install/local
install/local: preinstall
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Installing only the local directory..."
/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
.PHONY : install/local
# Special rule for the target install/local
install/local/fast: preinstall/fast
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Installing only the local directory..."
/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
.PHONY : install/local/fast
# Special rule for the target install/strip
install/strip: preinstall
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Installing the project stripped..."
/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
.PHONY : install/strip
# Special rule for the target install/strip
install/strip/fast: preinstall/fast
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Installing the project stripped..."
/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
.PHONY : install/strip/fast
# The main all target
all: cmake_check_build_system
- cd /usr/local/src/asymptote-2.85/LspCpp && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/src/asymptote-2.85/LspCpp/CMakeFiles /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src//CMakeFiles/progress.marks
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/src/all
- $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/src/asymptote-2.85/LspCpp/CMakeFiles 0
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/src/asymptote-2.87/LspCpp/CMakeFiles /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src//CMakeFiles/progress.marks
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/src/all
+ $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/src/asymptote-2.87/LspCpp/CMakeFiles 0
.PHONY : all
# The main clean target
clean:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/src/clean
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/src/clean
.PHONY : clean
# The main clean target
@@ -151,22 +151,22 @@
# Prepare targets for installation.
preinstall: all
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/src/preinstall
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/src/preinstall
.PHONY : preinstall
# Prepare targets for installation.
preinstall/fast:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/src/preinstall
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/src/preinstall
.PHONY : preinstall/fast
# clear depends
depend:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
.PHONY : depend
# Convenience name for target.
third_party/uri/src/CMakeFiles/network-uri.dir/rule:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/src/CMakeFiles/network-uri.dir/rule
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/src/CMakeFiles/network-uri.dir/rule
.PHONY : third_party/uri/src/CMakeFiles/network-uri.dir/rule
# Convenience name for target.
@@ -175,7 +175,7 @@
# fast build rule for target.
network-uri/fast:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/build
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/build
.PHONY : network-uri/fast
detail/uri_advance_parts.o: detail/uri_advance_parts.cpp.o
@@ -183,7 +183,7 @@
# target to build an object file
detail/uri_advance_parts.cpp.o:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o
.PHONY : detail/uri_advance_parts.cpp.o
detail/uri_advance_parts.i: detail/uri_advance_parts.cpp.i
@@ -191,7 +191,7 @@
# target to preprocess a source file
detail/uri_advance_parts.cpp.i:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.i
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.i
.PHONY : detail/uri_advance_parts.cpp.i
detail/uri_advance_parts.s: detail/uri_advance_parts.cpp.s
@@ -199,7 +199,7 @@
# target to generate assembly for a file
detail/uri_advance_parts.cpp.s:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.s
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.s
.PHONY : detail/uri_advance_parts.cpp.s
detail/uri_normalize.o: detail/uri_normalize.cpp.o
@@ -207,7 +207,7 @@
# target to build an object file
detail/uri_normalize.cpp.o:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o
.PHONY : detail/uri_normalize.cpp.o
detail/uri_normalize.i: detail/uri_normalize.cpp.i
@@ -215,7 +215,7 @@
# target to preprocess a source file
detail/uri_normalize.cpp.i:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.i
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.i
.PHONY : detail/uri_normalize.cpp.i
detail/uri_normalize.s: detail/uri_normalize.cpp.s
@@ -223,7 +223,7 @@
# target to generate assembly for a file
detail/uri_normalize.cpp.s:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.s
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.s
.PHONY : detail/uri_normalize.cpp.s
detail/uri_parse.o: detail/uri_parse.cpp.o
@@ -231,7 +231,7 @@
# target to build an object file
detail/uri_parse.cpp.o:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o
.PHONY : detail/uri_parse.cpp.o
detail/uri_parse.i: detail/uri_parse.cpp.i
@@ -239,7 +239,7 @@
# target to preprocess a source file
detail/uri_parse.cpp.i:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.i
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.i
.PHONY : detail/uri_parse.cpp.i
detail/uri_parse.s: detail/uri_parse.cpp.s
@@ -247,7 +247,7 @@
# target to generate assembly for a file
detail/uri_parse.cpp.s:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.s
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.s
.PHONY : detail/uri_parse.cpp.s
detail/uri_parse_authority.o: detail/uri_parse_authority.cpp.o
@@ -255,7 +255,7 @@
# target to build an object file
detail/uri_parse_authority.cpp.o:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o
.PHONY : detail/uri_parse_authority.cpp.o
detail/uri_parse_authority.i: detail/uri_parse_authority.cpp.i
@@ -263,7 +263,7 @@
# target to preprocess a source file
detail/uri_parse_authority.cpp.i:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.i
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.i
.PHONY : detail/uri_parse_authority.cpp.i
detail/uri_parse_authority.s: detail/uri_parse_authority.cpp.s
@@ -271,7 +271,7 @@
# target to generate assembly for a file
detail/uri_parse_authority.cpp.s:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.s
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.s
.PHONY : detail/uri_parse_authority.cpp.s
detail/uri_resolve.o: detail/uri_resolve.cpp.o
@@ -279,7 +279,7 @@
# target to build an object file
detail/uri_resolve.cpp.o:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o
.PHONY : detail/uri_resolve.cpp.o
detail/uri_resolve.i: detail/uri_resolve.cpp.i
@@ -287,7 +287,7 @@
# target to preprocess a source file
detail/uri_resolve.cpp.i:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.i
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.i
.PHONY : detail/uri_resolve.cpp.i
detail/uri_resolve.s: detail/uri_resolve.cpp.s
@@ -295,7 +295,7 @@
# target to generate assembly for a file
detail/uri_resolve.cpp.s:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.s
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.s
.PHONY : detail/uri_resolve.cpp.s
uri.o: uri.cpp.o
@@ -303,7 +303,7 @@
# target to build an object file
uri.cpp.o:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o
.PHONY : uri.cpp.o
uri.i: uri.cpp.i
@@ -311,7 +311,7 @@
# target to preprocess a source file
uri.cpp.i:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.i
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.i
.PHONY : uri.cpp.i
uri.s: uri.cpp.s
@@ -319,7 +319,7 @@
# target to generate assembly for a file
uri.cpp.s:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.s
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.s
.PHONY : uri.cpp.s
uri_builder.o: uri_builder.cpp.o
@@ -327,7 +327,7 @@
# target to build an object file
uri_builder.cpp.o:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o
.PHONY : uri_builder.cpp.o
uri_builder.i: uri_builder.cpp.i
@@ -335,7 +335,7 @@
# target to preprocess a source file
uri_builder.cpp.i:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.i
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.i
.PHONY : uri_builder.cpp.i
uri_builder.s: uri_builder.cpp.s
@@ -343,7 +343,7 @@
# target to generate assembly for a file
uri_builder.cpp.s:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.s
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.s
.PHONY : uri_builder.cpp.s
uri_errors.o: uri_errors.cpp.o
@@ -351,7 +351,7 @@
# target to build an object file
uri_errors.cpp.o:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o
.PHONY : uri_errors.cpp.o
uri_errors.i: uri_errors.cpp.i
@@ -359,7 +359,7 @@
# target to preprocess a source file
uri_errors.cpp.i:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.i
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.i
.PHONY : uri_errors.cpp.i
uri_errors.s: uri_errors.cpp.s
@@ -367,7 +367,7 @@
# target to generate assembly for a file
uri_errors.cpp.s:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.s
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.s
.PHONY : uri_errors.cpp.s
# Help Target
@@ -418,6 +418,6 @@
# No rule that depends on this can have commands that come from listfiles
# because they might be regenerated.
cmake_check_build_system:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/src/cmake_install.cmake
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/src/cmake_install.cmake 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/uri/src/cmake_install.cmake 2024-02-27 20:51:03 UTC (rev 70212)
@@ -1,4 +1,4 @@
-# Install script for directory: /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src
+# Install script for directory: /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src
# Set the install prefix
if(NOT DEFINED CMAKE_INSTALL_PREFIX)
@@ -43,6 +43,6 @@
endif()
if(CMAKE_INSTALL_COMPONENT STREQUAL "Unspecified" OR NOT CMAKE_INSTALL_COMPONENT)
- file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" TYPE STATIC_LIBRARY FILES "/usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/libnetwork-uri.a")
+ file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" TYPE STATIC_LIBRARY FILES "/usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/libnetwork-uri.a")
endif()
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/CMakeLists.txt
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/CMakeLists.txt 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/CMakeLists.txt 2024-02-27 20:51:03 UTC (rev 70212)
@@ -1,5 +1,5 @@
cmake_minimum_required (VERSION 3.0.2)
-project (utf8cpp VERSION 3.2 LANGUAGES CXX)
+project (utf8cpp VERSION 3.2.2 LANGUAGES CXX)
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
set(IS_ROOT_PROJECT ON)
@@ -19,6 +19,7 @@
add_library(utf8::cpp ALIAS utf8cpp)
if(UTF8_INSTALL)
+ include(CMakePackageConfigHelpers)
if(MSVC)
set(DEF_INSTALL_CMAKE_DIR CMake)
else()
@@ -26,9 +27,28 @@
set(DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/utf8cpp)
endif()
+ write_basic_package_version_file(
+ ${CMAKE_CURRENT_BINARY_DIR}/utf8cppConfigVersion.cmake
+ VERSION ${PROJECT_VERSION}
+ COMPATIBILITY SameMajorVersion
+ )
+
+ configure_package_config_file(
+ ${PROJECT_SOURCE_DIR}/utf8cppConfig.cmake.in
+ ${CMAKE_CURRENT_BINARY_DIR}/utf8cppConfig.cmake
+ INSTALL_DESTINATION ${DEF_INSTALL_CMAKE_DIR}
+ )
+
install(DIRECTORY source/ DESTINATION include/utf8cpp)
- install(TARGETS utf8cpp EXPORT utf8cppConfig)
- install(EXPORT utf8cppConfig DESTINATION ${DEF_INSTALL_CMAKE_DIR})
+ install(TARGETS utf8cpp EXPORT utf8cppTargets)
+ install(EXPORT utf8cppTargets DESTINATION ${DEF_INSTALL_CMAKE_DIR})
+ install(
+ FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/utf8cppConfig.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/utf8cppConfigVersion.cmake
+ DESTINATION
+ ${DEF_INSTALL_CMAKE_DIR}
+ )
endif()
if(UTF8_SAMPLES)
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/README.md
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/README.md 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/README.md 2024-02-27 20:51:03 UTC (rev 70212)
@@ -11,7 +11,7 @@
## Examples of use
-### Introductionary Sample
+### Introductory Sample
To illustrate the use of the library, let's start with a small but complete program that opens a file containing UTF-8 encoded text, reads it line by line, checks each line for invalid UTF-8 byte sequences, and converts it to UTF-16 encoding and back to UTF-8:
@@ -149,7 +149,7 @@
The library was designed to be:
1. Generic: for better or worse, there are many C++ string classes out there, and the library should work with as many of them as possible.
-2. Portable: the library should be portable both accross different platforms and compilers. The only non-portable code is a small section that declares unsigned integers of different sizes: three typedefs. They can be changed by the users of the library if they don't match their platform. The default setting should work for Windows (both 32 and 64 bit), and most 32 bit and 64 bit Unix derivatives. Support for post C++03 language features is included for modern compilers at API level only, so the library should work even with pretty old compilers.
+2. Portable: the library should be portable both across different platforms and compilers. The only non-portable code is a small section that declares unsigned integers of different sizes: three typedefs. They can be changed by the users of the library if they don't match their platform. The default setting should work for Windows (both 32 and 64 bit), and most 32 bit and 64 bit Unix derivatives. Support for post C++03 language features is included for modern compilers at API level only, so the library should work even with pretty old compilers.
3. Lightweight: follow the "pay only for what you use" guideline.
4. Unintrusive: avoid forcing any particular design or even programming style on the user. This is a library, not a framework.
@@ -157,7 +157,7 @@
In case you want to look into other means of working with UTF-8 strings from C++, here is the list of solutions I am aware of:
-1. [ICU Library](http://icu.sourceforge.net/). It is very powerful, complete, feature-rich, mature, and widely used. Also big, intrusive, non-generic, and doesn't play well with the Standard Library. I definitelly recommend looking at ICU even if you don't plan to use it.
+1. [ICU Library](http://icu.sourceforge.net/). It is very powerful, complete, feature-rich, mature, and widely used. Also big, intrusive, non-generic, and doesn't play well with the Standard Library. I definitely recommend looking at ICU even if you don't plan to use it.
2. C++11 language and library features. Still far from complete, and not easy to use.
3. [Glib::ustring](http://www.gtkmm.org/gtkmm2/docs/tutorial/html/ch03s04.html). A class specifically made to work with UTF-8 strings, and also feel like `std::string`. If you prefer to have yet another string class in your code, it may be worth a look. Be aware of the licensing issues, though.
4. Platform dependent solutions: Windows and POSIX have functions to convert strings from one encoding to another. That is only a subset of what my library offers, but if that is all you need it may be good enough.
@@ -247,7 +247,7 @@
This function is typically used to iterate through a UTF-8 encoded string.
-In case of an invalid UTF-8 seqence, a `utf8::invalid_utf8` exception is thrown.
+In case of an invalid UTF-8 sequence, a `utf8::invalid_utf8` exception is thrown.
#### utf8::peek_next
@@ -276,7 +276,7 @@
assert (w == twochars);
```
-In case of an invalid UTF-8 seqence, a `utf8::invalid_utf8` exception is thrown.
+In case of an invalid UTF-8 sequence, a `utf8::invalid_utf8` exception is thrown.
#### utf8::prior
@@ -345,7 +345,7 @@
Available in version 1.0 and later.
-Given the iterators to two UTF-8 encoded code points in a seqence, returns the number of code points between them.
+Given the iterators to two UTF-8 encoded code points in a sequence, returns the number of code points between them.
```cpp
template <typename octet_iterator>
@@ -367,7 +367,7 @@
This function is used to find the length (in code points) of a UTF-8 encoded string. The reason it is called _distance_, rather than, say, _length_ is mainly because developers are used that _length_ is an O(1) function. Computing the length of an UTF-8 string is a linear operation, and it looked better to model it after `std::distance` algorithm.
-In case of an invalid UTF-8 seqence, a `utf8::invalid_utf8` exception is thrown. If `last` does not point to the past-of-end of a UTF-8 seqence, a `utf8::not_enough_room` exception is thrown.
+In case of an invalid UTF-8 sequence, a `utf8::invalid_utf8` exception is thrown. If `last` does not point to the past-of-end of a UTF-8 sequence, a `utf8::not_enough_room` exception is thrown.
#### utf8::utf16to8
@@ -469,7 +469,7 @@
assert (utf16result[3] == 0xdd1e);
```
-In case of an invalid UTF-8 seqence, a `utf8::invalid_utf8` exception is thrown.
+In case of an invalid UTF-8 sequence, a `utf8::invalid_utf8` exception is thrown.
#### utf8::utf8to16
@@ -494,7 +494,7 @@
assert (utf16result[3] == 0xdd1e);
```
-In case of an invalid UTF-8 seqence, a `utf8::invalid_utf8` exception is thrown.
+In case of an invalid UTF-8 sequence, a `utf8::invalid_utf8` exception is thrown.
#### utf8::utf8to16
@@ -525,7 +525,7 @@
assert (utf16result[3] == 0xdd1e);
```
-In case of an invalid UTF-8 seqence, a `utf8::invalid_utf8` exception is thrown. If `end` does not point to the past-of-end of a UTF-8 seqence, a `utf8::not_enough_room` exception is thrown.
+In case of an invalid UTF-8 sequence, a `utf8::invalid_utf8` exception is thrown. If `end` does not point to the past-of-end of a UTF-8 sequence, a `utf8::not_enough_room` exception is thrown.
#### utf8::utf32to8
@@ -625,7 +625,7 @@
assert (utf32result.size() == 2);
```
-In case of an invalid UTF-8 seqence, a `utf8::invalid_utf8` exception is thrown.
+In case of an invalid UTF-8 sequence, a `utf8::invalid_utf8` exception is thrown.
#### utf8::utf8to32
@@ -648,7 +648,7 @@
assert (utf32result.size() == 2);
```
-In case of an invalid UTF-8 seqence, a `utf8::invalid_utf8` exception is thrown.
+In case of an invalid UTF-8 sequence, a `utf8::invalid_utf8` exception is thrown.
#### utf8::utf8to32
@@ -678,7 +678,7 @@
assert (utf32result.size() == 2);
```
-In case of an invalid UTF-8 seqence, a `utf8::invalid_utf8` exception is thrown. If `end` does not point to the past-of-end of a UTF-8 seqence, a `utf8::not_enough_room` exception is thrown.
+In case of an invalid UTF-8 sequence, a `utf8::invalid_utf8` exception is thrown. If `end` does not point to the past-of-end of a UTF-8 sequence, a `utf8::not_enough_room` exception is thrown.
#### utf8::find_invalid
@@ -824,7 +824,7 @@
assert (bvalid == false);
```
-`is_valid` is a shorthand for `find_invalid(start, end) == end;`. You may want to use it to make sure that a byte seqence is a valid UTF-8 string without the need to know where it fails if it is not valid.
+`is_valid` is a shorthand for `find_invalid(start, end) == end;`. You may want to use it to make sure that a byte sequence is a valid UTF-8 string without the need to know where it fails if it is not valid.
#### utf8::replace_invalid
@@ -1094,9 +1094,9 @@
`uint32_t operator * () const;` decodes the utf-8 sequence the underlying octet_iterator is pointing to and returns the code point.
-`bool operator == (const iterator& rhs) const;` returns `true` if the two underlaying iterators are equal.
+`bool operator == (const iterator& rhs) const;` returns `true` if the two underlying iterators are equal.
-`bool operator != (const iterator& rhs) const;` returns `true` if the two underlaying iterators are not equal.
+`bool operator != (const iterator& rhs) const;` returns `true` if the two underlying iterators are not equal.
`iterator& operator ++ ();` the prefix increment - moves the iterator to the next UTF-8 encoded code point.
@@ -1219,7 +1219,7 @@
Available in version 1.02 and later.
-Given a reference to an iterator pointing to an octet in a UTF-8 seqence, it decreases the iterator until it hits the beginning of the previous UTF-8 encoded code point and returns the 32 bits representation of the code point.
+Given a reference to an iterator pointing to an octet in a UTF-8 sequence, it decreases the iterator until it hits the beginning of the previous UTF-8 encoded code point and returns the 32 bits representation of the code point.
```cpp
template <typename octet_iterator>
@@ -1270,7 +1270,7 @@
Available in version 1.0 and later.
-Given the iterators to two UTF-8 encoded code points in a seqence, returns the number of code points between them.
+Given the iterators to two UTF-8 encoded code points in a sequence, returns the number of code points between them.
```cpp
template <typename octet_iterator>
@@ -1460,9 +1460,9 @@
`uint32_t operator * () const;` decodes the utf-8 sequence the underlying octet_iterator is pointing to and returns the code point.
-`bool operator == (const iterator& rhs) const;` returns `true` if the two underlaying iterators are equal.
+`bool operator == (const iterator& rhs) const;` returns `true` if the two underlying iterators are equal.
-`bool operator != (const iterator& rhs) const;` returns `true` if the two underlaying iterators are not equal.
+`bool operator != (const iterator& rhs) const;` returns `true` if the two underlying iterators are not equal.
`iterator& operator ++ ();` the prefix increment - moves the iterator to the next UTF-8 encoded code point.
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/checked.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/checked.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/checked.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -50,6 +50,7 @@
uint8_t u8;
public:
invalid_utf8 (uint8_t u) : u8(u) {}
+ invalid_utf8 (char c) : u8(static_cast<uint8_t>(c)) {}
virtual const char* what() const UTF_CPP_NOEXCEPT UTF_CPP_OVERRIDE { return "Invalid UTF-8"; }
uint8_t utf8_octet() const {return u8;}
};
@@ -75,24 +76,7 @@
if (!utf8::internal::is_code_point_valid(cp))
throw invalid_code_point(cp);
- if (cp < 0x80) // one octet
- *(result++) = static_cast<uint8_t>(cp);
- else if (cp < 0x800) { // two octets
- *(result++) = static_cast<uint8_t>((cp >> 6) | 0xc0);
- *(result++) = static_cast<uint8_t>((cp & 0x3f) | 0x80);
- }
- else if (cp < 0x10000) { // three octets
- *(result++) = static_cast<uint8_t>((cp >> 12) | 0xe0);
- *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f) | 0x80);
- *(result++) = static_cast<uint8_t>((cp & 0x3f) | 0x80);
- }
- else { // four octets
- *(result++) = static_cast<uint8_t>((cp >> 18) | 0xf0);
- *(result++) = static_cast<uint8_t>(((cp >> 12) & 0x3f) | 0x80);
- *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f) | 0x80);
- *(result++) = static_cast<uint8_t>((cp & 0x3f) | 0x80);
- }
- return result;
+ return internal::append(cp, result);
}
template <typename octet_iterator, typename output_iterator>
@@ -148,7 +132,7 @@
case internal::INVALID_LEAD :
case internal::INCOMPLETE_SEQUENCE :
case internal::OVERLONG_SEQUENCE :
- throw invalid_utf8(*it);
+ throw invalid_utf8(static_cast<uint8_t>(*it));
case internal::INVALID_CODE_POINT :
throw invalid_code_point(cp);
}
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/core.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/core.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/core.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -297,6 +297,55 @@
return utf8::internal::validate_next(it, end, ignored);
}
+ // Internal implementation of both checked and unchecked append() function
+ // This function will be invoked by the overloads below, as they will know
+ // the octet_type.
+ template <typename octet_iterator, typename octet_type>
+ octet_iterator append(uint32_t cp, octet_iterator result) {
+ if (cp < 0x80) // one octet
+ *(result++) = static_cast<octet_type>(cp);
+ else if (cp < 0x800) { // two octets
+ *(result++) = static_cast<octet_type>((cp >> 6) | 0xc0);
+ *(result++) = static_cast<octet_type>((cp & 0x3f) | 0x80);
+ }
+ else if (cp < 0x10000) { // three octets
+ *(result++) = static_cast<octet_type>((cp >> 12) | 0xe0);
+ *(result++) = static_cast<octet_type>(((cp >> 6) & 0x3f) | 0x80);
+ *(result++) = static_cast<octet_type>((cp & 0x3f) | 0x80);
+ }
+ else { // four octets
+ *(result++) = static_cast<octet_type>((cp >> 18) | 0xf0);
+ *(result++) = static_cast<octet_type>(((cp >> 12) & 0x3f)| 0x80);
+ *(result++) = static_cast<octet_type>(((cp >> 6) & 0x3f) | 0x80);
+ *(result++) = static_cast<octet_type>((cp & 0x3f) | 0x80);
+ }
+ return result;
+ }
+
+ // One of the following overloads will be invoked from the API calls
+
+ // A simple (but dangerous) case: the caller appends byte(s) to a char array
+ inline char* append(uint32_t cp, char* result) {
+ return append<char*, char>(cp, result);
+ }
+
+ // Hopefully, most common case: the caller uses back_inserter
+ // i.e. append(cp, std::back_inserter(str));
+ template<typename container_type>
+ std::back_insert_iterator<container_type> append
+ (uint32_t cp, std::back_insert_iterator<container_type> result) {
+ return append<std::back_insert_iterator<container_type>,
+ typename container_type::value_type>(cp, result);
+ }
+
+ // The caller uses some other kind of output operator - not covered above
+ // Note that in this case we are not able to determine octet_type
+ // so we assume it's uint_8; that can cause a conversion warning if we are wrong.
+ template <typename octet_iterator>
+ octet_iterator append(uint32_t cp, octet_iterator result) {
+ return append<octet_iterator, uint8_t>(cp, result);
+ }
+
} // namespace internal
/// The library API - functions intended to be called by the users
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/cpp11.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/cpp11.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/cpp11.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -70,7 +70,7 @@
inline std::size_t find_invalid(const std::string& s)
{
std::string::const_iterator invalid = find_invalid(s.begin(), s.end());
- return (invalid == s.end()) ? std::string::npos : (invalid - s.begin());
+ return (invalid == s.end()) ? std::string::npos : static_cast<std::size_t>(invalid - s.begin());
}
inline bool is_valid(const std::string& s)
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/cpp17.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/cpp17.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/cpp17.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -70,7 +70,7 @@
inline std::size_t find_invalid(std::string_view s)
{
std::string_view::const_iterator invalid = find_invalid(s.begin(), s.end());
- return (invalid == s.end()) ? std::string_view::npos : (invalid - s.begin());
+ return (invalid == s.end()) ? std::string_view::npos : static_cast<std::size_t>(invalid - s.begin());
}
inline bool is_valid(std::string_view s)
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/unchecked.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/unchecked.h 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/unchecked.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -37,24 +37,7 @@
template <typename octet_iterator>
octet_iterator append(uint32_t cp, octet_iterator result)
{
- if (cp < 0x80) // one octet
- *(result++) = static_cast<uint8_t>(cp);
- else if (cp < 0x800) { // two octets
- *(result++) = static_cast<uint8_t>((cp >> 6) | 0xc0);
- *(result++) = static_cast<uint8_t>((cp & 0x3f) | 0x80);
- }
- else if (cp < 0x10000) { // three octets
- *(result++) = static_cast<uint8_t>((cp >> 12) | 0xe0);
- *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f) | 0x80);
- *(result++) = static_cast<uint8_t>((cp & 0x3f) | 0x80);
- }
- else { // four octets
- *(result++) = static_cast<uint8_t>((cp >> 18) | 0xf0);
- *(result++) = static_cast<uint8_t>(((cp >> 12) & 0x3f)| 0x80);
- *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f) | 0x80);
- *(result++) = static_cast<uint8_t>((cp & 0x3f) | 0x80);
- }
- return result;
+ return internal::append(cp, result);
}
template <typename octet_iterator, typename output_iterator>
Modified: trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/CMakeLists.txt
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/CMakeLists.txt 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/CMakeLists.txt 2024-02-27 20:51:03 UTC (rev 70212)
@@ -1,17 +1,9 @@
add_executable(negative ${PROJECT_SOURCE_DIR}/tests/negative.cpp)
add_executable(cpp11 ${PROJECT_SOURCE_DIR}/tests/test_cpp11.cpp)
add_executable(cpp17 ${PROJECT_SOURCE_DIR}/tests/test_cpp17.cpp)
-add_executable(apitests
- ${PROJECT_SOURCE_DIR}/tests/test_checked_api.cpp
- ${PROJECT_SOURCE_DIR}/tests/test_unchecked_api.cpp
- ${PROJECT_SOURCE_DIR}/tests/test_checked_iterator.cpp
- ${PROJECT_SOURCE_DIR}/tests/test_unchecked_iterator.cpp
-)
+add_executable(apitests ${PROJECT_SOURCE_DIR}/tests/apitests.cpp)
-add_executable(noexceptionstests
- ${PROJECT_SOURCE_DIR}/tests/test_unchecked_api.cpp
- ${PROJECT_SOURCE_DIR}/tests/test_unchecked_iterator.cpp
-)
+add_executable(noexceptionstests ${PROJECT_SOURCE_DIR}/tests/noexceptionstests.cpp)
target_link_libraries(negative PRIVATE utf8::cpp)
target_link_libraries(cpp11 PRIVATE utf8::cpp)
@@ -19,6 +11,10 @@
target_link_libraries(apitests PRIVATE utf8::cpp)
target_link_libraries(noexceptionstests PRIVATE utf8::cpp)
+target_compile_options(${PROJECT_NAME} INTERFACE
+ $<$<CXX_COMPILER_ID:MSVC>:/W4>
+ $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Wconversion>)
+
target_compile_options(noexceptionstests PUBLIC -fno-exceptions)
set_target_properties(negative apitests noexceptionstests
Added: trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/apitests.cpp
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/apitests.cpp (rev 0)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/apitests.cpp 2024-02-27 20:51:03 UTC (rev 70212)
@@ -0,0 +1,6 @@
+#include "../extern/ftest/ftest.h"
+
+#include "test_checked_api.h"
+#include "test_checked_iterator.h"
+#include "test_unchecked_api.h"
+#include "test_unchecked_iterator.h"
Property changes on: trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/apitests.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/noexceptionstests.cpp
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/noexceptionstests.cpp (rev 0)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/noexceptionstests.cpp 2024-02-27 20:51:03 UTC (rev 70212)
@@ -0,0 +1,4 @@
+#include "../extern/ftest/ftest.h"
+
+#include "test_unchecked_api.h"
+#include "test_unchecked_iterator.h"
Property changes on: trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/noexceptionstests.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_checked_api.cpp
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_checked_api.cpp 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_checked_api.cpp 2024-02-27 20:51:03 UTC (rev 70212)
@@ -1,189 +0,0 @@
-#define F_TEST_NO_MAIN
-#include "../extern/ftest/ftest.h"
-#include "utf8.h"
-
-#include <string>
-#include <vector>
-using namespace utf8;
-using namespace std;
-
-
-TEST(CheckedAPITests, test_append)
-{
- unsigned char u[5] = {0,0,0,0,0};
- append(0x0448, u);
- EXPECT_EQ (u[0], 0xd1);
- EXPECT_EQ (u[1], 0x88);
- EXPECT_EQ (u[2], 0);
- EXPECT_EQ (u[3], 0);
- EXPECT_EQ (u[4], 0);
-
- append(0x65e5, u);
- EXPECT_EQ (u[0], 0xe6);
- EXPECT_EQ (u[1], 0x97);
- EXPECT_EQ (u[2], 0xa5);
- EXPECT_EQ (u[3], 0);
- EXPECT_EQ (u[4], 0);
-
- append(0x3044, u);
- EXPECT_EQ (u[0], 0xe3);
- EXPECT_EQ (u[1], 0x81);
- EXPECT_EQ (u[2], 0x84);
- EXPECT_EQ (u[3], 0);
- EXPECT_EQ (u[4], 0);
-
- append(0x10346, u);
- EXPECT_EQ (u[0], 0xf0);
- EXPECT_EQ (u[1], 0x90);
- EXPECT_EQ (u[2], 0x8d);
- EXPECT_EQ (u[3], 0x86);
- EXPECT_EQ (u[4], 0);
-}
-
-TEST(CheckedAPITests, test_next)
-{
- const char* twochars = "\xe6\x97\xa5\xd1\x88";
- const char* w = twochars;
- int cp = next(w, twochars + 6);
- EXPECT_EQ (cp, 0x65e5);
- EXPECT_EQ (w, twochars + 3);
-
- const char* threechars = "\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88";
- w = threechars;
-
- cp = next(w, threechars + 9);
- EXPECT_EQ (cp, 0x10346);
- EXPECT_EQ (w, threechars + 4);
-
- cp = next(w, threechars + 9);
- EXPECT_EQ (cp, 0x65e5);
- EXPECT_EQ (w, threechars + 7);
-
- cp = next(w, threechars + 9);
- EXPECT_EQ (cp, 0x0448);
- EXPECT_EQ (w, threechars + 9);
-}
-
-TEST(CheckedAPITests, test_peek_next)
-{
- const char* const cw = "\xe6\x97\xa5\xd1\x88";
- int cp = peek_next(cw, cw + 6);
- EXPECT_EQ (cp, 0x65e5);
-}
-
-TEST(CheckedAPITests, test_prior)
-{
- const char* twochars = "\xe6\x97\xa5\xd1\x88";
- const char* w = twochars + 3;
- int cp = prior (w, twochars);
- EXPECT_EQ (cp, 0x65e5);
- EXPECT_EQ (w, twochars);
-
- const char* threechars = "\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88";
- w = threechars + 9;
- cp = prior(w, threechars);
- EXPECT_EQ (cp, 0x0448);
- EXPECT_EQ (w, threechars + 7);
- cp = prior(w, threechars);
- EXPECT_EQ (cp, 0x65e5);
- EXPECT_EQ (w, threechars + 4);
- cp = prior(w, threechars);
- EXPECT_EQ (cp, 0x10346);
- EXPECT_EQ (w, threechars);
-}
-
-TEST(CheckedAPITests, test_advance)
-{
- const char* threechars = "\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88";
- const char* w = threechars;
- advance(w, 2, threechars + 9);
- EXPECT_EQ(w, threechars + 7);
- advance(w, -2, threechars);
- EXPECT_EQ(w, threechars);
- advance(w, 3, threechars + 9);
- EXPECT_EQ(w, threechars + 9);
- advance(w, -2, threechars);
- EXPECT_EQ(w, threechars + 4);
- advance(w, -1, threechars);
- EXPECT_EQ(w, threechars);
-}
-
-TEST(CheckedAPITests, test_distance)
-{
- const char* twochars = "\xe6\x97\xa5\xd1\x88";
- size_t dist = utf8::distance(twochars, twochars + 5);
- EXPECT_EQ (dist, 2);
-}
-
-TEST(CheckedAPITests, test_utf32to8)
-{
- int utf32string[] = {0x448, 0x65E5, 0x10346, 0};
- string utf8result;
- utf32to8(utf32string, utf32string + 3, back_inserter(utf8result));
- EXPECT_EQ (utf8result.size(), 9);
-}
-
-TEST(CheckedAPITests, test_utf8to32)
-{
- const char* twochars = "\xe6\x97\xa5\xd1\x88";
- vector<int> utf32result;
- utf8to32(twochars, twochars + 5, back_inserter(utf32result));
- EXPECT_EQ (utf32result.size(), 2);
-}
-
-TEST(CheckedAPITests, test_utf16to8)
-{
- unsigned short utf16string[] = {0x41, 0x0448, 0x65e5, 0xd834, 0xdd1e};
- string utf8result;
- utf16to8(utf16string, utf16string + 5, back_inserter(utf8result));
- EXPECT_EQ (utf8result.size(), 10);
-}
-
-TEST(CheckedAPITests, test_utf8to16)
-{
- char utf8_with_surrogates[] = "\xe6\x97\xa5\xd1\x88\xf0\x9d\x84\x9e";
- vector <unsigned short> utf16result;
- utf8to16(utf8_with_surrogates, utf8_with_surrogates + 9, back_inserter(utf16result));
- EXPECT_EQ (utf16result.size(), 4);
- EXPECT_EQ (utf16result[2], 0xd834);
- EXPECT_EQ (utf16result[3], 0xdd1e);
-}
-
-TEST(CheckedAPITests, test_replace_invalid)
-{
- char invalid_sequence[] = "a\x80\xe0\xa0\xc0\xaf\xed\xa0\x80z";
- vector<char> replace_invalid_result;
- replace_invalid (invalid_sequence, invalid_sequence + sizeof(invalid_sequence), std::back_inserter(replace_invalid_result), '?');
- bool bvalid = is_valid(replace_invalid_result.begin(), replace_invalid_result.end());
- EXPECT_TRUE (bvalid);
- const char fixed_invalid_sequence[] = "a????z";
- EXPECT_EQ (sizeof(fixed_invalid_sequence), replace_invalid_result.size());
- EXPECT_TRUE (std::equal(replace_invalid_result.begin(), replace_invalid_result.begin() + sizeof(fixed_invalid_sequence), fixed_invalid_sequence));
-}
-
-TEST(CheckedAPITests, test_find_invalid)
-{
- char utf_invalid[] = "\xe6\x97\xa5\xd1\x88\xfa";
- char* invalid = find_invalid(utf_invalid, utf_invalid + 6);
- EXPECT_EQ (invalid, utf_invalid + 5);
-}
-
-TEST(CheckedAPITests, test_is_valid)
-{
- char utf_invalid[] = "\xe6\x97\xa5\xd1\x88\xfa";
- bool bvalid = is_valid(utf_invalid, utf_invalid + 6);
- EXPECT_FALSE (bvalid);
- char utf8_with_surrogates[] = "\xe6\x97\xa5\xd1\x88\xf0\x9d\x84\x9e";
- bvalid = is_valid(utf8_with_surrogates, utf8_with_surrogates + 9);
- EXPECT_TRUE (bvalid);
-}
-
-TEST(CheckedAPITests, test_starts_with_bom)
-{
- unsigned char byte_order_mark[] = {0xef, 0xbb, 0xbf};
- bool bbom = starts_with_bom(byte_order_mark, byte_order_mark + sizeof(byte_order_mark));
- EXPECT_TRUE (bbom);
- const char* threechars = "\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88";
- bool no_bbom = starts_with_bom(threechars, threechars + sizeof(threechars));
- EXPECT_FALSE (no_bbom);
-}
Added: trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_checked_api.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_checked_api.h (rev 0)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_checked_api.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -0,0 +1,198 @@
+#ifndef UTF8_FOR_CPP_TEST_CHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
+#define UTF8_FOR_CPP_TEST_CHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
+
+#include "utf8.h"
+
+#include <string>
+#include <vector>
+using namespace utf8;
+using namespace std;
+
+
+TEST(CheckedAPITests, test_append)
+{
+ unsigned char u[5] = {0,0,0,0,0};
+ append(0x0448, u);
+ EXPECT_EQ (u[0], 0xd1);
+ EXPECT_EQ (u[1], 0x88);
+ EXPECT_EQ (u[2], 0);
+ EXPECT_EQ (u[3], 0);
+ EXPECT_EQ (u[4], 0);
+
+ append(0x65e5, u);
+ EXPECT_EQ (u[0], 0xe6);
+ EXPECT_EQ (u[1], 0x97);
+ EXPECT_EQ (u[2], 0xa5);
+ EXPECT_EQ (u[3], 0);
+ EXPECT_EQ (u[4], 0);
+
+ append(0x3044, u);
+ EXPECT_EQ (u[0], 0xe3);
+ EXPECT_EQ (u[1], 0x81);
+ EXPECT_EQ (u[2], 0x84);
+ EXPECT_EQ (u[3], 0);
+ EXPECT_EQ (u[4], 0);
+
+ append(0x10346, u);
+ EXPECT_EQ (u[0], 0xf0);
+ EXPECT_EQ (u[1], 0x90);
+ EXPECT_EQ (u[2], 0x8d);
+ EXPECT_EQ (u[3], 0x86);
+ EXPECT_EQ (u[4], 0);
+
+ // Ensure no warnings with plain char
+ char c[2] = {0,0};
+ append('a', c);
+ EXPECT_EQ (c[0], 'a');
+ EXPECT_EQ (c[1], 0);
+}
+
+TEST(CheckedAPITests, test_next)
+{
+ const char* twochars = "\xe6\x97\xa5\xd1\x88";
+ const char* w = twochars;
+ unsigned int cp = next(w, twochars + 6);
+ EXPECT_EQ (cp, 0x65e5);
+ EXPECT_EQ (w, twochars + 3);
+
+ const char* threechars = "\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88";
+ w = threechars;
+
+ cp = next(w, threechars + 9);
+ EXPECT_EQ (cp, 0x10346);
+ EXPECT_EQ (w, threechars + 4);
+
+ cp = next(w, threechars + 9);
+ EXPECT_EQ (cp, 0x65e5);
+ EXPECT_EQ (w, threechars + 7);
+
+ cp = next(w, threechars + 9);
+ EXPECT_EQ (cp, 0x0448);
+ EXPECT_EQ (w, threechars + 9);
+}
+
+TEST(CheckedAPITests, test_peek_next)
+{
+ const char* const cw = "\xe6\x97\xa5\xd1\x88";
+ unsigned int cp = peek_next(cw, cw + 6);
+ EXPECT_EQ (cp, 0x65e5);
+}
+
+TEST(CheckedAPITests, test_prior)
+{
+ const char* twochars = "\xe6\x97\xa5\xd1\x88";
+ const char* w = twochars + 3;
+ unsigned int cp = prior (w, twochars);
+ EXPECT_EQ (cp, 0x65e5);
+ EXPECT_EQ (w, twochars);
+
+ const char* threechars = "\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88";
+ w = threechars + 9;
+ cp = prior(w, threechars);
+ EXPECT_EQ (cp, 0x0448);
+ EXPECT_EQ (w, threechars + 7);
+ cp = prior(w, threechars);
+ EXPECT_EQ (cp, 0x65e5);
+ EXPECT_EQ (w, threechars + 4);
+ cp = prior(w, threechars);
+ EXPECT_EQ (cp, 0x10346);
+ EXPECT_EQ (w, threechars);
+}
+
+TEST(CheckedAPITests, test_advance)
+{
+ const char* threechars = "\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88";
+ const char* w = threechars;
+ advance(w, 2, threechars + 9);
+ EXPECT_EQ(w, threechars + 7);
+ advance(w, -2, threechars);
+ EXPECT_EQ(w, threechars);
+ advance(w, 3, threechars + 9);
+ EXPECT_EQ(w, threechars + 9);
+ advance(w, -2, threechars);
+ EXPECT_EQ(w, threechars + 4);
+ advance(w, -1, threechars);
+ EXPECT_EQ(w, threechars);
+}
+
+TEST(CheckedAPITests, test_distance)
+{
+ const char* twochars = "\xe6\x97\xa5\xd1\x88";
+ size_t dist = static_cast<size_t>(utf8::distance(twochars, twochars + 5));
+ EXPECT_EQ (dist, 2);
+}
+
+TEST(CheckedAPITests, test_utf32to8)
+{
+ unsigned int utf32string[] = {0x448, 0x65E5, 0x10346, 0};
+ string utf8result;
+ utf32to8(utf32string, utf32string + 3, back_inserter(utf8result));
+ EXPECT_EQ (utf8result.size(), 9);
+}
+
+TEST(CheckedAPITests, test_utf8to32)
+{
+ const char* twochars = "\xe6\x97\xa5\xd1\x88";
+ vector<unsigned int> utf32result;
+ utf8to32(twochars, twochars + 5, back_inserter(utf32result));
+ EXPECT_EQ (utf32result.size(), 2);
+}
+
+TEST(CheckedAPITests, test_utf16to8)
+{
+ unsigned short utf16string[] = {0x41, 0x0448, 0x65e5, 0xd834, 0xdd1e};
+ string utf8result;
+ utf16to8(utf16string, utf16string + 5, back_inserter(utf8result));
+ EXPECT_EQ (utf8result.size(), 10);
+}
+
+TEST(CheckedAPITests, test_utf8to16)
+{
+ char utf8_with_surrogates[] = "\xe6\x97\xa5\xd1\x88\xf0\x9d\x84\x9e";
+ vector <unsigned short> utf16result;
+ utf8to16(utf8_with_surrogates, utf8_with_surrogates + 9, back_inserter(utf16result));
+ EXPECT_EQ (utf16result.size(), 4);
+ EXPECT_EQ (utf16result[2], 0xd834);
+ EXPECT_EQ (utf16result[3], 0xdd1e);
+}
+
+TEST(CheckedAPITests, test_replace_invalid)
+{
+ char invalid_sequence[] = "a\x80\xe0\xa0\xc0\xaf\xed\xa0\x80z";
+ vector<char> replace_invalid_result;
+ replace_invalid (invalid_sequence, invalid_sequence + sizeof(invalid_sequence), std::back_inserter(replace_invalid_result), '?');
+ bool bvalid = is_valid(replace_invalid_result.begin(), replace_invalid_result.end());
+ EXPECT_TRUE (bvalid);
+ const char fixed_invalid_sequence[] = "a????z";
+ EXPECT_EQ (sizeof(fixed_invalid_sequence), replace_invalid_result.size());
+ EXPECT_TRUE (std::equal(replace_invalid_result.begin(), replace_invalid_result.begin() + sizeof(fixed_invalid_sequence), fixed_invalid_sequence));
+}
+
+TEST(CheckedAPITests, test_find_invalid)
+{
+ char utf_invalid[] = "\xe6\x97\xa5\xd1\x88\xfa";
+ char* invalid = find_invalid(utf_invalid, utf_invalid + 6);
+ EXPECT_EQ (invalid, utf_invalid + 5);
+}
+
+TEST(CheckedAPITests, test_is_valid)
+{
+ char utf_invalid[] = "\xe6\x97\xa5\xd1\x88\xfa";
+ bool bvalid = is_valid(utf_invalid, utf_invalid + 6);
+ EXPECT_FALSE (bvalid);
+ char utf8_with_surrogates[] = "\xe6\x97\xa5\xd1\x88\xf0\x9d\x84\x9e";
+ bvalid = is_valid(utf8_with_surrogates, utf8_with_surrogates + 9);
+ EXPECT_TRUE (bvalid);
+}
+
+TEST(CheckedAPITests, test_starts_with_bom)
+{
+ unsigned char byte_order_mark[] = {0xef, 0xbb, 0xbf};
+ bool bbom = starts_with_bom(byte_order_mark, byte_order_mark + sizeof(byte_order_mark));
+ EXPECT_TRUE (bbom);
+ const char* threechars = "\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88";
+ bool no_bbom = starts_with_bom(threechars, threechars + sizeof(threechars));
+ EXPECT_FALSE (no_bbom);
+}
+
+#endif
Property changes on: trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_checked_api.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_checked_iterator.cpp
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_checked_iterator.cpp 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_checked_iterator.cpp 2024-02-27 20:51:03 UTC (rev 70212)
@@ -1,32 +0,0 @@
-#define F_TEST_NO_MAIN
-#include "../extern/ftest/ftest.h"
-#include "utf8.h"
-
-using namespace utf8;
-
-
-TEST(CheckedIteratrTests, test_increment)
-{
- const char* threechars = "\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88";
- utf8::iterator<const char*> it(threechars, threechars, threechars + 9);
- utf8::iterator<const char*> it2 = it;
- EXPECT_EQ (it2, it);
- EXPECT_EQ (*it, 0x10346);
- EXPECT_EQ (*(++it), 0x65e5);
- EXPECT_EQ ((*it++), 0x65e5);
- EXPECT_EQ (*it, 0x0448);
- EXPECT_NE (it, it2);
- utf8::iterator<const char*> endit (threechars + 9, threechars, threechars + 9);
- EXPECT_EQ (++it, endit);
-}
-
-TEST(CheckedIteratrTests, test_decrement)
-{
- const char* threechars = "\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88";
- utf8::iterator<const char*> it(threechars+9, threechars, threechars + 9);
- EXPECT_EQ (*(--it), 0x0448);
- EXPECT_EQ ((*it--), 0x0448);
- EXPECT_EQ (*it, 0x65e5);
- EXPECT_EQ (--it, utf8::iterator<const char*>(threechars, threechars, threechars + 9));
- EXPECT_EQ (*it, 0x10346);
-}
Added: trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_checked_iterator.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_checked_iterator.h (rev 0)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_checked_iterator.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -0,0 +1,35 @@
+#ifndef UTF8_FOR_CPP_TEST_CHECKED_ITERATOR_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
+#define UTF8_FOR_CPP_TEST_CHECKED_ITERATOR_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
+
+#include "utf8.h"
+
+using namespace utf8;
+
+
+TEST(CheckedIteratrTests, test_increment)
+{
+ const char* threechars = "\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88";
+ utf8::iterator<const char*> it(threechars, threechars, threechars + 9);
+ utf8::iterator<const char*> it2 = it;
+ EXPECT_EQ (it2, it);
+ EXPECT_EQ (*it, 0x10346);
+ EXPECT_EQ (*(++it), 0x65e5);
+ EXPECT_EQ ((*it++), 0x65e5);
+ EXPECT_EQ (*it, 0x0448);
+ EXPECT_NE (it, it2);
+ utf8::iterator<const char*> endit (threechars + 9, threechars, threechars + 9);
+ EXPECT_EQ (++it, endit);
+}
+
+TEST(CheckedIteratrTests, test_decrement)
+{
+ const char* threechars = "\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88";
+ utf8::iterator<const char*> it(threechars+9, threechars, threechars + 9);
+ EXPECT_EQ (*(--it), 0x0448);
+ EXPECT_EQ ((*it--), 0x0448);
+ EXPECT_EQ (*it, 0x65e5);
+ EXPECT_EQ (--it, utf8::iterator<const char*>(threechars, threechars, threechars + 9));
+ EXPECT_EQ (*it, 0x10346);
+}
+
+#endif
Property changes on: trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_checked_iterator.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_unchecked_api.cpp
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_unchecked_api.cpp 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_unchecked_api.cpp 2024-02-27 20:51:03 UTC (rev 70212)
@@ -1,161 +0,0 @@
-#include "../extern/ftest/ftest.h"
-#include "utf8/unchecked.h"
-
-#include <string>
-#include <vector>
-using namespace utf8::unchecked;
-using namespace std;
-
-TEST(UnCheckedAPITests, test_append)
-{
- unsigned char u[5] = {0,0,0,0,0};
- append(0x0448, u);
- EXPECT_EQ (u[0], 0xd1);
- EXPECT_EQ (u[1], 0x88);
- EXPECT_EQ (u[2], 0);
- EXPECT_EQ (u[3], 0);
- EXPECT_EQ (u[4], 0);
-
- append(0x65e5, u);
- EXPECT_EQ (u[0], 0xe6);
- EXPECT_EQ (u[1], 0x97);
- EXPECT_EQ (u[2], 0xa5);
- EXPECT_EQ (u[3], 0);
- EXPECT_EQ (u[4], 0);
-
- append(0x3044, u);
- EXPECT_EQ (u[0], 0xe3);
- EXPECT_EQ (u[1], 0x81);
- EXPECT_EQ (u[2], 0x84);
- EXPECT_EQ (u[3], 0);
- EXPECT_EQ (u[4], 0);
-
- append(0x10346, u);
- EXPECT_EQ (u[0], 0xf0);
- EXPECT_EQ (u[1], 0x90);
- EXPECT_EQ (u[2], 0x8d);
- EXPECT_EQ (u[3], 0x86);
- EXPECT_EQ (u[4], 0);
-}
-
-TEST(UnCheckedAPITests, test_next)
-{
- const char* twochars = "\xe6\x97\xa5\xd1\x88";
- const char* w = twochars;
- int cp = utf8::unchecked::next(w);
- EXPECT_EQ (cp, 0x65e5);
- EXPECT_EQ (w, twochars + 3);
-
- const char* threechars = "\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88";
- w = threechars;
-
- cp = utf8::unchecked::next(w);
- EXPECT_EQ (cp, 0x10346);
- EXPECT_EQ (w, threechars + 4);
-
- cp = utf8::unchecked::next(w);
- EXPECT_EQ (cp, 0x65e5);
- EXPECT_EQ (w, threechars + 7);
-
- cp = utf8::unchecked::next(w);
- EXPECT_EQ (cp, 0x0448);
- EXPECT_EQ (w, threechars + 9);
-}
-
-TEST(UnCheckedAPITests, test_peek_next)
-{
- const char* const cw = "\xe6\x97\xa5\xd1\x88";
- int cp = peek_next(cw);
- EXPECT_EQ (cp, 0x65e5);
-}
-
-TEST(UnCheckedAPITests, test_prior)
-{
- const char* twochars = "\xe6\x97\xa5\xd1\x88";
- const char* w = twochars + 3;
- int cp = prior (w);
- EXPECT_EQ (cp, 0x65e5);
- EXPECT_EQ (w, twochars);
-
- const char* threechars = "\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88";
- w = threechars + 9;
- cp = prior(w);
- EXPECT_EQ (cp, 0x0448);
- EXPECT_EQ (w, threechars + 7);
- cp = prior(w);
- EXPECT_EQ (cp, 0x65e5);
- EXPECT_EQ (w, threechars + 4);
- cp = prior(w);
- EXPECT_EQ (cp, 0x10346);
- EXPECT_EQ (w, threechars);
-}
-
-TEST(UnCheckedAPITests, test_advance)
-{
- const char* threechars = "\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88";
- const char* w = threechars;
- utf8::unchecked::advance(w, 2);
- EXPECT_EQ(w, threechars + 7);
- utf8::unchecked::advance(w, -2);
- EXPECT_EQ(w, threechars);
- utf8::unchecked::advance(w, 3);
- EXPECT_EQ(w, threechars + 9);
- utf8::unchecked::advance(w, -2);
- EXPECT_EQ(w, threechars + 4);
- utf8::unchecked::advance(w, -1);
- EXPECT_EQ(w, threechars);
-}
-
-TEST(UnCheckedAPITests, test_distance)
-{
- const char* twochars = "\xe6\x97\xa5\xd1\x88";
- size_t dist = utf8::unchecked::distance(twochars, twochars + 5);
- EXPECT_EQ (dist, 2);
-}
-
-TEST(UnCheckedAPITests, test_utf32to8)
-{
- int utf32string[] = {0x448, 0x65E5, 0x10346, 0};
- string utf8result;
- utf32to8(utf32string, utf32string + 3, back_inserter(utf8result));
- EXPECT_EQ (utf8result.size(), 9);
-}
-
-TEST(UnCheckedAPITests, test_utf8to32)
-{
- const char* twochars = "\xe6\x97\xa5\xd1\x88";
- vector<int> utf32result;
- utf8to32(twochars, twochars + 5, back_inserter(utf32result));
- EXPECT_EQ (utf32result.size(), 2);
-}
-
-TEST(UnCheckedAPITests, test_utf16to8)
-{
- unsigned short utf16string[] = {0x41, 0x0448, 0x65e5, 0xd834, 0xdd1e};
- string utf8result;
- utf16to8(utf16string, utf16string + 5, back_inserter(utf8result));
- EXPECT_EQ (utf8result.size(), 10);
-}
-
-TEST(UnCheckedAPITests, test_utf8to16)
-{
- char utf8_with_surrogates[] = "\xe6\x97\xa5\xd1\x88\xf0\x9d\x84\x9e";
- vector <unsigned short> utf16result;
- utf8to16(utf8_with_surrogates, utf8_with_surrogates + 9, back_inserter(utf16result));
- EXPECT_EQ (utf16result.size(), 4);
- EXPECT_EQ (utf16result[2], 0xd834);
- EXPECT_EQ (utf16result[3], 0xdd1e);
-}
-
-TEST(UnCheckedAPITests, test_replace_invalid)
-{
- char invalid_sequence[] = "a\x80\xe0\xa0\xc0\xaf\xed\xa0\x80z";
- vector<char> replace_invalid_result;
- replace_invalid (invalid_sequence, invalid_sequence + sizeof(invalid_sequence), std::back_inserter(replace_invalid_result), '?');
- bool bvalid = utf8::is_valid(replace_invalid_result.begin(), replace_invalid_result.end());
- EXPECT_TRUE (bvalid);
- const char fixed_invalid_sequence[] = "a????z";
- EXPECT_EQ (sizeof(fixed_invalid_sequence), replace_invalid_result.size());
- EXPECT_TRUE (std::equal(replace_invalid_result.begin(), replace_invalid_result.begin() + sizeof(fixed_invalid_sequence), fixed_invalid_sequence));
-}
-
Added: trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_unchecked_api.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_unchecked_api.h (rev 0)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_unchecked_api.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -0,0 +1,164 @@
+#ifndef UTF8_FOR_CPP_TEST_UNCHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
+#define UTF8_FOR_CPP_TEST_UNCHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
+
+#include "utf8/unchecked.h"
+
+#include <string>
+#include <vector>
+
+using namespace std;
+
+TEST(UnCheckedAPITests, test_append)
+{
+ unsigned char u[5] = {0,0,0,0,0};
+ utf8::unchecked::append(0x0448, u);
+ EXPECT_EQ (u[0], 0xd1);
+ EXPECT_EQ (u[1], 0x88);
+ EXPECT_EQ (u[2], 0);
+ EXPECT_EQ (u[3], 0);
+ EXPECT_EQ (u[4], 0);
+
+ utf8::unchecked::append(0x65e5, u);
+ EXPECT_EQ (u[0], 0xe6);
+ EXPECT_EQ (u[1], 0x97);
+ EXPECT_EQ (u[2], 0xa5);
+ EXPECT_EQ (u[3], 0);
+ EXPECT_EQ (u[4], 0);
+
+ utf8::unchecked::append(0x3044, u);
+ EXPECT_EQ (u[0], 0xe3);
+ EXPECT_EQ (u[1], 0x81);
+ EXPECT_EQ (u[2], 0x84);
+ EXPECT_EQ (u[3], 0);
+ EXPECT_EQ (u[4], 0);
+
+ utf8::unchecked::append(0x10346, u);
+ EXPECT_EQ (u[0], 0xf0);
+ EXPECT_EQ (u[1], 0x90);
+ EXPECT_EQ (u[2], 0x8d);
+ EXPECT_EQ (u[3], 0x86);
+ EXPECT_EQ (u[4], 0);
+}
+
+TEST(UnCheckedAPITests, test_next)
+{
+ const char* twochars = "\xe6\x97\xa5\xd1\x88";
+ const char* w = twochars;
+ unsigned int cp = utf8::unchecked::next(w);
+ EXPECT_EQ (cp, 0x65e5);
+ EXPECT_EQ (w, twochars + 3);
+
+ const char* threechars = "\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88";
+ w = threechars;
+
+ cp = utf8::unchecked::next(w);
+ EXPECT_EQ (cp, 0x10346);
+ EXPECT_EQ (w, threechars + 4);
+
+ cp = utf8::unchecked::next(w);
+ EXPECT_EQ (cp, 0x65e5);
+ EXPECT_EQ (w, threechars + 7);
+
+ cp = utf8::unchecked::next(w);
+ EXPECT_EQ (cp, 0x0448);
+ EXPECT_EQ (w, threechars + 9);
+}
+
+TEST(UnCheckedAPITests, test_peek_next)
+{
+ const char* const cw = "\xe6\x97\xa5\xd1\x88";
+ unsigned int cp = utf8::unchecked::peek_next(cw);
+ EXPECT_EQ (cp, 0x65e5);
+}
+
+TEST(UnCheckedAPITests, test_prior)
+{
+ const char* twochars = "\xe6\x97\xa5\xd1\x88";
+ const char* w = twochars + 3;
+ unsigned int cp = utf8::unchecked::prior (w);
+ EXPECT_EQ (cp, 0x65e5);
+ EXPECT_EQ (w, twochars);
+
+ const char* threechars = "\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88";
+ w = threechars + 9;
+ cp = utf8::unchecked::prior(w);
+ EXPECT_EQ (cp, 0x0448);
+ EXPECT_EQ (w, threechars + 7);
+ cp = utf8::unchecked::prior(w);
+ EXPECT_EQ (cp, 0x65e5);
+ EXPECT_EQ (w, threechars + 4);
+ cp = utf8::unchecked::prior(w);
+ EXPECT_EQ (cp, 0x10346);
+ EXPECT_EQ (w, threechars);
+}
+
+TEST(UnCheckedAPITests, test_advance)
+{
+ const char* threechars = "\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88";
+ const char* w = threechars;
+ utf8::unchecked::advance(w, 2);
+ EXPECT_EQ(w, threechars + 7);
+ utf8::unchecked::advance(w, -2);
+ EXPECT_EQ(w, threechars);
+ utf8::unchecked::advance(w, 3);
+ EXPECT_EQ(w, threechars + 9);
+ utf8::unchecked::advance(w, -2);
+ EXPECT_EQ(w, threechars + 4);
+ utf8::unchecked::advance(w, -1);
+ EXPECT_EQ(w, threechars);
+}
+
+TEST(UnCheckedAPITests, test_distance)
+{
+ const char* twochars = "\xe6\x97\xa5\xd1\x88";
+ size_t dist = static_cast<size_t>(utf8::unchecked::distance(twochars, twochars + 5));
+ EXPECT_EQ (dist, 2);
+}
+
+TEST(UnCheckedAPITests, test_utf32to8)
+{
+ unsigned int utf32string[] = {0x448, 0x65E5, 0x10346, 0};
+ string utf8result;
+ utf8::unchecked::utf32to8(utf32string, utf32string + 3, back_inserter(utf8result));
+ EXPECT_EQ (utf8result.size(), 9);
+}
+
+TEST(UnCheckedAPITests, test_utf8to32)
+{
+ const char* twochars = "\xe6\x97\xa5\xd1\x88";
+ vector<unsigned int> utf32result;
+ utf8::unchecked::utf8to32(twochars, twochars + 5, back_inserter(utf32result));
+ EXPECT_EQ (utf32result.size(), 2);
+}
+
+TEST(UnCheckedAPITests, test_utf16to8)
+{
+ unsigned short utf16string[] = {0x41, 0x0448, 0x65e5, 0xd834, 0xdd1e};
+ string utf8result;
+ utf8::unchecked::utf16to8(utf16string, utf16string + 5, back_inserter(utf8result));
+ EXPECT_EQ (utf8result.size(), 10);
+}
+
+TEST(UnCheckedAPITests, test_utf8to16)
+{
+ char utf8_with_surrogates[] = "\xe6\x97\xa5\xd1\x88\xf0\x9d\x84\x9e";
+ vector <unsigned short> utf16result;
+ utf8::unchecked::utf8to16(utf8_with_surrogates, utf8_with_surrogates + 9, back_inserter(utf16result));
+ EXPECT_EQ (utf16result.size(), 4);
+ EXPECT_EQ (utf16result[2], 0xd834);
+ EXPECT_EQ (utf16result[3], 0xdd1e);
+}
+
+TEST(UnCheckedAPITests, test_replace_invalid)
+{
+ char invalid_sequence[] = "a\x80\xe0\xa0\xc0\xaf\xed\xa0\x80z";
+ vector<char> replace_invalid_result;
+ utf8::unchecked::replace_invalid (invalid_sequence, invalid_sequence + sizeof(invalid_sequence), std::back_inserter(replace_invalid_result), '?');
+ bool bvalid = utf8::is_valid(replace_invalid_result.begin(), replace_invalid_result.end());
+ EXPECT_TRUE (bvalid);
+ const char fixed_invalid_sequence[] = "a????z";
+ EXPECT_EQ (sizeof(fixed_invalid_sequence), replace_invalid_result.size());
+ EXPECT_TRUE (std::equal(replace_invalid_result.begin(), replace_invalid_result.begin() + sizeof(fixed_invalid_sequence), fixed_invalid_sequence));
+}
+
+#endif
Property changes on: trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_unchecked_api.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_unchecked_iterator.cpp
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_unchecked_iterator.cpp 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_unchecked_iterator.cpp 2024-02-27 20:51:03 UTC (rev 70212)
@@ -1,34 +0,0 @@
-#define F_TEST_NO_MAIN
-#include "../extern/ftest/ftest.h"
-
-#include "utf8/unchecked.h"
-
-using namespace utf8::unchecked;
-
-
-TEST(UnCheckedIteratrTests, test_increment)
-{
- const char* threechars = "\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88";
- utf8::unchecked::iterator<const char*> it(threechars);
- utf8::unchecked::iterator<const char*> it2 = it;
- EXPECT_EQ (it2, it);
- EXPECT_EQ (*it, 0x10346);
- EXPECT_EQ (*(++it), 0x65e5);
- EXPECT_EQ ((*it++), 0x65e5);
- EXPECT_EQ (*it, 0x0448);
- EXPECT_NE (it, it2);
- utf8::unchecked::iterator<const char*> endit (threechars + 9);
- EXPECT_EQ (++it, endit);
-}
-
-TEST(UnCheckedIteratrTests, test_decrement)
-{
- const char* threechars = "\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88";
- utf8::unchecked::iterator<const char*> it(threechars+9);
- EXPECT_EQ (*(--it), 0x0448);
- EXPECT_EQ ((*it--), 0x0448);
- EXPECT_EQ (*it, 0x65e5);
- EXPECT_EQ (--it, utf8::unchecked::iterator<const char*>(threechars));
- EXPECT_EQ (*it, 0x10346);
-
-}
Added: trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_unchecked_iterator.h
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_unchecked_iterator.h (rev 0)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_unchecked_iterator.h 2024-02-27 20:51:03 UTC (rev 70212)
@@ -0,0 +1,36 @@
+#ifndef UTF8_FOR_CPP_TEST_UNCHECKED_ITERATOR_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
+#define UTF8_FOR_CPP_TEST_UNCHECKED_ITERATOR_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
+
+#include "utf8/unchecked.h"
+
+using namespace utf8::unchecked;
+
+
+TEST(UnCheckedIteratrTests, test_increment)
+{
+ const char* threechars = "\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88";
+ utf8::unchecked::iterator<const char*> it(threechars);
+ utf8::unchecked::iterator<const char*> it2 = it;
+ EXPECT_EQ (it2, it);
+ EXPECT_EQ (*it, 0x10346);
+ EXPECT_EQ (*(++it), 0x65e5);
+ EXPECT_EQ ((*it++), 0x65e5);
+ EXPECT_EQ (*it, 0x0448);
+ EXPECT_NE (it, it2);
+ utf8::unchecked::iterator<const char*> endit (threechars + 9);
+ EXPECT_EQ (++it, endit);
+}
+
+TEST(UnCheckedIteratrTests, test_decrement)
+{
+ const char* threechars = "\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88";
+ utf8::unchecked::iterator<const char*> it(threechars+9);
+ EXPECT_EQ (*(--it), 0x0448);
+ EXPECT_EQ ((*it--), 0x0448);
+ EXPECT_EQ (*it, 0x65e5);
+ EXPECT_EQ (--it, utf8::unchecked::iterator<const char*>(threechars));
+ EXPECT_EQ (*it, 0x10346);
+
+}
+
+#endif
Property changes on: trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_unchecked_iterator.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/utf8cppConfig.cmake.in
===================================================================
--- trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/utf8cppConfig.cmake.in (rev 0)
+++ trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/utf8cppConfig.cmake.in 2024-02-27 20:51:03 UTC (rev 70212)
@@ -0,0 +1,6 @@
+ at PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/utf8cppTargets.cmake")
+check_required_components( "utf8cpp" )
+
+add_library(utf8::cpp ALIAS utf8cpp)
Property changes on: trunk/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/utf8cppConfig.cmake.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Modified: trunk/Build/source/utils/asymptote/Makefile.in
===================================================================
--- trunk/Build/source/utils/asymptote/Makefile.in 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/Makefile.in 2024-02-27 20:51:03 UTC (rev 70212)
@@ -13,7 +13,7 @@
GCLIBS = $(GCPPLIB) $(GCLIB)
LFLAGS = @LDFLAGS@ -LLspCpp -LLspCpp/third_party/uri/src
LIBS = $(LFLAGS) @PTHREAD_LIBS@ @GLEW@ @LIBS@ $(GCLIBS) @LSPLIBS@
-DOSLIBS = $(subst -lncurses, -ltermcap, $(LIBS)) -lwolfssl -lgdi32 -lwinmm -s -static
+DOSLIBS = $(LIBS) -ltermcap -lwolfssl -lgdi32 -lwinmm -s -static
CMAKE ?= cmake
PERL ?= perl
@@ -249,7 +249,7 @@
@echo Creating $@;
$(ASY) -l > asy.list
ls $(addsuffix /*.asy,$(KEYWORDS)) | grep -v plain\* | \
- grep -v three_\* | grep -v featpost3D | xargs $(ASY) -l >> asy.list
+ grep -v three_\* | grep -v map | xargs $(ASY) -l >> asy.list
$(PERL) ./asy-list.pl asy.list $(revision)
install-notexhash: asy-keywords.el install-asy install-man
Modified: trunk/Build/source/utils/asymptote/ReleaseNotes
===================================================================
--- trunk/Build/source/utils/asymptote/ReleaseNotes 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/ReleaseNotes 2024-02-27 20:51:03 UTC (rev 70212)
@@ -1,6 +1,33 @@
+Release Notes for Version 2.87
+
+Templated imports were implemented.
+An incorrect dvisvgm optimization is avoided.
+SVG gradient shading offsets were fixed.
+Integer are now implicitly formatted with full precision.
+Inferred assignment of void type is prohibited.
+An LSP segmentation fault was fixed.
+Repeated stripping of file extensions is avoided.
+The --output-directory option of latexmk is supported.
+The OSMesa compatibility profile is used for offscreen rendering.
+The fitscreen toggle is fixed.
+The context menu in Xasy is now only opened for GUI-drawn items.
+A -v3d option allows embedding V3D content within a PDF file.
+A workaround was implemented for a MacOS libc++ parsing bug.
+The documentation was updated.
+
+Release Notes for Version 2.86
+
+PDF transfer functions are automatically applied;
+EPS output suppresses .setblendmode.
+NaN and inf values can be read in cvs mode.
+The OpenGL index buffer is properly initialized.
+WebGL and V3D primitives are used only when unscaled.
+Bugs in the inversion section of the geometry module were fixed.
+Portability issues were addressed.
+
Release Notes for Version 2.85
-Intersections of 3D paths with Bezier triangles was implemented.
+Intersections of 3D paths with Bezier triangles were implemented.
A workaround for broken offscreen graphics drivers was implemented.
The icon resource file is now pregenerated. Uninitialized variables and
a division by zero were fixed. The 3D animation timer and keyboard controls
Modified: trunk/Build/source/utils/asymptote/asy-keywords.el
===================================================================
--- trunk/Build/source/utils/asymptote/asy-keywords.el 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/asy-keywords.el 2024-02-27 20:51:03 UTC (rev 70212)
@@ -2,7 +2,7 @@
;; This file is automatically generated by asy-list.pl.
;; Changes will be overwritten.
;;
-(defvar asy-keywords-version "2.85")
+(defvar asy-keywords-version "2.87")
(defvar asy-keyword-name '(
and controls tension atleast curl if else while for do return break continue struct typedef new access import unravel from include quote static public private restricted this explicit true false null cycle newframe operator ))
@@ -11,7 +11,7 @@
Braid FitResult Label Legend Solution TreeNode abscissa arc arrowhead binarytree binarytreeNode block bool bool3 bounds bqe circle conic coord coordsys cputime ellipse evaluatedpoint file filltype frame grid3 guide horner hsv hyperbola int inversion key light line linefit marginT marker mass node object pair parabola patch path path3 pen picture point position positionedvector projection rational real realschur revolution scaleT schur scientific segment side simplex slice solution splitface string surface tensionSpecifier ticklocate ticksgridT tickvalues transform transformation tree triangle trilinear triple vector vertex void ))
(defvar asy-function-name '(
-AND Align Arc ArcArrow ArcArrows Arrow Arrows AtA Automatic AvantGarde B03 B13 B23 B33 BBox BWRainbow BWRainbow2 Bar Bars BeginArcArrow BeginArrow BeginBar BeginDotMargin BeginMargin BeginPenMargin Blank Bookman Bottom BottomTop Bounds Break Broken BrokenLog CLZ CTZ Ceil Circle CircleBarIntervalMarker Cos Courier CrossIntervalMarker DOSendl DOSnewl DefaultFormat DefaultLogFormat Degrees Dir DotMargin DotMargins Dotted Draw Drawline Embed EndArcArrow EndArrow EndBar EndDotMargin EndMargin EndPenMargin Fill FillDraw Finite Floor Format Full Gaussian Gaussrand Gaussrandpair Gradient Grayscale Helvetica Hermite HookHead InOutTicks InTicks Jn Label Landscape Left LeftRight LeftTicks Legend Linear Log LogFormat Margin Margins Mark MidArcArrow MidArrow NOT NewCenturySchoolBook NoBox NoMargin NoModifier NoTicks NoTicks3 NoZero NoZeroFormat None OR OmitFormat OmitTick OmitTickInterval OmitTickIntervals OutTicks Ox Oy Palatino PaletteTicks Pen PenMargin PenMargins Pentype Portrait RGB RadialShade RadialShadeDraw Rainbow Range Relative Right RightTicks Rotate Round SQR Scale ScaleX ScaleY ScaleZ Seascape Shift Sin Slant Spline StickIntervalMarker Straight Symbol Tan TeXify Ticks Ticks3 TildeIntervalMarker TimesRoman Top TrueMargin UnFill UpsideDown Wheel X XEquals XOR XY XYEquals XYZero XYgrid XZEquals XZZero XZero XZgrid Y YEquals YXgrid YZ YZEquals YZZero YZero YZgrid Yn Z ZX ZXgrid ZYgrid ZapfChancery ZapfDingbats _begingroup3 _cputime _draw _eval _findroot _image _labelpath _projection _schur _shipout _strokepath _texpath aCos aSin aTan abort abs abs2 accel acos acosh acot acsc activatequote add addArrow addMargins addSaveFunction addpenarc addpenline addseg adjust alias align all altitude angabscissa angle angledegrees angpoint animate annotate anticomplementary antipedal apply approximate arc arcarrowsize arccircle arcdir arcfromcenter arcfromfocus arclength arcnodesnumber arcpoint arcsubtended arcsubtendedcenter arctime arctopath array arrow arrow2 arrowbase arrowbasepoints arrowsize ascii asec asin asinh a!
sk assert asy asycode asydir asyfigure asyfilecode asyinclude asywrite atan atan2 atanh atbreakpoint atexit attach attract atupdate autoformat autoscale autoscale3 axes axes3 axialshade axis axiscoverage azimuth babel background bangles bar barmarksize barsize basealign baseline bbox beep begin beginclip begingroup beginpoint between bevel bezier bezierP bezierPP bezierPPP bezulate bibliography bibliographystyle binarytree binarytreeNode binomial bins bisector bisectorpoint bispline bispline0 bitreverse blend blockconnector box bqe brace breakpoint breakpoints brick buildRestoreDefaults buildRestoreThunk buildcycle bulletcolor byte byteinv calculateScaling canonical canonicalcartesiansystem cartesiansystem case1 case2 case3 cbrt cd ceil center centerToFocus centroid cevian change2 changecoordsys checkSegment check_fpt_zero checkconditionlength checker checkincreasing checklengths checkposition checkpt checkptincube checktriangle choose circle circlebarframe circlemarkradius circlenodesnumber circumcenter circumcircle clamped clear clip clipdraw close cmyk code colatitude collect collinear color colorless colors colorspace comma compassmark complement complementary concat concurrent cone conic conicnodesnumber conictype conj connect containmentTree contains contour contour3 controlSpecifier convert coordinates coordsys copy copyPairOrTriple cos cosh cot countIntersections cputime crop cropcode cross crossframe crosshatch crossmarksize csc cubicroots curabscissa curlSpecifier curpoint currentarrow currentexitfunction currentmomarrow currentpolarconicroutine curve cut cutafter cutbefore cyclic cylinder deactivatequote debugger deconstruct defaultdir defaultformat defaultpen defined degenerate degrees delete deletepreamble determinant diagonal diamond diffdiv dir dirSpecifier dirtime display distance divisors do_overpaint dot dotframe dotsize downcase draw drawAll drawCylinder drawDisk drawDoubleLine drawFermion drawGhost drawGluon drawMomArrow drawPhoton drawScalar drawSphere drawTube drawVertex drawVertexBox drawV!
ertexBoxO drawVertexBoxX drawVertexO drawVertexOX drawVertexTriangle drawVertexTriangleO drawVertexX drawarrow drawarrow2 drawbeziertriangle drawline drawpixel drawstrokepath drawtick duplicate elle ellipse ellipsenodesnumber embed embed3 embedplayer empty enclose end endclip endgroup endgroup3 endl endpoint endpoints eof eol equation equations erase erasestep erf erfc error errorbar errorbars eval excenter excircle exit exitfunction exp expfactors expi expm1 exradius extend extension extouch fabs factorial fermat fft fhorner figure file filecode fill filldraw filloutside fillrule filltype find findall findroot finite finiteDifferenceJacobian firstcut firstframe fit fit2 fixedscaling floor flush fmdefaults fmod focusToCenter font fontcommand fontsize foot format frac frequency fromCenter fromFocus fspline functionshade gamma gcd generate_random_backtrace generateticks gergonne getc getint getpair getreal getstring gettriple gluon gouraudshade graph graphic graphicscale graphwithderiv gray grestore grid grid3 gsave halfbox hatch hdiffdiv hermite hex histogram history hline hprojection hsv hyperbola hyperbolanodesnumber hyperlink hypot identity image implicitsurface importv3d incenter incentral incircle increasing incrementposition indexedfigure initdefaults initialized input inradius insert inside insphere integrate interactive interior interp interpolate intersect intersection intersectionpoint intersectionpoints intersections intouch inverse inversion invisible is3D isDuplicate isnan isogonal isogonalconjugate isometry isotomic isotomicconjugate isparabola italic item jobname key kurtosis kurtosisexcess label labelaxis labelmargin labelpath labels labeltick labelx labelx3 labely labely3 labelz labelz3 lastcut latex latitude latticeshade layer layout lcm ldexp leastsquares legend legenditem length lexorder lift light limits line linear linecap lineinversion linejoin linemargin lineskip linetype linewidth link list lm_enorm lm_evaluate_default lm_lmdif lm_lmpar lm_minimize lm_print_default lm_print_quiet lm_qrfac!
lm_qrsolv locale locate locatefile location log log10 log1p logaxiscoverage longitude lookup make3dgrid makeMappingArray makeNode makecircle makedraw makepen maketriangle map mapArray mapTemplate margin markangle markangleradius markanglespace markarc marker markinterval marknodes markrightangle markthin markuniform mass masscenter massformat math max max3 maxAfterTransform maxbezier maxbound maxcoords maxlength maxratio maxtimes mean medial median midpoint min min3 minAfterTransform minbezier minbound minipage minratio mintimes miterlimit mktemp momArrowPath momarrowsize monotonic multifigure nGrad nativeformat natural newl newpage newslide newton newtree nextframe nextnormal nextpage nib nodabscissa node none norm normalout normalvideo notaknot nowarn numberpage nurb object offset onpath opacity opposite orient orientation origin orthic orthocenter orthocentercenter outdirectory outformat outline outname outprefix output overloadedMessage overwrite pack pad pairs palette parabola parabolanodesnumber parallel parallelogram partialsum patchwithnormals path path3 pathbetween pathinface pattern pause pdf pedal periodic perp perpendicular perpendicularmark phantom phi1 phi2 phi3 phi4 photon piecewisestraight point polar polarconicroutine polargraph polygon popcount postcontrol postscript pow10 ppoint prc prc0 prconly precision precontrol prepend primitive printBytecode print_random_addresses progress project projection projecttospan projecttospan_findcoeffs purge pwhermite quadpatches quadrant quadraticroots quantize quarticroots quotient radialshade radians radicalcenter radicalline radius rand randompath rationalidentity rd readline realmult realquarticroots rectangle rectangular rectify reflect relabscissa relative relativedistance reldir relpoint reltime remainder remark removeDuplicates rename render replace report resetdefaultpen restore restoredefaults reverse reversevideo rf rfind rgb rgba rgbint rms rotate rotateO rotation round roundbox roundedpath roundrectangle samecoordsys sameside sample save savedef!
aults saveline scale scale3 scaleO scaleT scaleless schur scientific search searchtree sec secondaryX secondaryY seconds section sector seek seekeof segment segmentlimits sequence setpens sgn sgnd sharpangle sharpdegrees shift shiftless shipout shipout3 show simeq simplex simplexInit simplexPhase1 simplexPhase2 simplexTableau simplexWrite simpson sin sinh size size3 skewness skip slant sleep slice slope slopefield solve solveBVP sort sourceline sphere split sqrt square srand standardizecoordsys stdev step stickframe stickmarksize stickmarkspace stop straight straightness string stripdirectory stripextension stripfile stripsuffix strokepath subdivide subitem subpath substr sum surface symmedial symmedian system tab tableau tan tangent tangential tangents tanh tell tensionSpecifier tensorshade tex texcolor texify texpath texpreamble texreset texshipout texsize texstring textpath thick thin tick tickMax tickMax3 tickMin tickMin3 ticklabelshift ticklocate tildeframe tildemarksize tile tiling time times title titlepage topbox transform transformation transpose trembleFuzz triangle triangleAbc triangleabc triangletoquads trianglewithnormals triangulate tricoef tridiagonal trilinear trim truepoint tube type uncycle unfill uniform unique unit unitrand unitsize unityroot unstraighten upcase updatefunction uperiodic upscale uptodate usepackage usersetting usetypescript usleep value variance variancebiased vbox vector vectorfield verbatim view vline vperiodic vprojection warn warning windingnumber write xasyKEY xaxis xaxis3 xaxis3At xaxisAt xequals xlimits xmap xpart xscale xscaleO xtick xtick3 xtrans yaxis yaxis3 yaxis3At yaxisAt yequals ylimits ypart yscale yscaleO ytick ytick3 ytrans zaxis3 zaxis3At zero zlimits zpart ztick ztick3 ztrans ))
+AND Align Arc ArcArrow ArcArrows Arrow Arrows AtA Automatic AvantGarde B03 B13 B23 B33 BBox BWRainbow BWRainbow2 Bar Bars BeginArcArrow BeginArrow BeginBar BeginDotMargin BeginMargin BeginPenMargin Blank Bookman Bottom BottomTop Bounds Break Broken BrokenLog CLZ CTZ Ceil Circle CircleBarIntervalMarker Cos Courier CrossIntervalMarker DOSendl DOSnewl DefaultFormat DefaultLogFormat Degrees Dir DotMargin DotMargins Dotted Draw Drawline Embed EndArcArrow EndArrow EndBar EndDotMargin EndMargin EndPenMargin Fill FillDraw Finite Floor Format Full Gaussian Gaussrand Gaussrandpair Gradient Grayscale Helvetica Hermite HookHead InOutTicks InTicks Jn Label Landscape Left LeftRight LeftTicks Legend Linear Log LogFormat Margin Margins Mark MidArcArrow MidArrow NOT NewCenturySchoolBook NoBox NoMargin NoModifier NoTicks NoTicks3 NoZero NoZeroFormat None OR OmitFormat OmitTick OmitTickInterval OmitTickIntervals OutTicks Ox Oy Palatino PaletteTicks Pen PenMargin PenMargins Pentype Portrait RGB RadialShade RadialShadeDraw Rainbow Range Relative Right RightTicks Rotate Round SQR Scale ScaleX ScaleY ScaleZ Seascape Shift Sin Slant Spline StickIntervalMarker Straight Symbol Tan TeXify Ticks Ticks3 TildeIntervalMarker TimesRoman Top TrueMargin UnFill UpsideDown Wheel X XEquals XOR XY XYEquals XYZero XYgrid XZEquals XZZero XZero XZgrid Y YEquals YXgrid YZ YZEquals YZZero YZero YZgrid Yn Z ZX ZXgrid ZYgrid ZapfChancery ZapfDingbats _begingroup3 _cputime _draw _eval _findroot _image _labelpath _projection _schur _shipout _strokepath _texpath aCos aSin aTan abort abs abs2 accel acos acosh acot acsc activatequote add addArrow addMargins addSaveFunction addpenarc addpenline addseg adjust alias align all altitude angabscissa angle angledegrees angpoint animate annotate anticomplementary antipedal apply approximate arc arcarrowsize arccircle arcdir arcfromcenter arcfromfocus arclength arcnodesnumber arcpoint arcsubtended arcsubtendedcenter arctime arctopath array arrow arrow2 arrowbase arrowbasepoints arrowsize ascii asec asin asinh a!
sk assert asy asycode asydir asyfigure asyfilecode asyinclude asywrite atan atan2 atanh atbreakpoint atexit attach attract atupdate autoformat autoscale autoscale3 axes axes3 axialshade axis axiscoverage azimuth babel background bangles bar barmarksize barsize basealign baseline bbox beep begin beginclip begingroup beginpoint between bevel bezier bezierP bezierPP bezierPPP bezulate bibliography bibliographystyle binarytree binarytreeNode binomial bins bisector bisectorpoint bispline bispline0 bitreverse blend blockconnector box bqe brace breakpoint breakpoints brick buildRestoreDefaults buildRestoreThunk buildcycle bulletcolor byte byteinv calculateScaling canonical canonicalcartesiansystem cartesiansystem case1 case2 case3 cbrt cd ceil center centerToFocus centroid cevian change2 changecoordsys checkSegment check_fpt_zero checkconditionlength checker checkincreasing checklengths checkposition checkpt checkptincube checktriangle choose circle circlebarframe circlemarkradius circlenodesnumber circumcenter circumcircle clamped clear clip clipdraw close cmyk code colatitude collect collinear color colorless colors colorspace comma compassmark complement complementary concat concurrent cone conic conicnodesnumber conictype conj connect containmentTree contains contour contour3 controlSpecifier convert coordinates coordsys copy copyPairOrTriple cos cosh cot countIntersections cputime crop cropcode cross crossframe crosshatch crossmarksize csc cubicroots curabscissa curlSpecifier curpoint currentarrow currentexitfunction currentmomarrow currentpolarconicroutine curve cut cutafter cutbefore cyclic cylinder deactivatequote debugger deconstruct defaultdir defaultformat defaultpen defined degenerate degrees delete deletepreamble determinant diagonal diamond diffdiv dir dirSpecifier dirtime display distance divisors do_overpaint dot dotframe dotsize downcase draw drawAll drawCylinder drawDisk drawDoubleLine drawFermion drawGhost drawGluon drawMomArrow drawPhoton drawScalar drawSphere drawTube drawVertex drawVertexBox drawV!
ertexBoxO drawVertexBoxX drawVertexO drawVertexOX drawVertexTriangle drawVertexTriangleO drawVertexX drawarrow drawarrow2 drawbeziertriangle drawline drawpixel drawstrokepath drawtick duplicate elle ellipse ellipsenodesnumber embed embed3 embedplayer empty enclose end endclip endgroup endgroup3 endl endpoint endpoints eof eol equation equations erase erasestep erf erfc error errorbar errorbars eval excenter excircle exit exitfunction exp expfactors expi expm1 exradius extend extension extouch fabs factorial fermat fft fhorner figure file filecode fill filldraw filloutside fillrule filltype find findall findroot finite finiteDifferenceJacobian firstcut firstframe fit fit2 fixedscaling floor flush fmdefaults fmod focusToCenter font fontcommand fontsize foot format frac frequency fromCenter fromFocus fspline functionshade gamma gcd generate_random_backtrace generateticks gergonne getc getint getpair getreal getstring gettriple gluon gouraudshade graph graphic graphicscale graphwithderiv gray grestore grid grid3 gsave halfbox hatch hdiffdiv hermite hex histogram history hline hprojection hsv hyperbola hyperbolanodesnumber hyperlink hypot identity image implicitsurface importv3d incenter incentral incircle increasing incrementposition indexedfigure initdefaults initialized input inradius insert inside insphere integrate interactive interior interp interpolate intersect intersection intersectionpoint intersectionpoints intersections intouch inverse inversion invisible is3D isDuplicate isnan isogonal isogonalconjugate isometry isotomic isotomicconjugate isparabola italic item jobname key kurtosis kurtosisexcess label labelaxis labelmargin labelpath labels labeltick labelx labelx3 labely labely3 labelz labelz3 lastcut latex latitude latticeshade layer layout lcm ldexp leastsquares legend legenditem length lexorder lift light limits line linear linecap lineinversion linejoin linemargin lineskip linetype linewidth link list lm_enorm lm_evaluate_default lm_lmdif lm_lmpar lm_minimize lm_print_default lm_print_quiet lm_qrfac!
lm_qrsolv locale locate locatefile location log log10 log1p logaxiscoverage longitude lookup make3dgrid makeNode makecircle makedraw makepen maketriangle map mapArray mapArrayString margin markangle markangleradius markanglespace markarc marker markinterval marknodes markrightangle markthin markuniform mass masscenter massformat math max max3 maxAfterTransform maxbezier maxbound maxcoords maxlength maxratio maxtimes mean medial median midpoint min min3 minAfterTransform minbezier minbound minipage minratio mintimes miterlimit mktemp momArrowPath momarrowsize monotonic multifigure nGrad nativeformat natural newl newpage newslide newton newtree nextframe nextnormal nextpage nib nodabscissa node none norm normalout normalvideo notaknot nowarn numberpage nurb object offset onpath opacity opposite orient orientation origin orthic orthocenter orthocentercenter outdirectory outformat outline outname outprefix output overloadedMessage overwrite pack pad pairs palette parabola parabolanodesnumber parallel parallelogram partialsum patchwithnormals path path3 pathbetween pathinface pattern pause pdf pedal periodic perp perpendicular perpendicularmark phantom phi1 phi2 phi3 phi4 photon piecewisestraight point polar polarconicroutine polargraph polygon popcount postcontrol postscript pow10 ppoint prc prc0 prconly precision precontrol prepend primitive printBytecode print_random_addresses progress project projection projecttospan projecttospan_findcoeffs purge pwhermite quadpatches quadrant quadraticroots quantize quarticroots quotient radialshade radians radicalcenter radicalline radius rand randompath rationalidentity rd readline realmult realquarticroots rectangle rectangular rectify reflect relabscissa relative relativedistance reldir relpoint reltime remainder remark removeDuplicates rename render replace report resetdefaultpen restore restoredefaults reverse reversevideo rf rfind rgb rgba rgbint rms rotate rotateO rotation round roundbox roundedpath roundrectangle samecoordsys sameside sample save savedefaults saveline!
scale scale3 scaleO scaleT scaleless schur scientific search searchtree sec secondaryX secondaryY seconds section sector seek seekeof segment segmentlimits sequence setpens sgn sgnd sharpangle sharpdegrees shift shiftless shipout shipout3 show simeq simplex simplexInit simplexPhase1 simplexPhase2 simplexTableau simplexWrite simpson sin sinh size size3 skewness skip slant sleep slice slope slopefield solve solveBVP sort sourceline sphere split sqrt square srand standardizecoordsys stdev step stickframe stickmarksize stickmarkspace stop straight straightness string stripdirectory stripextension stripfile stripsuffix strokepath subdivide subitem subpath substr sum surface symmedial symmedian system tab tableau tan tangent tangential tangents tanh tell tensionSpecifier tensorshade tex texcolor texify texpath texpreamble texreset texshipout texsize texstring textpath thick thin tick tickMax tickMax3 tickMin tickMin3 ticklabelshift ticklocate tildeframe tildemarksize tile tiling time times title titlepage topbox transform transformation transpose trembleFuzz triangle triangleAbc triangleabc triangletoquads trianglewithnormals triangulate tricoef tridiagonal trilinear trim truepoint tube uncycle unfill uniform unique unit unitrand unitsize unityroot unstraighten upcase updatefunction uperiodic upscale uptodate usepackage usersetting usetypescript usleep value variance variancebiased vbox vector vectorfield verbatim view vline vperiodic vprojection warn warning windingnumber write xasyKEY xaxis xaxis3 xaxis3At xaxisAt xequals xlimits xmap xpart xscale xscaleO xtick xtick3 xtrans yaxis yaxis3 yaxis3At yaxisAt yequals ylimits ypart yscale yscaleO ytick ytick3 ytrans zaxis3 zaxis3At zero zlimits zpart ztick ztick3 ztrans ))
(defvar asy-variable-name '(
-Accent AliceBlue Align Allow AntiqueWhite Apricot Aqua Aquamarine Aspect Azure BeginPoint Beige Bisque Bittersweet Black BlanchedAlmond Blue BlueGreen BlueViolet Blues Both BrBG Break BrickRed Brown BuGn BuPu BurlyWood BurntOrange CCW CMRmap CW CadetBlue CarnationPink Center Centered Cerulean Chartreuse Chocolate Coeff Coral CornflowerBlue Cornsilk Crimson Crop Cyan Dandelion Dark2 DarkBlue DarkCyan DarkGoldenrod DarkGray DarkGreen DarkKhaki DarkMagenta DarkOliveGreen DarkOrange DarkOrchid DarkRed DarkSalmon DarkSeaGreen DarkSlateBlue DarkSlateGray DarkTurquoise DarkViolet DeepPink DeepSkyBlue DefaultHead DimGray DodgerBlue Dotted Down Draw E ENE EPS ESE E_Euler E_PC E_RK2 E_RK3BS Emerald EndPoint Euler Fill FillDraw FireBrick FloralWhite ForestGreen Fuchsia Gainsboro GhostWhite GnBu Gold Goldenrod Gray Green GreenYellow Greens Greys Honeydew HookHead Horizontal HotPink I IgnoreAspect IndianRed Indigo Infinity Ivory JOIN_IN JOIN_OUT JungleGreen Khaki LM_DWARF LM_MACHEP LM_SQRT_DWARF LM_SQRT_GIANT LM_USERTOL Label Lavender LavenderBlush LawnGreen Left LeftJustified LeftSide LemonChiffon LightBlue LightCoral LightCyan LightGoldenrodYellow LightGreen LightGrey LightPink LightSalmon LightSeaGreen LightSkyBlue LightSlateGray LightSteelBlue LightYellow Lime LimeGreen Linear Linen Log Logarithmic Magenta Mahogany Mark MarkFill MarkFillable MarkPath Maroon Max MediumAquamarine MediumBlue MediumOrchid MediumPurple MediumSeaGreen MediumSlateBlue MediumSpringGreen MediumTurquoise MediumVioletRed Melon MidPoint MidnightBlue Min MintCream MistyRose Moccasin Move MoveQuiet Mulberry N NE NNE NNW NULL_VERTEX NW NavajoWhite Navy NavyBlue NoAlign NoCrop NoFill NoSide OldLace Olive OliveDrab OliveGreen OrRd Orange OrangeRed Oranges Orchid Ox Oy PC PRGn Paired PaleGoldenrod PaleGreen PaleTurquoise PaleVioletRed PapayaWhip Pastel1 Pastel2 Peach PeachPuff Periwinkle Peru PiYG PineGreen Pink Plum PowderBlue ProcessBlue PuBu PuBuGn PuOr PuRd Purple Purples RELEASE RK2 RK3 RK3BS RK4 RK5 RK5DP RK5F RawSienna RdBu RdGy RdPu RdYlB!
u RdYlGn Red RedOrange RedViolet Reds Rhodamine Right RightJustified RightSide RosyBrown RoyalBlue RoyalPurple RubineRed S SE SSE SSW SW SaddleBrown Salmon SandyBrown SeaGreen Seashell Sepia Set1 Set2 Set3 Sienna Silver SimpleHead SkyBlue SlateBlue SlateGray Snow Spectral SpringGreen SteelBlue Suppress SuppressQuiet Tan TeXHead Teal TealBlue Thistle Ticksize Tomato Turquoise UnFill Up VERSION Value Vertical Violet VioletRed W WNW WSW Wheat White WhiteSmoke WildStrawberry XHIGH XLOW XYAlign YAlign YHIGH YLOW Yellow YellowGreen YellowOrange YlGn YlGnBu YlOrBr YlOrRd ZHIGH ZLOW _outpipe aboveequationskip addpenarc addpenline align allowstepping angularsystem animationdelay appendsuffix arcarrowangle arcarrowfactor arrow2sizelimit arrowangle arrowbarb arrowdir arrowfactor arrowhookfactor arrowlength arrowsizelimit arrowtexfactor artificialColumn authorpen autumn axis axiscoverage axislabelfactor background backgroundcolor backgroundpen barfactor barmarksizefactor basealign baselinetemplate bernstein beveljoin bigvertexpen bigvertexsize binary black blue bm bone bottom bp bracedefaultratio braceinnerangle bracemidangle braceouterangle brg brown bullet bwr byfoci byvertices camerafactor chartreuse circlemarkradiusfactor circlenodesnumberfactor circleprecision circlescale cividis cm codefile codepen codeskip colorPen coloredNodes coloredSegments conditionlength conicnodesfactor cool coolwarm copper count cputimeformat crossmarksizefactor currentcoordsys currentlight currentpatterns currentpen currentpicture currentposition currentprojection curvilinearsystem cuttings cyan darkblue darkbrown darkcyan darkgray darkgreen darkgrey darkmagenta darkolive darkred dashdotted dashed datepen dateskip debuggerlines debugging deepblue deepcyan deepgray deepgreen deepgrey deepmagenta deepred deepyellow default defaultControl defaultS defaultbackpen defaultcoordsys defaultexcursion defaultfilename defaultformat defaultmassformat defaultpen defaultseparator diamond differentlengths dot dotfactor dotfilltype dotframe dotted doubleline!
pen doublelinespacing down duplicateFuzz ellipsenodesnumberfactor eps epsgeo epsilon evenodd expansionfactor extendcap fermionpen figureborder figuremattpen file3 firstnode firststep foregroundcolor fuchsia fuzz gapfactor ghostpen gist_earth gist_ncar gist_stern gluonamplitude gluonpen gluonratio gray green grey hatchepsilon havepagenumber heavyblue heavycyan heavygray heavygreen heavygrey heavymagenta heavyred hline hot hsv hwratio hyperbolanodesnumberfactor identity identity4 ignore implicitshipout inch inches includegraphicscommand inf inferno infinity institutionpen intMax intMin invert invisible itempen itemskip itemstep jet labelmargin landscape lastnode left legendhskip legendlinelength legendmargin legendmarkersize legendmaxrelativewidth legendvskip lightblue lightcyan lightgray lightgreen lightgrey lightmagenta lightolive lightred lightyellow linemargin lm_infmsg lm_shortmsg longdashdotted longdashed magenta magma magneticRadius mantissaBits markangleradius markangleradiusfactor markanglespace markanglespacefactor maxDenominator maxrefinements mediumblue mediumcyan mediumgray mediumgreen mediumgrey mediummagenta mediumred mediumyellow middle minDistDefault minblockheight minblockwidth mincirclediameter minipagemargin minipagewidth minvertexangle miterjoin mm momarrowfactor momarrowlength momarrowmargin momarrowoffset momarrowpen monoPen morepoints nCircle nan newbulletcolor ngraph nil nipy_spectral nmesh nobasealign nodeMarginDefault nodesystem nomarker nopoint noprimary nullpath nullpen numarray ocgindex oldbulletcolor olive optimizeTableau orange origin overpaint page pageheight pagemargin pagenumberalign pagenumberpen pagenumberposition pagewidth paleblue palecyan palegray palegreen palegrey palemagenta palered paleyellow parabolanodesnumberfactor perpfactor phi photonamplitude photonpen photonratio pi pink plain plain_bounds plain_scaling plasma plus preamblenodes pt purple r3 r4a r4b randMax realDigits realEpsilon realMax realMin red relativesystem reverse right roundcap roundjoin royalblue salmon !
saveFunctions scalarpen seismic sequencereal settings signedtrailingzero simplex solid spinner spring springgreen sqrtEpsilon squarecap squarepen startposition stdin stdout stepfactor stepfraction steppagenumberpen stepping stickframe stickmarksizefactor stickmarkspacefactor summer swap tab10 tab20 tab20b tab20c textpen ticksize tildeframe tildemarksizefactor tinv titlealign titlepagepen titlepageposition titlepen titleskip top trailingzero treeLevelStep treeMinNodeWidth treeNodeStep trembleAngle trembleFrequency trembleRandom tubegranularity twilight twilight_shifted undefined unitcircle unitsquare up urlpen urlskip v3dheadertypes v3dtypes version vertexpen vertexsize viewportmargin viewportsize viridis vline white winter wistia wye yellow ylabelwidth zeroTransform zerotickfuzz zerowinding ))
+AliceBlue Align Allow AntiqueWhite Apricot Aqua Aquamarine Aspect Azure BeginPoint Beige Bisque Bittersweet Black BlanchedAlmond Blue BlueGreen BlueViolet Both Break BrickRed Brown BurlyWood BurntOrange CCW CW CadetBlue CarnationPink Center Centered Cerulean Chartreuse Chocolate Coeff Coral CornflowerBlue Cornsilk Crimson Crop Cyan Dandelion DarkBlue DarkCyan DarkGoldenrod DarkGray DarkGreen DarkKhaki DarkMagenta DarkOliveGreen DarkOrange DarkOrchid DarkRed DarkSalmon DarkSeaGreen DarkSlateBlue DarkSlateGray DarkTurquoise DarkViolet DeepPink DeepSkyBlue DefaultHead DimGray DodgerBlue Dotted Down Draw E ENE EPS ESE E_Euler E_PC E_RK2 E_RK3BS Emerald EndPoint Euler Fill FillDraw FireBrick FloralWhite ForestGreen Fuchsia Gainsboro GhostWhite Gold Goldenrod Gray Green GreenYellow Honeydew HookHead Horizontal HotPink I IgnoreAspect IndianRed Indigo Infinity Ivory JOIN_IN JOIN_OUT JungleGreen Khaki LM_DWARF LM_MACHEP LM_SQRT_DWARF LM_SQRT_GIANT LM_USERTOL Label Lavender LavenderBlush LawnGreen Left LeftJustified LeftSide LemonChiffon LightBlue LightCoral LightCyan LightGoldenrodYellow LightGreen LightGrey LightPink LightSalmon LightSeaGreen LightSkyBlue LightSlateGray LightSteelBlue LightYellow Lime LimeGreen Linear Linen Log Logarithmic Magenta Mahogany Mark MarkFill MarkFillable MarkPath Maroon Max MediumAquamarine MediumBlue MediumOrchid MediumPurple MediumSeaGreen MediumSlateBlue MediumSpringGreen MediumTurquoise MediumVioletRed Melon MidPoint MidnightBlue Min MintCream MistyRose Moccasin Move MoveQuiet Mulberry N NE NNE NNW NULL_VERTEX NW NavajoWhite Navy NavyBlue NoAlign NoCrop NoFill NoSide OldLace Olive OliveDrab OliveGreen Orange OrangeRed Orchid Ox Oy PC PaleGoldenrod PaleGreen PaleTurquoise PaleVioletRed PapayaWhip Peach PeachPuff Periwinkle Peru PineGreen Pink Plum PowderBlue ProcessBlue Purple RELEASE RK2 RK3 RK3BS RK4 RK5 RK5DP RK5F RawSienna Red RedOrange RedViolet Rhodamine Right RightJustified RightSide RosyBrown RoyalBlue RoyalPurple RubineRed S SE SSE SSW SW SaddleBrown Salmon SandyBrown Se!
aGreen Seashell Sepia Sienna Silver SimpleHead SkyBlue SlateBlue SlateGray Snow SpringGreen SteelBlue Suppress SuppressQuiet Tan TeXHead Teal TealBlue Thistle Ticksize Tomato Turquoise UnFill Up VERSION Value Vertical Violet VioletRed W WNW WSW Wheat White WhiteSmoke WildStrawberry XHIGH XLOW XYAlign YAlign YHIGH YLOW Yellow YellowGreen YellowOrange ZHIGH ZLOW _outpipe aboveequationskip addpenarc addpenline align allowstepping angularsystem animationdelay appendsuffix arcarrowangle arcarrowfactor arrow2sizelimit arrowangle arrowbarb arrowdir arrowfactor arrowhookfactor arrowlength arrowsizelimit arrowtexfactor artificialColumn authorpen axis axiscoverage axislabelfactor background backgroundcolor backgroundpen barfactor barmarksizefactor basealign baselinetemplate bernstein beveljoin bigvertexpen bigvertexsize black blue bm bottom bp bracedefaultratio braceinnerangle bracemidangle braceouterangle brown bullet byfoci byvertices camerafactor chartreuse circlemarkradiusfactor circlenodesnumberfactor circleprecision circlescale cm codefile codepen codeskip colorPen coloredNodes coloredSegments conditionlength conicnodesfactor count cputimeformat crossmarksizefactor currentcoordsys currentlight currentpatterns currentpen currentpicture currentposition currentprojection curvilinearsystem cuttings cyan darkblue darkbrown darkcyan darkgray darkgreen darkgrey darkmagenta darkolive darkred dashdotted dashed datepen dateskip debuggerlines debugging deepblue deepcyan deepgray deepgreen deepgrey deepmagenta deepred deepyellow default defaultControl defaultS defaultbackpen defaultcoordsys defaultexcursion defaultfilename defaultformat defaultmassformat defaultpen defaultseparator diamond differentlengths dot dotfactor dotfilltype dotframe dotted doublelinepen doublelinespacing down duplicateFuzz ellipsenodesnumberfactor eps epsgeo epsilon evenodd expansionfactor extendcap fermionpen figureborder figuremattpen file3 firstnode firststep foregroundcolor fuchsia fuzz gapfactor ghostpen gluonamplitude gluonpen gluonratio gray gree!
n grey hatchepsilon havepagenumber heavyblue heavycyan heavygray heavygreen heavygrey heavymagenta heavyred hline hwratio hyperbolanodesnumberfactor identity identity4 ignore implicitshipout inch inches includegraphicscommand inf infinity institutionpen intMax intMin invert invisible itempen itemskip itemstep labelmargin landscape lastnode left legendhskip legendlinelength legendmargin legendmarkersize legendmaxrelativewidth legendvskip lightblue lightcyan lightgray lightgreen lightgrey lightmagenta lightolive lightred lightyellow linemargin lm_infmsg lm_shortmsg longdashdotted longdashed magenta magneticRadius mantissaBits markangleradius markangleradiusfactor markanglespace markanglespacefactor maxDenominator maxrefinements mediumblue mediumcyan mediumgray mediumgreen mediumgrey mediummagenta mediumred mediumyellow middle minDistDefault minblockheight minblockwidth mincirclediameter minipagemargin minipagewidth minvertexangle miterjoin mm momarrowfactor momarrowlength momarrowmargin momarrowoffset momarrowpen monoPen morepoints nCircle nan newbulletcolor ngraph nil nmesh nobasealign nodeMarginDefault nodesystem nomarker nopoint noprimary nullpath nullpen numarray ocgindex oldbulletcolor olive optimizeTableau orange origin overpaint page pageheight pagemargin pagenumberalign pagenumberpen pagenumberposition pagewidth paleblue palecyan palegray palegreen palegrey palemagenta palered paleyellow parabolanodesnumberfactor perpfactor phi photonamplitude photonpen photonratio pi pink plain plain_bounds plain_scaling plus preamblenodes pt purple r3 r4a r4b randMax realDigits realEpsilon realMax realMin red relativesystem reverse right roundcap roundjoin royalblue salmon saveFunctions scalarpen sequencereal settings signedtrailingzero simplex solid spinner springgreen sqrtEpsilon squarecap squarepen startposition stdin stdout stepfactor stepfraction steppagenumberpen stepping stickframe stickmarksizefactor stickmarkspacefactor swap textpen ticksize tildeframe tildemarksizefactor tinv titlealign titlepagepen titlepagepo!
sition titlepen titleskip top trailingzero treeLevelStep treeMinNodeWidth treeNodeStep trembleAngle trembleFrequency trembleRandom tubegranularity undefined unitcircle unitsquare up urlpen urlskip v3dheadertypes v3dtypes version vertexpen vertexsize viewportmargin viewportsize vline white wye yellow ylabelwidth zeroTransform zerotickfuzz zerowinding ))
Modified: trunk/Build/source/utils/asymptote/asy.list
===================================================================
--- trunk/Build/source/utils/asymptote/asy.list 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/asy.list 2024-02-27 20:51:03 UTC (rev 70212)
@@ -1833,6 +1833,7 @@
real[] intersect(path3 p, path3 q, real fuzz=<default>);
real[] intersect(path3 p, triple[][] p, real fuzz=<default>);
bool interactive();
+string mapArrayString(string From, string To);
real[][] intersections(path p, path q, real fuzz=<default>);
real[] intersections(path p, explicit pair a, explicit pair b, real fuzz=<default>);
real[][] intersections(path3 p, path3 q, real fuzz=<default>);
@@ -1850,7 +1851,6 @@
pair Align;
void exit();
real[] uniform(real a, real b, int n);
-void type(string type, string name);
pair viewportsize;
pair viewportmargin;
string VERSION;
@@ -2007,6 +2007,7 @@
pair[][][] fft(pair[][][] a, int sign=<default>);
pair SE;
pen nobasealign;
+sCAD operator init();
real animationdelay;
animation operator init();
frame NoBox(frame f);
@@ -2053,88 +2054,6 @@
picture operator cast(face f);
face operator cast(path3 p);
void add(picture pic=<default>, face[] faces, projection P=<default>);
-sCAD operator init();
-list_data Set2;
-list_data YlOrBr;
-list_data YlGn;
-list_data BuPu;
-list_data tab20;
-list_data tab20b;
-list_data tab20c;
-seg_data gist_earth;
-seg_data gist_ncar;
-seg_data gist_stern;
-list_data PuBuGn;
-seg_data hot;
-list_data Blues;
-seg_data autumn;
-list_data PuBu;
-list_data plasma;
-seg_data nipy_spectral;
-seg_data spring;
-list_data Set3;
-list_data Dark2;
-seg_data bone;
-seg_data hsv;
-list_data bwr;
-list_data viridis;
-list_data Reds;
-list_data inferno;
-seg_data copper;
-seg_data pink;
-list_data YlOrRd;
-seg_data gray;
-list_data RdYlGn;
-seg_data CMRmap;
-seg_data winter;
-list_data Greys;
-list_data Purples;
-list_data BuGn;
-list_data Oranges;
-list_data RdGy;
-seg_data binary;
-list_data magma;
-list_data cividis;
-seg_data operator init();
-list_data operator init();
-list_data BrBG;
-list_data seismic;
-list_data Greens;
-list_data YlGnBu;
-list_data PuRd;
-real[] makeMappingArray(int N, triple[] data, real gamma=<default>);
-seg_data coolwarm;
-list_data RdPu;
-list_data RdBu;
-list_data twilight;
-list_data twilight_shifted;
-seg_data wistia;
-list_data brg;
-list_data Pastel1;
-list_data Pastel2;
-list_data GnBu;
-list_data Accent;
-list_data PuOr;
-list_data Spectral;
-list_data PiYG;
-list_data OrRd;
-seg_data cool;
-list_data PRGn;
-list_data Set1;
-list_data tab10;
-list_data Paired;
-seg_data jet;
-seg_data summer;
-list_data RdYlBu;
-surface surface(vertex[][] g);
-weighted operator init();
-bucket operator init();
-vertex operator init();
-object operator init();
-vertex[][] contour3(triple[][][] v, real[][][] f, real[][][] midpoint=<default>, projection P=<default>);
-vertex[][] contour3(real[][][] f, real[][][] midpoint=<default>, triple a, triple b, projection P=<default>);
-vertex[][] contour3(real f(real, real, real), triple a, triple b, int nx=<default>, int ny=<default>, int nz=<default>, projection P=<default>);
-real eps;
segment case1(pair p0, pair p1, int edge);
void draw(picture pic=<default>, Label[] L=<default>, guide[][] g, pen[] p);
void draw(picture pic=<default>, Label[] L=<default>, guide[][] g, pen p=<default>);
@@ -2154,6 +2073,15 @@
guide[][] contour(picture pic=<default>, real f(pair), pair a, pair b, real[] c, int nx=<default>, int ny=<default>, guide join(... guide[])=<default>);
guide[][] contour(picture pic=<default>, pair[] z, real[] f, real[] c, guide join(... guide[])=<default>);
real eps;
+surface surface(vertex[][] g);
+weighted operator init();
+bucket operator init();
+vertex operator init();
+object operator init();
+vertex[][] contour3(triple[][][] v, real[][][] f, real[][][] midpoint=<default>, projection P=<default>);
+vertex[][] contour3(real[][][] f, real[][][] midpoint=<default>, triple a, triple b, projection P=<default>);
+vertex[][] contour3(real f(real, real, real), triple a, triple b, int nx=<default>, int ny=<default>, int nz=<default>, projection P=<default>);
+real eps;
void draw(TreeNode root, pair pos);
real treeNodeStep;
void drawAll(TreeNode node, frame f);
@@ -2184,9 +2112,10 @@
void drawVertexTriangleO(picture pic=<default>, pair xy, real r=<default>, pen fgpen=<default>, bool erasebg=<default>, pen bgpen=<default>);
void drawVertexBoxX(picture pic=<default>, pair xy, real r=<default>, pen fgpen=<default>, bool erasebg=<default>, pen bgpen=<default>);
void do_overpaint(picture pic, path p, pen bgpen, real halfwidth, real vertexangle);
-void texshipout(string stem, picture pic=<default>, bool xalign=<default>);
pen doublelinepen;
real doublelinespacing;
+void texshipout(string stem, picture pic=<default>, bool xalign=<default>);
+bool XYAlign;
void drawDoubleLine(picture pic=<default>, path p, pen fgpen=<default>, real dlspacing=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, bool erasebg=<default>, pen bgpen=<default>, real vertexangle=<default>, real margin=<default>);
void drawScalar(picture pic=<default>, path p, pen fgpen=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, bool erasebg=<default>, pen bgpen=<default>, real vertexangle=<default>, real margin=<default>);
bool overpaint;
@@ -2201,7 +2130,6 @@
real momarrowoffset;
real momarrowmargin;
real momarrowfactor;
-bool XYAlign;
pen vertexpen;
real vertexsize;
path momArrowPath(path p, align align, position pos, real offset=<default>, real length=<default>);
@@ -2214,9 +2142,9 @@
real bigvertexsize;
real minvertexangle;
void drawMomArrow(picture pic=<default>, path p, align align, position pos=<default>, real offset=<default>, real length=<default>, pen fgpen=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, bool erasebg=<default>, pen bgpen=<default>, real margin=<default>);
+pen ghostpen;
void fmdefaults();
real linemargin;
-pen ghostpen;
void drawFermion(picture pic=<default>, path p, pen fgpen=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, bool erasebg=<default>, pen bgpen=<default>, real vertexangle=<default>, real margin=<default>);
bool currentarrow(picture, path, pen, marginT(path, pen));
bool currentmomarrow(picture, path, pen, marginT(path, pen));
@@ -2255,6 +2183,8 @@
point isotomicconjugate(triangle t, point M);
bool Finite(explicit point z);
real rd(real x, real y, real z);
+real[] bangles(picture pic=<default>, parabola p);
+real[][] bangles(picture pic=<default>, hyperbola h);
point circumcenter(point A, point B, point C);
point circumcenter(triangle t);
circle circumcircle(point A, point B, point C);
@@ -2290,6 +2220,8 @@
point point(circle c, point M);
point point(circle c, explicit vector v);
bool finite(explicit point p);
+line altitude(vertex V);
+line altitude(side side);
void dot(picture pic=<default>, Label L, explicit point Z, align align=<default>, string format=<default>, pen p=<default>);
real dot(point A, point B);
real dot(point A, explicit pair B);
@@ -2296,6 +2228,10 @@
real dot(explicit pair A, point B);
void dot(picture pic=<default>, Label L, explicit mass M, align align=<default>, string format=<default>, pen p=<default>);
void dot(picture pic=<default>, triangle t, pen p=<default>);
+point isogonalconjugate(triangle t, point M);
+point isogonal(side side, point M);
+line isogonal(vertex V, point M);
+triangle isogonal(triangle t, point M);
real[] realquarticroots(real a, real b, real c, real d, real e);
point origin;
point origin(coordsys R=<default>);
@@ -2329,8 +2265,6 @@
bool byfoci;
transform reflect(line l);
transform reflect(line l1, line l2, bool safe=<default>);
-real[] bangles(picture pic=<default>, parabola p);
-real[][] bangles(picture pic=<default>, hyperbola h);
abscissa relabscissa(real x);
abscissa relabscissa(int x);
abscissa relabscissa(line l, point M);
@@ -2355,12 +2289,6 @@
real perpfactor;
int conicnodesfactor;
int conicnodesnumber(conic co, real angle1, real angle2, bool dir=<default>);
-line altitude(vertex V);
-line altitude(side side);
-point isogonalconjugate(triangle t, point M);
-point isogonal(side side, point M);
-line isogonal(vertex V, point M);
-triangle isogonal(triangle t, point M);
line hline(coordsys R=<default>);
line hline;
int[] tricoef(side side);
@@ -2429,6 +2357,7 @@
triangle intouch(triangle t);
real rf(real x, real y, real z);
bool concurrent(... line[] l);
+point[] standardizecoordsys(coordsys R=<default>, bool warn=<default> ... point[] M);
real inradius(point A, point B, point C);
real inradius(triangle t);
pen addpenline;
@@ -2501,7 +2430,6 @@
real length(explicit point M);
real length(segment s);
int arcnodesnumber(explicit arc a);
-point[] standardizecoordsys(coordsys R=<default>, bool warn=<default> ... point[] M);
int nodesystem;
bool collinear(vector u, vector v);
point centroid(point A, point B, point C);
@@ -2547,6 +2475,7 @@
real arclength(parabola p, real angle1, real angle2);
real arclength(parabola p);
real arclength(arc a);
+bool between(point M, point O, point N);
line reverse(line l);
arc reverse(arc a);
point gergonne(triangle t);
@@ -2585,7 +2514,6 @@
line[] complementary(explicit segment s);
arc complementary(arc a);
point ppoint(arc a, real x);
-bool between(point M, point O, point N);
path fromFocus(conic co, real angle1, real angle2, int n, bool direction);
bool sameside(point M, point N, point O);
bool sameside(point M, point P, line l);
@@ -2602,9 +2530,6 @@
triangle incentral(triangle t);
point arcsubtendedcenter(point A, point B, real angle);
real Infinity;
-segment segment(point A, point B);
-segment segment(line l);
-segment segment(explicit side side);
circle circle(explicit point C, real r);
circle circle(point A, point B);
circle circle(segment s);
@@ -2673,6 +2598,7 @@
mass operator -(mass M1, mass M2);
mass operator -(explicit mass M, real x);
mass operator -(explicit mass M, int x);
+transform xscaleO(real x);
pair operator *(coordsys R, pair p);
path operator *(coordsys R, path g);
coordsys operator *(transform t, coordsys R);
@@ -2710,6 +2636,7 @@
circle operator *(inversion i, circle c);
arc operator *(inversion i, segment s);
path operator *(inversion i, triangle t);
+transform yscaleO(real x);
coordsys operator init();
point operator init();
vector operator init();
@@ -2790,8 +2717,8 @@
arc operator /(explicit arc a, real x);
mass operator /(explicit mass M, real x);
mass operator /(explicit mass M, int x);
+transform scaleO(real x);
real operator ^(point M, explicit circle c);
-transform scaleO(real x);
bool operator ==(coordsys c1, coordsys c2);
bool operator ==(explicit point M, explicit point N);
bool operator ==(explicit vector u, explicit vector v);
@@ -2798,8 +2725,6 @@
bool operator ==(line l1, line l2);
bool operator !=(explicit point M, explicit point N);
bool operator !=(line l1, line l2);
-transform xscaleO(real x);
-transform yscaleO(real x);
line[] operator ^^(line l1, line l2);
line[] operator ^^(line l1, line[] l2);
line[] operator ^^(line[] l2, line l1);
@@ -2833,6 +2758,9 @@
real degrees(line l, coordsys R=<default>);
real degrees(line l1, line l2);
real degrees(arc a);
+segment segment(point A, point B);
+segment segment(line l);
+segment segment(explicit side side);
real linemargin;
real linemargin();
line Oy(coordsys R=<default>);
@@ -2848,6 +2776,9 @@
vector conj(explicit vector u);
hyperbola conj(hyperbola h);
transform vprojection(line l, bool safe=<default>);
+triangle cevian(triangle t, point P);
+point cevian(side side, point P);
+line cevian(vertex V, point P);
parabola parabola(point F, line l);
parabola parabola(point F, point vertex);
parabola parabola(point F, real a, real angle);
@@ -2867,6 +2798,8 @@
transform rotate(explicit point dir);
real EPS;
transform rotateO(real a);
+pair attract(pair m, path g, real fuzz=<default>);
+point attract(point M, path g, real fuzz=<default>);
line perpendicular(point M, line l);
line perpendicular(point M, explicit vector normal);
line perpendicular(point M, explicit pair normal);
@@ -2879,17 +2812,13 @@
void perpendicularmark(picture pic=<default>, point z, explicit pair align, path g, real size=<default>, pen p=<default>, marginT margin(path, pen)=<default>, filltype filltype=<default>);
void perpendicularmark(picture pic=<default>, point z, vector align, path g, real size=<default>, pen p=<default>, marginT margin(path, pen)=<default>, filltype filltype=<default>);
void perpendicularmark(picture pic=<default>, line l1, line l2, real size=<default>, pen p=<default>, int quarter=<default>, marginT margin(path, pen)=<default>, filltype filltype=<default>);
-pair attract(pair m, path g, real fuzz=<default>);
-point attract(point M, path g, real fuzz=<default>);
void Drawline(picture pic=<default>, Label L=<default>, pair P, bool dirP=<default>, pair Q, bool dirQ=<default>, align align=<default>, pen p=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, Label legend=<default>, marker marker=<default>, path pathModifier(path)=<default>);
bool simeq(point A, point B, real fuzz=<default>);
bool simeq(point a, real b, real fuzz=<default>);
-point inverse(real k, point A, point M);
-circle inverse(real k, point A, line l);
-circle inverse(real k, point A, circle c);
-arc inverse(real k, point A, segment s);
-inversion inversion(real k, point C);
-inversion inversion(point C, real k);
+point inverse(inversion i, point P);
+circle inverse(inversion i, line l);
+circle inverse(inversion i, circle c);
+arc inverse(inversion i, segment s);
inversion inversion(circle c1, circle c2, real sgn=<default>);
inversion inversion(circle c1, circle c2, circle c3);
inversion inversion(circle c);
@@ -2915,9 +2844,6 @@
triangle pedal(triangle t, point M);
line pedal(side side, point M);
string massformat(string format=<default>, string s, mass M);
-triangle cevian(triangle t, point P);
-point cevian(side side, point P);
-line cevian(vertex V, point P);
int relativesystem;
void drawline(picture pic=<default>, triangle t, pen p=<default>);
void addMargins(picture pic=<default>, real lmargin=<default>, real bmargin=<default>, real rmargin=<default>, real tmargin=<default>, bool rigid=<default>, bool allObject=<default>);
@@ -2939,127 +2865,6 @@
abscissa curabscissa(parabola p, point M);
abscissa curabscissa(conic co, point M);
abscissa curabscissa(arc a, point M);
-locateT operator init();
-void Straight(flatguide3)(... void(flatguide3)[]);
-void graph(flatguide3)(triple F(real), real, real, int)(void join(flatguide3)(... void(flatguide3)[]));
-void(flatguide3)[] graph(triple F(real), real, real, int)(void join(flatguide3)(... void(flatguide3)[]), bool3 cond(real));
-void graph(flatguide3)(picture pic=<default>, real x(real), real y(real), real z(real), real a, real b, int n=<default>, void join(flatguide3)(... void(flatguide3)[])=<default>);
-void(flatguide3)[] graph(picture pic=<default>, real x(real), real y(real), real z(real), real a, real b, int n=<default>, bool3 cond(real), void join(flatguide3)(... void(flatguide3)[])=<default>);
-void graph(flatguide3)(picture pic=<default>, triple v(real), real a, real b, int n=<default>, void join(flatguide3)(... void(flatguide3)[])=<default>);
-void(flatguide3)[] graph(picture pic=<default>, triple v(real), real a, real b, int n=<default>, bool3 cond(real), void join(flatguide3)(... void(flatguide3)[])=<default>);
-void graph(flatguide3)(picture pic=<default>, triple[] v, void join(flatguide3)(... void(flatguide3)[])=<default>);
-void(flatguide3)[] graph(picture pic=<default>, triple[] v, bool3[] cond, void join(flatguide3)(... void(flatguide3)[])=<default>);
-void graph(flatguide3)(picture pic=<default>, real[] x, real[] y, real[] z, void join(flatguide3)(... void(flatguide3)[])=<default>);
-void(flatguide3)[] graph(picture pic=<default>, real[] x, real[] y, real[] z, bool3[] cond, void join(flatguide3)(... void(flatguide3)[])=<default>);
-void graph(flatguide3)(triple F(path, real), path p, int n=<default>, void join(flatguide3)(... void(flatguide3)[])=<default>);
-void graph(flatguide3)(triple F(pair), path p, int n=<default>, void join(flatguide3)(... void(flatguide3)[])=<default>);
-void graph(flatguide3)(picture pic=<default>, real f(pair), path p, int n=<default>, void join(flatguide3)(... void(flatguide3)[])=<default>);
-void graph(flatguide3)(real f(pair), path p, int n=<default>, real T(pair), void join(flatguide3)(... void(flatguide3)[])=<default>);
-void(flatguide3)[][] lift(real f(real x, real y), guide[][] g, void join(flatguide3)(... void(flatguide3)[])=<default>);
-void(flatguide3)[][] lift(real f(pair z), guide[][] g, void join(flatguide3)(... void(flatguide3)[])=<default>);
-triple polar(real r, real theta, real phi);
-void polargraph(flatguide3)(real r(real, real), real theta(real), real phi(real), int n=<default>, void join(flatguide3)(... void(flatguide3)[])=<default>);
-bool uperiodic(real[][] a);
-bool uperiodic(triple[][] a);
-bool vperiodic(real[][] a);
-bool vperiodic(triple[][] a);
-void OutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)(Label format=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, int N=<default>, int n=<default>, real Step=<default>, real step=<default>, bool begin=<default>, bool end=<default>, tickvalues modify(tickvalues)=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>);
-void OutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)(Label format=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, real[] Ticks, real[] ticks=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>);
-void OutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>);
-void axis(picture pic=<default>, Label L=<default>, path3 g, path3 g2=<default>, pen p=<default>, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>), ticklocate locate, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>, int[] divisor=<default>, bool above=<default>, bool opposite=<default>);
-void Bounds(picture, axisT)(int type=<default>, int type2=<default>, triple align=<default>, bool extend=<default>);
-void Bounds(picture, axisT);
-void xaxis3At(picture pic=<default>, Label L=<default>, void axis(picture, axisT), real xmin=<default>, real xmax=<default>, pen p=<default>, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)=<default>, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>, bool above=<default>, bool opposite=<default>, bool opposite2=<default>, bool primary=<default>);
-void yaxis3At(picture pic=<default>, Label L=<default>, void axis(picture, axisT), real ymin=<default>, real ymax=<default>, pen p=<default>, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)=<default>, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>, bool above=<default>, bool opposite=<default>, bool opposite2=<default>, bool primary=<default>);
-void zaxis3At(picture pic=<default>, Label L=<default>, void axis(picture, axisT), real zmin=<default>, real zmax=<default>, pen p=<default>, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)=<default>, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>, bool above=<default>, bool opposite=<default>, bool opposite2=<default>, bool primary=<default>);
-void xaxis3(picture pic=<default>, Label L=<default>, void axis(picture, axisT)=<default>, real xmin=<default>, real xmax=<default>, pen p=<default>, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)=<default>, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>, bool above=<default>);
-void yaxis3(picture pic=<default>, Label L=<default>, void axis(picture, axisT)=<default>, real ymin=<default>, real ymax=<default>, pen p=<default>, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)=<default>, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>, bool above=<default>);
-void zaxis3(picture pic=<default>, Label L=<default>, void axis(picture, axisT)=<default>, real zmin=<default>, real zmax=<default>, pen p=<default>, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)=<default>, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>, bool above=<default>);
-void XZZero(picture, axisT)(triple align=<default>, bool extend=<default>);
-void XZZero(picture, axisT);
-void YZZero(picture, axisT)(triple align=<default>, bool extend=<default>);
-void YZZero(picture, axisT);
-surface surface(picture pic=<default>, triple[][] f, bool[][] cond=<default>);
-surface surface(picture pic=<default>, real[][] f, real[] x, real[] y, real[] xsplinetype(real[], real[])=<default>, real[] ysplinetype(real[], real[])=<default>, bool[][] cond=<default>);
-surface surface(picture pic=<default>, real[][] f, pair a, pair b, real[] xsplinetype(real[], real[]), real[] ysplinetype(real[], real[])=<default>, bool[][] cond=<default>);
-surface surface(picture pic=<default>, real[][] f, pair a, pair b, bool[][] cond=<default>);
-surface surface(picture pic=<default>, triple f(pair z), pair a, pair b, int nu=<default>, int nv=<default>, bool cond(pair z)=<default>);
-surface surface(picture pic=<default>, triple f(pair z), real[] u, real[] v, real[](real[], real[])[] usplinetype, real[](real[], real[])[] vsplinetype=<default>, bool cond(pair z)=<default>);
-surface surface(picture pic=<default>, triple f(pair z), pair a, pair b, int nu=<default>, int nv=<default>, real[](real[], real[])[] usplinetype, real[](real[], real[])[] vsplinetype=<default>, bool cond(pair z)=<default>);
-surface surface(picture pic=<default>, real f(pair z), pair a, pair b, int nx=<default>, int ny=<default>, bool cond(pair z)=<default>);
-surface surface(picture pic=<default>, real f(pair z), pair a, pair b, int nx=<default>, int ny=<default>, real[] xsplinetype(real[], real[]), real[] ysplinetype(real[], real[])=<default>, bool cond(pair z)=<default>);
-void XYEquals(picture, axisT)(real x, real y, triple align=<default>, bool extend=<default>);
-triple Dir(real)(triple dir);
-void draw(picture pic=<default>, Label[] L=<default>, void(flatguide3)[][] g, pen[] p, light light=<default>, string name=<default>, render render=<default>, interaction interaction=<default>);
-void draw(picture pic=<default>, Label[] L=<default>, void(flatguide3)[][] g, pen p=<default>, light light=<default>, string name=<default>, render render=<default>, interaction interaction=<default>);
-void Ticks3(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)(int sign, Label F=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, real[] Ticks=<default>, real[] ticks=<default>, int N=<default>, bool begin=<default>, bool end=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>);
-void Ticks3(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)(int sign, Label F=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, int N, int n=<default>, real Step=<default>, real step=<default>, bool begin=<default>, bool end=<default>, tickvalues modify(tickvalues)=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>);
-real maxlength(triple f(pair z), pair a, pair b, int nu, int nv);
-void drawtick(picture pic, real[][] T, path3 g, path3 g2, ticklocate locate, real val, real Size, int sign, pen p, bool extend);
-triple tickMin3(picture pic);
-triple tickMax3(picture pic);
-triple Scale(picture pic=<default>, triple v);
-triple[][] Scale(picture pic=<default>, triple[][] P);
-real ScaleX(picture pic=<default>, real x);
-real ScaleY(picture pic=<default>, real y);
-real ScaleZ(picture pic=<default>, real z);
-real[][] ScaleZ(picture pic=<default>, real[][] P);
-picture vectorfield(path3 vector(pair v), triple f(pair z), pair a, pair b, int nu=<default>, int nv=<default>, bool truesize=<default>, real maxlength=<default>, bool cond(pair z)=<default>, pen p=<default>, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>, string name=<default>, render render=<default>);
-path3 Circle(triple c, real r, triple normal=<default>, int n=<default>);
-void InTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)(Label format=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, int N=<default>, int n=<default>, real Step=<default>, real step=<default>, bool begin=<default>, bool end=<default>, tickvalues modify(tickvalues)=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>);
-void InTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)(Label format=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, real[] Ticks, real[] ticks=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>);
-void InTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>);
-void Spline(flatguide3)(... void(flatguide3)[]);
-void InOutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)(Label format=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, int N=<default>, int n=<default>, real Step=<default>, real step=<default>, bool begin=<default>, bool end=<default>, tickvalues modify(tickvalues)=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>);
-void InOutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)(Label format=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, real[] Ticks, real[] ticks=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>);
-void InOutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>);
-void axes3(picture pic=<default>, Label xlabel=<default>, Label ylabel=<default>, Label zlabel=<default>, bool extend=<default>, triple min=<default>, triple max=<default>, pen p=<default>, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>);
-void label(picture pic, Label L, triple v, real x, align align, string format, pen p);
-void labelx(picture pic=<default>, Label L=<default>, triple v, align align=<default>, string format=<default>, pen p=<default>);
-void labelx3(picture pic=<default>, Label L=<default>, real x, align align=<default>, string format=<default>, pen p=<default>);
-void labeltick(picture pic, real[][] T, path3 g, ticklocate locate, real val, int sign, real Size, string ticklabel(real), Label F, real norm=<default>);
-void labelaxis(picture pic, real[][] T, Label L, path3 g, ticklocate locate=<default>, int sign=<default>, bool ticklabels=<default>);
-void labely(picture pic=<default>, Label L=<default>, triple v, align align=<default>, string format=<default>, pen p=<default>);
-void labely3(picture pic=<default>, Label L=<default>, real y, align align=<default>, string format=<default>, pen p=<default>);
-void labelz(picture pic=<default>, Label L=<default>, triple v, align align=<default>, string format=<default>, pen p=<default>);
-void labelz3(picture pic=<default>, Label L=<default>, real z, align align=<default>, string format=<default>, pen p=<default>);
-void autoscale3(picture pic=<default>, void axis(picture, axisT));
-void xtick(picture pic=<default>, triple v, triple dir=<default>, real size=<default>, pen p=<default>);
-void xtick(picture pic=<default>, Label L, triple v, triple dir=<default>, string format=<default>, real size=<default>, pen p=<default>);
-void xtick3(picture pic=<default>, real x, triple dir=<default>, real size=<default>, pen p=<default>);
-void xtick3(picture pic=<default>, Label L, real x, triple dir=<default>, string format=<default>, real size=<default>, pen p=<default>);
-void ytick(picture pic=<default>, triple v, triple dir=<default>, real size=<default>, pen p=<default>);
-void ytick(picture pic=<default>, Label L, triple v, triple dir=<default>, string format=<default>, real size=<default>, pen p=<default>);
-void ytick3(picture pic=<default>, real y, triple dir=<default>, real size=<default>, pen p=<default>);
-void ytick3(picture pic=<default>, Label L, real y, triple dir=<default>, string format=<default>, real size=<default>, pen p=<default>);
-void ztick(picture pic=<default>, triple v, triple dir=<default>, real size=<default>, pen p=<default>);
-void ztick(picture pic=<default>, Label L, triple v, triple dir=<default>, string format=<default>, real size=<default>, pen p=<default>);
-void ztick3(picture pic=<default>, real z, triple dir=<default>, real size=<default>, pen p=<default>);
-void ztick3(picture pic=<default>, Label L, real z, triple dir=<default>, string format=<default>, real size=<default>, pen p=<default>);
-triple defaultdir(triple X, triple Y, triple Z, bool opposite=<default>, projection P);
-real xtrans(real[][] t, real x);
-real ytrans(real[][] t, real y);
-real ztrans(real[][] t, real z);
-ticklocate ticklocate(real a, real b, autoscaleT S=<default>, real tickmin=<default>, real tickmax=<default>, real time(real)=<default>, triple dir(real));
-triple ticklabelshift(triple align, pen p=<default>);
-path3 Arc(triple c, triple v1, triple v2, triple normal=<default>, bool direction=<default>, int n=<default>);
-path3 Arc(triple c, real r, real theta1, real phi1, real theta2, real phi2, triple normal=<default>, bool direction, int n=<default>);
-path3 Arc(triple c, real r, real theta1, real phi1, real theta2, real phi2, triple normal=<default>, int n=<default>);
-void limits(picture pic=<default>, triple min, triple max);
-void XZEquals(picture, axisT)(real x, real z, triple align=<default>, bool extend=<default>);
-void YZEquals(picture, axisT)(real y, real z, triple align=<default>, bool extend=<default>);
-void XYZero(picture, axisT)(triple align=<default>, bool extend=<default>);
-void XYZero(picture, axisT);
-void zlimits(picture pic=<default>, real min=<default>, real max=<default>, bool crop=<default>);
-void tick(picture pic=<default>, triple v, triple dir, real size=<default>, pen p=<default>);
-void tick(picture pic=<default>, Label L, real value, triple v, triple dir, string format=<default>, real size=<default>, pen p=<default>);
-surface bispline(real[][] z, real[][] p, real[][] q, real[][] r, real[] x, real[] y, bool[][] cond=<default>);
-real[][][] bispline(real[][] f, real[] x, real[] y, real[] xsplinetype(real[], real[])=<default>, real[] ysplinetype(real[], real[])=<default>, bool[][] cond=<default>);
-real[][][] bispline0(real[][] z, real[][] p, real[][] q, real[][] r, real[] x, real[] y, bool[][] cond=<default>);
-path3[] segment(triple[] v, bool[] cond, void join(flatguide3)(... void(flatguide3)[])=<default>);
-real[] uniform(real T(real x), real Tinv(real x), real a, real b, int n);
-void NoTicks3(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)();
-void NoTicks3(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>);
string DefaultFormat(real);
string DefaultLogFormat(real)(int base);
string DefaultLogFormat(real);
@@ -3103,6 +2908,9 @@
string OmitFormat(real)(string s=<default> ... real[] x);
guide Straight(... guide[]);
int Min;
+tickvalues OmitTickIntervals(tickvalues)(real[] a, real[] b);
+tickvalues OmitTickInterval(tickvalues)(real a, real b);
+tickvalues OmitTick(tickvalues)(... real[] x);
string trailingzero;
void label(picture pic, Label L, pair z, real x, align align, string format, pen p);
void labelx(picture pic=<default>, Label L=<default>, explicit pair z, align align=<default>, string format=<default>, pen p=<default>);
@@ -3111,11 +2919,11 @@
path Arc(pair c, real r, real angle1, real angle2, bool direction, int n=<default>);
path Arc(pair c, real r, real angle1, real angle2, int n=<default>);
path Arc(pair c, explicit pair z1, explicit pair z2, bool direction=<default>, int n=<default>);
-pair labeltick(frame d, transform T, path g, ticklocate locate, real val, pair side, int sign, real Size, string ticklabel(real), Label F, real norm=<default>);
-void labelaxis(frame f, transform T, Label L, path g, ticklocate locate=<default>, int sign=<default>, bool ticklabels=<default>);
void labely(picture pic=<default>, Label L=<default>, explicit pair z, align align=<default>, string format=<default>, pen p=<default>);
void labely(picture pic=<default>, Label L=<default>, real y, align align=<default>, string format=<default>, pen p=<default>);
void labely(picture pic=<default>, Label L, string format=<default>, explicit pen p=<default>);
+pair labeltick(frame d, transform T, path g, ticklocate locate, real val, pair side, int sign, real Size, string ticklabel(real), Label F, real norm=<default>);
+void labelaxis(frame f, transform T, Label L, path g, ticklocate locate=<default>, int sign=<default>, bool ticklabels=<default>);
void xtick(picture pic=<default>, explicit pair z, pair dir=<default>, real size=<default>, pen p=<default>);
void xtick(picture pic=<default>, real x, pair dir=<default>, real size=<default>, pen p=<default>);
void xtick(picture pic=<default>, Label L, explicit pair z, pair dir=<default>, string format=<default>, real size=<default>, pen p=<default>);
@@ -3133,17 +2941,20 @@
pair tickMin(picture pic);
pair tickMax(picture pic);
string autoformat(string format=<default>, real norm ... real[] a);
-tickvalues OmitTickIntervals(tickvalues)(real[] a, real[] b);
-tickvalues OmitTickInterval(tickvalues)(real a, real b);
-tickvalues OmitTick(tickvalues)(... real[] x);
real linear(real)(real S(real x)=<default>, real Min, real Max);
pair polar(real r, real theta);
string Format(real)(string s=<default>);
guide polargraph(picture pic=<default>, real r(real), real a, real b, int n=<default>, guide join(... guide[])=<default>);
guide polargraph(picture pic=<default>, real[] r, real[] theta, guide join(... guide[])=<default>);
+void xaxisAt(picture pic=<default>, Label L=<default>, void axis(picture, axisT), real xmin=<default>, real xmax=<default>, pen p=<default>, void ticks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=<default>)=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, marginT margin(path, pen)=<default>, bool above=<default>, bool opposite=<default>);
+void yaxisAt(picture pic=<default>, Label L=<default>, void axis(picture, axisT), real ymin=<default>, real ymax=<default>, pen p=<default>, void ticks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=<default>)=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, marginT margin(path, pen)=<default>, bool above=<default>, bool opposite=<default>);
+void xaxis(picture pic=<default>, Label L=<default>, void axis(picture, axisT)=<default>, real xmin=<default>, real xmax=<default>, pen p=<default>, void ticks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=<default>)=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, marginT margin(path, pen)=<default>, bool above=<default>);
+void yaxis(picture pic=<default>, Label L=<default>, void axis(picture, axisT)=<default>, real ymin=<default>, real ymax=<default>, pen p=<default>, void ticks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=<default>)=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, marginT margin(path, pen)=<default>, bool above=<default>, bool autorotate=<default>);
void LeftTicks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=<default>)(Label format=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, int N=<default>, int n=<default>, real Step=<default>, real step=<default>, bool begin=<default>, bool end=<default>, tickvalues modify(tickvalues)=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>);
void LeftTicks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=<default>)(Label format=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, real[] Ticks, real[] ticks=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>);
void LeftTicks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=<default>);
+tickvalues NoZero(tickvalues);
+string NoZeroFormat(real);
guide Hermite(... guide[])(real[] splinetype(real[], real[]));
guide Hermite(... guide[]);
path Circle(pair c, real r, int n=<default>);
@@ -3162,7 +2973,6 @@
real ScaleX(picture pic=<default>, real x);
real ScaleY(picture pic=<default>, real y);
tickvalues generateticks(int sign, Label F=<default>, string ticklabel(real)=<default>, int N, int n=<default>, real Step=<default>, real step=<default>, real Size=<default>, real size=<default>, transform T, pair side, path g, real limit, pen p, ticklocate locate, int[] divisor, bool opposite);
-path[] segment(pair[] z, bool[] cond, guide join(... guide[])=<default>);
void checkconditionlength(int x, int y);
real xtrans(transform t, real x);
void Top(picture, axisT)(bool extend=<default>);
@@ -3170,7 +2980,6 @@
real ytrans(transform t, real y);
void scale(picture pic=<default>, scaleT x, scaleT y=<default>, scaleT z=<default>);
void scale(picture pic=<default>, bool xautoscale=<default>, bool yautoscale=<default>, bool zautoscale=<default>);
-string NoZeroFormat(real);
int[] divisors(int a, int b);
scientific operator init();
bounds operator init();
@@ -3178,14 +2987,10 @@
locateT operator init();
tickvalues operator init();
axisT operator init();
-tickvalues NoZero(tickvalues);
int Both;
void axes(picture pic=<default>, Label xlabel=<default>, Label ylabel=<default>, bool extend=<default>, pair min=<default>, pair max=<default>, pen p=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, marginT margin(path, pen)=<default>, bool above=<default>);
string signedtrailingzero;
-void xaxisAt(picture pic=<default>, Label L=<default>, void axis(picture, axisT), real xmin=<default>, real xmax=<default>, pen p=<default>, void ticks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=<default>)=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, marginT margin(path, pen)=<default>, bool above=<default>, bool opposite=<default>);
-void yaxisAt(picture pic=<default>, Label L=<default>, void axis(picture, axisT), real ymin=<default>, real ymax=<default>, pen p=<default>, void ticks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=<default>)=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, marginT margin(path, pen)=<default>, bool above=<default>, bool opposite=<default>);
-void xaxis(picture pic=<default>, Label L=<default>, void axis(picture, axisT)=<default>, real xmin=<default>, real xmax=<default>, pen p=<default>, void ticks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=<default>)=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, marginT margin(path, pen)=<default>, bool above=<default>);
-void yaxis(picture pic=<default>, Label L=<default>, void axis(picture, axisT)=<default>, real ymin=<default>, real ymax=<default>, pen p=<default>, void ticks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=<default>)=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, marginT margin(path, pen)=<default>, bool above=<default>, bool autorotate=<default>);
+path[] segment(pair[] z, bool[] cond, guide join(... guide[])=<default>);
ticklocate ticklocate(real a, real b, autoscaleT S=<default>, real tickmin=<default>, real tickmax=<default>, real time(real)=<default>, pair dir(real)=<default>);
pair ticklabelshift(pair align, pen p=<default>);
pair zero(real);
@@ -3219,6 +3024,127 @@
guide Spline(... guide[]);
void LeftRight(picture, axisT)(bool extend=<default>);
void LeftRight(picture, axisT);
+path3[] segment(triple[] v, bool[] cond, void join(flatguide3)(... void(flatguide3)[])=<default>);
+locateT operator init();
+void Straight(flatguide3)(... void(flatguide3)[]);
+void graph(flatguide3)(triple F(real), real, real, int)(void join(flatguide3)(... void(flatguide3)[]));
+void(flatguide3)[] graph(triple F(real), real, real, int)(void join(flatguide3)(... void(flatguide3)[]), bool3 cond(real));
+void graph(flatguide3)(picture pic=<default>, real x(real), real y(real), real z(real), real a, real b, int n=<default>, void join(flatguide3)(... void(flatguide3)[])=<default>);
+void(flatguide3)[] graph(picture pic=<default>, real x(real), real y(real), real z(real), real a, real b, int n=<default>, bool3 cond(real), void join(flatguide3)(... void(flatguide3)[])=<default>);
+void graph(flatguide3)(picture pic=<default>, triple v(real), real a, real b, int n=<default>, void join(flatguide3)(... void(flatguide3)[])=<default>);
+void(flatguide3)[] graph(picture pic=<default>, triple v(real), real a, real b, int n=<default>, bool3 cond(real), void join(flatguide3)(... void(flatguide3)[])=<default>);
+void graph(flatguide3)(picture pic=<default>, triple[] v, void join(flatguide3)(... void(flatguide3)[])=<default>);
+void(flatguide3)[] graph(picture pic=<default>, triple[] v, bool3[] cond, void join(flatguide3)(... void(flatguide3)[])=<default>);
+void graph(flatguide3)(picture pic=<default>, real[] x, real[] y, real[] z, void join(flatguide3)(... void(flatguide3)[])=<default>);
+void(flatguide3)[] graph(picture pic=<default>, real[] x, real[] y, real[] z, bool3[] cond, void join(flatguide3)(... void(flatguide3)[])=<default>);
+void graph(flatguide3)(triple F(path, real), path p, int n=<default>, void join(flatguide3)(... void(flatguide3)[])=<default>);
+void graph(flatguide3)(triple F(pair), path p, int n=<default>, void join(flatguide3)(... void(flatguide3)[])=<default>);
+void graph(flatguide3)(picture pic=<default>, real f(pair), path p, int n=<default>, void join(flatguide3)(... void(flatguide3)[])=<default>);
+void graph(flatguide3)(real f(pair), path p, int n=<default>, real T(pair), void join(flatguide3)(... void(flatguide3)[])=<default>);
+void(flatguide3)[][] lift(real f(real x, real y), guide[][] g, void join(flatguide3)(... void(flatguide3)[])=<default>);
+void(flatguide3)[][] lift(real f(pair z), guide[][] g, void join(flatguide3)(... void(flatguide3)[])=<default>);
+triple polar(real r, real theta, real phi);
+void polargraph(flatguide3)(real r(real, real), real theta(real), real phi(real), int n=<default>, void join(flatguide3)(... void(flatguide3)[])=<default>);
+bool uperiodic(real[][] a);
+bool uperiodic(triple[][] a);
+bool vperiodic(real[][] a);
+bool vperiodic(triple[][] a);
+void OutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)(Label format=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, int N=<default>, int n=<default>, real Step=<default>, real step=<default>, bool begin=<default>, bool end=<default>, tickvalues modify(tickvalues)=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>);
+void OutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)(Label format=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, real[] Ticks, real[] ticks=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>);
+void OutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>);
+void axis(picture pic=<default>, Label L=<default>, path3 g, path3 g2=<default>, pen p=<default>, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>), ticklocate locate, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>, int[] divisor=<default>, bool above=<default>, bool opposite=<default>);
+void Bounds(picture, axisT)(int type=<default>, int type2=<default>, triple align=<default>, bool extend=<default>);
+void Bounds(picture, axisT);
+void xaxis3At(picture pic=<default>, Label L=<default>, void axis(picture, axisT), real xmin=<default>, real xmax=<default>, pen p=<default>, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)=<default>, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>, bool above=<default>, bool opposite=<default>, bool opposite2=<default>, bool primary=<default>);
+void yaxis3At(picture pic=<default>, Label L=<default>, void axis(picture, axisT), real ymin=<default>, real ymax=<default>, pen p=<default>, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)=<default>, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>, bool above=<default>, bool opposite=<default>, bool opposite2=<default>, bool primary=<default>);
+void zaxis3At(picture pic=<default>, Label L=<default>, void axis(picture, axisT), real zmin=<default>, real zmax=<default>, pen p=<default>, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)=<default>, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>, bool above=<default>, bool opposite=<default>, bool opposite2=<default>, bool primary=<default>);
+void xaxis3(picture pic=<default>, Label L=<default>, void axis(picture, axisT)=<default>, real xmin=<default>, real xmax=<default>, pen p=<default>, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)=<default>, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>, bool above=<default>);
+void yaxis3(picture pic=<default>, Label L=<default>, void axis(picture, axisT)=<default>, real ymin=<default>, real ymax=<default>, pen p=<default>, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)=<default>, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>, bool above=<default>);
+void zaxis3(picture pic=<default>, Label L=<default>, void axis(picture, axisT)=<default>, real zmin=<default>, real zmax=<default>, pen p=<default>, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)=<default>, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>, bool above=<default>);
+void XZZero(picture, axisT)(triple align=<default>, bool extend=<default>);
+void XZZero(picture, axisT);
+void YZZero(picture, axisT)(triple align=<default>, bool extend=<default>);
+void YZZero(picture, axisT);
+surface surface(picture pic=<default>, triple[][] f, bool[][] cond=<default>);
+surface surface(picture pic=<default>, real[][] f, real[] x, real[] y, real[] xsplinetype(real[], real[])=<default>, real[] ysplinetype(real[], real[])=<default>, bool[][] cond=<default>);
+surface surface(picture pic=<default>, real[][] f, pair a, pair b, real[] xsplinetype(real[], real[]), real[] ysplinetype(real[], real[])=<default>, bool[][] cond=<default>);
+surface surface(picture pic=<default>, real[][] f, pair a, pair b, bool[][] cond=<default>);
+surface surface(picture pic=<default>, triple f(pair z), pair a, pair b, int nu=<default>, int nv=<default>, bool cond(pair z)=<default>);
+surface surface(picture pic=<default>, triple f(pair z), real[] u, real[] v, real[](real[], real[])[] usplinetype, real[](real[], real[])[] vsplinetype=<default>, bool cond(pair z)=<default>);
+surface surface(picture pic=<default>, triple f(pair z), pair a, pair b, int nu=<default>, int nv=<default>, real[](real[], real[])[] usplinetype, real[](real[], real[])[] vsplinetype=<default>, bool cond(pair z)=<default>);
+surface surface(picture pic=<default>, real f(pair z), pair a, pair b, int nx=<default>, int ny=<default>, bool cond(pair z)=<default>);
+surface surface(picture pic=<default>, real f(pair z), pair a, pair b, int nx=<default>, int ny=<default>, real[] xsplinetype(real[], real[]), real[] ysplinetype(real[], real[])=<default>, bool cond(pair z)=<default>);
+void XYEquals(picture, axisT)(real x, real y, triple align=<default>, bool extend=<default>);
+triple Dir(real)(triple dir);
+void draw(picture pic=<default>, Label[] L=<default>, void(flatguide3)[][] g, pen[] p, light light=<default>, string name=<default>, render render=<default>, interaction interaction=<default>);
+void draw(picture pic=<default>, Label[] L=<default>, void(flatguide3)[][] g, pen p=<default>, light light=<default>, string name=<default>, render render=<default>, interaction interaction=<default>);
+void Ticks3(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)(int sign, Label F=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, real[] Ticks=<default>, real[] ticks=<default>, int N=<default>, bool begin=<default>, bool end=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>);
+void Ticks3(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)(int sign, Label F=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, int N, int n=<default>, real Step=<default>, real step=<default>, bool begin=<default>, bool end=<default>, tickvalues modify(tickvalues)=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>);
+real maxlength(triple f(pair z), pair a, pair b, int nu, int nv);
+void drawtick(picture pic, real[][] T, path3 g, path3 g2, ticklocate locate, real val, real Size, int sign, pen p, bool extend);
+triple tickMin3(picture pic);
+triple tickMax3(picture pic);
+triple Scale(picture pic=<default>, triple v);
+triple[][] Scale(picture pic=<default>, triple[][] P);
+real ScaleX(picture pic=<default>, real x);
+real ScaleY(picture pic=<default>, real y);
+real ScaleZ(picture pic=<default>, real z);
+real[][] ScaleZ(picture pic=<default>, real[][] P);
+picture vectorfield(path3 vector(pair v), triple f(pair z), pair a, pair b, int nu=<default>, int nv=<default>, bool truesize=<default>, real maxlength=<default>, bool cond(pair z)=<default>, pen p=<default>, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>, string name=<default>, render render=<default>);
+path3 Circle(triple c, real r, triple normal=<default>, int n=<default>);
+void InTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)(Label format=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, int N=<default>, int n=<default>, real Step=<default>, real step=<default>, bool begin=<default>, bool end=<default>, tickvalues modify(tickvalues)=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>);
+void InTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)(Label format=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, real[] Ticks, real[] ticks=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>);
+void InTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>);
+void Spline(flatguide3)(... void(flatguide3)[]);
+void InOutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)(Label format=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, int N=<default>, int n=<default>, real Step=<default>, real step=<default>, bool begin=<default>, bool end=<default>, tickvalues modify(tickvalues)=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>);
+void InOutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)(Label format=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, real[] Ticks, real[] ticks=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>);
+void InOutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>);
+void axes3(picture pic=<default>, Label xlabel=<default>, Label ylabel=<default>, Label zlabel=<default>, bool extend=<default>, triple min=<default>, triple max=<default>, pen p=<default>, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>);
+void label(picture pic, Label L, triple v, real x, align align, string format, pen p);
+void labelx(picture pic=<default>, Label L=<default>, triple v, align align=<default>, string format=<default>, pen p=<default>);
+void labely(picture pic=<default>, Label L=<default>, triple v, align align=<default>, string format=<default>, pen p=<default>);
+void labeltick(picture pic, real[][] T, path3 g, ticklocate locate, real val, int sign, real Size, string ticklabel(real), Label F, real norm=<default>);
+void labelaxis(picture pic, real[][] T, Label L, path3 g, ticklocate locate=<default>, int sign=<default>, bool ticklabels=<default>);
+void labelx3(picture pic=<default>, Label L=<default>, real x, align align=<default>, string format=<default>, pen p=<default>);
+void labely3(picture pic=<default>, Label L=<default>, real y, align align=<default>, string format=<default>, pen p=<default>);
+void labelz(picture pic=<default>, Label L=<default>, triple v, align align=<default>, string format=<default>, pen p=<default>);
+void labelz3(picture pic=<default>, Label L=<default>, real z, align align=<default>, string format=<default>, pen p=<default>);
+void autoscale3(picture pic=<default>, void axis(picture, axisT));
+void xtick(picture pic=<default>, triple v, triple dir=<default>, real size=<default>, pen p=<default>);
+void xtick(picture pic=<default>, Label L, triple v, triple dir=<default>, string format=<default>, real size=<default>, pen p=<default>);
+void ytick(picture pic=<default>, triple v, triple dir=<default>, real size=<default>, pen p=<default>);
+void ytick(picture pic=<default>, Label L, triple v, triple dir=<default>, string format=<default>, real size=<default>, pen p=<default>);
+void xtick3(picture pic=<default>, real x, triple dir=<default>, real size=<default>, pen p=<default>);
+void xtick3(picture pic=<default>, Label L, real x, triple dir=<default>, string format=<default>, real size=<default>, pen p=<default>);
+void ytick3(picture pic=<default>, real y, triple dir=<default>, real size=<default>, pen p=<default>);
+void ytick3(picture pic=<default>, Label L, real y, triple dir=<default>, string format=<default>, real size=<default>, pen p=<default>);
+void ztick(picture pic=<default>, triple v, triple dir=<default>, real size=<default>, pen p=<default>);
+void ztick(picture pic=<default>, Label L, triple v, triple dir=<default>, string format=<default>, real size=<default>, pen p=<default>);
+void ztick3(picture pic=<default>, real z, triple dir=<default>, real size=<default>, pen p=<default>);
+void ztick3(picture pic=<default>, Label L, real z, triple dir=<default>, string format=<default>, real size=<default>, pen p=<default>);
+triple defaultdir(triple X, triple Y, triple Z, bool opposite=<default>, projection P);
+real xtrans(real[][] t, real x);
+real ytrans(real[][] t, real y);
+real ztrans(real[][] t, real z);
+ticklocate ticklocate(real a, real b, autoscaleT S=<default>, real tickmin=<default>, real tickmax=<default>, real time(real)=<default>, triple dir(real));
+triple ticklabelshift(triple align, pen p=<default>);
+path3 Arc(triple c, triple v1, triple v2, triple normal=<default>, bool direction=<default>, int n=<default>);
+path3 Arc(triple c, real r, real theta1, real phi1, real theta2, real phi2, triple normal=<default>, bool direction, int n=<default>);
+path3 Arc(triple c, real r, real theta1, real phi1, real theta2, real phi2, triple normal=<default>, int n=<default>);
+void limits(picture pic=<default>, triple min, triple max);
+void XZEquals(picture, axisT)(real x, real z, triple align=<default>, bool extend=<default>);
+void YZEquals(picture, axisT)(real y, real z, triple align=<default>, bool extend=<default>);
+void XYZero(picture, axisT)(triple align=<default>, bool extend=<default>);
+void XYZero(picture, axisT);
+void zlimits(picture pic=<default>, real min=<default>, real max=<default>, bool crop=<default>);
+void tick(picture pic=<default>, triple v, triple dir, real size=<default>, pen p=<default>);
+void tick(picture pic=<default>, Label L, real value, triple v, triple dir, string format=<default>, real size=<default>, pen p=<default>);
+surface bispline(real[][] z, real[][] p, real[][] q, real[][] r, real[] x, real[] y, bool[][] cond=<default>);
+real[][][] bispline(real[][] f, real[] x, real[] y, real[] xsplinetype(real[], real[])=<default>, real[] ysplinetype(real[], real[])=<default>, bool[][] cond=<default>);
+real[][][] bispline0(real[][] z, real[][] p, real[][] q, real[][] r, real[] x, real[] y, bool[][] cond=<default>);
+real[] uniform(real T(real x), real Tinv(real x), real a, real b, int n);
+void NoTicks3(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)();
+void NoTicks3(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>);
bool Crop;
int ngraph;
real epsilon;
@@ -3226,8 +3152,8 @@
real Ticksize;
bool NoCrop;
real ticksize;
+int nCircle;
int nmesh;
-int nCircle;
real ylabelwidth;
real axislabelfactor;
real[] clamped(real[], real[])(real slopea, real slopeb);
@@ -3253,9 +3179,9 @@
triple X(picture pic);
triple Y(picture pic);
triple Z(picture pic);
-position middle;
grid3(picture pic)[] XYXgrid(position pos=<default>);
grid3(picture pic)[] XYXgrid;
+position middle;
grid3(picture pic)[] XY_XZgrid(position posa=<default>, position posb=<default>);
grid3(picture pic)[] XY_XZgrid;
grid3(picture pic)[] ZX_ZYgrid(position posa=<default>, position posb=<default>);
@@ -3291,12 +3217,12 @@
grid3(picture pic)[][] XYZgrid;
grid3(picture pic)[] ZYZgrid(position pos=<default>);
grid3(picture pic)[] ZYZgrid;
-grid3(picture pic)[] YZYgrid(position pos=<default>);
-grid3(picture pic)[] YZYgrid;
grid3 XZgrid(picture pic)(position pos=<default>);
grid3 XZgrid(picture pic);
grid3 YZgrid(picture pic)(position pos=<default>);
grid3 YZgrid(picture pic);
+grid3(picture pic)[] YZYgrid(position pos=<default>);
+grid3(picture pic)[] YZYgrid;
real fspline(real)(real[] x, real[] y, real[] splinetype(real[], real[])=<default>);
real pwhermite(real)(real[] x, real[] y, real[] dy);
horner diffdiv(real[] x, real[] y);
@@ -3303,16 +3229,16 @@
horner hdiffdiv(real[] x, real[] y, real[] dy);
horner operator init();
real fhorner(real)(horner sh);
+void labelpath(frame f, Label L, path g, string justify=<default>, pen p=<default>);
+void labelpath(picture pic=<default>, Label L, path g, string justify=<default>, pen p=<default>);
+string LeftJustified;
+string Centered;
+string RightJustified;
surface labelpath(string s, path3 p, real angle=<default>, triple optional=<default>);
triple[] firstframe(path3 p, triple optional=<default>);
triple[] nextframe(path3 p, real reltimestart, triple[] start, real reltimeend, int subdiv=<default>);
real eps;
triple nextnormal(triple p, triple q);
-void labelpath(frame f, Label L, path g, string justify=<default>, pen p=<default>);
-void labelpath(picture pic=<default>, Label L, path g, string justify=<default>, pen p=<default>);
-string LeftJustified;
-string Centered;
-string RightJustified;
string[] lm_infmsg;
void lm_qrfac(int m, int n, real[] a, bool pivot, int[] ipvt, real[] rdiag, real[] acnorm, real[] wa);
void lm_qrsolv(int n, real[] r, int ldr, int[] ipvt, real[] diag, real[] qtb, real[] x, real[] sdiag, real[] wa);
@@ -3342,7 +3268,6 @@
real LM_DWARF;
void lm_print_quiet(int n_par, real[] par, int m_dat, real[] fvec, lm_data_type data, int iflag, int iter, int nfev);
void lm_print_default(int n_par, real[] par, int m_dat, real[] fvec, lm_data_type data, int iflag, int iter, int nfev);
-void mapTemplate(string name, string key, string value, string default);
real barmarksize(pen p=<default>);
real barmarksizefactor;
marker CrossIntervalMarker(int i=<default>, int n=<default>, real size=<default>, real space=<default>, real angle=<default>, pair offset=<default>, bool rotated=<default>, pen p=<default>, frame uniform=<default>, bool above=<default>);
@@ -3404,12 +3329,12 @@
pair[][] fft(pair[][] a, int sign=<default>);
real slope(path g, real x, int n=<default>, real fuzz=<default>);
real slope(path g, explicit pair z, int n=<default>, real fuzz=<default>);
-int[][] segmentlimits(bool[] b);
-int[][] segment(bool[] b);
picture grid(int Nx, int Ny, pen p=<default>);
rootfinder_settings operator init();
real frac(real x);
real asec(real x);
+int[][] segmentlimits(bool[] b);
+int[][] segment(bool[] b);
real time(path g, real x, int n=<default>, real fuzz=<default>);
real time(path g, explicit pair z, int n=<default>, real fuzz=<default>);
real[] leastsquares(real[][] A, real[] b, bool warn=<default>);
@@ -3434,11 +3359,11 @@
real error(real error, real initial, real lowOrder, real norm, real diff);
RKTableau RK5;
real stepfactor;
+solution integrate(real y, real c=<default>, real f(real t, real y), real a, real b=<default>, real h=<default>, int n=<default>, bool dynamic=<default>, real tolmin=<default>, real tolmax=<default>, real dtmin=<default>, real dtmax=<default>, RKTableau tableau, bool verbose=<default>);
+Solution integrate(real[] y, real[] f(real t, real[] y), real a, real b=<default>, real h=<default>, int n=<default>, bool dynamic=<default>, real tolmin=<default>, real tolmax=<default>, real dtmin=<default>, real dtmax=<default>, RKTableau tableau, bool verbose=<default>);
RKTableau RK4;
real[] newton(int iterations=<default>, real[] f(real[]), real[][] jacobian(real[]), real[] t);
real phi1(real x);
-solution integrate(real y, real c=<default>, real f(real t, real y), real a, real b=<default>, real h=<default>, int n=<default>, bool dynamic=<default>, real tolmin=<default>, real tolmax=<default>, real dtmin=<default>, real dtmax=<default>, RKTableau tableau, bool verbose=<default>);
-Solution integrate(real[] y, real[] f(real t, real[] y), real a, real b=<default>, real h=<default>, int n=<default>, bool dynamic=<default>, real tolmin=<default>, real tolmax=<default>, real dtmin=<default>, real dtmax=<default>, RKTableau tableau, bool verbose=<default>);
RKTableau RK3;
void expfactors(real x, coefficients a);
real phi2(real x);
@@ -3464,7 +3389,6 @@
RKTableau PC;
RKTableau E_RK3BS;
pen[] Grayscale(int NColors=<default>);
-bounds Range(picture pic, real min, real max)(bool automin=<default>, real min=<default>, bool automax=<default>, real max=<default>);
pen[] Wheel(int NColors=<default>);
void image(frame f, real[][] data, pair initial, pair final, pen[] palette, bool transpose=<default>, transform t=<default>, bool copy=<default>, bool antialias=<default>);
void image(frame f, pen[][] data, pair initial, pair final, bool transpose=<default>, transform t=<default>, bool copy=<default>, bool antialias=<default>);
@@ -3486,6 +3410,7 @@
pen[] Gradient(int NColors=<default> ... pen[] p);
pen[] quantize(pen[] Palette, int n);
void NoTicks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=<default>)(int sign=<default>);
+bounds Range(picture pic, real min, real max)(bool automin=<default>, real min=<default>, bool automax=<default>, real max=<default>);
bounds Full(picture pic, real min, real max);
void PaletteTicks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=<default>)(int sign=<default>)(Label format=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, int N=<default>, int n=<default>, real Step=<default>, real step=<default>, pen pTick=<default>, pen ptick=<default>);
void PaletteTicks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=<default>)(int sign=<default>);
@@ -3555,13 +3480,14 @@
void simplexWrite(rational[][] E, int[] Bindices, int, int);
path roundedpath(path A, real R, real S=<default>);
simplex operator init();
+void nextpage(pen p=<default>);
void display(frame[] f, real margin=<default>, pair align=<default>, pen p=<default>, pen figuremattpen=<default>, bool final=<default>);
void display(frame f, real margin=<default>, pair align=<default>, pen p=<default>, pen figuremattpen=<default>, bool final=<default>);
void display(string[] s, real margin=<default>, string[] captions=<default>, string caption=<default>, pair align=<default>, pen p=<default>, pen figuremattpen=<default>, bool final=<default>);
void display(string s, string caption=<default>, pair align=<default>, pen p=<default>, pen figuremattpen=<default>, bool final=<default>);
void multifigure(string[] slist, string options=<default>, string caption=<default>, pair align=<default>, pen p=<default>, pen figuremattpen=<default>, bool step=<default>);
+void filecode(bool center=<default>, string s, pen p=<default>, real indent=<default>, real skip=<default>, filltype filltype=<default>);
void subitem(string s, pen p=<default>);
-int page;
pen pagenumberpen;
pair pagenumberalign;
pair pagenumberposition;
@@ -3573,7 +3499,6 @@
void bibliographystyle(string name);
int[] lastnode;
real aboveequationskip;
-void nextpage(pen p=<default>);
void asyfigure(string s, string options=<default>, string caption=<default>, pair align=<default>, pen p=<default>, pen figuremattpen=<default>, filltype filltype=<default>, bool newslide=<default>);
void asyfilecode(bool center=<default>, string s, string options=<default>, string caption=<default>, pair align=<default>, pen p=<default>, pen figuremattpen=<default>, real indent=<default>, real skip=<default>, filltype filltype=<default>, bool newslide=<default>);
bool itemstep;
@@ -3580,11 +3505,15 @@
real itemskip;
void remark(bool center=<default>, string s, pair align=<default>, pen p=<default>, real indent=<default>, bool minipage=<default>, real skip=<default>, filltype filltype=<default>, bool step=<default>);
void usersetting();
-void filecode(bool center=<default>, string s, pen p=<default>, real indent=<default>, real skip=<default>, filltype filltype=<default>);
+void item(string s, pen p=<default>, bool step=<default>);
bool landscape;
+pen authorpen;
real codeskip;
+string cropcode(string s);
void newslide(bool stepping=<default>);
pen itempen;
+bool allowstepping;
+pair currentposition;
bool reverse;
void reversevideo();
void vbox(string s, pen p=<default>);
@@ -3593,7 +3522,6 @@
bool havepagenumber;
real pageheight;
real pagewidth;
-void item(string s, pen p=<default>, bool step=<default>);
picture background;
void background();
pen backgroundcolor;
@@ -3607,18 +3535,14 @@
void titlepage(string title, string author, string institution=<default>, string date=<default>, string url=<default>, bool newslide=<default>);
pair titlepageposition;
pen codepen;
-pen authorpen;
void erasestep(int erasenode);
bool checkposition();
void setpens(pen red=<default>, pen blue=<default>, pen steppen=<default>);
-string cropcode(string s);
void code(bool center=<default>, string s, pen p=<default>, real indent=<default>, real skip=<default>, filltype filltype=<default>);
transform tinv;
pair urlskip;
void numberpage(pen p=<default>);
pen urlpen;
-bool allowstepping;
-pair currentposition;
int[] firstnode;
bool firststep;
string asywrite(string s, string preamble=<default>);
@@ -3632,6 +3556,7 @@
bool stepping;
real pagemargin;
pen steppagenumberpen;
+int page;
bool empty();
void currentexitfunction();
void step();
@@ -3655,7 +3580,6 @@
path curve(pair c, real f(real), pair a, pair b);
picture slopefield(real f(real, real), pair a, pair b, int nx=<default>, int ny=<default>, real tickfactor=<default>, pen p=<default>);
picture slopefield(real f(real), pair a, pair b, int nx=<default>, int ny=<default>, pen p=<default>);
-real B03(real t);
patch[] maketriangle(path3 external, real f(triple), triple grad(triple), bool allowsubdivide=<default>);
real B23(real t);
path3 pathinface(positionedvector v1, positionedvector v2, triple facenorm, triple edge1normout, triple edge2normout);
@@ -3698,13 +3622,14 @@
bool operator ==(edge a, edge b);
patch[] triangletoquads(path3 external, real f(triple), triple grad(triple), triple a, triple b);
patch trianglewithnormals(path3 external, triple n1, triple n2, triple n3);
+int NULL_VERTEX;
evaluatedpoint[][][] make3dgrid(triple a, triple b, int nx, int ny, int nz, real f(triple), bool allowzero=<default>);
real B33(real t);
+real B03(real t);
evaluatedpoint[][] slice(evaluatedpoint[][] a, int start1, int end1, int start2, int end2);
evaluatedpoint[][][] slice(evaluatedpoint[][][] a, int start1, int end1, int start2, int end2, int start3, int end3);
positionedvector[][] slice(positionedvector[][] a, int start1, int end1, int start2, int end2);
positionedvector[][][] slice(positionedvector[][][] a, int start1, int end1, int start2, int end2, int start3, int end3);
-int NULL_VERTEX;
revolution operator *(real[][] t, revolution r);
skeleton operator init();
revolution operator init();
@@ -3724,36 +3649,35 @@
int[][] frequency(real[] x, real[] y, pair a, pair b, int nx, int ny=<default>);
int[][] frequency(pair[] z, pair a, pair b, int nx, int ny=<default>);
real mean(real[] A);
-void histogram(picture pic=<default>, real[] bins, real[] count, real low=<default>, pen fillpen=<default>, pen drawpen=<default>, bool bars=<default>, Label legend=<default>, real markersize=<default>);
-void histogram(picture pic=<default>, real[] data, real a, real b, int n, bool normalize=<default>, real low=<default>, pen fillpen=<default>, pen drawpen=<default>, bool bars=<default>, Label legend=<default>, real markersize=<default>);
+real stdev(real[] A);
int bins(real[] data, int max=<default>);
path topbox(pair a, pair b);
path halfbox(pair a, pair b);
-real stdev(real[] A);
+real Gaussian(real x, real sigma);
+real Gaussian(real x);
+pair Gaussrandpair();
+real Gaussrand();
real variance(real[] A);
real legendmarkersize;
real variancebiased(real[] A);
linefit operator init();
-real Gaussian(real x, real sigma);
-real Gaussian(real x);
-pair Gaussrandpair();
-real Gaussrand();
real skewness(real[] A);
linefit leastsquares(real[] x, real[] y);
linefit leastsquares(real[] x, real[] y, real[] w);
real kurtosis(real[] A);
real kurtosisexcess(real[] A);
-real hwratio;
-Relation r4a;
+void histogram(picture pic=<default>, real[] bins, real[] count, real low=<default>, pen fillpen=<default>, pen drawpen=<default>, bool bars=<default>, Label legend=<default>, real markersize=<default>);
+void histogram(picture pic=<default>, real[] data, real a, real b, int n, bool normalize=<default>, real low=<default>, pen fillpen=<default>, pen drawpen=<default>, bool bars=<default>, Label legend=<default>, real markersize=<default>);
pair[] endpoints(guide[] a);
Relation r3;
picture tableau(frame[] cards, bool number=<default>);
pair min(pair[] z);
Component bp;
+Braid apply(Relation r, Braid b, int step, int place);
Component phi;
real gapfactor;
Component bm;
-Braid apply(Relation r, Braid b, int step, int place);
+Component wye;
Relation operator -(Relation r);
Component operator init();
Braid operator init();
@@ -3760,10 +3684,10 @@
Relation operator init();
Syzygy operator init();
Relation r4b;
-Component wye;
+real hwratio;
+Relation r4a;
pair max(pair[] z);
pen Orchid;
-pen WildStrawberry;
pen Magenta;
pen BrickRed;
pen CadetBlue;
@@ -3772,8 +3696,9 @@
pen MidnightBlue;
pen OliveGreen;
pen Apricot;
-pen Salmon;
+pen Aquamarine;
pen Cyan;
+pen Lavender;
pen Red;
pen RawSienna;
pen Mahogany;
@@ -3788,10 +3713,11 @@
pen ForestGreen;
pen BurntOrange;
pen Tan;
-pen Aquamarine;
+pen YellowOrange;
+pen Maroon;
+pen YellowGreen;
pen Brown;
pen RubineRed;
-pen Lavender;
pen TealBlue;
pen White;
pen Purple;
@@ -3800,32 +3726,31 @@
pen OrangeRed;
pen Fuchsia;
pen Peach;
+pen Sepia;
pen PineGreen;
pen Dandelion;
pen Black;
pen NavyBlue;
+pen VioletRed;
pen Rhodamine;
+pen Violet;
pen ProcessBlue;
-pen YellowOrange;
-pen Maroon;
-pen YellowGreen;
pen LimeGreen;
+pen Thistle;
pen Green;
pen GreenYellow;
+pen DarkOrchid;
pen Emerald;
-pen Sepia;
pen Mulberry;
pen RedViolet;
pen SkyBlue;
pen SeaGreen;
-pen VioletRed;
+pen WildStrawberry;
pen Periwinkle;
-pen Violet;
-pen Thistle;
pen Yellow;
pen JungleGreen;
+pen Salmon;
pen CornflowerBlue;
-pen DarkOrchid;
pen RoyalBlue;
pen Melon;
pen RoyalPurple;
@@ -3867,31 +3792,30 @@
string VERSION;
pen Orchid;
pen Indigo;
+pen DeepSkyBlue;
pen Beige;
pen SlateBlue;
pen SlateGray;
pen Magenta;
-pen DarkOliveGreen;
-pen DarkOrange;
pen CadetBlue;
pen DeepPink;
+pen Cornsilk;
pen SpringGreen;
pen MidnightBlue;
pen Olive;
-pen Silver;
pen OliveDrab;
-pen Salmon;
+pen Aquamarine;
pen Chocolate;
+pen Seashell;
pen Cyan;
pen Gainsboro;
-pen Linen;
-pen SandyBrown;
pen Ivory;
+pen Lavender;
+pen GhostWhite;
pen PapayaWhip;
pen Red;
pen Pink;
pen MintCream;
-pen DeepSkyBlue;
pen DarkTurquoise;
pen Gray;
pen MediumBlue;
@@ -3907,28 +3831,30 @@
pen Blue;
pen Gold;
pen BlueViolet;
+pen LavenderBlush;
pen Goldenrod;
pen ForestGreen;
-pen Cornsilk;
+pen Wheat;
pen Chartreuse;
pen NavajoWhite;
+pen PeachPuff;
pen Tan;
pen DarkMagenta;
pen AntiqueWhite;
+pen Maroon;
pen PaleTurquoise;
+pen YellowGreen;
pen IndianRed;
+pen Lime;
pen Crimson;
-pen Seashell;
-pen Aquamarine;
+pen SteelBlue;
pen Azure;
+pen LawnGreen;
pen Brown;
pen BurlyWood;
pen Moccasin;
pen DarkBlue;
-pen LawnGreen;
-pen Lavender;
pen Peru;
-pen GhostWhite;
pen White;
pen Purple;
pen WhiteSmoke;
@@ -3936,28 +3862,26 @@
pen Orange;
pen OrangeRed;
pen Fuchsia;
+pen LemonChiffon;
pen Bisque;
pen Honeydew;
pen RosyBrown;
pen Black;
-pen LavenderBlush;
+pen Aqua;
pen Khaki;
-pen Wheat;
pen FireBrick;
-pen PeachPuff;
+pen Violet;
pen Snow;
-pen Maroon;
-pen YellowGreen;
pen LimeGreen;
-pen Lime;
-pen SteelBlue;
+pen Thistle;
pen OldLace;
pen Green;
pen GreenYellow;
pen DarkCyan;
pen FloralWhite;
+pen Sienna;
pen DarkRed;
-pen LemonChiffon;
+pen DarkOrchid;
pen BlanchedAlmond;
pen PowderBlue;
pen DarkGray;
@@ -3966,39 +3890,40 @@
pen SkyBlue;
pen SeaGreen;
pen DarkViolet;
-pen Aqua;
pen Teal;
pen AliceBlue;
-pen Violet;
pen HotPink;
+pen DarkOliveGreen;
+pen DarkOrange;
pen DodgerBlue;
pen SaddleBrown;
pen Tomato;
pen DarkKhaki;
-pen Thistle;
+pen Silver;
pen LightBlue;
pen LightCoral;
+pen LightCyan;
pen Yellow;
-pen LightCyan;
+pen LightGreen;
pen PaleGreen;
pen LightGoldenrodYellow;
-pen LightGreen;
pen LightGrey;
+pen LightPink;
pen PaleGoldenrod;
-pen LightPink;
pen LightSalmon;
pen LightSeaGreen;
pen LightSkyBlue;
+pen LightSlateGray;
pen Navy;
pen PaleVioletRed;
-pen Sienna;
+pen Salmon;
pen CornflowerBlue;
-pen LightSlateGray;
-pen DarkOrchid;
pen LightSteelBlue;
+pen LightYellow;
pen rgbint(int r, int g, int b);
-pen LightYellow;
+pen Linen;
pen Coral;
+pen SandyBrown;
pen MistyRose;
pen DarkSalmon;
pen DarkSeaGreen;
Modified: trunk/Build/source/utils/asymptote/asymptote.spec
===================================================================
--- trunk/Build/source/utils/asymptote/asymptote.spec 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/asymptote.spec 2024-02-27 20:51:03 UTC (rev 70212)
@@ -3,7 +3,7 @@
%global __python %{__python3}
Name: asymptote
-Version: 2.85
+Version: 2.87
Release: 1%{?dist}
Summary: Descriptive vector graphics language
Modified: trunk/Build/source/utils/asymptote/base/geometry.asy
===================================================================
--- trunk/Build/source/utils/asymptote/base/geometry.asy 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/base/geometry.asy 2024-02-27 20:51:03 UTC (rev 70212)
@@ -6354,29 +6354,49 @@
// *=======================================================*
// *.......................INVERSIONS......................*
-/*<asyxml><function type="point" signature="inverse(real k,point,point)"><code></asyxml>*/
-point inverse(real k, point A, point M)
-{/*<asyxml></code><documentation>Return the inverse point of 'M' with respect to point A and inversion radius 'k'.</documentation></function></asyxml>*/
- return A + k/conj(M - A);
+/*<asyxml><struct signature="inversion"><code></asyxml>*/
+struct inversion
+{/*<asyxml></code><documentation>https://mathworld.wolfram.com/Inversion.html</documentation></asyxml>*/
+ point C;
+ real k;
+
+ /*<asyxml><function type="void" signature="init(point,real)"><code></asyxml>*/
+ void operator init(point C, real k)
+ {/*<asyxml></code><documentation>Return the inversion with respect to 'C' having circle power 'k'.</documentation></function></asyxml>*/
+ this.C = C;
+ this.k = k;
+ }
+ /*<asyxml><function type="void" signature="init(real,point)"><code></asyxml>*/
+ void operator init(real k, point C)
+ {/*<asyxml></code><documentation>Return the inversion with respect to 'C' having circle power 'k'.</documentation></function></asyxml>*/
+ this.C = C;
+ this.k = k;
+ }
+}/*<asyxml></struct></asyxml>*/
+
+/*<asyxml><function type="point" signature="inverse(inversion,point)"><code></asyxml>*/
+point inverse(inversion i, point P)
+{/*<asyxml></code><documentation>Return the inverse point of 'P' with respect to 'i'.</documentation></function></asyxml>*/
+ pair C = locate(i.C), P1 = locate(P);
+ pair P2 = C + i.k / conj(P1 - C);
+ return P2 / currentcoordsys;
}
/*<asyxml><function type="point" signature="radicalcenter(circle,circle)"><code></asyxml>*/
point radicalcenter(circle c1, circle c2)
-{/*<asyxml></code><documentation><url href = "http://fr.wikipedia.org/wiki/Puissance_d'un_point_par_rapport_%C3%A0_un_cercle"/></documentation></function></asyxml>*/
- point[] P = standardizecoordsys(c1.C, c2.C);
+{/*<asyxml></code><documentation><url href="http://fr.wikipedia.org/wiki/Puissance_d'un_point_par_rapport_%C3%A0_un_cercle"/></documentation></function></asyxml>*/
real k = c1.r^2 - c2.r^2;
- pair C1 = locate(c1.C);
- pair C2 = locate(c2.C);
- pair oop = C2 - C1;
- pair K = (abs(oop) == 0) ?
+ pair C1 = locate(c1.C), C2 = locate(c2.C);
+ pair D = C2 - C1;
+ pair K = C1 == C2 ?
(infinity, infinity) :
- midpoint(C1--C2) + 0.5 * k * oop/dot(oop, oop);
- return point(P[0].coordsys, K/P[0].coordsys);
+ 0.5 * (C1 + C2 + k * D / abs2(D));
+ return K / currentcoordsys;
}
/*<asyxml><function type="line" signature="radicalline(circle,circle)"><code></asyxml>*/
line radicalline(circle c1, circle c2)
-{/*<asyxml></code><documentation><url href = "http://fr.wikipedia.org/wiki/Puissance_d'un_point_par_rapport_%C3%A0_un_cercle"/></documentation></function></asyxml>*/
+{/*<asyxml></code><documentation><url href="http://fr.wikipedia.org/wiki/Puissance_d'un_point_par_rapport_%C3%A0_un_cercle"/></documentation></function></asyxml>*/
if (c1.C == c2.C) abort("radicalline: the centers must be distinct");
return perpendicular(radicalcenter(c1, c2), line(c1.C, c2.C));
}
@@ -6383,48 +6403,25 @@
/*<asyxml><function type="point" signature="radicalcenter(circle,circle,circle)"><code></asyxml>*/
point radicalcenter(circle c1, circle c2, circle c3)
-{/*<asyxml></code><documentation><url href = "http://fr.wikipedia.org/wiki/Puissance_d'un_point_par_rapport_%C3%A0_un_cercle"/></documentation></function></asyxml>*/
+{/*<asyxml></code><documentation><url href="http://fr.wikipedia.org/wiki/Puissance_d'un_point_par_rapport_%C3%A0_un_cercle"/></documentation></function></asyxml>*/
return intersectionpoint(radicalline(c1, c2), radicalline(c1, c3));
}
-/*<asyxml><struct signature="inversion"><code></asyxml>*/
-struct inversion
-{/*<asyxml></code><documentation>http://mathworld.wolfram.com/Inversion.html</documentation></asyxml>*/
- point C;
- real k;
-}/*<asyxml></struct></asyxml>*/
-
-/*<asyxml><function type="inversion" signature="inversion(real,point)"><code></asyxml>*/
-inversion inversion(real k, point C)
-{/*<asyxml></code><documentation>Return the inversion with respect to 'C' having inversion radius 'k'.</documentation></function></asyxml>*/
- inversion oi;
- oi.k = k;
- oi.C = C;
- return oi;
-}
-/*<asyxml><function type="inversion" signature="inversion(real,point)"><code></asyxml>*/
-inversion inversion(point C, real k)
-{/*<asyxml></code><documentation>Return the inversion with respect to 'C' having inversion radius 'k'.</documentation></function></asyxml>*/
- return inversion(k, C);
-}
-
/*<asyxml><function type="inversion" signature="inversion(circle,circle)"><code></asyxml>*/
inversion inversion(circle c1, circle c2, real sgn = 1)
{/*<asyxml></code><documentation>Return the inversion which transforms 'c1' to
- . 'c2' and positive inversion radius if 'sgn > 0';
- . 'c2' and negative inversion radius if 'sgn < 0';
- . 'c1' and 'c2' to 'c2' if 'sgn = 0'.</documentation></function></asyxml>*/
+ • 'c2' and positive inversion radius if 'sgn > 0';
+ • 'c2' and negative inversion radius if 'sgn < 0';
+ • 'c1' and 'c2' to 'c2' if 'sgn = 0'.</documentation></function></asyxml>*/
if(sgn == 0) {
point O = radicalcenter(c1, c2);
- return inversion(O^c1, O);
+ return inversion(O, O^c1);
}
- else {
- point C1 = c1.C, C2 = c2.C;
- real r1 = c1.r, r2 = sgn(sgn) * c2.r;
- return inversion(
- r1 * r2 * (1 - (length(C2 - C1) / (r1 + r2))^2),
- (r2 * C1 + r1 * C2) / (r1 + r2));
- }
+ pair C1 = locate(c1.C), C2 = locate(c2.C);
+ real r1 = c1.r, r2 = sgn(sgn) * c2.r;
+ pair O = (r2 * C1 + r1 * C2) / (r1 + r2);
+ real k = r1 * r2 * (1 - abs2(C2 - C1) / (r1 + r2)^2);
+ return inversion(O / currentcoordsys, k);
}
/*<asyxml><function type="inversion" signature="inversion(circle,circle,circle)"><code></asyxml>*/
@@ -6434,7 +6431,10 @@
return inversion(Rc, Rc^c1);
}
-circle operator cast(inversion i){return circle(i.C, sgn(i.k) * sqrt(abs(i.k)));}
+circle operator cast(inversion i)
+{
+ return circle(i.C, sgn(i.k) * sqrt(abs(i.k)));
+}
/*<asyxml><function type="circle" signature="circle(inversion)"><code></asyxml>*/
circle circle(inversion i)
{/*<asyxml></code><documentation>Return the inversion circle of 'i'.</documentation></function></asyxml>*/
@@ -6443,7 +6443,7 @@
inversion operator cast(circle c)
{
- return inversion(sgn(c.r) * c.r^2, c.C);
+ return inversion(c.C, sgn(c.r) * c.r^2);
}
/*<asyxml><function type="inversion" signature="inversion(circle)"><code></asyxml>*/
inversion inversion(circle c)
@@ -6451,10 +6451,10 @@
return c;
}
-/*<asyxml><operator type = "point" signature="*(inversion,point)"><code></asyxml>*/
+/*<asyxml><operator type="point" signature="*(inversion,point)"><code></asyxml>*/
point operator *(inversion i, point P)
{/*<asyxml></code><documentation>Provide inversion * point.</documentation></operator></asyxml>*/
- return inverse(i.k, i.C, P);
+ return inverse(i, P);
}
void lineinversion()
@@ -6463,48 +6463,47 @@
The returned circle has an infinite radius, circle.l has been set.");
}
-
-/*<asyxml><function type="circle" signature="inverse(real,point,line)"><code></asyxml>*/
-circle inverse(real k, point A, line l)
-{/*<asyxml></code><documentation>Return the inverse circle of 'l' with
- respect to point 'A' and inversion radius 'k'.</documentation></function></asyxml>*/
- if(A @ l) {
+/*<asyxml><function type="circle" signature="inverse(inversion,line)"><code></asyxml>*/
+circle inverse(inversion i, line l)
+{/*<asyxml></code><documentation>Return the inverse circle of 'l' with respect to 'i'.</documentation></function></asyxml>*/
+ if(i.C @ l) {
lineinversion();
- circle C = circle(A, infinity);
- C.l = l;
- return C;
+ circle c = circle(i.C, infinity);
+ c.l = l;
+ return c;
}
- point Ap = inverse(k, A, l.A), Bp = inverse(k, A, l.B);
- return circle(A, Ap, Bp);
+ point A = inverse(i, l.A), B = inverse(i, l.B);
+ return circle(i.C, A, B);
}
-/*<asyxml><operator type = "circle" signature="*(inversion,line)"><code></asyxml>*/
+/*<asyxml><operator type="circle" signature="*(inversion,line)"><code></asyxml>*/
circle operator *(inversion i, line l)
{/*<asyxml></code><documentation>Provide inversion * line for lines that don't pass through the inversion center.</documentation></operator></asyxml>*/
- return inverse(i.k, i.C, l);
+ return inverse(i, l);
}
-/*<asyxml><function type="circle" signature="inverse(real,point,circle)"><code></asyxml>*/
-circle inverse(real k, point A, circle c)
-{/*<asyxml></code><documentation>Return the inverse circle of 'c' with
- respect to point A and inversion radius 'k'.</documentation></function></asyxml>*/
- if(degenerate(c)) return inverse(k, A, c.l);
- if(A @ c) {
+/*<asyxml><function type="circle" signature="inverse(inversion,circle)"><code></asyxml>*/
+circle inverse(inversion i, circle c)
+{/*<asyxml></code><documentation>Return the inverse circle of 'c' with respect to 'i'.</documentation></function></asyxml>*/
+ if(degenerate(c)) return inverse(i, c.l);
+ if(i.C @ c) {
lineinversion();
- point M = rotate(180, c.C) * A, Mp = rotate(90, c.C) * A;
- circle oc = circle(A, infinity);
- oc.l = line(inverse(k, A, M), inverse(k, A, Mp));
- return oc;
+ point M1 = rotate(90, c.C) * i.C, M2 = rotate(-90, c.C) * i.C;
+ circle c1 = circle(i.C, infinity);
+ c1.l = line(inverse(i, M1), inverse(i, M2));
+ return c1;
}
- point[] P = standardizecoordsys(A, c.C);
- real s = k/((P[1].x - P[0].x)^2 + (P[1].y - P[0].y)^2 - c.r^2);
- return circle(P[0] + s * (P[1]-P[0]), abs(s) * c.r);
+ pair C1 = locate(i.C), C2 = locate(c.C);
+ pair D = C2 - C1;
+ real s = i.k / (abs2(D) - c.r^2);
+ pair C3 = C1 + s * D;
+ return circle((point)(C3 / currentcoordsys), abs(s) * c.r);
}
-/*<asyxml><operator type = "circle" signature="*(inversion,circle)"><code></asyxml>*/
+/*<asyxml><operator type="circle" signature="*(inversion,circle)"><code></asyxml>*/
circle operator *(inversion i, circle c)
{/*<asyxml></code><documentation>Provide inversion * circle.</documentation></operator></asyxml>*/
- return inverse(i.k, i.C, c);
+ return inverse(i, c);
}
// *.......................INVERSIONS......................*
// *=======================================================*
@@ -7151,20 +7150,20 @@
return arc(a, relabscissa(a, M), relabscissa(a, N));
}
-/*<asyxml><function type="arc" signature="inverse(real,point,segment)"><code></asyxml>*/
-arc inverse(real k, point A, segment s)
+/*<asyxml><function type="arc" signature="inverse(inversion,segment)"><code></asyxml>*/
+arc inverse(inversion i, segment s)
{/*<asyxml></code><documentation>Return the inverse arc circle of 's'
- with respect to point A and inversion radius 'k'.</documentation></function></asyxml>*/
- point Ap = inverse(k, A, s.A), Bp = inverse(k, A, s.B),
- M = inverse(k, A, midpoint(s));
+ with respect to inversion 'i'.</documentation></function></asyxml>*/
+ point Ap = inverse(i, s.A), Bp = inverse(i, s.B),
+ M = inverse(i, midpoint(s));
return arccircle(Ap, M, Bp);
}
-/*<asyxml><operator type = "arc" signature="*(inversion,segment)"><code></asyxml>*/
+/*<asyxml><operator type="arc" signature="*(inversion,segment)"><code></asyxml>*/
arc operator *(inversion i, segment s)
{/*<asyxml></code><documentation>Provide
inversion * segment.</documentation></operator></asyxml>*/
- return inverse(i.k, i.C, s);
+ return inverse(i, s);
}
/*<asyxml><operator type = "path" signature="*(inversion,triangle)"><code></asyxml>*/
Modified: trunk/Build/source/utils/asymptote/base/graph3.asy
===================================================================
--- trunk/Build/source/utils/asymptote/base/graph3.asy 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/base/graph3.asy 2024-02-27 20:51:03 UTC (rev 70212)
@@ -1880,6 +1880,27 @@
splinetype ysplinetype=xsplinetype,
bool[][] cond={})
{
+ if(xsplinetype == linear && ysplinetype == linear) {
+ int nx=f.length-1;
+ int ny=nx > 0 ? f[0].length-1 : 0;
+
+ if(nx == 0 || ny == 0) return nullsurface;
+
+ bool all=cond.length == 0;
+
+ triple[][] v=new triple[nx+1][ny+1];
+
+ for(int i=0; i <= nx; ++i) {
+ bool[] condi=all ? null : cond[i];
+ real xi=x[i];
+ real[] fi=f[i];
+ triple[] vi=v[i];
+ for(int j=0; j <= ny; ++j)
+ vi[j]=(xi,y[j],fi[j]);
+ }
+ return surface(pic,v,cond);
+ }
+
real[][] f=ScaleZ(pic,f);
real[] x=map(pic.scale.x.T,x);
real[] y=map(pic.scale.y.T,y);
Added: trunk/Build/source/utils/asymptote/base/mapArray.asy
===================================================================
--- trunk/Build/source/utils/asymptote/base/mapArray.asy (rev 0)
+++ trunk/Build/source/utils/asymptote/base/mapArray.asy 2024-02-27 20:51:03 UTC (rev 70212)
@@ -0,0 +1,9 @@
+typedef import(Src, Dst);
+
+private typedef Dst MapType(Src);
+
+Dst[] map(MapType f, Src[] a) {
+ return sequence(
+ new Dst(int i) {return f(a[i]);},
+ a.length);
+}
\ No newline at end of file
Modified: trunk/Build/source/utils/asymptote/base/plain.asy
===================================================================
--- trunk/Build/source/utils/asymptote/base/plain.asy 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/base/plain.asy 2024-02-27 20:51:03 UTC (rev 70212)
@@ -188,17 +188,20 @@
if(!embedded) restoredefaults();
}
-// Associate a parametrized type with a name.
-void type(string type, string name)
+string mapArrayString(string From, string To)
{
- eval("typedef "+type+" "+name,true);
+ return "typedef "+From+" From;
+ typedef "+To+" To;
+ To[] map(To f(From), From[] a) {
+ return sequence(new To(int i) {return f(a[i]);},a.length);
+ }";
}
+// This function is deprecated: use
+// from mapArray(Src=T1, Dst=T2) access map;
void mapArray(string From, string To)
{
- type(From,"From");
- type(To,"To");
- eval("To[] map(To f(From), From[] a) {return sequence(new To(int i) {return f(a[i]);},a.length);}",true);
+ eval(mapArrayString(From,To),true);
}
// Evaluate user command line option.
@@ -267,8 +270,8 @@
real[] a=_cputime();
cputime cputime;
real clock=a[4];
- cputime.parent.user=a[0];
- cputime.parent.system=a[1];
+ cputime.parent.user=a[0]; // Includes system time
+ cputime.parent.system=0;
cputime.parent.clock=clock;
cputime.child.user=a[2];
cputime.child.system=a[3];
Modified: trunk/Build/source/utils/asymptote/base/plain_shipout.asy
===================================================================
--- trunk/Build/source/utils/asymptote/base/plain_shipout.asy 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/base/plain_shipout.asy 2024-02-27 20:51:03 UTC (rev 70212)
@@ -7,8 +7,8 @@
string[] file3;
-string outprefix(string prefix=defaultfilename) {
- return stripextension(prefix != "" ? prefix : outname());
+string outprefix(string prefix=stripextension(defaultfilename)) {
+ return prefix != "" ? prefix : outname();
}
string outformat(string format="")
@@ -33,7 +33,7 @@
real height=0);
bool primitive() { // Encode primitive objects
- return settings.outformat == "html" || settings.outformat=="v3d";
+ return settings.outformat == "html" || settings.outformat=="v3d" || settings.v3d;
}
bool prconly(string format="")
@@ -125,7 +125,7 @@
pic.uptodate=true;
if(!uptodate()) {
bool inlinetex=settings.inlinetex;
- bool prc=prc(format);
+ bool prc=prc(format) || settings.v3d;
bool empty3=pic.empty3();
if(prc && !empty3) {
if(settings.render == 0) {
Modified: trunk/Build/source/utils/asymptote/base/shaders/fragment.glsl
===================================================================
--- trunk/Build/source/utils/asymptote/base/shaders/fragment.glsl 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/base/shaders/fragment.glsl 2024-02-27 20:51:03 UTC (rev 70212)
@@ -220,7 +220,7 @@
#endif
}
#else
- m=Materials[int(materialIndex)];
+ m=Materials[materialIndex];
emissive=m.emissive;
#ifdef COLOR
diffuse=Color;
Modified: trunk/Build/source/utils/asymptote/base/three.asy
===================================================================
--- trunk/Build/source/utils/asymptote/base/three.asy 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/base/three.asy 2024-02-27 20:51:03 UTC (rev 70212)
@@ -1,7 +1,12 @@
private import math;
-if(prc0()) {
- if(!latex()) settings.prc=false;
+if(settings.v3d) settings.prc=false;
+
+if(prc0() || settings.v3d) {
+ if(!latex()) {
+ settings.prc=false;
+ settings.v3d=false;
+ }
else {
access embed;
Embed=embed.embedplayer;
@@ -2854,8 +2859,8 @@
light Light=modelview*light;
if(prefix == "") prefix=outprefix();
- bool preview=settings.render > 0 && !prconly();
- if(prc) {
+ bool preview=settings.render > 0 && !prconly() && !settings.v3d;
+ if(prc || settings.v3d) {
// The media9.sty package cannot handle spaces or dots in filenames.
string dir=stripfile(prefix);
prefix=dir+replace(stripdirectory(prefix),
@@ -2864,7 +2869,7 @@
prefix += "+"+(string) file3.length;
} else
preview=false;
- if(preview || (!prc && settings.render != 0)) {
+ if(preview || (!prc && settings.render != 0) || settings.v3d) {
frame f=S.f;
triple m,M;
real zcenter;
@@ -2891,7 +2896,7 @@
} else if(M.z >= 0) abort("camera too close");
if(primitive())
- format=settings.outformat;
+ format=settings.v3d ? "v3d" : settings.outformat;
shipout3(prefix,f,preview ? nativeformat() : format,
S.width-defaultrender.margin,S.height-defaultrender.margin,
@@ -2900,6 +2905,12 @@
tinv*inv*shift(0,0,zcenter),Light.background(),Light.position,
Light.diffuse,Light.specular,
view && !preview);
+ if(settings.v3d) {
+ string content=prefix+".v3d";
+ F.L=Embed(content,S.width,S.height);
+ if(!settings.inlinetex) file3.push(content);
+ return F;
+ }
if(!preview) return F;
}
@@ -2997,7 +3008,7 @@
string prefix, string format, bool view, light light)
{
frame f;
- bool prc=prc(format);
+ bool prc=prc(format) || settings.v3d;
if(!prc && settings.render != 0 && !view) {
static int previewcount=0;
bool keep=prefix != "";
Modified: trunk/Build/source/utils/asymptote/base/three_surface.asy
===================================================================
--- trunk/Build/source/utils/asymptote/base/three_surface.asy 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/base/three_surface.asy 2024-02-27 20:51:03 UTC (rev 70212)
@@ -742,8 +742,22 @@
}
typedef void drawfcn(frame f, transform3 t=identity4, material[] m,
- light light=currentlight, render render=defaultrender);
+ light light=currentlight, render render=defaultrender);
+typedef bool primitivefcn(transform3 t);
+bool unscaled(transform3 t, triple v, triple w) {
+ return abs(length(t*v)-length(t*w)) < sqrtEpsilon;
+}
+
+struct primitive {
+ drawfcn draw;
+ primitivefcn valid;
+ void operator init(drawfcn draw, primitivefcn valid) {
+ this.draw=draw;
+ this.valid=valid;
+ }
+}
+
struct surface {
patch[] s;
int index[][];// Position of patch corresponding to major U,V parameter in s.
@@ -750,7 +764,7 @@
bool vcyclic;
transform3 T=identity4;
- drawfcn draw;
+ primitive primitive=null;
bool PRCprimitive=true; // True unless no PRC primitive is available.
bool empty() {
@@ -1050,7 +1064,7 @@
S.index=copy(s.index);
S.vcyclic=(bool) s.vcyclic;
S.T=t*s.T;
- S.draw=s.draw;
+ S.primitive=s.primitive;
S.PRCprimitive=s.PRCprimitive;
return S;
@@ -1564,7 +1578,8 @@
bool is3D=is3D();
if(is3D) {
bool prc=prc();
- if(s.draw != null && (primitive() || (prc && s.PRCprimitive))) {
+ if(s.primitive != null && (primitive() || (prc && s.PRCprimitive)) &&
+ s.primitive.valid(shiftless(s.T))) {
bool noprerender=settings.prerender == 0;
for(int k=0; k < s.s.length; ++k) {
patch p=s.s[k];
@@ -1572,7 +1587,7 @@
if(p.colors.length > 0) noprerender=false;
}
if(noprerender)
- s.draw(f,s.T,surfacepen,light,render);
+ s.primitive.draw(f,s.T,surfacepen,light,render);
} else {
bool group=name != "" || render.defaultnames;
if(group)
@@ -2144,8 +2159,7 @@
restricted surface unitsphere=surface(octant1,t1*octant1,t2*octant1,t3*octant1,
i*octant1,i*t1*octant1,i*t2*octant1,
i*t3*octant1);
-
-unitsphere.draw=
+unitsphere.primitive=primitive(
new void(frame f, transform3 t=identity4, material[] m,
light light=currentlight, render render=defaultrender)
{
@@ -2152,9 +2166,11 @@
material m=material(m[0],light);
drawSphere(f,t,half=false,m.p,m.opacity,m.shininess,m.metallic,m.fresnel0,
render.sphere);
- };
+ },new bool(transform3 t) {
+ return unscaled(t,X,Y) && unscaled(t,Y,Z);
+ });
-unithemisphere.draw=
+unithemisphere.primitive=primitive(
new void(frame f, transform3 t=identity4, material[] m,
light light=currentlight, render render=defaultrender)
{
@@ -2161,7 +2177,9 @@
material m=material(m[0],light);
drawSphere(f,t,half=true,m.p,m.opacity,m.shininess,m.metallic,m.fresnel0,
render.sphere);
- };
+ },new bool(transform3 t) {
+ return unscaled(t,X,Y) && unscaled(t,Y,Z);
+ });
restricted patch unitfrustum1(real ta, real tb)
{
@@ -2200,7 +2218,10 @@
};
}
-unitcylinder.draw=unitcylinderDraw(false);
+unitcylinder.primitive=primitive(unitcylinderDraw(false),
+ new bool(transform3 t) {
+ return unscaled(t,X,Y);
+ });
private patch unitplane=patch(new triple[] {O,X,X+Y,Y});
restricted surface unitcube=surface(reverse(unitplane),
@@ -2212,13 +2233,16 @@
restricted surface unitplane=surface(unitplane);
restricted surface unitdisk=surface(unitcircle3);
-unitdisk.draw=
+unitdisk.primitive=primitive(
new void(frame f, transform3 t=identity4, material[] m,
light light=currentlight, render render=defaultrender)
{
material m=material(m[0],light);
drawDisk(f,t,m.p,m.opacity,m.shininess,m.metallic,m.fresnel0);
- };
+ },
+ new bool(transform3 t) {
+ return unscaled(t,X,Y);
+ });
void dot(frame f, triple v, material p=currentpen,
light light=nolight, string name="",
Modified: trunk/Build/source/utils/asymptote/base/three_tube.asy
===================================================================
--- trunk/Build/source/utils/asymptote/base/three_tube.asy 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/base/three_tube.asy 2024-02-27 20:51:03 UTC (rev 70212)
@@ -136,7 +136,10 @@
f(t3);
s.PRCprimitive=false;
- s.draw=drawTube(g,w,min(s),max(s));
+ s.primitive=primitive(drawTube(g,w,min(s),max(s)),
+ new bool(transform3 t) {
+ return unscaled(t,X,Y);
+ });
return s;
}
@@ -213,7 +216,10 @@
transform3 t=shift(v)*align(unit(u))*scale(r,r,abs(u));
// Draw opaque surfaces with core for better small-scale rendering.
surface unittube=t*unitcylinder;
- unittube.draw=unitcylinderDraw(core=true);
+ unittube.primitive=primitive(unitcylinderDraw(core=true),
+ new bool(transform3 t) {
+ return unscaled(t,X,Y);
+ });
s.push(unittube);
} else
s.append(render(subpath(p,i,i+1),r));
Modified: trunk/Build/source/utils/asymptote/base/v3d.asy
===================================================================
--- trunk/Build/source/utils/asymptote/base/v3d.asy 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/base/v3d.asy 2024-02-27 20:51:03 UTC (rev 70212)
@@ -321,7 +321,7 @@
int material=xdrfile;
surface s=shift(origin)*scale3(radius)*unitsphere;
- s.draw=unitsphere.draw;
+ s.primitive=unitsphere.primitive;
primitive(center,material,s);
}
@@ -336,7 +336,7 @@
real azimuth=xdrfile;
surface s=shift(origin)*Align(polar,azimuth)*scale3(radius)*unithemisphere;
- s.draw=unithemisphere.draw;
+ s.primitive=unithemisphere.primitive;
primitive(center,material,s);
}
@@ -351,7 +351,7 @@
real azimuth=xdrfile;
surface s=shift(origin)*Align(polar,azimuth)*scale3(radius)*unitdisk;
- s.draw=unitdisk.draw;
+ s.primitive=unitdisk.primitive;
primitive(center,material,s);
}
@@ -396,7 +396,7 @@
path3(center,material,T*(O--Z));
surface s=T*unitcylinder;
- s.draw=unitcylinder.draw;
+ s.primitive=unitcylinder.primitive;
primitive(center,material,s);
}
@@ -414,7 +414,10 @@
path3(center,material,g[0]..controls g[1] and g[2]..g[3]);
surface s=tube(g[0],g[1],g[2],g[3],width);
- s.draw=drawTube(g,width,info.b,info.B);
+ s.primitive=primitive(drawTube(g,width,info.b,info.B),
+ new bool(transform3 t) {
+ return unscaled(t,X,Y);
+ });
primitive(center,material,s);
}
Modified: trunk/Build/source/utils/asymptote/base/v3dheadertypes.asy
===================================================================
--- trunk/Build/source/utils/asymptote/base/v3dheadertypes.asy 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/base/v3dheadertypes.asy 2024-02-27 20:51:03 UTC (rev 70212)
@@ -1,6 +1,6 @@
// Enum class for v3dheadertypes
// AUTO-GENERATED from v3dheadertypes.csv
-// Generated at 2023-02-09 04:54:07
+// Generated at 2024-02-27 00:38:18
struct v3dheadertypes
{
Modified: trunk/Build/source/utils/asymptote/base/v3dtypes.asy
===================================================================
--- trunk/Build/source/utils/asymptote/base/v3dtypes.asy 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/base/v3dtypes.asy 2024-02-27 20:51:03 UTC (rev 70212)
@@ -1,6 +1,6 @@
// Enum class for v3dtypes
// AUTO-GENERATED from v3dtypes.csv
-// Generated at 2023-02-09 04:54:07
+// Generated at 2024-02-27 00:38:18
struct v3dtypes
{
Modified: trunk/Build/source/utils/asymptote/build-scripts/HOWTO-MSWindows
===================================================================
--- trunk/Build/source/utils/asymptote/build-scripts/HOWTO-MSWindows 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/build-scripts/HOWTO-MSWindows 2024-02-27 20:51:03 UTC (rev 70212)
@@ -19,8 +19,8 @@
make install
readline-devel:
-./configure --prefix=/usr --without-curses --disable-shared
-make install
+./configure --prefix=/usr --disable-shared
+make install LOCAL_CFLAGS=-DNEED_EXTERN_PC
fftw3-devel:
./configure --prefix=/usr --disable-shared
Modified: trunk/Build/source/utils/asymptote/build-scripts/build-asymptote
===================================================================
--- trunk/Build/source/utils/asymptote/build-scripts/build-asymptote 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/build-scripts/build-asymptote 2024-02-27 20:51:03 UTC (rev 70212)
@@ -3,7 +3,7 @@
HOME=~bowman
SHARED=$HOME/shared/asy
-GCVERSION=8.2.0
+GCVERSION=8.2.4
ATOMICVERSION=7.6.12
GC=gc-$GCVERSION
@@ -34,7 +34,7 @@
wget https://github.com/ivmai/libatomic_ops/releases/download/v$ATOMICVERSION/libatomic_ops-$ATOMICVERSION.tar.gz
cp /usr/local/src/$GC.tar.gz asymptote-$VERSION
cp /usr/local/src/libatomic_ops-$ATOMICVERSION.tar.gz asymptote-$VERSION
-chown -R root.root asymptote-$VERSION
+chown -R root:root asymptote-$VERSION
cd asymptote-$VERSION
find . -name ".[^.]*" -exec rm -rf {} \;
./autogen.sh
Modified: trunk/Build/source/utils/asymptote/camp.l
===================================================================
--- trunk/Build/source/utils/asymptote/camp.l 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/camp.l 2024-02-27 20:51:03 UTC (rev 70212)
@@ -54,7 +54,7 @@
input_f yy_input = NULL;
-void setlexer(input_f input, string filename)
+void setlexer(input_f input, string filename)
{
YY_FLUSH_BUFFER;
yywrap();
@@ -74,7 +74,7 @@
p.init(fi, tokPos);
return p;
}
-
+
namespace {
position here()
@@ -87,7 +87,7 @@
tokPos = charPos;
charPos += yyleng;
yylval.pos = here();
-}
+}
void savesymbol(symbol name)
{
@@ -154,7 +154,7 @@
eof=true;
eofMessage=message;
}
-
+
// Called by code outside of the lexer to see if a parse error was caused by
// running out of input.
bool lexerEOF()
@@ -225,14 +225,14 @@
<texstring>{
\"/([ \t]|{ENDL})*[\"\'] {adjust(); BEGIN INITIAL;}
-\" {adjust();
+\" {adjust();
BEGIN INITIAL;
- getstring();
+ getstring();
return STRING; }
<<EOF>> {adjust();
setEOF("string not terminated");
BEGIN INITIAL;
- getstring();
+ getstring();
return GARBAGE;
}
{ENDL} {adjust(); newline(); append('\n'); continue; }
@@ -243,14 +243,14 @@
<cstring>{
\'/([ \t]|{ENDL})*[\"\'] {adjust(); BEGIN INITIAL;}
-\' {adjust();
+\' {adjust();
BEGIN INITIAL;
- getstring();
+ getstring();
return STRING; }
<<EOF>> {adjust();
setEOF("string not terminated");
BEGIN INITIAL;
- getstring();
+ getstring();
return GARBAGE;
}
{ENDL} {adjust(); newline(); append('\n'); continue; }
@@ -266,32 +266,32 @@
char x=(char)(yytext[1]-'0');
append(x);
continue;
- }
+ }
{ESC}[0-7][0-7] {adjust();
char x=(char)((yytext[1]-'0')*8+yytext[2]-'0');
append(x);
continue;
- }
+ }
{ESC}[0-3][0-7][0-7] {adjust();
char x=(char)((yytext[1]-'0')*64+(yytext[2]-'0')*8
+yytext[3]-'0');
append(x);
continue;
- }
+ }
{ESC}x[0-9,A-F] {adjust();
- char x=(char) (yytext[2] <= '9' ? yytext[2]-'0' :
+ char x=(char) (yytext[2] <= '9' ? yytext[2]-'0' :
10+yytext[2]-'A');
append(x);
continue;
- }
+ }
{ESC}x[0-9,A-F][0-9,A-F] {adjust();
- char x=(char) ((yytext[2] <= '9' ? yytext[2]-'0' :
+ char x=(char) ((yytext[2] <= '9' ? yytext[2]-'0' :
10+yytext[2]-'A')*16
- +(yytext[3] <= '9' ? yytext[3]-'0' :
+ +(yytext[3] <= '9' ? yytext[3]-'0' :
10+yytext[3]-'A'));
append(x);
continue;
- }
+ }
. {adjust(); append(*yytext); }
}
@@ -380,11 +380,11 @@
[0-9]+ try {
- adjust(); yylval.e= new intExp(here(), lexical::cast<Int>(yytext));
+ adjust(); yylval.e= new intExp(here(), lexical::cast<Int>(yytext));
} catch (lexical::bad_cast&) {
error();
em << "invalid integer";
- yylval.e= new intExp(here(), 0);
+ yylval.e= new intExp(here(), 0);
} return LIT;
([0-9]*\.[0-9]+)|([0-9]+\.[0-9]*)|([0-9]*\.*[0-9]+e[-+]*[0-9]+)|([0-9]+\.[0-9]*e[-+]*[0-9]+) try {
adjust(); yylval.e= new realExp(here(), lexical::cast<double>(yytext));
@@ -391,7 +391,7 @@
} catch (lexical::bad_cast&) {
error();
em << "invalid real";
- yylval.e= new realExp(here(), 0);
+ yylval.e= new realExp(here(), 0);
} return LIT;
true {
adjust(); yylval.e= new booleanExp(here(), true); return LIT; }
@@ -406,7 +406,7 @@
operator {adjust(); BEGIN opname; }
<opname>{
-[ \t\r] {adjust(); continue;}
+[ \t\r] {adjust(); continue;}
{ENDL} {adjust(); newline(); continue;}
<<EOF>> {adjust();
setEOF("missing operator name");
@@ -430,7 +430,7 @@
{LETTER}({LETTER}|[0-9])* {
makesymbol();
- return ID; }
+ return ID; }
\/\* {adjust(); /*commentDepth = 1;*/ BEGIN lexcomment; }
\" {startstring(); BEGIN texstring; }
Modified: trunk/Build/source/utils/asymptote/camp.tab.cc
===================================================================
--- trunk/Build/source/utils/asymptote/camp.tab.cc 2024-02-27 20:49:40 UTC (rev 70211)
+++ trunk/Build/source/utils/asymptote/camp.tab.cc 2024-02-27 20:51:03 UTC (rev 70212)
@@ -238,48 +238,52 @@
YYSYMBOL_runnable = 81, /* runnable */
YYSYMBOL_modifiers = 82, /* modifiers */
YYSYMBOL_dec = 83, /* dec */
- YYSYMBOL_idpair = 84, /* idpair */
- YYSYMBOL_idpairlist = 85, /* idpairlist */
- YYSYMBOL_strid = 86, /* strid */
- YYSYMBOL_stridpair = 87, /* stridpair */
- YYSYMBOL_stridpairlist = 88, /* stridpairlist */
- YYSYMBOL_vardec = 89, /* vardec */
- YYSYMBOL_barevardec = 90, /* barevardec */
- YYSYMBOL_type = 91, /* type */
- YYSYMBOL_celltype = 92, /* celltype */
- YYSYMBOL_dims = 93, /* dims */
- YYSYMBOL_dimexps = 94, /* dimexps */
- YYSYMBOL_decidlist = 95, /* decidlist */
- YYSYMBOL_decid = 96, /* decid */
- YYSYMBOL_decidstart = 97, /* decidstart */
- YYSYMBOL_varinit = 98, /* varinit */
- YYSYMBOL_block = 99, /* block */
- YYSYMBOL_arrayinit = 100, /* arrayinit */
- YYSYMBOL_basearrayinit = 101, /* basearrayinit */
- YYSYMBOL_varinits = 102, /* varinits */
- YYSYMBOL_formals = 103, /* formals */
- YYSYMBOL_explicitornot = 104, /* explicitornot */
- YYSYMBOL_formal = 105, /* formal */
- YYSYMBOL_fundec = 106, /* fundec */
- YYSYMBOL_typedec = 107, /* typedec */
- YYSYMBOL_slice = 108, /* slice */
- YYSYMBOL_value = 109, /* value */
- YYSYMBOL_argument = 110, /* argument */
- YYSYMBOL_arglist = 111, /* arglist */
- YYSYMBOL_tuple = 112, /* tuple */
- YYSYMBOL_exp = 113, /* exp */
- YYSYMBOL_join = 114, /* join */
- YYSYMBOL_dir = 115, /* dir */
- YYSYMBOL_basicjoin = 116, /* basicjoin */
- YYSYMBOL_tension = 117, /* tension */
- YYSYMBOL_controls = 118, /* controls */
- YYSYMBOL_stm = 119, /* stm */
- YYSYMBOL_stmexp = 120, /* stmexp */
- YYSYMBOL_blockstm = 121, /* blockstm */
- YYSYMBOL_forinit = 122, /* forinit */
- YYSYMBOL_fortest = 123, /* fortest */
- YYSYMBOL_forupdate = 124, /* forupdate */
- YYSYMBOL_stmexplist = 125 /* stmexplist */
+ YYSYMBOL_decdec = 84, /* decdec */
+ YYSYMBOL_decdeclist = 85, /* decdeclist */
+ YYSYMBOL_typeparam = 86, /* typeparam */
+ YYSYMBOL_typeparamlist = 87, /* typeparamlist */
+ YYSYMBOL_idpair = 88, /* idpair */
+ YYSYMBOL_idpairlist = 89, /* idpairlist */
+ YYSYMBOL_strid = 90, /* strid */
+ YYSYMBOL_stridpair = 91, /* stridpair */
+ YYSYMBOL_stridpairlist = 92, /* stridpairlist */
+ YYSYMBOL_vardec = 93, /* vardec */
+ YYSYMBOL_barevardec = 94, /* barevardec */
+ YYSYMBOL_type = 95, /* type */
+ YYSYMBOL_celltype = 96, /* celltype */
+ YYSYMBOL_dims = 97, /* dims */
+ YYSYMBOL_dimexps = 98, /* dimexps */
+ YYSYMBOL_decidlist = 99, /* decidlist */
+ YYSYMBOL_decid = 100, /* decid */
+ YYSYMBOL_decidstart = 101, /* decidstart */
+ YYSYMBOL_varinit = 102, /* varinit */
+ YYSYMBOL_block = 103, /* block */
+ YYSYMBOL_arrayinit = 104, /* arrayinit */
+ YYSYMBOL_basearrayinit = 105, /* basearrayinit */
+ YYSYMBOL_varinits = 106, /* varinits */
+ YYSYMBOL_formals = 107, /* formals */
+ YYSYMBOL_explicitornot = 108, /* explicitornot */
+ YYSYMBOL_formal = 109, /* formal */
+ YYSYMBOL_fundec = 110, /* fundec */
+ YYSYMBOL_typedec = 111, /* typedec */
+ YYSYMBOL_slice = 112, /* slice */
+ YYSYMBOL_value = 113, /* value */
+ YYSYMBOL_argument = 114, /* argument */
+ YYSYMBOL_arglist = 115, /* arglist */
+ YYSYMBOL_tuple = 116, /* tuple */
+ YYSYMBOL_exp = 117, /* exp */
+ YYSYMBOL_join = 118, /* join */
+ YYSYMBOL_dir = 119, /* dir */
+ YYSYMBOL_basicjoin = 120, /* basicjoin */
+ YYSYMBOL_tension = 121, /* tension */
+ YYSYMBOL_controls = 122, /* controls */
+ YYSYMBOL_stm = 123, /* stm */
+ YYSYMBOL_stmexp = 124, /* stmexp */
+ YYSYMBOL_blockstm = 125, /* blockstm */
+ YYSYMBOL_forinit = 126, /* forinit */
+ YYSYMBOL_fortest = 127, /* fortest */
+ YYSYMBOL_forupdate = 128, /* forupdate */
+ YYSYMBOL_stmexplist = 129 /* stmexplist */
};
typedef enum yysymbol_kind_t yysymbol_kind_t;
@@ -607,16 +611,16 @@
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 3
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 1979
+#define YYLAST 1994
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 76
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 50
+#define YYNNTS 54
/* YYNRULES -- Number of rules. */
-#define YYNRULES 200
+#define YYNRULES 213
/* YYNSTATES -- Number of states. */
-#define YYNSTATES 376
+#define YYNSTATES 416
/* YYMAXUTOK -- Last valid token kind. */
#define YYMAXUTOK 312
@@ -671,27 +675,28 @@
/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
static const yytype_int16 yyrline[] =
{
- 0, 191, 191, 195, 196, 201, 202, 207, 208, 209,
- 214, 215, 216, 218, 223, 224, 225, 227, 232, 233,
- 234, 235, 237, 239, 241, 242, 244, 246, 248, 249,
- 254, 256, 260, 261, 266, 267, 272, 274, 278, 279,
- 284, 288, 292, 293, 297, 301, 302, 306, 307, 312,
- 313, 318, 319, 324, 325, 326, 328, 333, 334, 338,
- 343, 344, 346, 348, 353, 354, 355, 359, 361, 366,
- 367, 368, 370, 375, 376, 380, 382, 384, 387, 390,
- 396, 398, 403, 404, 408, 409, 410, 411, 415, 416,
- 418, 419, 421, 422, 425, 429, 430, 432, 434, 436,
- 440, 441, 445, 446, 448, 450, 456, 457, 461, 462,
- 463, 464, 466, 467, 469, 471, 473, 475, 476, 477,
- 478, 479, 480, 481, 482, 483, 484, 485, 486, 487,
- 488, 489, 490, 491, 492, 493, 494, 495, 496, 498,
- 500, 502, 504, 506, 508, 513, 515, 520, 522, 523,
- 524, 526, 532, 534, 537, 539, 540, 547, 548, 550,
- 553, 556, 562, 563, 564, 567, 573, 574, 576, 578,
- 579, 583, 585, 588, 591, 597, 598, 603, 604, 605,
- 606, 608, 610, 612, 614, 616, 618, 619, 620, 621,
- 625, 629, 633, 634, 635, 639, 640, 644, 645, 649,
- 650
+ 0, 195, 195, 199, 200, 205, 206, 211, 212, 213,
+ 218, 219, 220, 222, 227, 228, 229, 231, 236, 237,
+ 238, 239, 241, 243, 245, 246, 248, 250, 252, 253,
+ 257, 259, 264, 268, 270, 276, 282, 286, 290, 292,
+ 297, 301, 303, 308, 310, 314, 315, 320, 321, 326,
+ 328, 332, 333, 338, 342, 346, 347, 351, 355, 356,
+ 360, 361, 366, 367, 372, 373, 378, 379, 380, 382,
+ 387, 388, 392, 397, 398, 400, 402, 407, 408, 409,
+ 413, 415, 420, 421, 422, 424, 429, 430, 434, 436,
+ 438, 441, 444, 450, 452, 457, 458, 462, 463, 464,
+ 465, 469, 470, 472, 473, 475, 476, 479, 483, 484,
+ 486, 488, 490, 494, 495, 499, 500, 502, 504, 510,
+ 511, 515, 516, 517, 518, 520, 521, 523, 525, 527,
+ 529, 530, 531, 532, 533, 534, 535, 536, 537, 538,
+ 539, 540, 541, 542, 543, 544, 545, 546, 547, 548,
+ 549, 550, 552, 554, 556, 558, 560, 562, 567, 569,
+ 574, 576, 577, 578, 580, 586, 588, 591, 593, 594,
+ 601, 602, 604, 607, 610, 616, 617, 618, 621, 627,
+ 628, 630, 632, 633, 637, 639, 642, 645, 651, 652,
+ 657, 658, 659, 660, 662, 664, 666, 668, 670, 672,
+ 673, 674, 675, 679, 683, 687, 688, 689, 693, 694,
+ 698, 699, 703, 704
};
#endif
@@ -718,7 +723,8 @@
"CONTINUE", "RETURN_", "THIS", "EXPLICIT", "GARBAGE", "LIT", "STRING",
"PERM", "MODIFIER", "UNARY", "EXP_IN_PARENS_RULE", "$accept", "file",
"fileblock", "bareblock", "name", "runnable", "modifiers", "dec",
- "idpair", "idpairlist", "strid", "stridpair", "stridpairlist", "vardec",
+ "decdec", "decdeclist", "typeparam", "typeparamlist", "idpair",
+ "idpairlist", "strid", "stridpair", "stridpairlist", "vardec",
"barevardec", "type", "celltype", "dims", "dimexps", "decidlist",
"decid", "decidstart", "varinit", "block", "arrayinit", "basearrayinit",
"varinits", "formals", "explicitornot", "formal", "fundec", "typedec",
@@ -734,12 +740,12 @@
}
#endif
-#define YYPACT_NINF (-285)
+#define YYPACT_NINF (-292)
#define yypact_value_is_default(Yyn) \
((Yyn) == YYPACT_NINF)
-#define YYTABLE_NINF (-45)
+#define YYTABLE_NINF (-58)
#define yytable_value_is_error(Yyn) \
0
@@ -748,44 +754,48 @@
STATE-NUM. */
static const yytype_int16 yypact[] =
{
- -285, 41, 472, -285, -285, 873, 873, 873, 873, -285,
- 873, -285, 873, -285, 14, 20, 14, 16, 8, 23,
- 31, 20, 20, 26, 49, 614, 56, 86, 91, 687,
- -285, 141, -285, -285, -285, 18, -285, 543, -285, -285,
- 100, 53, -285, -285, -285, -285, 122, 1545, -285, 125,
- -285, 224, 148, 148, 148, 148, 1931, 330, 203, 60,
- 1146, 190, -285, 194, -285, 88, 0, 155, 161, 166,
- 168, -1, 169, -285, 180, 34, -285, 236, 207, 15,
- 873, 873, 193, 873, -285, -285, -285, 961, 148, 235,
- 254, 616, 212, -285, -285, -285, -285, -285, 35, 217,
- -285, 229, 685, 262, 741, 873, 79, -285, -285, 141,
- -285, 873, 873, 873, 873, 873, 873, 873, 873, 873,
- 873, 873, 873, 873, 873, 873, 873, 873, 873, 873,
- 873, 873, 761, 873, -285, 231, -285, 741, -285, -285,
- 141, 114, -285, 873, -285, 873, 270, 14, -285, -285,
- -285, -285, -285, 24, 39, 401, -285, 227, 134, -14,
- 797, 105, 234, 1272, 1312, 233, -285, 278, -285, 243,
- 237, -285, 249, -285, 893, -285, 107, 1545, -285, 873,
- -285, 245, 998, 247, -10, 212, 236, 817, -285, 118,
- -285, 248, 1035, 1545, 873, 853, 291, 292, 197, 1763,
- 1791, 1819, 1847, 1875, 1875, 1903, 1903, 1903, 1903, 1939,
- 258, 258, 148, 148, 148, 148, 148, 1931, 1545, 1508,
- 873, 1188, 197, 231, -285, -285, 873, 1545, 1545, -285,
- -285, 295, 252, -285, 136, 253, 162, -285, -3, 180,
- 239, -285, 149, 20, -285, 1072, 146, 94, -285, 797,
- 212, 614, 614, 873, 46, 873, 873, 873, -285, -285,
- 893, 893, 1545, -285, 873, -285, -285, 180, 157, -285,
- -285, -285, 1545, -285, -285, -285, 1580, 873, 1617, -285,
- -285, 873, 1432, -285, 873, -285, -285, 300, -285, 301,
- -285, -285, -285, -285, 186, -285, -285, 180, 239, 239,
- 305, -285, -285, -285, 817, -285, 4, 265, 180, 191,
- 1109, 251, -285, 1352, 873, 1545, 264, -285, 1545, -285,
- -285, 1545, -285, 180, 873, 1654, 873, 1727, -285, 1230,
- -285, -285, -285, -285, -285, -285, 27, 279, 273, -285,
- 817, 817, -285, 180, -285, 614, 267, 1392, 873, -285,
- 1691, 873, 1691, -285, 873, 282, 817, -285, 276, -285,
- -285, -285, -285, 614, 275, 237, 1691, 1470, 817, -285,
- -285, -285, 614, -285, -285, -285
+ -292, 43, 500, -292, -292, 881, 881, 881, 881, -292,
+ 881, -292, 881, -292, 20, 31, 15, 24, 17, 21,
+ 68, 11, 31, 50, 57, 176, 64, 143, 156, 282,
+ -292, 27, -292, -292, -292, 129, -292, 571, -292, -292,
+ 185, 165, -292, -292, -292, -292, 111, 1560, -292, 197,
+ -292, 175, 183, 183, 183, 183, 1946, 358, 222, 124,
+ 1161, 45, -292, 26, -292, 60, 132, 210, 34, 233,
+ 238, 245, -1, 4, 12, -292, 221, 268, -2, -292,
+ 293, 273, 202, 881, 881, 262, 881, -292, -292, -292,
+ 976, 183, 642, 316, 669, 281, -292, -292, -292, -292,
+ -292, 213, 283, -292, 297, 700, 329, 727, 881, 217,
+ -292, -292, 27, -292, 881, 881, 881, 881, 881, 881,
+ 881, 881, 881, 881, 881, 881, 881, 881, 881, 881,
+ 881, 881, 881, 881, 881, 770, 881, -292, 294, -292,
+ 727, -292, -292, 27, 160, -292, 881, -292, 881, 330,
+ 35, 20, -292, -292, 336, 35, -292, -292, -292, 131,
+ 35, 147, 429, -292, 336, 307, 216, 2, 784, 146,
+ 309, 1287, 1327, 315, -292, 353, -292, 310, 317, -292,
+ 325, -292, 908, -292, 144, 1560, -292, 881, -292, 320,
+ 1013, 321, 7, 281, 293, 827, -292, 151, -292, 322,
+ 1050, 1560, 881, 854, 359, 365, 348, 1778, 1806, 1834,
+ 1862, 1890, 1890, 1918, 1918, 1918, 1918, 1954, 314, 314,
+ 183, 183, 183, 183, 183, 1946, 1560, 1523, 881, 1203,
+ 348, 294, -292, -292, 881, 1560, 1560, -292, 347, -292,
+ 239, -292, 360, -292, -292, -292, 249, 254, 383, 344,
+ -292, 225, 258, 345, 231, -292, 270, 9, 221, 326,
+ -292, 166, 31, -292, 1087, 280, 16, -292, 784, 281,
+ 176, 176, 881, 120, 881, 881, 881, -292, -292, 908,
+ 908, 1560, -292, 881, -292, -292, 221, 177, -292, -292,
+ -292, 1560, -292, -292, -292, 1595, 881, 1632, -292, -292,
+ 881, 1447, -292, 881, -292, -292, 31, 18, 35, 349,
+ 336, 354, 392, -292, 393, -292, 351, -292, -292, 356,
+ -292, 187, -292, -292, 221, 326, 326, 402, -292, -292,
+ -292, 827, -292, 110, 362, 221, 208, 1124, 366, -292,
+ 1367, 881, 1560, 370, -292, 1560, -292, -292, 1560, -292,
+ 221, 881, 1669, 881, 1742, -292, 1245, -292, 424, -292,
+ -292, -292, -292, -292, -292, -292, 393, -292, -292, -292,
+ -292, -292, 139, 399, 394, -292, 827, 827, -292, 221,
+ -292, 176, 386, 1407, 881, -292, 1706, 881, 1706, -292,
+ 881, 390, 232, 405, 827, -292, 400, -292, -292, -292,
+ -292, 176, 397, 317, 1706, 1485, -292, -292, 827, -292,
+ -292, -292, 176, -292, -292, -292
};
/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -794,63 +804,69 @@
static const yytype_uint8 yydefact[] =
{
3, 0, 2, 1, 7, 0, 0, 0, 0, 9,
- 0, 5, 0, 177, 0, 0, 0, 0, 0, 0,
+ 0, 5, 0, 190, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 99, 110, 111, 15, 14, 108, 4, 0, 10, 18,
- 0, 0, 42, 191, 19, 20, 109, 190, 11, 0,
- 178, 108, 153, 152, 115, 116, 117, 0, 108, 0,
- 0, 36, 35, 0, 38, 0, 0, 0, 0, 0,
- 7, 0, 0, 3, 0, 44, 83, 0, 44, 138,
- 0, 0, 0, 192, 186, 187, 188, 0, 112, 0,
- 0, 0, 43, 17, 16, 12, 13, 40, 53, 41,
- 49, 51, 0, 0, 0, 0, 166, 169, 157, 154,
- 170, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 112, 123, 124, 15, 14, 121, 4, 0, 10, 18,
+ 0, 0, 55, 204, 19, 20, 122, 203, 11, 0,
+ 191, 121, 166, 165, 128, 129, 130, 0, 121, 0,
+ 0, 47, 48, 0, 51, 0, 0, 0, 0, 0,
+ 0, 0, 7, 0, 0, 3, 0, 0, 57, 96,
+ 0, 57, 151, 0, 0, 0, 205, 199, 200, 201,
+ 0, 125, 0, 0, 0, 56, 17, 16, 12, 13,
+ 53, 66, 54, 62, 64, 0, 0, 0, 0, 179,
+ 182, 170, 167, 183, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 151, 158, 179, 0, 59, 6,
- 98, 0, 149, 0, 97, 0, 0, 0, 21, 24,
- 27, 28, 29, 0, 0, 0, 82, 0, 53, 74,
- 0, 141, 139, 0, 0, 0, 194, 0, 199, 0,
- 193, 189, 7, 93, 0, 102, 0, 100, 8, 84,
- 45, 0, 0, 0, 74, 54, 0, 0, 95, 0,
- 88, 0, 0, 155, 0, 0, 0, 0, 137, 132,
- 131, 135, 134, 129, 130, 125, 126, 127, 128, 133,
- 118, 119, 120, 121, 122, 123, 124, 136, 148, 0,
- 0, 0, 150, 159, 160, 113, 0, 107, 106, 37,
- 39, 30, 0, 32, 0, 0, 0, 156, 74, 0,
- 74, 73, 0, 0, 69, 0, 0, 74, 142, 0,
- 140, 0, 0, 0, 53, 195, 0, 0, 103, 94,
- 0, 0, 86, 91, 85, 89, 46, 55, 0, 50,
- 52, 58, 57, 96, 92, 90, 175, 0, 171, 167,
- 168, 0, 0, 163, 0, 161, 114, 0, 23, 0,
- 22, 26, 25, 55, 0, 143, 70, 0, 74, 74,
- 75, 47, 60, 64, 0, 67, 0, 65, 0, 0,
- 0, 180, 182, 0, 0, 196, 0, 200, 101, 104,
- 105, 87, 80, 56, 0, 173, 0, 147, 162, 0,
- 31, 33, 56, 145, 71, 72, 53, 76, 0, 62,
- 0, 66, 144, 0, 48, 0, 0, 0, 197, 81,
- 176, 0, 172, 164, 0, 78, 0, 61, 0, 68,
- 146, 181, 183, 0, 0, 198, 174, 0, 0, 77,
- 63, 185, 0, 165, 79, 184
+ 0, 0, 0, 0, 0, 0, 0, 164, 171, 192,
+ 0, 72, 6, 111, 0, 162, 0, 110, 0, 0,
+ 0, 0, 21, 24, 0, 0, 27, 28, 29, 0,
+ 0, 0, 0, 95, 0, 0, 66, 87, 0, 154,
+ 152, 0, 0, 0, 207, 0, 212, 0, 206, 202,
+ 7, 106, 0, 115, 0, 113, 8, 97, 58, 0,
+ 0, 0, 87, 67, 0, 0, 108, 0, 101, 0,
+ 0, 168, 0, 0, 0, 0, 150, 145, 144, 148,
+ 147, 142, 143, 138, 139, 140, 141, 146, 131, 132,
+ 133, 134, 135, 136, 137, 149, 161, 0, 0, 0,
+ 163, 172, 173, 126, 0, 120, 119, 50, 7, 38,
+ 0, 37, 0, 52, 40, 41, 0, 0, 43, 0,
+ 45, 0, 0, 0, 0, 169, 0, 87, 0, 87,
+ 86, 0, 0, 82, 0, 0, 87, 155, 0, 153,
+ 0, 0, 0, 66, 208, 0, 0, 116, 107, 0,
+ 0, 99, 104, 98, 102, 59, 68, 0, 63, 65,
+ 71, 70, 109, 105, 103, 188, 0, 184, 180, 181,
+ 0, 0, 176, 0, 174, 127, 0, 0, 0, 0,
+ 0, 0, 0, 23, 0, 22, 0, 26, 25, 0,
+ 68, 0, 156, 83, 0, 87, 87, 88, 60, 73,
+ 77, 0, 80, 0, 78, 0, 0, 0, 193, 195,
+ 0, 0, 209, 0, 213, 114, 117, 118, 100, 93,
+ 69, 0, 186, 0, 160, 175, 0, 36, 0, 33,
+ 39, 31, 42, 34, 44, 46, 0, 30, 69, 158,
+ 84, 85, 66, 89, 0, 75, 0, 79, 157, 0,
+ 61, 0, 0, 0, 210, 94, 189, 0, 185, 177,
+ 0, 0, 0, 91, 0, 74, 0, 81, 159, 194,
+ 196, 0, 0, 211, 187, 0, 32, 35, 0, 90,
+ 76, 198, 0, 178, 92, 197
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -285, -285, 250, -285, 10, 263, -285, 285, 36, 170,
- 309, -6, -285, 307, 246, -13, 308, -20, -285, -285,
- 145, -284, -210, 260, 171, -285, -285, -164, -285, -227,
- -285, -285, 238, -285, -165, 241, -285, -5, -285, -121,
- 205, -285, -285, -19, -79, -138, -285, -285, -285, -8
+ -292, -292, 367, -292, 10, 387, -292, 406, 137, 52,
+ 136, 284, 133, -153, 1, -3, -292, 428, 364, -6,
+ 430, -25, -292, -292, 257, -291, -230, 377, 287, -292,
+ -292, -183, -292, -186, -292, -292, 350, -292, -143, 355,
+ -292, -5, -292, -127, 327, -292, -292, -21, -80, -125,
+ -292, -292, -292, 75
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- 0, 1, 2, 57, 51, 36, 37, 38, 233, 234,
- 63, 64, 65, 39, 40, 41, 42, 185, 162, 99,
- 100, 101, 270, 43, 271, 306, 307, 242, 243, 244,
- 44, 45, 181, 46, 175, 176, 59, 47, 133, 134,
- 135, 196, 197, 48, 49, 50, 169, 316, 364, 170
+ 0, 1, 2, 57, 51, 36, 37, 38, 239, 240,
+ 245, 246, 250, 251, 63, 64, 65, 39, 40, 41,
+ 42, 193, 170, 102, 103, 104, 289, 43, 290, 333,
+ 334, 261, 262, 263, 44, 45, 189, 46, 183, 184,
+ 59, 47, 136, 137, 138, 204, 205, 48, 49, 50,
+ 177, 343, 402, 178
};
/* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If
@@ -858,44 +874,61 @@
number is the opposite. If YYTABLE_NINF, syntax error. */
static const yytype_int16 yytable[] =
{
- 52, 53, 54, 55, 168, 56, 82, 60, 77, 258,
- 67, 70, 35, 296, 224, 92, 337, 61, 96, 68,
- 268, -44, 58, 4, 87, 66, 88, 231, 71, 239,
- 158, 75, 78, 267, 74, 240, 305, 9, 141, 240,
- 293, 3, 231, 90, 90, 339, 240, 35, 149, 9,
- 153, 232, 355, 340, 241, 92, 98, 159, 241, 161,
- 89, 160, 90, 73, 91, 241, 235, 35, 80, 238,
- 167, 334, 335, 157, 294, 163, 164, 184, 90, 62,
- 157, 157, 314, 309, 177, 62, 182, 69, 238, 194,
- 195, 81, 157, 35, 338, 319, 320, 177, 83, 192,
- 193, 295, 285, 142, 198, 143, 199, 200, 201, 202,
- 203, 204, 205, 206, 207, 208, 209, 210, 211, 212,
- 213, 214, 215, 216, 217, 218, 219, 221, 222, 322,
- 358, 359, 182, 147, 84, 225, 148, 308, 227, 85,
- 228, 230, 250, 240, 4, 246, 369, 247, 97, 4,
- 259, 183, 260, 5, 6, 245, 261, 226, 374, 333,
- 183, 273, 241, 260, 102, 35, 103, 261, 104, 177,
- 342, 7, 8, 136, 262, 9, 238, 317, 10, 128,
- 157, 289, 272, 12, 290, 349, 246, 302, 12, 276,
- 278, 303, 297, -34, 298, 304, 19, 146, 299, 22,
- 323, 19, 298, 150, 22, 360, 299, 289, 30, 151,
- 292, 31, 32, 30, 152, 282, 31, 32, -34, 154,
- 11, 286, 122, 123, 124, 125, 126, 127, 128, 332,
- 300, 298, 311, 312, 343, 299, 298, 132, 172, 158,
- 299, 272, 5, 6, 310, 89, 140, 90, 313, 91,
- 315, 90, 318, 75, 165, 177, 177, 178, 183, 321,
- 7, 8, 186, 187, 9, 190, 89, 10, 90, 168,
- 137, 132, 325, 229, 180, 253, 327, 12, 173, 329,
- 249, 254, 256, 257, 174, 124, 125, 126, 127, 128,
- 19, 255, 263, 22, 266, 274, 279, 280, 287, 272,
- 288, 291, 30, 330, 231, 31, 32, 241, 336, 347,
- 341, 345, 348, 356, 357, 362, 368, 370, 372, 350,
- 139, 352, 95, 155, 236, 331, 361, 72, 76, 166,
- 79, 269, 248, 4, 156, 272, 272, 5, 6, 223,
- 365, 0, 191, 189, 371, 0, 366, 0, 0, 367,
- 0, 272, 0, 375, 0, 7, 8, 0, 0, 9,
- 0, 0, 10, 272, 0, 0, 0, 0, 0, 0,
- 11, 138, 12, 0, 0, 0, 0, 0, 13, 0,
+ 52, 53, 54, 55, 85, 56, 176, 60, 254, 287,
+ 95, 232, 35, 69, 4, 80, 99, 68, 61, 74,
+ 72, 358, 58, 61, 90, 66, 91, 70, 73, 149,
+ 4, 78, 81, 144, 4, 332, 373, 149, 238, 277,
+ 9, -47, 93, 3, 165, 258, 9, 35, 93, -47,
+ 286, 259, 320, 95, 160, 159, 259, 169, 259, 335,
+ 9, 75, 161, 77, 9, 259, 359, 35, 150, 12,
+ 260, 76, 67, 323, 321, 260, 155, 260, 171, 172,
+ 175, 393, 19, 336, 260, 22, 62, 185, 62, 190,
+ -49, 62, 83, -49, 30, 71, 35, 31, 32, 84,
+ 185, 374, 200, 201, 304, 151, 86, 206, 152, 207,
+ 208, 209, 210, 211, 212, 213, 214, 215, 216, 217,
+ 218, 219, 220, 221, 222, 223, 224, 225, 226, 227,
+ 229, 230, -57, 322, 248, 190, 346, 347, 233, 370,
+ 371, 235, 166, 236, 241, 269, 396, 397, 243, 241,
+ 248, 375, 242, 105, 241, 106, 341, 107, 249, 376,
+ 78, 349, 257, 264, 409, 78, 165, 145, 101, 146,
+ 78, 92, 35, 93, 253, 94, 93, 185, 414, 4,
+ 153, 257, 281, 5, 6, 165, 265, 278, 266, 279,
+ 291, 87, 191, 280, 292, 344, 279, 295, 297, 369,
+ 280, 7, 8, 234, 88, 9, 191, 247, 10, 324,
+ 378, 325, 252, 392, 131, 326, 11, 92, 12, 93,
+ 350, 140, 325, 301, 13, 385, 326, 202, 203, 305,
+ 368, 19, 325, 100, 22, 23, 326, 24, 25, 26,
+ 27, 28, 29, 30, 167, 139, 31, 32, 168, 338,
+ 339, 379, 154, 325, 398, 192, 327, 326, 257, 165,
+ 291, 11, 165, 337, 92, 143, 93, 340, 94, 342,
+ 314, 345, 78, 315, 185, 185, 314, 314, 348, 318,
+ 407, 156, 307, 4, 308, 4, 157, 5, 6, 5,
+ 6, 352, 309, 158, 310, 354, 166, 311, 356, 308,
+ 357, 316, 241, 308, 176, 7, 8, 7, 8, 9,
+ 164, 9, 10, 319, 10, 310, 78, 93, 78, 186,
+ 265, 329, 12, 173, 12, 330, 291, 191, 194, 331,
+ 89, 195, 198, 237, 135, 19, 383, 19, 22, 244,
+ 22, 127, 128, 129, 130, 131, 386, 30, 388, 30,
+ 31, 32, 31, 32, 188, 268, 273, 272, 274, 276,
+ 399, 4, 275, 149, 298, 5, 6, 282, 285, 293,
+ 299, 291, 291, 125, 126, 127, 128, 129, 130, 131,
+ 411, 306, 404, 7, 8, 405, 312, 9, 135, 291,
+ 10, 415, 313, 317, 260, 364, 248, 361, 11, 141,
+ 12, 366, 363, 291, 367, 372, 13, 377, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 384, 24,
+ 25, 26, 27, 28, 29, 30, 381, 391, 31, 32,
+ 33, 34, 4, 394, 400, 395, 5, 6, 406, 408,
+ 412, 410, 162, 98, 142, 360, 362, 365, 256, 79,
+ 174, 288, 82, 163, 7, 8, 267, 199, 9, 403,
+ 197, 10, 0, 0, 231, 0, 0, 0, 0, 11,
+ 255, 12, 0, 0, 0, 0, 0, 13, 0, 14,
+ 15, 16, 17, 18, 19, 20, 21, 22, 23, 0,
+ 24, 25, 26, 27, 28, 29, 30, 0, 0, 31,
+ 32, 33, 34, 4, 0, 0, 0, 5, 6, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 7, 8, 0, 0, 9,
+ 0, 0, 10, 0, 0, 0, 0, 0, 0, 0,
+ 11, 0, 12, 0, 0, 0, 0, 0, 13, 0,
14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
0, 24, 25, 26, 27, 28, 29, 30, 0, 0,
31, 32, 33, 34, 4, 0, 0, 0, 5, 6,
@@ -902,202 +935,204 @@
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 7, 8, 0, 0,
9, 0, 0, 10, 0, 0, 0, 0, 0, 0,
- 0, 11, 237, 12, 0, 0, 0, 0, 0, 13,
+ 0, 11, 0, 12, 0, 0, 0, 0, 0, 13,
0, 14, 15, 16, 17, 18, 19, 20, 21, 22,
23, 0, 24, 25, 26, 27, 28, 29, 30, 0,
- 0, 31, 32, 33, 34, 4, 0, 0, 0, 5,
+ 0, 31, 32, 96, 97, 180, 0, 0, 0, 5,
6, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 7, 8, 0,
- 0, 9, 0, 0, 10, 0, 0, 0, 0, 0,
- 0, 0, 11, 0, 12, 0, 0, 0, 0, 0,
- 13, 0, 14, 15, 16, 17, 18, 19, 20, 21,
- 22, 23, 0, 24, 25, 26, 27, 28, 29, 30,
- 0, 0, 31, 32, 33, 34, 4, 0, 0, 0,
- 5, 6, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 7, 8,
- 0, 0, 9, 0, 0, 10, 0, 0, 0, 0,
- 0, 0, 0, 11, 0, 12, 0, 0, 0, 0,
- 0, 13, 0, 14, 15, 16, 17, 18, 19, 20,
- 21, 22, 23, 0, 24, 25, 26, 27, 28, 29,
- 30, 0, 0, 31, 32, 93, 94, 4, 0, 4,
- 0, 5, 6, 5, 6, 0, 0, 0, 0, 0,
+ 0, 9, 4, 0, 10, 0, 5, 6, 0, 0,
+ 0, 0, 0, 0, 12, 181, 0, 0, 0, 0,
+ 0, 182, 0, 0, 7, 8, 0, 19, 9, 0,
+ 22, 10, 0, 180, 0, 187, 0, 5, 6, 30,
+ 0, 12, 31, 32, 0, 0, 188, 0, 0, 0,
+ 0, 0, 0, 0, 19, 7, 8, 22, 0, 9,
+ 4, 0, 10, 0, 5, 6, 30, 0, 0, 31,
+ 32, 0, 12, 196, 0, 0, 0, 0, 0, 182,
+ 0, 0, 7, 8, 0, 19, 9, 0, 22, 10,
+ 0, 0, 0, 187, 0, 0, 0, 30, 0, 12,
+ 31, 32, 0, 4, 0, 0, 0, 5, 6, 0,
+ 0, 0, 19, 228, 0, 22, 0, 4, 0, 0,
+ 0, 5, 6, 0, 30, 7, 8, 31, 32, 9,
+ 0, 0, 10, 0, 0, 0, 0, 0, 0, 7,
+ 8, 0, 12, 9, 0, 0, 10, 0, 0, 0,
+ 0, 0, 0, 0, 0, 19, 12, 0, 22, 0,
+ 4, 188, 0, 0, 5, 6, 0, 30, 0, 19,
+ 31, 32, 22, 0, 0, 0, 0, 0, 0, 0,
+ 0, 30, 7, 8, 31, 32, 9, 4, 0, 10,
+ 0, 5, 6, 0, 0, 0, 296, 265, 0, 12,
0, 0, 0, 0, 0, 0, 0, 0, 0, 7,
- 8, 7, 8, 9, 0, 9, 10, 0, 10, 0,
- 0, 0, 179, 0, 11, 0, 12, 0, 12, 0,
- 0, 0, 13, 180, 0, 0, 0, 0, 0, 19,
- 0, 19, 22, 23, 22, 24, 25, 26, 27, 28,
- 29, 30, 0, 30, 31, 32, 31, 32, 172, 0,
- 4, 0, 5, 6, 5, 6, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 7, 8, 7, 8, 9, 0, 9, 10, 0, 10,
- 0, 0, 0, 0, 0, 0, 0, 12, 188, 12,
- 0, 0, 0, 0, 174, 86, 0, 0, 0, 0,
- 19, 0, 19, 22, 4, 22, 0, 0, 5, 6,
- 0, 0, 30, 0, 30, 31, 32, 31, 32, 0,
- 0, 0, 0, 0, 4, 0, 7, 8, 5, 6,
- 9, 0, 0, 10, 220, 0, 0, 179, 0, 0,
- 0, 0, 0, 12, 0, 0, 7, 8, 0, 0,
- 9, 0, 0, 10, 0, 0, 19, 0, 0, 22,
- 4, 0, 0, 12, 5, 6, 0, 0, 30, 0,
- 0, 31, 32, 0, 0, 0, 19, 0, 0, 22,
- 4, 0, 7, 8, 5, 6, 9, 0, 30, 10,
- 0, 31, 32, 0, 0, 0, 0, 0, 0, 12,
- 0, 0, 7, 8, 180, 0, 9, 0, 0, 10,
- 0, 0, 19, 0, 0, 22, 4, 246, 0, 12,
- 5, 6, 0, 0, 30, 277, 0, 31, 32, 0,
- 0, 0, 19, 0, 0, 22, 4, 0, 7, 8,
- 5, 6, 9, 0, 30, 10, 0, 31, 32, 0,
- 0, 0, 0, 0, 0, 12, 172, 0, 7, 8,
- 5, 6, 9, 0, 0, 10, 0, 0, 19, 0,
- 0, 22, 0, 0, 0, 12, 0, 0, 7, 8,
- 30, 0, 9, 31, 32, 10, 0, 0, 19, 0,
- 0, 22, 0, 0, 0, 12, 0, 0, 0, 0,
- 30, 0, 0, 31, 32, 0, 0, 0, 19, 0,
- 0, 22, 0, 0, 0, 0, 0, 0, 0, 0,
- 30, 0, 0, 31, 32, 105, 106, 107, 108, 109,
- 110, 0, 0, 0, 0, 111, 112, 113, 114, 115,
+ 8, 0, 19, 9, 4, 22, 10, 0, 5, 6,
+ 0, 0, 0, 0, 30, 0, 12, 31, 32, 0,
+ 0, 0, 0, 0, 0, 0, 7, 8, 0, 19,
+ 9, 180, 22, 10, 0, 5, 6, 0, 0, 0,
+ 0, 30, 0, 12, 31, 32, 0, 0, 0, 0,
+ 0, 0, 0, 7, 8, 0, 19, 9, 0, 22,
+ 10, 0, 0, 0, 0, 0, 0, 0, 30, 0,
+ 12, 31, 32, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 19, 0, 0, 22, 0, 0, 0,
+ 0, 0, 0, 0, 0, 30, 0, 0, 31, 32,
+ 108, 109, 110, 111, 112, 113, 0, 0, 0, 0,
+ 114, 115, 116, 117, 118, 119, 120, 121, 122, 123,
+ 124, 125, 126, 127, 128, 129, 130, 131, 132, 0,
+ 133, 134, 0, 0, 0, 0, 135, 108, 109, 110,
+ 111, 112, 113, 0, 179, 0, 0, 114, 115, 116,
+ 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
+ 127, 128, 129, 130, 131, 132, 0, 133, 134, 283,
+ 0, 0, 0, 135, 108, 109, 110, 111, 112, 113,
+ 284, 0, 0, 0, 114, 115, 116, 117, 118, 119,
+ 120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
+ 130, 131, 132, 0, 133, 134, 283, 0, 0, 0,
+ 135, 108, 109, 110, 111, 112, 113, 294, 0, 0,
+ 0, 114, 115, 116, 117, 118, 119, 120, 121, 122,
+ 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+ 0, 133, 134, 0, 0, 0, 0, 135, 108, 109,
+ 110, 111, 112, 113, 328, 0, 0, 0, 114, 115,
116, 117, 118, 119, 120, 121, 122, 123, 124, 125,
- 126, 127, 128, 129, 0, 130, 131, 0, 0, 0,
- 0, 132, 105, 106, 107, 108, 109, 110, 0, 171,
- 0, 0, 111, 112, 113, 114, 115, 116, 117, 118,
+ 126, 127, 128, 129, 130, 131, 132, 0, 133, 134,
+ 0, 0, 0, 0, 135, 108, 109, 110, 111, 112,
+ 113, 380, 0, 0, 0, 114, 115, 116, 117, 118,
119, 120, 121, 122, 123, 124, 125, 126, 127, 128,
- 129, 0, 130, 131, 264, 0, 0, 0, 132, 105,
- 106, 107, 108, 109, 110, 265, 0, 0, 0, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
- 122, 123, 124, 125, 126, 127, 128, 129, 0, 130,
- 131, 264, 0, 0, 0, 132, 105, 106, 107, 108,
- 109, 110, 275, 0, 0, 0, 111, 112, 113, 114,
- 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 0, 130, 131, 0, 0,
- 0, 0, 132, 105, 106, 107, 108, 109, 110, 301,
- 0, 0, 0, 111, 112, 113, 114, 115, 116, 117,
- 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 128, 129, 0, 130, 131, 0, 0, 0, 0, 132,
- 105, 106, 107, 108, 109, 110, 344, 0, 0, 0,
- 111, 112, 113, 114, 115, 116, 117, 118, 119, 120,
- 121, 122, 123, 124, 125, 126, 127, 128, 129, 0,
- 130, 131, 0, 0, 0, 0, 132, 0, 0, 144,
- 0, 145, 105, 106, 107, 108, 109, 110, 0, 0,
- 0, 0, 111, 112, 113, 114, 115, 116, 117, 118,
- 119, 120, 121, 122, 123, 124, 125, 126, 127, 128,
- 129, 0, 130, 131, 0, 0, 0, 0, 132, 283,
- 0, 0, 0, 284, 105, 106, 107, 108, 109, 110,
- 0, 0, 0, 0, 111, 112, 113, 114, 115, 116,
+ 129, 130, 131, 132, 0, 133, 134, 0, 0, 0,
+ 0, 135, 0, 0, 147, 0, 148, 108, 109, 110,
+ 111, 112, 113, 0, 0, 0, 0, 114, 115, 116,
117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
- 127, 128, 129, 0, 130, 131, 0, 0, 0, 0,
- 132, 353, 0, 0, 0, 354, 105, 106, 107, 108,
- 109, 110, 0, 0, 0, 0, 111, 112, 113, 114,
+ 127, 128, 129, 130, 131, 132, 0, 133, 134, 0,
+ 0, 0, 0, 135, 302, 0, 0, 0, 303, 108,
+ 109, 110, 111, 112, 113, 0, 0, 0, 0, 114,
115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 0, 130, 131, 0, 0,
- 0, 0, 132, 0, 0, 251, 105, 106, 107, 108,
- 109, 110, 0, 0, 0, 0, 111, 112, 113, 114,
+ 125, 126, 127, 128, 129, 130, 131, 132, 0, 133,
+ 134, 0, 0, 0, 0, 135, 389, 0, 0, 0,
+ 390, 108, 109, 110, 111, 112, 113, 0, 0, 0,
+ 0, 114, 115, 116, 117, 118, 119, 120, 121, 122,
+ 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+ 0, 133, 134, 0, 0, 0, 0, 135, 0, 0,
+ 270, 108, 109, 110, 111, 112, 113, 0, 0, 0,
+ 0, 114, 115, 116, 117, 118, 119, 120, 121, 122,
+ 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+ 0, 133, 134, 0, 0, 0, 0, 135, 0, 0,
+ 271, 108, 109, 110, 111, 112, 113, 0, 0, 0,
+ 0, 114, 115, 116, 117, 118, 119, 120, 121, 122,
+ 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+ 0, 133, 134, 0, 0, 0, 0, 135, 0, 0,
+ 382, 108, 109, 110, 111, 112, 113, 0, 0, 0,
+ 0, 114, 115, 116, 117, 118, 119, 120, 121, 122,
+ 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+ 0, 133, 134, 0, 0, 0, 0, 135, 0, 0,
+ 401, 108, 109, 110, 111, 112, 113, 0, 0, 0,
+ 0, 114, 115, 116, 117, 118, 119, 120, 121, 122,
+ 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+ 0, 133, 134, 0, 0, 0, 0, 135, 355, 108,
+ 109, 110, 111, 112, 113, 0, 0, 0, 0, 114,
115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 0, 130, 131, 0, 0,
- 0, 0, 132, 0, 0, 252, 105, 106, 107, 108,
- 109, 110, 0, 0, 0, 0, 111, 112, 113, 114,
- 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 0, 130, 131, 0, 0,
- 0, 0, 132, 0, 0, 346, 105, 106, 107, 108,
- 109, 110, 0, 0, 0, 0, 111, 112, 113, 114,
- 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 0, 130, 131, 0, 0,
- 0, 0, 132, 0, 0, 363, 105, 106, 107, 108,
- 109, 110, 0, 0, 0, 0, 111, 112, 113, 114,
- 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 0, 130, 131, 0, 0,
- 0, 0, 132, 328, 105, 106, 107, 108, 109, 110,
- 0, 0, 0, 0, 111, 112, 113, 114, 115, 116,
+ 125, 126, 127, 128, 129, 130, 131, 132, 0, 133,
+ 134, 0, 0, 0, 0, 135, 413, 108, 109, 110,
+ 111, 112, 113, 0, 0, 0, 0, 114, 115, 116,
117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
- 127, 128, 129, 0, 130, 131, 0, 0, 0, 0,
- 132, 373, 105, 106, 107, 108, 109, 110, 0, 0,
- 0, 0, 111, 112, 113, 114, 115, 116, 117, 118,
- 119, 120, 121, 122, 123, 124, 125, 126, 127, 128,
- 129, 0, 130, 131, 281, 0, 0, 0, 132, 105,
- 106, 107, 108, 109, 110, 0, 0, 0, 0, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
- 122, 123, 124, 125, 126, 127, 128, 129, 0, 130,
- 131, 0, 0, 0, 105, 132, 107, 108, 109, 110,
- 0, 0, 0, 0, 111, 112, 113, 114, 115, 116,
- 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
- 127, 128, 129, 0, 130, 131, 0, 0, 0, 324,
- 132, 105, 0, 107, 108, 109, 110, 0, 0, 0,
- 0, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+ 127, 128, 129, 130, 131, 132, 0, 133, 134, 300,
+ 0, 0, 0, 135, 108, 109, 110, 111, 112, 113,
+ 0, 0, 0, 0, 114, 115, 116, 117, 118, 119,
120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
- 0, 130, 131, 0, 0, 0, 326, 132, 105, 0,
- 107, 108, 109, 110, 0, 0, 0, 0, 111, 112,
- 113, 114, 115, 116, 117, 118, 119, 120, 121, 122,
- 123, 124, 125, 126, 127, 128, 129, 0, 130, 131,
- 0, 0, 0, 351, 132, 105, 0, 107, 108, 109,
- 110, 0, 0, 0, 0, 111, 112, 113, 114, 115,
- 116, 117, 118, 119, 120, 121, 122, 123, 124, 125,
- 126, 127, 128, 129, 0, 130, 131, 0, 0, 0,
- 0, 132, 106, 107, 108, 109, 110, 0, 0, 0,
- 0, 111, 112, 113, 114, 115, 116, 117, 118, 119,
- 120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
- 0, 0, 131, 0, 0, 0, 0, 132, 106, 107,
- 108, 109, 110, 0, 0, 0, 0, 0, 112, 113,
+ 130, 131, 132, 0, 133, 134, 0, 0, 0, 108,
+ 135, 110, 111, 112, 113, 0, 0, 0, 0, 114,
+ 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
+ 125, 126, 127, 128, 129, 130, 131, 132, 0, 133,
+ 134, 0, 0, 0, 351, 135, 108, 0, 110, 111,
+ 112, 113, 0, 0, 0, 0, 114, 115, 116, 117,
+ 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 128, 129, 130, 131, 132, 0, 133, 134, 0, 0,
+ 0, 353, 135, 108, 0, 110, 111, 112, 113, 0,
+ 0, 0, 0, 114, 115, 116, 117, 118, 119, 120,
+ 121, 122, 123, 124, 125, 126, 127, 128, 129, 130,
+ 131, 132, 0, 133, 134, 0, 0, 0, 387, 135,
+ 108, 0, 110, 111, 112, 113, 0, 0, 0, 0,
114, 115, 116, 117, 118, 119, 120, 121, 122, 123,
- 124, 125, 126, 127, 128, 129, 106, 107, 108, 109,
- 110, 0, 0, 132, 0, 0, 0, 113, 114, 115,
- 116, 117, 118, 119, 120, 121, 122, 123, 124, 125,
- 126, 127, 128, 129, 106, 107, 108, 109, 110, 0,
- 0, 132, 0, 0, 0, 0, 114, 115, 116, 117,
+ 124, 125, 126, 127, 128, 129, 130, 131, 132, 0,
+ 133, 134, 0, 0, 0, 0, 135, 109, 110, 111,
+ 112, 113, 0, 0, 0, 0, 114, 115, 116, 117,
118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 128, 129, 106, 107, 108, 109, 110, 0, 0, 132,
- 0, 0, 0, 0, 0, 115, 116, 117, 118, 119,
+ 128, 129, 130, 131, 132, 0, 0, 134, 0, 0,
+ 0, 0, 135, 109, 110, 111, 112, 113, 0, 0,
+ 0, 0, 0, 115, 116, 117, 118, 119, 120, 121,
+ 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
+ 132, 109, 110, 111, 112, 113, 0, 0, 135, 0,
+ 0, 0, 116, 117, 118, 119, 120, 121, 122, 123,
+ 124, 125, 126, 127, 128, 129, 130, 131, 132, 109,
+ 110, 111, 112, 113, 0, 0, 135, 0, 0, 0,
+ 0, 117, 118, 119, 120, 121, 122, 123, 124, 125,
+ 126, 127, 128, 129, 130, 131, 132, 109, 110, 111,
+ 112, 113, 0, 0, 135, 0, 0, 0, 0, 0,
+ 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 128, 129, 130, 131, 132, 109, 110, 111, 112, 113,
+ 0, 0, 135, 0, 0, 0, 0, 0, 0, 0,
120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
- 106, 107, 108, 109, 110, 0, 0, 132, 0, 0,
- 0, 0, 0, 0, 0, 117, 118, 119, 120, 121,
- 122, 123, 124, 125, 126, 127, 128, 129, 106, 107,
- 108, 109, 110, 0, 0, 132, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 121, 122, 123,
- 124, 125, 126, 127, 128, 129, 106, 107, 108, 109,
- 110, 0, 0, 132, 106, 107, 108, 109, 110, 0,
- 0, 0, 0, 0, 0, 121, 122, 123, 124, 125,
- 126, 127, 128, 0, 122, 123, 124, 125, 126, 127,
- 128, 132, 0, 0, 0, 0, 0, 0, 0, 132
+ 130, 131, 132, 109, 110, 111, 112, 113, 0, 0,
+ 135, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 124, 125, 126, 127, 128, 129, 130, 131,
+ 132, 109, 110, 111, 112, 113, 0, 0, 135, 109,
+ 110, 111, 112, 113, 0, 0, 0, 0, 0, 0,
+ 124, 125, 126, 127, 128, 129, 130, 131, 0, 125,
+ 126, 127, 128, 129, 130, 131, 135, 0, 0, 0,
+ 0, 0, 0, 0, 135
};
static const yytype_int16 yycheck[] =
{
- 5, 6, 7, 8, 83, 10, 25, 12, 21, 174,
- 16, 3, 2, 240, 135, 35, 300, 3, 37, 3,
- 184, 3, 12, 3, 29, 15, 31, 3, 18, 43,
- 3, 21, 22, 43, 3, 49, 246, 29, 58, 49,
- 43, 0, 3, 44, 44, 41, 49, 37, 48, 29,
- 51, 27, 336, 49, 68, 75, 3, 42, 68, 79,
- 42, 46, 44, 40, 46, 68, 27, 57, 42, 42,
- 83, 298, 299, 46, 238, 80, 81, 42, 44, 71,
- 46, 46, 36, 247, 89, 71, 91, 71, 42, 10,
- 11, 42, 46, 83, 304, 260, 261, 102, 42, 104,
- 105, 239, 223, 43, 109, 45, 111, 112, 113, 114,
+ 5, 6, 7, 8, 25, 10, 86, 12, 161, 192,
+ 35, 138, 2, 16, 3, 21, 37, 16, 3, 18,
+ 3, 3, 12, 3, 29, 15, 31, 3, 18, 3,
+ 3, 21, 22, 58, 3, 265, 327, 3, 3, 182,
+ 29, 42, 44, 0, 46, 43, 29, 37, 44, 50,
+ 43, 49, 43, 78, 42, 51, 49, 82, 49, 43,
+ 29, 40, 50, 52, 29, 49, 48, 57, 42, 42,
+ 68, 3, 57, 259, 257, 68, 42, 68, 83, 84,
+ 86, 372, 55, 266, 68, 58, 71, 92, 71, 94,
+ 45, 71, 42, 48, 67, 71, 86, 70, 71, 42,
+ 105, 331, 107, 108, 231, 45, 42, 112, 48, 114,
115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 130, 131, 132, 133, 267,
- 340, 341, 137, 45, 48, 140, 48, 43, 143, 48,
- 145, 147, 162, 49, 3, 40, 356, 42, 48, 3,
- 43, 46, 45, 7, 8, 160, 49, 43, 368, 297,
- 46, 43, 68, 45, 42, 155, 44, 49, 46, 174,
- 308, 25, 26, 48, 179, 29, 42, 256, 32, 31,
- 46, 45, 187, 42, 48, 323, 40, 41, 42, 194,
- 195, 45, 43, 3, 45, 49, 55, 3, 49, 58,
- 43, 55, 45, 48, 58, 343, 49, 45, 67, 48,
- 48, 70, 71, 67, 48, 220, 70, 71, 50, 50,
- 40, 226, 25, 26, 27, 28, 29, 30, 31, 43,
- 243, 45, 251, 252, 43, 49, 45, 40, 3, 3,
- 49, 246, 7, 8, 249, 42, 43, 44, 253, 46,
- 255, 44, 257, 243, 61, 260, 261, 3, 46, 264,
- 25, 26, 45, 34, 29, 3, 42, 32, 44, 348,
- 46, 40, 277, 3, 47, 42, 281, 42, 43, 284,
- 46, 3, 45, 34, 49, 27, 28, 29, 30, 31,
- 55, 48, 47, 58, 47, 47, 5, 5, 3, 304,
- 48, 48, 67, 3, 3, 70, 71, 68, 3, 314,
- 45, 60, 48, 34, 41, 48, 34, 41, 43, 324,
- 57, 326, 37, 73, 154, 289, 345, 18, 21, 83,
- 22, 186, 161, 3, 74, 340, 341, 7, 8, 134,
- 348, -1, 104, 102, 363, -1, 351, -1, -1, 354,
- -1, 356, -1, 372, -1, 25, 26, -1, -1, 29,
- -1, -1, 32, 368, -1, -1, -1, -1, -1, -1,
- 40, 41, 42, -1, -1, -1, -1, -1, 48, -1,
+ 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+ 135, 136, 3, 258, 3, 140, 279, 280, 143, 325,
+ 326, 146, 3, 148, 150, 170, 376, 377, 151, 155,
+ 3, 41, 151, 42, 160, 44, 36, 46, 27, 49,
+ 150, 286, 42, 168, 394, 155, 46, 43, 3, 45,
+ 160, 42, 162, 44, 27, 46, 44, 182, 408, 3,
+ 48, 42, 187, 7, 8, 46, 40, 43, 42, 45,
+ 195, 48, 46, 49, 43, 275, 45, 202, 203, 324,
+ 49, 25, 26, 43, 48, 29, 46, 155, 32, 43,
+ 335, 45, 160, 366, 31, 49, 40, 42, 42, 44,
+ 43, 46, 45, 228, 48, 350, 49, 10, 11, 234,
+ 43, 55, 45, 48, 58, 59, 49, 61, 62, 63,
+ 64, 65, 66, 67, 42, 48, 70, 71, 46, 270,
+ 271, 43, 42, 45, 379, 42, 262, 49, 42, 46,
+ 265, 40, 46, 268, 42, 43, 44, 272, 46, 274,
+ 45, 276, 262, 48, 279, 280, 45, 45, 283, 48,
+ 48, 48, 43, 3, 45, 3, 48, 7, 8, 7,
+ 8, 296, 43, 48, 45, 300, 3, 43, 303, 45,
+ 306, 43, 308, 45, 384, 25, 26, 25, 26, 29,
+ 42, 29, 32, 43, 32, 45, 306, 44, 308, 3,
+ 40, 41, 42, 61, 42, 45, 331, 46, 45, 49,
+ 48, 34, 3, 3, 40, 55, 341, 55, 58, 3,
+ 58, 27, 28, 29, 30, 31, 351, 67, 353, 67,
+ 70, 71, 70, 71, 47, 46, 3, 42, 48, 34,
+ 381, 3, 45, 3, 5, 7, 8, 47, 47, 47,
+ 5, 376, 377, 25, 26, 27, 28, 29, 30, 31,
+ 401, 34, 387, 25, 26, 390, 3, 29, 40, 394,
+ 32, 412, 48, 48, 68, 3, 3, 48, 40, 41,
+ 42, 50, 48, 408, 48, 3, 48, 45, 50, 51,
+ 52, 53, 54, 55, 56, 57, 58, 59, 48, 61,
+ 62, 63, 64, 65, 66, 67, 60, 3, 70, 71,
+ 72, 73, 3, 34, 48, 41, 7, 8, 48, 34,
+ 43, 41, 75, 37, 57, 308, 310, 314, 164, 21,
+ 86, 194, 22, 76, 25, 26, 169, 107, 29, 384,
+ 105, 32, -1, -1, 137, -1, -1, -1, -1, 40,
+ 41, 42, -1, -1, -1, -1, -1, 48, -1, 50,
+ 51, 52, 53, 54, 55, 56, 57, 58, 59, -1,
+ 61, 62, 63, 64, 65, 66, 67, -1, -1, 70,
+ 71, 72, 73, 3, -1, -1, -1, 7, 8, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 25, 26, -1, -1, 29,
+ -1, -1, 32, -1, -1, -1, -1, -1, -1, -1,
+ 40, -1, 42, -1, -1, -1, -1, -1, 48, -1,
50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
-1, 61, 62, 63, 64, 65, 66, 67, -1, -1,
70, 71, 72, 73, 3, -1, -1, -1, 7, 8,
@@ -1104,230 +1139,220 @@
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, 25, 26, -1, -1,
29, -1, -1, 32, -1, -1, -1, -1, -1, -1,
- -1, 40, 41, 42, -1, -1, -1, -1, -1, 48,
+ -1, 40, -1, 42, -1, -1, -1, -1, -1, 48,
-1, 50, 51, 52, 53, 54, 55, 56, 57, 58,
59, -1, 61, 62, 63, 64, 65, 66, 67, -1,
-1, 70, 71, 72, 73, 3, -1, -1, -1, 7,
8, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, 25, 26, -1,
- -1, 29, -1, -1, 32, -1, -1, -1, -1, -1,
- -1, -1, 40, -1, 42, -1, -1, -1, -1, -1,
- 48, -1, 50, 51, 52, 53, 54, 55, 56, 57,
- 58, 59, -1, 61, 62, 63, 64, 65, 66, 67,
- -1, -1, 70, 71, 72, 73, 3, -1, -1, -1,
- 7, 8, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 25, 26,
- -1, -1, 29, -1, -1, 32, -1, -1, -1, -1,
- -1, -1, -1, 40, -1, 42, -1, -1, -1, -1,
- -1, 48, -1, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, -1, 61, 62, 63, 64, 65, 66,
- 67, -1, -1, 70, 71, 72, 73, 3, -1, 3,
- -1, 7, 8, 7, 8, -1, -1, -1, -1, -1,
+ -1, 29, 3, -1, 32, -1, 7, 8, -1, -1,
+ -1, -1, -1, -1, 42, 43, -1, -1, -1, -1,
+ -1, 49, -1, -1, 25, 26, -1, 55, 29, -1,
+ 58, 32, -1, 3, -1, 36, -1, 7, 8, 67,
+ -1, 42, 70, 71, -1, -1, 47, -1, -1, -1,
+ -1, -1, -1, -1, 55, 25, 26, 58, -1, 29,
+ 3, -1, 32, -1, 7, 8, 67, -1, -1, 70,
+ 71, -1, 42, 43, -1, -1, -1, -1, -1, 49,
+ -1, -1, 25, 26, -1, 55, 29, -1, 58, 32,
+ -1, -1, -1, 36, -1, -1, -1, 67, -1, 42,
+ 70, 71, -1, 3, -1, -1, -1, 7, 8, -1,
+ -1, -1, 55, 13, -1, 58, -1, 3, -1, -1,
+ -1, 7, 8, -1, 67, 25, 26, 70, 71, 29,
+ -1, -1, 32, -1, -1, -1, -1, -1, -1, 25,
+ 26, -1, 42, 29, -1, -1, 32, -1, -1, -1,
+ -1, -1, -1, -1, -1, 55, 42, -1, 58, -1,
+ 3, 47, -1, -1, 7, 8, -1, 67, -1, 55,
+ 70, 71, 58, -1, -1, -1, -1, -1, -1, -1,
+ -1, 67, 25, 26, 70, 71, 29, 3, -1, 32,
+ -1, 7, 8, -1, -1, -1, 12, 40, -1, 42,
-1, -1, -1, -1, -1, -1, -1, -1, -1, 25,
- 26, 25, 26, 29, -1, 29, 32, -1, 32, -1,
- -1, -1, 36, -1, 40, -1, 42, -1, 42, -1,
- -1, -1, 48, 47, -1, -1, -1, -1, -1, 55,
- -1, 55, 58, 59, 58, 61, 62, 63, 64, 65,
- 66, 67, -1, 67, 70, 71, 70, 71, 3, -1,
- 3, -1, 7, 8, 7, 8, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 25, 26, 25, 26, 29, -1, 29, 32, -1, 32,
- -1, -1, -1, -1, -1, -1, -1, 42, 43, 42,
- -1, -1, -1, -1, 49, 48, -1, -1, -1, -1,
- 55, -1, 55, 58, 3, 58, -1, -1, 7, 8,
- -1, -1, 67, -1, 67, 70, 71, 70, 71, -1,
- -1, -1, -1, -1, 3, -1, 25, 26, 7, 8,
- 29, -1, -1, 32, 13, -1, -1, 36, -1, -1,
- -1, -1, -1, 42, -1, -1, 25, 26, -1, -1,
- 29, -1, -1, 32, -1, -1, 55, -1, -1, 58,
- 3, -1, -1, 42, 7, 8, -1, -1, 67, -1,
- -1, 70, 71, -1, -1, -1, 55, -1, -1, 58,
- 3, -1, 25, 26, 7, 8, 29, -1, 67, 32,
- -1, 70, 71, -1, -1, -1, -1, -1, -1, 42,
- -1, -1, 25, 26, 47, -1, 29, -1, -1, 32,
- -1, -1, 55, -1, -1, 58, 3, 40, -1, 42,
- 7, 8, -1, -1, 67, 12, -1, 70, 71, -1,
- -1, -1, 55, -1, -1, 58, 3, -1, 25, 26,
- 7, 8, 29, -1, 67, 32, -1, 70, 71, -1,
- -1, -1, -1, -1, -1, 42, 3, -1, 25, 26,
- 7, 8, 29, -1, -1, 32, -1, -1, 55, -1,
- -1, 58, -1, -1, -1, 42, -1, -1, 25, 26,
- 67, -1, 29, 70, 71, 32, -1, -1, 55, -1,
- -1, 58, -1, -1, -1, 42, -1, -1, -1, -1,
- 67, -1, -1, 70, 71, -1, -1, -1, 55, -1,
- -1, 58, -1, -1, -1, -1, -1, -1, -1, -1,
- 67, -1, -1, 70, 71, 4, 5, 6, 7, 8,
- 9, -1, -1, -1, -1, 14, 15, 16, 17, 18,
+ 26, -1, 55, 29, 3, 58, 32, -1, 7, 8,
+ -1, -1, -1, -1, 67, -1, 42, 70, 71, -1,
+ -1, -1, -1, -1, -1, -1, 25, 26, -1, 55,
+ 29, 3, 58, 32, -1, 7, 8, -1, -1, -1,
+ -1, 67, -1, 42, 70, 71, -1, -1, -1, -1,
+ -1, -1, -1, 25, 26, -1, 55, 29, -1, 58,
+ 32, -1, -1, -1, -1, -1, -1, -1, 67, -1,
+ 42, 70, 71, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 55, -1, -1, 58, -1, -1, -1,
+ -1, -1, -1, -1, -1, 67, -1, -1, 70, 71,
+ 4, 5, 6, 7, 8, 9, -1, -1, -1, -1,
+ 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
+ 24, 25, 26, 27, 28, 29, 30, 31, 32, -1,
+ 34, 35, -1, -1, -1, -1, 40, 4, 5, 6,
+ 7, 8, 9, -1, 48, -1, -1, 14, 15, 16,
+ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+ 27, 28, 29, 30, 31, 32, -1, 34, 35, 36,
+ -1, -1, -1, 40, 4, 5, 6, 7, 8, 9,
+ 47, -1, -1, -1, 14, 15, 16, 17, 18, 19,
+ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+ 30, 31, 32, -1, 34, 35, 36, -1, -1, -1,
+ 40, 4, 5, 6, 7, 8, 9, 47, -1, -1,
+ -1, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+ 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
+ -1, 34, 35, -1, -1, -1, -1, 40, 4, 5,
+ 6, 7, 8, 9, 47, -1, -1, -1, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+ 26, 27, 28, 29, 30, 31, 32, -1, 34, 35,
+ -1, -1, -1, -1, 40, 4, 5, 6, 7, 8,
+ 9, 47, -1, -1, -1, 14, 15, 16, 17, 18,
19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
29, 30, 31, 32, -1, 34, 35, -1, -1, -1,
- -1, 40, 4, 5, 6, 7, 8, 9, -1, 48,
- -1, -1, 14, 15, 16, 17, 18, 19, 20, 21,
- 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, -1, 34, 35, 36, -1, -1, -1, 40, 4,
- 5, 6, 7, 8, 9, 47, -1, -1, -1, 14,
+ -1, 40, -1, -1, 43, -1, 45, 4, 5, 6,
+ 7, 8, 9, -1, -1, -1, -1, 14, 15, 16,
+ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+ 27, 28, 29, 30, 31, 32, -1, 34, 35, -1,
+ -1, -1, -1, 40, 41, -1, -1, -1, 45, 4,
+ 5, 6, 7, 8, 9, -1, -1, -1, -1, 14,
15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
25, 26, 27, 28, 29, 30, 31, 32, -1, 34,
- 35, 36, -1, -1, -1, 40, 4, 5, 6, 7,
- 8, 9, 47, -1, -1, -1, 14, 15, 16, 17,
+ 35, -1, -1, -1, -1, 40, 41, -1, -1, -1,
+ 45, 4, 5, 6, 7, 8, 9, -1, -1, -1,
+ -1, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+ 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
+ -1, 34, 35, -1, -1, -1, -1, 40, -1, -1,
+ 43, 4, 5, 6, 7, 8, 9, -1, -1, -1,
+ -1, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+ 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
+ -1, 34, 35, -1, -1, -1, -1, 40, -1, -1,
+ 43, 4, 5, 6, 7, 8, 9, -1, -1, -1,
+ -1, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+ 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
+ -1, 34, 35, -1, -1, -1, -1, 40, -1, -1,
+ 43, 4, 5, 6, 7, 8, 9, -1, -1, -1,
+ -1, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+ 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
+ -1, 34, 35, -1, -1, -1, -1, 40, -1, -1,
+ 43, 4, 5, 6, 7, 8, 9, -1, -1, -1,
+ -1, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+ 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
+ -1, 34, 35, -1, -1, -1, -1, 40, 41, 4,
+ 5, 6, 7, 8, 9, -1, -1, -1, -1, 14,
+ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+ 25, 26, 27, 28, 29, 30, 31, 32, -1, 34,
+ 35, -1, -1, -1, -1, 40, 41, 4, 5, 6,
+ 7, 8, 9, -1, -1, -1, -1, 14, 15, 16,
+ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+ 27, 28, 29, 30, 31, 32, -1, 34, 35, 36,
+ -1, -1, -1, 40, 4, 5, 6, 7, 8, 9,
+ -1, -1, -1, -1, 14, 15, 16, 17, 18, 19,
+ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+ 30, 31, 32, -1, 34, 35, -1, -1, -1, 4,
+ 40, 6, 7, 8, 9, -1, -1, -1, -1, 14,
+ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+ 25, 26, 27, 28, 29, 30, 31, 32, -1, 34,
+ 35, -1, -1, -1, 39, 40, 4, -1, 6, 7,
+ 8, 9, -1, -1, -1, -1, 14, 15, 16, 17,
18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
28, 29, 30, 31, 32, -1, 34, 35, -1, -1,
- -1, -1, 40, 4, 5, 6, 7, 8, 9, 47,
+ -1, 39, 40, 4, -1, 6, 7, 8, 9, -1,
-1, -1, -1, 14, 15, 16, 17, 18, 19, 20,
21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
- 31, 32, -1, 34, 35, -1, -1, -1, -1, 40,
- 4, 5, 6, 7, 8, 9, 47, -1, -1, -1,
+ 31, 32, -1, 34, 35, -1, -1, -1, 39, 40,
+ 4, -1, 6, 7, 8, 9, -1, -1, -1, -1,
14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
24, 25, 26, 27, 28, 29, 30, 31, 32, -1,
- 34, 35, -1, -1, -1, -1, 40, -1, -1, 43,
- -1, 45, 4, 5, 6, 7, 8, 9, -1, -1,
- -1, -1, 14, 15, 16, 17, 18, 19, 20, 21,
- 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, -1, 34, 35, -1, -1, -1, -1, 40, 41,
- -1, -1, -1, 45, 4, 5, 6, 7, 8, 9,
- -1, -1, -1, -1, 14, 15, 16, 17, 18, 19,
- 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
- 30, 31, 32, -1, 34, 35, -1, -1, -1, -1,
- 40, 41, -1, -1, -1, 45, 4, 5, 6, 7,
+ 34, 35, -1, -1, -1, -1, 40, 5, 6, 7,
8, 9, -1, -1, -1, -1, 14, 15, 16, 17,
18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 29, 30, 31, 32, -1, 34, 35, -1, -1,
- -1, -1, 40, -1, -1, 43, 4, 5, 6, 7,
- 8, 9, -1, -1, -1, -1, 14, 15, 16, 17,
+ 28, 29, 30, 31, 32, -1, -1, 35, -1, -1,
+ -1, -1, 40, 5, 6, 7, 8, 9, -1, -1,
+ -1, -1, -1, 15, 16, 17, 18, 19, 20, 21,
+ 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 5, 6, 7, 8, 9, -1, -1, 40, -1,
+ -1, -1, 16, 17, 18, 19, 20, 21, 22, 23,
+ 24, 25, 26, 27, 28, 29, 30, 31, 32, 5,
+ 6, 7, 8, 9, -1, -1, 40, -1, -1, -1,
+ -1, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+ 26, 27, 28, 29, 30, 31, 32, 5, 6, 7,
+ 8, 9, -1, -1, 40, -1, -1, -1, -1, -1,
18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 29, 30, 31, 32, -1, 34, 35, -1, -1,
- -1, -1, 40, -1, -1, 43, 4, 5, 6, 7,
- 8, 9, -1, -1, -1, -1, 14, 15, 16, 17,
- 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 29, 30, 31, 32, -1, 34, 35, -1, -1,
- -1, -1, 40, -1, -1, 43, 4, 5, 6, 7,
- 8, 9, -1, -1, -1, -1, 14, 15, 16, 17,
- 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 29, 30, 31, 32, -1, 34, 35, -1, -1,
- -1, -1, 40, -1, -1, 43, 4, 5, 6, 7,
- 8, 9, -1, -1, -1, -1, 14, 15, 16, 17,
- 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 29, 30, 31, 32, -1, 34, 35, -1, -1,
- -1, -1, 40, 41, 4, 5, 6, 7, 8, 9,
- -1, -1, -1, -1, 14, 15, 16, 17, 18, 19,
+ 28, 29, 30, 31, 32, 5, 6, 7, 8, 9,
+ -1, -1, 40, -1, -1, -1, -1, -1, -1, -1,
20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
- 30, 31, 32, -1, 34, 35, -1, -1, -1, -1,
- 40, 41, 4, 5, 6, 7, 8, 9, -1, -1,
- -1, -1, 14, 15, 16, 17, 18, 19, 20, 21,
- 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, -1, 34, 35, 36, -1, -1, -1, 40, 4,
- 5, 6, 7, 8, 9, -1, -1, -1, -1, 14,
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
- 25, 26, 27, 28, 29, 30, 31, 32, -1, 34,
- 35, -1, -1, -1, 4, 40, 6, 7, 8, 9,
- -1, -1, -1, -1, 14, 15, 16, 17, 18, 19,
- 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
- 30, 31, 32, -1, 34, 35, -1, -1, -1, 39,
- 40, 4, -1, 6, 7, 8, 9, -1, -1, -1,
- -1, 14, 15, 16, 17, 18, 19, 20, 21, 22,
- 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
- -1, 34, 35, -1, -1, -1, 39, 40, 4, -1,
- 6, 7, 8, 9, -1, -1, -1, -1, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
- 26, 27, 28, 29, 30, 31, 32, -1, 34, 35,
- -1, -1, -1, 39, 40, 4, -1, 6, 7, 8,
- 9, -1, -1, -1, -1, 14, 15, 16, 17, 18,
- 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
- 29, 30, 31, 32, -1, 34, 35, -1, -1, -1,
- -1, 40, 5, 6, 7, 8, 9, -1, -1, -1,
- -1, 14, 15, 16, 17, 18, 19, 20, 21, 22,
- 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
- -1, -1, 35, -1, -1, -1, -1, 40, 5, 6,
- 7, 8, 9, -1, -1, -1, -1, -1, 15, 16,
- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 5, 6, 7, 8,
- 9, -1, -1, 40, -1, -1, -1, 16, 17, 18,
- 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
- 29, 30, 31, 32, 5, 6, 7, 8, 9, -1,
- -1, 40, -1, -1, -1, -1, 17, 18, 19, 20,
- 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
- 31, 32, 5, 6, 7, 8, 9, -1, -1, 40,
- -1, -1, -1, -1, -1, 18, 19, 20, 21, 22,
- 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
- 5, 6, 7, 8, 9, -1, -1, 40, -1, -1,
- -1, -1, -1, -1, -1, 20, 21, 22, 23, 24,
- 25, 26, 27, 28, 29, 30, 31, 32, 5, 6,
- 7, 8, 9, -1, -1, 40, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 5, 6, 7, 8,
- 9, -1, -1, 40, 5, 6, 7, 8, 9, -1,
- -1, -1, -1, -1, -1, 24, 25, 26, 27, 28,
- 29, 30, 31, -1, 25, 26, 27, 28, 29, 30,
- 31, 40, -1, -1, -1, -1, -1, -1, -1, 40
+ 30, 31, 32, 5, 6, 7, 8, 9, -1, -1,
+ 40, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 5, 6, 7, 8, 9, -1, -1, 40, 5,
+ 6, 7, 8, 9, -1, -1, -1, -1, -1, -1,
+ 24, 25, 26, 27, 28, 29, 30, 31, -1, 25,
+ 26, 27, 28, 29, 30, 31, 40, -1, -1, -1,
+ -1, -1, -1, -1, 40
};
/* YYSTOS[STATE-NUM] -- The symbol kind of the accessing symbol of
state STATE-NUM. */
-static const yytype_int8 yystos[] =
+static const yytype_uint8 yystos[] =
{
0, 77, 78, 0, 3, 7, 8, 25, 26, 29,
32, 40, 42, 48, 50, 51, 52, 53, 54, 55,
56, 57, 58, 59, 61, 62, 63, 64, 65, 66,
- 67, 70, 71, 72, 73, 80, 81, 82, 83, 89,
- 90, 91, 92, 99, 106, 107, 109, 113, 119, 120,
- 121, 80, 113, 113, 113, 113, 113, 79, 80, 112,
- 113, 3, 71, 86, 87, 88, 80, 87, 3, 71,
- 3, 80, 86, 40, 3, 80, 89, 91, 80, 92,
- 42, 42, 119, 42, 48, 48, 48, 113, 113, 42,
- 44, 46, 93, 72, 73, 83, 119, 48, 3, 95,
- 96, 97, 42, 44, 46, 4, 5, 6, 7, 8,
- 9, 14, 15, 16, 17, 18, 19, 20, 21, 22,
- 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
- 34, 35, 40, 114, 115, 116, 48, 46, 41, 81,
- 43, 93, 43, 45, 43, 45, 3, 45, 48, 48,
- 48, 48, 48, 51, 50, 78, 99, 46, 3, 42,
- 46, 93, 94, 113, 113, 61, 90, 91, 120, 122,
- 125, 48, 3, 43, 49, 110, 111, 113, 3, 36,
- 47, 108, 113, 46, 42, 93, 45, 34, 43, 111,
- 3, 108, 113, 113, 10, 11, 117, 118, 113, 113,
- 113, 113, 113, 113, 113, 113, 113, 113, 113, 113,
- 113, 113, 113, 113, 113, 113, 113, 113, 113, 113,
- 13, 113, 113, 116, 115, 113, 43, 113, 113, 3,
- 87, 3, 27, 84, 85, 27, 85, 41, 42, 43,
- 49, 68, 103, 104, 105, 113, 40, 42, 100, 46,
- 93, 43, 43, 42, 3, 48, 45, 34, 110, 43,
- 45, 49, 113, 47, 36, 47, 47, 43, 103, 96,
- 98, 100, 113, 43, 47, 47, 113, 12, 113, 5,
- 5, 36, 113, 41, 45, 115, 113, 3, 48, 45,
- 48, 48, 48, 43, 103, 121, 105, 43, 45, 49,
- 91, 47, 41, 45, 49, 98, 101, 102, 43, 103,
- 113, 119, 119, 113, 36, 113, 123, 120, 113, 110,
- 110, 113, 121, 43, 39, 113, 39, 113, 41, 113,
- 3, 84, 43, 121, 105, 105, 3, 97, 98, 41,
- 49, 45, 121, 43, 47, 60, 43, 113, 48, 121,
- 113, 39, 113, 41, 45, 97, 34, 41, 98, 98,
- 121, 119, 48, 43, 124, 125, 113, 113, 34, 98,
- 41, 119, 43, 41, 98, 119
+ 67, 70, 71, 72, 73, 80, 81, 82, 83, 93,
+ 94, 95, 96, 103, 110, 111, 113, 117, 123, 124,
+ 125, 80, 117, 117, 117, 117, 117, 79, 80, 116,
+ 117, 3, 71, 90, 91, 92, 80, 57, 90, 91,
+ 3, 71, 3, 80, 90, 40, 3, 52, 80, 93,
+ 95, 80, 96, 42, 42, 123, 42, 48, 48, 48,
+ 117, 117, 42, 44, 46, 97, 72, 73, 83, 123,
+ 48, 3, 99, 100, 101, 42, 44, 46, 4, 5,
+ 6, 7, 8, 9, 14, 15, 16, 17, 18, 19,
+ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+ 30, 31, 32, 34, 35, 40, 118, 119, 120, 48,
+ 46, 41, 81, 43, 97, 43, 45, 43, 45, 3,
+ 42, 45, 48, 48, 42, 42, 48, 48, 48, 51,
+ 42, 50, 78, 103, 42, 46, 3, 42, 46, 97,
+ 98, 117, 117, 61, 94, 95, 124, 126, 129, 48,
+ 3, 43, 49, 114, 115, 117, 3, 36, 47, 112,
+ 117, 46, 42, 97, 45, 34, 43, 115, 3, 112,
+ 117, 117, 10, 11, 121, 122, 117, 117, 117, 117,
+ 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
+ 117, 117, 117, 117, 117, 117, 117, 117, 13, 117,
+ 117, 120, 119, 117, 43, 117, 117, 3, 3, 84,
+ 85, 95, 90, 91, 3, 86, 87, 85, 3, 27,
+ 88, 89, 85, 27, 89, 41, 87, 42, 43, 49,
+ 68, 107, 108, 109, 117, 40, 42, 104, 46, 97,
+ 43, 43, 42, 3, 48, 45, 34, 114, 43, 45,
+ 49, 117, 47, 36, 47, 47, 43, 107, 100, 102,
+ 104, 117, 43, 47, 47, 117, 12, 117, 5, 5,
+ 36, 117, 41, 45, 119, 117, 34, 43, 45, 43,
+ 45, 43, 3, 48, 45, 48, 43, 48, 48, 43,
+ 43, 107, 125, 109, 43, 45, 49, 95, 47, 41,
+ 45, 49, 102, 105, 106, 43, 107, 117, 123, 123,
+ 117, 36, 117, 127, 124, 117, 114, 114, 117, 125,
+ 43, 39, 117, 39, 117, 41, 117, 95, 3, 48,
+ 84, 48, 86, 48, 3, 88, 50, 48, 43, 125,
+ 109, 109, 3, 101, 102, 41, 49, 45, 125, 43,
+ 47, 60, 43, 117, 48, 125, 117, 39, 117, 41,
+ 45, 3, 89, 101, 34, 41, 102, 102, 125, 123,
+ 48, 43, 128, 129, 117, 117, 48, 48, 34, 102,
+ 41, 123, 43, 41, 102, 123
};
/* YYR1[RULE-NUM] -- Symbol kind of the left-hand side of rule RULE-NUM. */
-static const yytype_int8 yyr1[] =
+static const yytype_uint8 yyr1[] =
{
0, 76, 77, 78, 78, 79, 79, 80, 80, 80,
81, 81, 81, 81, 82, 82, 82, 82, 83, 83,
83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 84, 84, 85, 85, 86, 86, 87, 87, 88, 88,
- 89, 90, 91, 91, 92, 93, 93, 94, 94, 95,
- 95, 96, 96, 97, 97, 97, 97, 98, 98, 99,
- 100, 100, 100, 100, 101, 101, 101, 102, 102, 103,
- 103, 103, 103, 104, 104, 105, 105, 105, 105, 105,
- 106, 106, 107, 107, 108, 108, 108, 108, 109, 109,
- 109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
- 110, 110, 111, 111, 111, 111, 112, 112, 113, 113,
- 113, 113, 113, 113, 113, 113, 113, 113, 113, 113,
- 113, 113, 113, 113, 113, 113, 113, 113, 113, 113,
- 113, 113, 113, 113, 113, 113, 113, 113, 113, 113,
- 113, 113, 113, 113, 113, 113, 113, 113, 113, 113,
- 113, 113, 113, 113, 113, 113, 113, 114, 114, 114,
- 114, 114, 115, 115, 115, 115, 116, 116, 116, 116,
- 116, 117, 117, 117, 117, 118, 118, 119, 119, 119,
- 119, 119, 119, 119, 119, 119, 119, 119, 119, 119,
- 120, 121, 122, 122, 122, 123, 123, 124, 124, 125,
- 125
+ 83, 83, 83, 83, 83, 83, 84, 84, 85, 85,
+ 86, 87, 87, 88, 88, 89, 89, 90, 90, 91,
+ 91, 92, 92, 93, 94, 95, 95, 96, 97, 97,
+ 98, 98, 99, 99, 100, 100, 101, 101, 101, 101,
+ 102, 102, 103, 104, 104, 104, 104, 105, 105, 105,
+ 106, 106, 107, 107, 107, 107, 108, 108, 109, 109,
+ 109, 109, 109, 110, 110, 111, 111, 112, 112, 112,
+ 112, 113, 113, 113, 113, 113, 113, 113, 113, 113,
+ 113, 113, 113, 114, 114, 115, 115, 115, 115, 116,
+ 116, 117, 117, 117, 117, 117, 117, 117, 117, 117,
+ 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
+ 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
+ 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
+ 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
+ 118, 118, 118, 118, 118, 119, 119, 119, 119, 120,
+ 120, 120, 120, 120, 121, 121, 121, 121, 122, 122,
+ 123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
+ 123, 123, 123, 124, 125, 126, 126, 126, 127, 127,
+ 128, 128, 129, 129
};
/* YYR2[RULE-NUM] -- Number of symbols on the right-hand side of rule RULE-NUM. */
@@ -1336,24 +1361,25 @@
0, 2, 1, 0, 2, 0, 2, 1, 3, 1,
1, 1, 2, 2, 1, 1, 2, 2, 1, 1,
1, 3, 5, 5, 3, 5, 5, 3, 3, 3,
- 1, 3, 1, 3, 1, 1, 1, 3, 1, 3,
- 2, 2, 1, 2, 1, 2, 3, 3, 4, 1,
- 3, 1, 3, 1, 2, 3, 4, 1, 1, 3,
- 2, 4, 3, 5, 1, 1, 2, 1, 3, 1,
- 2, 3, 3, 1, 0, 2, 3, 5, 4, 6,
- 5, 6, 3, 2, 1, 2, 2, 3, 3, 4,
- 4, 4, 4, 3, 4, 3, 4, 3, 3, 1,
- 1, 3, 1, 2, 3, 3, 3, 3, 1, 1,
- 1, 1, 2, 4, 5, 2, 2, 2, 3, 3,
+ 6, 6, 8, 6, 6, 8, 3, 1, 1, 3,
+ 1, 1, 3, 1, 3, 1, 3, 1, 1, 1,
+ 3, 1, 3, 2, 2, 1, 2, 1, 2, 3,
+ 3, 4, 1, 3, 1, 3, 1, 2, 3, 4,
+ 1, 1, 3, 2, 4, 3, 5, 1, 1, 2,
+ 1, 3, 1, 2, 3, 3, 1, 0, 2, 3,
+ 5, 4, 6, 5, 6, 3, 2, 1, 2, 2,
+ 3, 3, 4, 4, 4, 4, 3, 4, 3, 4,
+ 3, 3, 1, 1, 3, 1, 2, 3, 3, 3,
+ 3, 1, 1, 1, 1, 2, 4, 5, 2, 2,
+ 2, 3, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 3, 3, 3, 3, 2, 3,
- 4, 3, 4, 5, 6, 6, 7, 5, 3, 3,
- 3, 2, 2, 2, 2, 3, 4, 1, 1, 2,
- 2, 3, 4, 3, 5, 7, 1, 3, 3, 1,
- 1, 2, 4, 3, 5, 2, 4, 1, 1, 2,
- 5, 7, 5, 7, 9, 8, 2, 2, 2, 3,
- 1, 1, 0, 1, 1, 0, 1, 0, 1, 1,
- 3
+ 3, 2, 3, 4, 3, 4, 5, 6, 6, 7,
+ 5, 3, 3, 3, 2, 2, 2, 2, 3, 4,
+ 1, 1, 2, 2, 3, 4, 3, 5, 7, 1,
+ 3, 3, 1, 1, 2, 4, 3, 5, 2, 4,
+ 1, 1, 2, 5, 7, 5, 7, 9, 8, 2,
+ 2, 2, 3, 1, 1, 0, 1, 1, 0, 1,
+ 0, 1, 1, 3
};
@@ -1817,1232 +1843,1320 @@
switch (yyn)
{
case 2: /* file: fileblock */
-#line 191 "camp.y"
+#line 195 "camp.y"
{ absyntax::root = (yyvsp[0].b); }
-#line 1823 "camp.tab.c"
+#line 1849 "camp.tab.c"
break;
case 3: /* fileblock: %empty */
-#line 195 "camp.y"
+#line 199 "camp.y"
{ (yyval.b) = new file(lexerPos(), false); }
-#line 1829 "camp.tab.c"
+#line 1855 "camp.tab.c"
break;
case 4: /* fileblock: fileblock runnable */
-#line 197 "camp.y"
+#line 201 "camp.y"
{ (yyval.b) = (yyvsp[-1].b); (yyval.b)->add((yyvsp[0].run)); }
-#line 1835 "camp.tab.c"
+#line 1861 "camp.tab.c"
break;
case 5: /* bareblock: %empty */
-#line 201 "camp.y"
+#line 205 "camp.y"
{ (yyval.b) = new block(lexerPos(), true); }
-#line 1841 "camp.tab.c"
+#line 1867 "camp.tab.c"
break;
case 6: /* bareblock: bareblock runnable */
-#line 203 "camp.y"
+#line 207 "camp.y"
{ (yyval.b) = (yyvsp[-1].b); (yyval.b)->add((yyvsp[0].run)); }
-#line 1847 "camp.tab.c"
+#line 1873 "camp.tab.c"
break;
case 7: /* name: ID */
-#line 207 "camp.y"
+#line 211 "camp.y"
{ (yyval.n) = new simpleName((yyvsp[0].ps).pos, (yyvsp[0].ps).sym); }
-#line 1853 "camp.tab.c"
+#line 1879 "camp.tab.c"
break;
case 8: /* name: name '.' ID */
-#line 208 "camp.y"
+#line 212 "camp.y"
{ (yyval.n) = new qualifiedName((yyvsp[-1].pos), (yyvsp[-2].n), (yyvsp[0].ps).sym); }
-#line 1859 "camp.tab.c"
+#line 1885 "camp.tab.c"
break;
case 9: /* name: '%' */
-#line 209 "camp.y"
+#line 213 "camp.y"
{ (yyval.n) = new simpleName((yyvsp[0].ps).pos,
symbol::trans("operator answer")); }
-#line 1866 "camp.tab.c"
+#line 1892 "camp.tab.c"
break;
case 10: /* runnable: dec */
-#line 214 "camp.y"
+#line 218 "camp.y"
{ (yyval.run) = (yyvsp[0].d); }
-#line 1872 "camp.tab.c"
+#line 1898 "camp.tab.c"
break;
case 11: /* runnable: stm */
-#line 215 "camp.y"
+#line 219 "camp.y"
{ (yyval.run) = (yyvsp[0].s); }
-#line 1878 "camp.tab.c"
+#line 1904 "camp.tab.c"
break;
case 12: /* runnable: modifiers dec */
-#line 217 "camp.y"
+#line 221 "camp.y"
{ (yyval.run) = new modifiedRunnable((yyvsp[-1].ml)->getPos(), (yyvsp[-1].ml), (yyvsp[0].d)); }
-#line 1884 "camp.tab.c"
+#line 1910 "camp.tab.c"
break;
case 13: /* runnable: modifiers stm */
-#line 219 "camp.y"
+#line 223 "camp.y"
{ (yyval.run) = new modifiedRunnable((yyvsp[-1].ml)->getPos(), (yyvsp[-1].ml), (yyvsp[0].s)); }
-#line 1890 "camp.tab.c"
+#line 1916 "camp.tab.c"
break;
case 14: /* modifiers: MODIFIER */
-#line 223 "camp.y"
+#line 227 "camp.y"
{ (yyval.ml) = new modifierList((yyvsp[0].mod).pos); (yyval.ml)->add((yyvsp[0].mod).val); }
-#line 1896 "camp.tab.c"
+#line 1922 "camp.tab.c"
break;
case 15: /* modifiers: PERM */
-#line 224 "camp.y"
+#line 228 "camp.y"
{ (yyval.ml) = new modifierList((yyvsp[0].perm).pos); (yyval.ml)->add((yyvsp[0].perm).val); }
-#line 1902 "camp.tab.c"
+#line 1928 "camp.tab.c"
break;
case 16: /* modifiers: modifiers MODIFIER */
-#line 226 "camp.y"
+#line 230 "camp.y"
{ (yyval.ml) = (yyvsp[-1].ml); (yyval.ml)->add((yyvsp[0].mod).val); }
-#line 1908 "camp.tab.c"
+#line 1934 "camp.tab.c"
break;
case 17: /* modifiers: modifiers PERM */
-#line 228 "camp.y"
+#line 232 "camp.y"
{ (yyval.ml) = (yyvsp[-1].ml); (yyval.ml)->add((yyvsp[0].perm).val); }
-#line 1914 "camp.tab.c"
+#line 1940 "camp.tab.c"
break;
case 18: /* dec: vardec */
-#line 232 "camp.y"
+#line 236 "camp.y"
{ (yyval.d) = (yyvsp[0].vd); }
-#line 1920 "camp.tab.c"
+#line 1946 "camp.tab.c"
break;
case 19: /* dec: fundec */
-#line 233 "camp.y"
+#line 237 "camp.y"
{ (yyval.d) = (yyvsp[0].d); }
-#line 1926 "camp.tab.c"
+#line 1952 "camp.tab.c"
break;
case 20: /* dec: typedec */
-#line 234 "camp.y"
+#line 238 "camp.y"
{ (yyval.d) = (yyvsp[0].d); }
-#line 1932 "camp.tab.c"
+#line 1958 "camp.tab.c"
break;
case 21: /* dec: ACCESS stridpairlist ';' */
-#line 236 "camp.y"
+#line 240 "camp.y"
{ (yyval.d) = new accessdec((yyvsp[-2].pos), (yyvsp[-1].ipl)); }
-#line 1938 "camp.tab.c"
+#line 1964 "camp.tab.c"
break;
case 22: /* dec: FROM name UNRAVEL idpairlist ';' */
-#line 238 "camp.y"
+#line 242 "camp.y"
{ (yyval.d) = new unraveldec((yyvsp[-4].pos), (yyvsp[-3].n), (yyvsp[-1].ipl)); }
-#line 1944 "camp.tab.c"
+#line 1970 "camp.tab.c"
break;
case 23: /* dec: FROM name UNRAVEL '*' ';' */
-#line 240 "camp.y"
+#line 244 "camp.y"
{ (yyval.d) = new unraveldec((yyvsp[-4].pos), (yyvsp[-3].n), WILDCARD); }
-#line 1950 "camp.tab.c"
+#line 1976 "camp.tab.c"
break;
case 24: /* dec: UNRAVEL name ';' */
-#line 241 "camp.y"
+#line 245 "camp.y"
{ (yyval.d) = new unraveldec((yyvsp[-2].pos), (yyvsp[-1].n), WILDCARD); }
-#line 1956 "camp.tab.c"
+#line 1982 "camp.tab.c"
break;
case 25: /* dec: FROM strid ACCESS idpairlist ';' */
-#line 243 "camp.y"
+#line 247 "camp.y"
{ (yyval.d) = new fromaccessdec((yyvsp[-4].pos), (yyvsp[-3].ps).sym, (yyvsp[-1].ipl)); }
-#line 1962 "camp.tab.c"
+#line 1988 "camp.tab.c"
break;
case 26: /* dec: FROM strid ACCESS '*' ';' */
-#line 245 "camp.y"
+#line 249 "camp.y"
{ (yyval.d) = new fromaccessdec((yyvsp[-4].pos), (yyvsp[-3].ps).sym, WILDCARD); }
-#line 1968 "camp.tab.c"
+#line 1994 "camp.tab.c"
break;
case 27: /* dec: IMPORT stridpair ';' */
-#line 247 "camp.y"
+#line 251 "camp.y"
{ (yyval.d) = new importdec((yyvsp[-2].pos), (yyvsp[-1].ip)); }
-#line 1974 "camp.tab.c"
+#line 2000 "camp.tab.c"
break;
case 28: /* dec: INCLUDE ID ';' */
-#line 248 "camp.y"
+#line 252 "camp.y"
{ (yyval.d) = new includedec((yyvsp[-2].pos), (yyvsp[-1].ps).sym); }
-#line 1980 "camp.tab.c"
+#line 2006 "camp.tab.c"
break;
case 29: /* dec: INCLUDE STRING ';' */
-#line 250 "camp.y"
+#line 254 "camp.y"
{ (yyval.d) = new includedec((yyvsp[-2].pos), (yyvsp[-1].stre)->getString()); }
-#line 1986 "camp.tab.c"
+#line 2012 "camp.tab.c"
break;
- case 30: /* idpair: ID */
-#line 254 "camp.y"
+ case 30: /* dec: TYPEDEF IMPORT '(' typeparamlist ')' ';' */
+#line 258 "camp.y"
+ { (yyval.d) = new receiveTypedefDec((yyvsp[-5].pos), (yyvsp[-2].tps)); }
+#line 2018 "camp.tab.c"
+ break;
+
+ case 31: /* dec: IMPORT TYPEDEF '(' typeparamlist ')' ';' */
+#line 260 "camp.y"
+ { (yyval.d) = new badDec((yyvsp[-5].pos), (yyvsp[-5].pos),
+ "Expected 'typedef import(<types>);'");
+ }
+#line 2026 "camp.tab.c"
+ break;
+
+ case 32: /* dec: ACCESS strid '(' decdeclist ')' ID ID ';' */
+#line 265 "camp.y"
+ { (yyval.d) = new templateAccessDec(
+ (yyvsp[-7].pos), (yyvsp[-6].ps).sym, (yyvsp[-4].fls), (yyvsp[-2].ps).sym, (yyvsp[-1].ps).sym, (yyvsp[-2].ps).pos
+ ); }
+#line 2034 "camp.tab.c"
+ break;
+
+ case 33: /* dec: ACCESS strid '(' decdeclist ')' ';' */
+#line 269 "camp.y"
+ { (yyval.d) = new badDec((yyvsp[-5].pos), (yyvsp[0].pos), "expected 'as'"); }
+#line 2040 "camp.tab.c"
+ break;
+
+ case 34: /* dec: IMPORT strid '(' decdeclist ')' ';' */
+#line 271 "camp.y"
+ { (yyval.d) = new badDec((yyvsp[-5].pos), (yyvsp[-5].pos),
+ "Parametrized imports disallowed to reduce naming "
+ "conflicts. Try "
+ "'access <module>(<type parameters>) as <newname>;'."
+ ); }
+#line 2050 "camp.tab.c"
+ break;
+
+ case 35: /* dec: FROM strid '(' decdeclist ')' ACCESS idpairlist ';' */
+#line 277 "camp.y"
+ { (yyval.d) = new fromaccessdec((yyvsp[-7].pos), (yyvsp[-6].ps).sym, (yyvsp[-1].ipl), (yyvsp[-4].fls)); }
+#line 2056 "camp.tab.c"
+ break;
+
+ case 36: /* decdec: ID ASSIGN type */
+#line 283 "camp.y"
+ { (yyval.fl) = new formal(
+ (yyvsp[-2].ps).pos, (yyvsp[0].t), new decidstart((yyvsp[-2].ps).pos, (yyvsp[-2].ps).sym)
+ ); }
+#line 2064 "camp.tab.c"
+ break;
+
+ case 37: /* decdec: type */
+#line 286 "camp.y"
+ { (yyval.fl) = new formal((yyvsp[0].t)->getPos(), (yyvsp[0].t), nullptr); }
+#line 2070 "camp.tab.c"
+ break;
+
+ case 38: /* decdeclist: decdec */
+#line 291 "camp.y"
+ { (yyval.fls) = new formals((yyvsp[0].fl)->getPos()); (yyval.fls)->add((yyvsp[0].fl)); }
+#line 2076 "camp.tab.c"
+ break;
+
+ case 39: /* decdeclist: decdeclist ',' decdec */
+#line 293 "camp.y"
+ { (yyval.fls) = (yyvsp[-2].fls); (yyval.fls)->add((yyvsp[0].fl)); }
+#line 2082 "camp.tab.c"
+ break;
+
+ case 40: /* typeparam: ID */
+#line 297 "camp.y"
+ { (yyval.tp) = new typeParam((yyvsp[0].ps).pos, (yyvsp[0].ps).sym); }
+#line 2088 "camp.tab.c"
+ break;
+
+ case 41: /* typeparamlist: typeparam */
+#line 302 "camp.y"
+ { (yyval.tps) = new typeParamList((yyvsp[0].tp)->getPos()); (yyval.tps)->add((yyvsp[0].tp)); }
+#line 2094 "camp.tab.c"
+ break;
+
+ case 42: /* typeparamlist: typeparamlist ',' typeparam */
+#line 304 "camp.y"
+ { (yyval.tps) = (yyvsp[-2].tps); (yyval.tps)->add((yyvsp[0].tp)); }
+#line 2100 "camp.tab.c"
+ break;
+
+ case 43: /* idpair: ID */
+#line 308 "camp.y"
{ (yyval.ip) = new idpair((yyvsp[0].ps).pos, (yyvsp[0].ps).sym); }
-#line 1992 "camp.tab.c"
+#line 2106 "camp.tab.c"
break;
- case 31: /* idpair: ID ID ID */
-#line 256 "camp.y"
+ case 44: /* idpair: ID ID ID */
+#line 310 "camp.y"
{ (yyval.ip) = new idpair((yyvsp[-2].ps).pos, (yyvsp[-2].ps).sym, (yyvsp[-1].ps).sym , (yyvsp[0].ps).sym); }
-#line 1998 "camp.tab.c"
+#line 2112 "camp.tab.c"
break;
- case 32: /* idpairlist: idpair */
-#line 260 "camp.y"
+ case 45: /* idpairlist: idpair */
+#line 314 "camp.y"
@@ Diff output truncated at 1234567 characters. @@
More information about the tex-live-commits
mailing list.